From 5d15fe2259a93f59a5a0f2f0a08e71353bd699cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Tue, 30 Jul 2019 14:51:58 -0300 Subject: [PATCH] =?UTF-8?q?Adicionar=20pesquisa=20de=20doc=20acess=C3=B3ri?= =?UTF-8?q?os=20de=20mat=C3=A9rias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/base/forms.py | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/sapl/base/forms.py b/sapl/base/forms.py index 0f9e9323c..76d112f6d 100644 --- a/sapl/base/forms.py +++ b/sapl/base/forms.py @@ -26,8 +26,8 @@ from sapl.comissoes.models import Reuniao, Comissao from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column, to_row) from sapl.crispy_layout_mixin import SaplFormHelper -from sapl.materia.models import ( - MateriaLegislativa, UnidadeTramitacao, StatusTramitacao) +from sapl.materia.models import (MateriaLegislativa, UnidadeTramitacao, StatusTramitacao, + DocumentoAcessorio, TipoMateriaLegislativa) from sapl.norma.models import (NormaJuridica, NormaEstatisticas) from sapl.parlamentares.models import SessaoLegislativa, Partido from sapl.protocoloadm.models import DocumentoAdministrativo @@ -731,6 +731,43 @@ class AutorFormForAdmin(AutorForm): 'status_user'] +class RelatorioDocumentosAcessoriosFilterSet(django_filters.FilterSet): + + @property + def qs(self): + parent = super(RelatorioDocumentosAcessoriosFilterSet, self).qs + return parent.distinct().order_by('-data') + + class Meta(FilterOverridesMetaMixin): + model = DocumentoAcessorio + fields = ['tipo', 'materia__tipo', 'data'] + + def __init__(self, *args, **kwargs): + + super( + RelatorioDocumentosAcessoriosFilterSet, self + ).__init__(*args, **kwargs) + + self.filters['tipo'].label = 'Tipo de Documento' + self.filters['materia__tipo'].label = 'Tipo de Matéria do Documento' + self.filters['data'].label = 'Período (Data Inicial - Data Final)' + + self.form.fields['tipo'].required = True + + row0 = to_row([('tipo', 6), + ('materia__tipo', 6)]) + + row1 = to_row([('data', 12)]) + + self.form.helper = SaplFormHelper() + self.form.helper.form_method = 'GET' + self.form.helper.layout = Layout( + Fieldset(_('Pesquisa'), + row0, row1, + form_actions(label='Pesquisar')) + ) + + class RelatorioAtasFilterSet(django_filters.FilterSet): class Meta(FilterOverridesMetaMixin):