From 579643a249742136a371ad4f55fdb1a52c8c41c0 Mon Sep 17 00:00:00 2001 From: Lude Ribeiro Date: Tue, 3 Aug 2021 09:31:52 -0300 Subject: [PATCH] =?UTF-8?q?Mudando=20a=20ordenacao=20no=20relat=C3=B3rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/convenios/reports.py | 10 +++++----- sigi/apps/convenios/views.py | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sigi/apps/convenios/reports.py b/sigi/apps/convenios/reports.py index 983edee..0cb0474 100644 --- a/sigi/apps/convenios/reports.py +++ b/sigi/apps/convenios/reports.py @@ -27,7 +27,7 @@ class SemEquipamentosReport(object): class ConvenioReport(ReportDefault): title = _(u'Relatório de Parcerias') - + class band_page_header(ReportDefault.band_page_header): label_top = ReportDefault.band_page_header.label_top @@ -270,16 +270,16 @@ class ConvenioReportRegiao(ReportDefault): class ConvenioPorCMReport(ConvenioReport): - title = _(u'Relatório de Convênios por Câmara Municipal') + title = _(u'Relatório de Parcerias por Câmara Municipal') class ConvenioPorALReport(ConvenioReport): - title = _(u'Relatório de Convênios por Assembléia Legislativa') + title = _(u'Relatório de Parcerias por Assembléia Legislativa') class ConvenioReportSemAceiteCM(ConvenioReportSemAceite): - title = _(u'Relatório de Convênios por Câmara Municipal') + title = _(u'Relatório de Parcerias por Câmara Municipal') class ConvenioReportSemAceiteAL(ConvenioReportSemAceite): - title = _(u'Relatório de Convênios por Assembléia Legislativa') + title = _(u'Relatório de Parcerias por Assembléia Legislativa') diff --git a/sigi/apps/convenios/views.py b/sigi/apps/convenios/views.py index d9ae58f..6760828 100644 --- a/sigi/apps/convenios/views.py +++ b/sigi/apps/convenios/views.py @@ -86,6 +86,8 @@ def carrinhoOrGet_for_qs(request): if 'carrinho_convenios' in request.session: ids = request.session['carrinho_convenios'] qs = Convenio.objects.filter(pk__in=ids) + qs = qs.order_by("casa_legislativa__municipio__uf", "casa_legislativa__municipio") + qs = get_for_qs(request.GET, qs) else: qs = Convenio.objects.all() if request.GET: