From 2a08688d504792e8b0badc7bad98120ebb1e0810 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Wed, 13 Sep 2017 19:32:17 -0300 Subject: [PATCH] =?UTF-8?q?Melhoria=20no=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/base/views.py | 45 +++++++------------------------------- sapl/materia/views.py | 30 +++++-------------------- sapl/norma/views.py | 8 ++----- sapl/protocoloadm/views.py | 20 +++++------------ sapl/sessao/views.py | 9 ++------ sapl/utils.py | 9 ++++++++ 6 files changed, 31 insertions(+), 90 deletions(-) diff --git a/sapl/base/views.py b/sapl/base/views.py index ab0ca587b..3edc7a99c 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -23,7 +23,8 @@ from sapl.materia.models import (Autoria, MateriaLegislativa, TipoMateriaLegislativa) from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria, SessaoPlenariaPresenca) -from sapl.utils import parlamentares_ativos, sapl_logger +from sapl.utils import (parlamentares_ativos, sapl_logger,\ + show_results_filter_set) from .forms import (CasaLegislativaForm, ConfiguracoesAppForm, RelatorioAtasFilterSet, @@ -203,12 +204,7 @@ class RelatorioAtasView(FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context @@ -303,12 +299,7 @@ class RelatorioPresencaSessaoView(FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context @@ -325,12 +316,7 @@ class RelatorioHistoricoTramitacaoView(FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context @@ -361,12 +347,7 @@ class RelatorioMateriasTramitacaoView(FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context @@ -440,12 +421,7 @@ class RelatorioMateriasPorAnoAutorTipoView(FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) if 'ano' in self.request.GET and self.request.GET['ano']: ano = int(self.request.GET['ano']) @@ -485,12 +461,7 @@ class RelatorioMateriasPorAutorView(FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 358b76aca..3d63afa8f 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -42,7 +42,7 @@ from sapl.norma.models import LegislacaoCitada from sapl.protocoloadm.models import Protocolo from sapl.utils import (TURNO_TRAMITACAO_CHOICES, YES_NO_CHOICES, autor_label, autor_modal, gerar_hash_arquivo, get_base_url, - montar_row_autor) + montar_row_autor, show_results_filter_set) from .email_utils import do_envia_email_confirmacao from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm, @@ -139,12 +139,7 @@ class AdicionarVariasAutorias(PermissionRequiredForAppCrudMixin, FilterView): qr = self.request.GET.copy() context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) context['pk_materia'] = self.kwargs['pk'] return context @@ -1515,12 +1510,7 @@ class MateriaLegislativaPesquisaView(FilterView): context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context @@ -1624,12 +1614,7 @@ class DocumentoAcessorioEmLoteView(PermissionRequiredMixin, FilterView): 'ano', 'numero') context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context @@ -1699,12 +1684,7 @@ class PrimeiraTramitacaoEmLoteView(PermissionRequiredMixin, FilterView): context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context diff --git a/sapl/norma/views.py b/sapl/norma/views.py index cd6a8c1dd..33589f243 100644 --- a/sapl/norma/views.py +++ b/sapl/norma/views.py @@ -11,6 +11,7 @@ from sapl.base.models import AppConfig from sapl.compilacao.views import IntegracaoTaView from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux, MasterDetailCrud, make_pagination) +from sapl.utils import show_results_filter_set from .forms import NormaFilterSet, NormaJuridicaForm, NormaRelacionadaForm from .models import (AssuntoNorma, NormaJuridica, NormaRelacionada, @@ -81,12 +82,7 @@ class NormaPesquisaView(FilterView): context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(qr) return context diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index 5314c822f..c2ff10189 100644 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -21,7 +21,7 @@ from sapl.crud.base import Crud, CrudAux, MasterDetailCrud, make_pagination from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa from sapl.parlamentares.models import Legislatura, Parlamentar from sapl.protocoloadm.models import Protocolo -from sapl.utils import create_barcode, get_client_ip +from sapl.utils import create_barcode, get_client_ip, show_results_filter_set from .forms import (AnularProcoloAdmForm, DocumentoAcessorioAdministrativoForm, DocumentoAdministrativoFilterSet, @@ -212,13 +212,8 @@ class ProtocoloPesquisaView(PermissionRequiredMixin, FilterView): numero_res=len(self.object_list) ) - qr = self.request.GET.copy() - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set( + self.request.GET.copy()) return self.render_to_response(context) @@ -572,13 +567,8 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin, numero_res=len(self.object_list) ) - qr = self.request.GET.copy() - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set( + self.request.GET.copy()) return self.render_to_response(context) diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 142647ea3..c68987bc6 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -34,6 +34,7 @@ from sapl.parlamentares.models import (Filiacao, Legislatura, Mandato, Parlamentar, SessaoLegislativa) from sapl.sessao.apps import AppConfig from sapl.sessao.forms import ExpedienteMateriaForm, OrdemDiaForm +from sapl.utils import show_results_filter_set from .forms import (AdicionarVariasMateriasFilterSet, ExpedienteForm, ListMateriaForm, MesaForm, OradorExpedienteForm, @@ -2455,13 +2456,7 @@ class PesquisarSessaoPlenariaView(FilterView): numero_res=len(self.object_list) ) - qr = self.request.GET.copy() - query_params = set(qr.keys()) - if ((len(query_params) == 1 and 'iframe' in query_params) or - len(query_params) == 0): - context['show_results'] = False - else: - context['show_results'] = True + context['show_results'] = show_results_filter_set(self.request.GET.copy()) return self.render_to_response(context) diff --git a/sapl/utils.py b/sapl/utils.py index 7c5e1697e..0d195db0f 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -642,3 +642,12 @@ def parlamentares_ativos(data_inicio, data_fim=None): flat=True).distinct('parlamentar_id') return Parlamentar.objects.filter(id__in=parlamentares_id) + + +def show_results_filter_set(qr): + query_params = set(qr.keys()) + if ((len(query_params) == 1 and 'iframe' in query_params) or + len(query_params) == 0): + return False + + return True