diff --git a/sapl/base/forms.py b/sapl/base/forms.py index 7d9a9e59e..0b99429c8 100644 --- a/sapl/base/forms.py +++ b/sapl/base/forms.py @@ -1164,19 +1164,37 @@ class RelatorioMateriasPorAnoAutorTipoFilterSet(django_filters.FilterSet): row1 = to_row( [('ano', 12)]) + buttons = FormActions( + *[ + HTML(''' +
+ + +
+ ''') + ], + Submit('pesquisar', _('Pesquisar'), css_class='float-right', + onclick='return true;'), + css_class='form-group row justify-content-between' + , + ) + self.form.helper = SaplFormHelper() self.form.helper.form_method = 'GET' self.form.helper.layout = Layout( - Fieldset(_('Pesquisar'), + Fieldset(_('Pesquisa de Matéria por Autor'), row1, - form_actions(label='Pesquisar')) + buttons, ) ) + class RelatorioMateriasPorAutorFilterSet(django_filters.FilterSet): autoria__autor = django_filters.CharFilter(widget=forms.HiddenInput()) + o = AnoNumeroOrderingFilter(help_text='') + @property def qs(self): parent = super().qs @@ -1205,15 +1223,30 @@ class RelatorioMateriasPorAutorFilterSet(django_filters.FilterSet): 'limpar Autor', css_class='btn btn-primary btn-sm'), 10)]) + buttons = FormActions( + *[ + HTML(''' +
+ + +
+ ''') + ], + Submit('pesquisar', _('Pesquisar'), css_class='float-right', + onclick='return true;'), + css_class='form-group row justify-content-between' + , + ) + self.form.helper = SaplFormHelper() self.form.helper.form_method = 'GET' self.form.helper.layout = Layout( - Fieldset(_('Pesquisar'), + Fieldset(_('Pesquisa de Matéria por Autor'), row1, row2, HTML(autor_label), HTML(autor_modal), row3, - form_actions(label='Pesquisar')) + buttons, ) ) diff --git a/sapl/base/views.py b/sapl/base/views.py index 9d7f281b3..d08387664 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -29,7 +29,7 @@ from django_filters.views import FilterView from haystack.views import SearchView from haystack.query import SearchQuerySet -from sapl.relatorios.views import relatorio_materia_em_tramitacao +from sapl.relatorios.views import relatorio_materia_em_tramitacao, relatorio_materia_por_autor from sapl import settings from sapl.audiencia.models import AudienciaPublica, TipoAudienciaPublica @@ -902,7 +902,7 @@ class RelatorioMateriasPorAutorView(FilterView): qtdes = {} for tipo in TipoMateriaLegislativa.objects.all(): - qs = kwargs['object_list'] + qs = context['object_list'] qtde = len(qs.filter(tipo_id=tipo.id)) if qtde > 0: qtdes[tipo] = qtde @@ -929,6 +929,43 @@ class RelatorioMateriasPorAutorView(FilterView): return context + def get(self, request, *args, **kwargs): + super(RelatorioMateriasPorAutorView, self).get(request) + # Se a pesquisa estiver quebrando com a paginação + # Olhe esta função abaixo + # Provavelmente você criou um novo campo no Form/FilterSet + # Então a ordem da URL está diferente + data = self.filterset.data + if data and data.get('tipo') is not None: + url = "&" + str(self.request.environ['QUERY_STRING']) + if url.startswith("&page"): + ponto_comeco = url.find('tipo=') - 1 + url = url[ponto_comeco:] + else: + url = '' + self.filterset.form.fields['o'].label = _('Ordenação') + # é usada essa verificação anônima para quando os documentos administrativos + # estão no modo ostensivo, mas podem existir documentos administrativos + # restritos + if request.user.is_anonymous(): + length = self.object_list.filter(restrito=False).count() + else: + length = self.object_list.count() + + is_relatorio = url != '' and request.GET.get('relatorio', None) + self.paginate_by = None if is_relatorio else self.paginate_by + context = self.get_context_data(filter=self.filterset, + filter_url=url, + numero_res=length + ) + context['show_results'] = show_results_filter_set( + self.request.GET.copy()) + + if is_relatorio: + return relatorio_materia_por_autor(request, context) + else: + return self.render_to_response(context) + class RelatorioNormasPublicadasMesView(FilterView): model = NormaJuridica diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index 1f537047e..08652232e 100755 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -1391,6 +1391,29 @@ def relatorio_materia_em_tramitacao(request, context): return response +def relatorio_materia_por_autor(request, context): + base_url = request.build_absolute_uri() + casa = CasaLegislativa.objects.first() + rodape = ' '.join(get_rodape(casa)) + + context.update({'data': dt.today().strftime('%d/%m/%Y')}) + context.update({'rodape': rodape}) + + header_context = {"casa": casa, 'logotipo': casa.logotipo, 'MEDIA_URL': MEDIA_URL} + + #import ipdb; ipdb.set_trace(); + html_template = render_to_string('relatorios/relatorio_materias_por_autor.html', context) + html_header = render_to_string('relatorios/header_ata.html', header_context) + + pdf_file = make_pdf(base_url=base_url, main_template=html_template, header_template=html_header) + + response = HttpResponse(content_type='application/pdf;') + response['Content-Disposition'] = 'inline; filename=relatorio.pdf' + response['Content-Transfer-Encoding'] = 'binary' + response.write(pdf_file) + + return response + def relatorio_sessao_plenaria_pdf(request, pk): base_url=request.build_absolute_uri() logger = logging.getLogger(__name__) diff --git a/sapl/templates/relatorios/relatorio_materias_por_autor.html b/sapl/templates/relatorios/relatorio_materias_por_autor.html new file mode 100644 index 000000000..64392f562 --- /dev/null +++ b/sapl/templates/relatorios/relatorio_materias_por_autor.html @@ -0,0 +1,101 @@ +{% load i18n %} +{% load common_tags %} +{% load static %} + + + + + + + +

Matérias por Autor

+ {% if object_list|length %} + + + + + + + + + + + {% for key, value in qtdes.items %} + + + + + {% endfor %} + +
QUADRO GERAL
Tipo MatériaQuantidade
{{key.sigla}} - {{key}}{{value}}
+
+
+ {% if object_list|length %} + + {% for materia in object_list %} + {% ifchanged materia.autoria_set.first.autor %} +
+ Autor: {{ materia.autoria_set.first.autor }} +
+
+ {% endifchanged %} + +
+ + Matéria: {{materia.tipo.descricao}} {{materia.numero}}/{{materia.ano}} +
+ Ementa: {{materia.ementa}} +
+ Coautor(es): {% if materia.autoria_set.first != materia.autoria_set.last %} + {% for autor in materia.autoria_set.all %} + {% if not autor.primeiro_autor %} + {{ autor.autor }}
+ {% endif %} + {% endfor %} + {% endif %} +
+
+ + + {% endfor %} + {% endif %} + + {% else %} +

Nenhum documento encontrado com essas especificações

+ {% endif %} + + \ No newline at end of file