diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 9d3257333..7ba3c2b1e 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -689,13 +689,18 @@ class ResumoOrdenacaoForm(forms.Form): class JustificativaAusenciaForm(ModelForm): - sessao_plenaria = forms.ModelChoiceField(queryset=SessaoPlenaria.objects.all(), - widget=forms.HiddenInput()) - class Meta: model = JustificativaAusencia - fields = ['sessao_plenaria', 'tipo_ausencia', 'hora', - 'data', 'upload_anexo', 'ausencia', 'parlamentar', 'observacao'] + fields = ['parlamentar', + 'hora', + 'data', + 'upload_anexo', + 'tipo_ausencia', + 'ausencia', + #'materias_do_expediente', + #'materias_da_ordem_do_dia', + 'observacao' + ] def __init__(self, *args, **kwargs): @@ -710,7 +715,11 @@ class JustificativaAusenciaForm(ModelForm): [('tipo_ausencia', 12)]) row5 = to_row( [('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)]) self.helper = FormHelper() @@ -718,13 +727,22 @@ class JustificativaAusenciaForm(ModelForm): Fieldset(_('Justificativa de AusĂȘncia'), row1, row2, row3, row4, row5, - HTML(ausencia_materia), - row6, + # row6, + # row7, + row8, form_actions(label='Salvar')) ) + super(JustificativaAusenciaForm, self).__init__( *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): cleaned_data = super(JustificativaAusenciaForm, self).clean() diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index cd108a82e..c5e637c67 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -2988,7 +2988,7 @@ class JustificativaAusenciaCrud(MasterDetailCrud): form_class = JustificativaAusenciaForm layout_key = None - def get_context_data(self, **kwargs): + def get_context_data_old(self, **kwargs): context = super().get_context_data(**kwargs) diff --git a/sapl/templates/sessao/justificativaausencia_form.html b/sapl/templates/sessao/justificativaausencia_form.html index b3b9259fd..6266f5552 100644 --- a/sapl/templates/sessao/justificativaausencia_form.html +++ b/sapl/templates/sessao/justificativaausencia_form.html @@ -1,4 +1,4 @@ -{% extends "crud/detail.html" %} +{% extends "crud/form.html" %} {% load i18n %} {% load crispy_forms_tags %} {% block detail_content %}