From 7ae8a7af8773baffa3612ba0a474b969d9995fa3 Mon Sep 17 00:00:00 2001 From: VictorFabreF Date: Tue, 30 Oct 2018 13:37:17 -0300 Subject: [PATCH] muda combo de parlamentares --- sapl/sessao/forms.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 273b11981..a72a86109 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -741,6 +741,10 @@ class JustificativaAusenciaForm(ModelForm): q = Q(sessao_plenaria=kwargs['initial']['sessao_plenaria']) ordens = OrdemDia.objects.filter(q) expedientes = ExpedienteMateria.objects.filter(q) + legislatura = kwargs['initial']['sessao_plenaria'].legislatura + mandato = Mandato.objects.filter(legislatura=legislatura) + parlamentares = [m.parlamentar for m in mandato] + super(JustificativaAusenciaForm, self).__init__( *args, **kwargs) @@ -748,6 +752,9 @@ class JustificativaAusenciaForm(ModelForm): presencas = SessaoPlenariaPresenca.objects.filter( q).order_by('parlamentar__nome_parlamentar') + presentes = [p.parlamentar for p in presencas] + setFinal = set(parlamentares) - set(presentes) + self.fields['materias_do_expediente'].choices = [ (e.id, e.materia) for e in expedientes] @@ -755,8 +762,7 @@ class JustificativaAusenciaForm(ModelForm): (o.id, o.materia) for o in ordens] self.fields['parlamentar'].choices = [ - ("0", "------------")] + [ - (p.parlamentar.id, p.parlamentar) for p in presencas] + ("0", "------------")] + [(p.id, p) for p in setFinal] def clean(self): cleaned_data = super(JustificativaAusenciaForm, self).clean()