Browse Source

add apenas os presentes la lista de parlamentares

pull/2260/head
Leandro Roberto 7 years ago
parent
commit
5336fc9948
  1. 34
      sapl/sessao/forms.py
  2. 2
      sapl/sessao/views.py
  3. 2
      sapl/templates/sessao/justificativaausencia_form.html

34
sapl/sessao/forms.py

@ -689,13 +689,18 @@ class ResumoOrdenacaoForm(forms.Form):
class JustificativaAusenciaForm(ModelForm): class JustificativaAusenciaForm(ModelForm):
sessao_plenaria = forms.ModelChoiceField(queryset=SessaoPlenaria.objects.all(),
widget=forms.HiddenInput())
class Meta: class Meta:
model = JustificativaAusencia model = JustificativaAusencia
fields = ['sessao_plenaria', 'tipo_ausencia', 'hora', fields = ['parlamentar',
'data', 'upload_anexo', 'ausencia', 'parlamentar', 'observacao'] 'hora',
'data',
'upload_anexo',
'tipo_ausencia',
'ausencia',
#'materias_do_expediente',
#'materias_da_ordem_do_dia',
'observacao'
]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -710,7 +715,11 @@ class JustificativaAusenciaForm(ModelForm):
[('tipo_ausencia', 12)]) [('tipo_ausencia', 12)])
row5 = to_row( row5 = to_row(
[('ausencia', 12)]) [('ausencia', 12)])
row6 = to_row( # row6 = to_row(
# [('materias_do_expediente', 12)])
# row7 = to_row(
# [('materias_da_ordem_do_dia', 12)])
row8 = to_row(
[('observacao', 12)]) [('observacao', 12)])
self.helper = FormHelper() self.helper = FormHelper()
@ -718,13 +727,22 @@ class JustificativaAusenciaForm(ModelForm):
Fieldset(_('Justificativa de Ausência'), Fieldset(_('Justificativa de Ausência'),
row1, row2, row3, row1, row2, row3,
row4, row5, row4, row5,
HTML(ausencia_materia), # row6,
row6, # row7,
row8,
form_actions(label='Salvar')) form_actions(label='Salvar'))
) )
super(JustificativaAusenciaForm, self).__init__( super(JustificativaAusenciaForm, self).__init__(
*args, **kwargs) *args, **kwargs)
presencas = SessaoPlenariaPresenca.objects.filter(
sessao_plenaria_id=kwargs['initial']['sessao_plenaria']
).order_by('parlamentar__nome_parlamentar')
self.fields['parlamentar'].choices = [
(p.parlamentar.id, p.parlamentar) for p in presencas]
def clean(self): def clean(self):
cleaned_data = super(JustificativaAusenciaForm, self).clean() cleaned_data = super(JustificativaAusenciaForm, self).clean()

2
sapl/sessao/views.py

@ -2988,7 +2988,7 @@ class JustificativaAusenciaCrud(MasterDetailCrud):
form_class = JustificativaAusenciaForm form_class = JustificativaAusenciaForm
layout_key = None layout_key = None
def get_context_data(self, **kwargs): def get_context_data_old(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)

2
sapl/templates/sessao/justificativaausencia_form.html

@ -1,4 +1,4 @@
{% extends "crud/detail.html" %} {% extends "crud/form.html" %}
{% load i18n %} {% load i18n %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% block detail_content %} {% block detail_content %}

Loading…
Cancel
Save