SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Melhoria no código

pull/1478/head
Eduardo Calil 8 years ago
parent
5300403afd
commit
2a08688d50
6 changed files with 31 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      sapl/base/views.py
  2. 30
      sapl/materia/views.py
  3. 8
      sapl/norma/views.py
  4. 20
      sapl/protocoloadm/views.py
  5. 9
      sapl/sessao/views.py
  6. 9
      sapl/utils.py

45
sapl/base/views.py
View File

@ -23,7 +23,8 @@ from sapl.materia.models import (Autoria, MateriaLegislativa,
TipoMateriaLegislativa) TipoMateriaLegislativa)
from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria, from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria,
SessaoPlenariaPresenca) 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, from .forms import (CasaLegislativaForm, ConfiguracoesAppForm,
RelatorioAtasFilterSet, RelatorioAtasFilterSet,
@ -203,12 +204,7 @@ class RelatorioAtasView(FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context
@ -303,12 +299,7 @@ class RelatorioPresencaSessaoView(FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context
@ -325,12 +316,7 @@ class RelatorioHistoricoTramitacaoView(FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context
@ -361,12 +347,7 @@ class RelatorioMateriasTramitacaoView(FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context
@ -440,12 +421,7 @@ class RelatorioMateriasPorAnoAutorTipoView(FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
if 'ano' in self.request.GET and self.request.GET['ano']: if 'ano' in self.request.GET and self.request.GET['ano']:
ano = int(self.request.GET['ano']) ano = int(self.request.GET['ano'])
@ -485,12 +461,7 @@ class RelatorioMateriasPorAutorView(FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context

30
sapl/materia/views.py
View File

@ -42,7 +42,7 @@ from sapl.norma.models import LegislacaoCitada
from sapl.protocoloadm.models import Protocolo from sapl.protocoloadm.models import Protocolo
from sapl.utils import (TURNO_TRAMITACAO_CHOICES, YES_NO_CHOICES, autor_label, from sapl.utils import (TURNO_TRAMITACAO_CHOICES, YES_NO_CHOICES, autor_label,
autor_modal, gerar_hash_arquivo, get_base_url, 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 .email_utils import do_envia_email_confirmacao
from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm, from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm,
@ -139,12 +139,7 @@ class AdicionarVariasAutorias(PermissionRequiredForAppCrudMixin, FilterView):
qr = self.request.GET.copy() qr = self.request.GET.copy()
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
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['pk_materia'] = self.kwargs['pk'] context['pk_materia'] = self.kwargs['pk']
return context return context
@ -1515,12 +1510,7 @@ class MateriaLegislativaPesquisaView(FilterView):
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context
@ -1624,12 +1614,7 @@ class DocumentoAcessorioEmLoteView(PermissionRequiredMixin, FilterView):
'ano', 'numero') 'ano', 'numero')
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context
@ -1699,12 +1684,7 @@ class PrimeiraTramitacaoEmLoteView(PermissionRequiredMixin, FilterView):
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context

8
sapl/norma/views.py
View File

@ -11,6 +11,7 @@ from sapl.base.models import AppConfig
from sapl.compilacao.views import IntegracaoTaView from sapl.compilacao.views import IntegracaoTaView
from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux, from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
MasterDetailCrud, make_pagination) MasterDetailCrud, make_pagination)
from sapl.utils import show_results_filter_set
from .forms import NormaFilterSet, NormaJuridicaForm, NormaRelacionadaForm from .forms import NormaFilterSet, NormaJuridicaForm, NormaRelacionadaForm
from .models import (AssuntoNorma, NormaJuridica, NormaRelacionada, from .models import (AssuntoNorma, NormaJuridica, NormaRelacionada,
@ -81,12 +82,7 @@ class NormaPesquisaView(FilterView):
context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else '' context['filter_url'] = ('&' + qr.urlencode()) if len(qr) > 0 else ''
query_params = set(qr.keys()) context['show_results'] = show_results_filter_set(qr)
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return context return context

20
sapl/protocoloadm/views.py
View File

@ -21,7 +21,7 @@ from sapl.crud.base import Crud, CrudAux, MasterDetailCrud, make_pagination
from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
from sapl.parlamentares.models import Legislatura, Parlamentar from sapl.parlamentares.models import Legislatura, Parlamentar
from sapl.protocoloadm.models import Protocolo 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, from .forms import (AnularProcoloAdmForm, DocumentoAcessorioAdministrativoForm,
DocumentoAdministrativoFilterSet, DocumentoAdministrativoFilterSet,
@ -212,13 +212,8 @@ class ProtocoloPesquisaView(PermissionRequiredMixin, FilterView):
numero_res=len(self.object_list) numero_res=len(self.object_list)
) )
qr = self.request.GET.copy() context['show_results'] = show_results_filter_set(
query_params = set(qr.keys()) self.request.GET.copy())
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return self.render_to_response(context) return self.render_to_response(context)
@ -572,13 +567,8 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin,
numero_res=len(self.object_list) numero_res=len(self.object_list)
) )
qr = self.request.GET.copy() context['show_results'] = show_results_filter_set(
query_params = set(qr.keys()) self.request.GET.copy())
if ((len(query_params) == 1 and 'iframe' in query_params) or
len(query_params) == 0):
context['show_results'] = False
else:
context['show_results'] = True
return self.render_to_response(context) return self.render_to_response(context)

9
sapl/sessao/views.py
View File

@ -34,6 +34,7 @@ from sapl.parlamentares.models import (Filiacao, Legislatura, Mandato,
Parlamentar, SessaoLegislativa) Parlamentar, SessaoLegislativa)
from sapl.sessao.apps import AppConfig from sapl.sessao.apps import AppConfig
from sapl.sessao.forms import ExpedienteMateriaForm, OrdemDiaForm from sapl.sessao.forms import ExpedienteMateriaForm, OrdemDiaForm
from sapl.utils import show_results_filter_set
from .forms import (AdicionarVariasMateriasFilterSet, ExpedienteForm, from .forms import (AdicionarVariasMateriasFilterSet, ExpedienteForm,
ListMateriaForm, MesaForm, OradorExpedienteForm, ListMateriaForm, MesaForm, OradorExpedienteForm,
@ -2455,13 +2456,7 @@ class PesquisarSessaoPlenariaView(FilterView):
numero_res=len(self.object_list) numero_res=len(self.object_list)
) )
qr = self.request.GET.copy() context['show_results'] = show_results_filter_set(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
return self.render_to_response(context) return self.render_to_response(context)

9
sapl/utils.py
View File

@ -642,3 +642,12 @@ def parlamentares_ativos(data_inicio, data_fim=None):
flat=True).distinct('parlamentar_id') flat=True).distinct('parlamentar_id')
return Parlamentar.objects.filter(id__in=parlamentares_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

Write Preview
Loading…
Cancel
Save