From 1eda96dba1fc1beb74e867f351b18165b8f05ee9 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 27 Sep 2016 13:51:15 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Arruma=20pagina=C3=A7=C3=A3o=20de=20Materia?= =?UTF-8?q?=20Legislativa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sapl/materia/views.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index afc1f091f..bd58c940b 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1034,6 +1034,13 @@ class MateriaLegislativaPesquisaView(FilterView): qr = self.request.GET.copy() if 'page' in qr: del qr['page'] + + paginator = context['paginator'] + page_obj = context['page_obj'] + + context['page_range'] = make_pagination( + page_obj.number, paginator.num_pages) + context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' return context From 5d6e59ac6b27004141f5613c91a77114582d412c Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 28 Sep 2016 08:18:40 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Ajusta=20titulo=20de=20relat=C3=B3rios=20PD?= =?UTF-8?q?F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/relatorios/templates/pdf_pauta_sessao_gerar.py | 5 +++-- sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sapl/relatorios/templates/pdf_pauta_sessao_gerar.py b/sapl/relatorios/templates/pdf_pauta_sessao_gerar.py index 31910156f..b35aaadb3 100755 --- a/sapl/relatorios/templates/pdf_pauta_sessao_gerar.py +++ b/sapl/relatorios/templates/pdf_pauta_sessao_gerar.py @@ -21,8 +21,9 @@ def cabecalho(inf_basicas_dic, imagem): tmp += '\t\t\t\t\n' tmp += '\t\t\t\tSistema de Apoio ao Processo Legislativo\n' tmp += '\t\t\t\t\n' - tmp += '\t\t\t\tPauta da ' + str(inf_basicas_dic['num_sessao_plen']) + 'ª Reunião ' + str(inf_basicas_dic['nom_sessao']) + ' da ' + str( - inf_basicas_dic['num_sessao_leg']) + 'ª Sessão Legislativa da ' + str(inf_basicas_dic['num_legislatura']) + 'ª Legislatura \n' + tmp += '\t\t\t\tPauta da ' + str(inf_basicas_dic['num_sessao_plen']) + 'ª Reunião ' + str(inf_basicas_dic['nom_sessao']) + ' da ' + str( + inf_basicas_dic['num_sessao_leg']) + 'ª Sessão Legislativa da \n' + tmp += '\t\t\t\t' + str(inf_basicas_dic['num_legislatura']) + ' Legislatura \n' return tmp diff --git a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py index fb7fe431c..251990dce 100644 --- a/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py +++ b/sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py @@ -22,9 +22,9 @@ def cabecalho(inf_basicas_dic, imagem): tmp += '\t\t\t\t\n' tmp += '\t\t\t\tSistema de Apoio ao Processo Legislativo\n' tmp += '\t\t\t\t\n' - tmp += '\t\t\t\tResumo da ' + str(inf_basicas_dic['num_sessao_plen']) + 'ª Reunião ' + str(inf_basicas_dic['nom_sessao']) + ' da ' + str( + tmp += '\t\t\t\tResumo da ' + str(inf_basicas_dic['num_sessao_plen']) + 'ª Reunião ' + str(inf_basicas_dic['nom_sessao']) + ' da ' + str( inf_basicas_dic['num_sessao_leg']) + 'ª Sessão Legislativa da \n' - tmp += '\t\t\t\t' + str(inf_basicas_dic['num_legislatura']) + 'ª Legislatura \n' + tmp += '\t\t\t\t' + str(inf_basicas_dic['num_legislatura']) + ' Legislatura \n' return tmp