Browse Source

1357 implementar visao reduzida de parlamentares (#1364)

* Fix #1357

Signed-off-by: Eliseu Egewarth <eliseuegewarth@gmail.com>

* Atualiza views para receber o query_string 'iframe'

Signed-off-by: Eliseu Egewarth <eliseuegewarth@gmail.com>
pull/1362/merge
Eliseu Egewarth 7 years ago
committed by Edward
parent
commit
96d386e162
  1. 66
      sapl/redireciona_urls/views.py

66
sapl/redireciona_urls/views.py

@ -50,6 +50,20 @@ relatorio_materia_por_ano_autor_tipo = (
historico_tramitacoes = (app_relatorios + ':historico_tramitacoes') historico_tramitacoes = (app_relatorios + ':historico_tramitacoes')
def has_iframe(url, request):
iframe = request.GET.get(
'iframe',
EMPTY_STRING)
if iframe:
iframe_qs= ("iframe=" + iframe)
url += ("&" if "?" in url else "?")
url += iframe_qs
return url
class RedirecionaSAPLIndex(RedirectView): class RedirecionaSAPLIndex(RedirectView):
permanent = True permanent = True
@ -59,6 +73,9 @@ class RedirecionaSAPLIndex(RedirectView):
url = reverse(url_pattern) url = reverse(url_pattern)
except NoReverseMatch: except NoReverseMatch:
raise UnknownUrlNameError(url_pattern) raise UnknownUrlNameError(url_pattern)
url = has_iframe(url, self.request)
return url return url
@ -90,6 +107,8 @@ class RedirecionaParlamentar(RedirectView):
args = '?pk=' + numero_legislatura args = '?pk=' + numero_legislatura
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -112,6 +131,9 @@ class RedirecionaComissao(RedirectView):
url = reverse(comissao_list) url = reverse(comissao_list)
except NoReverseMatch: except NoReverseMatch:
raise UnknownUrlNameError(comissao_list) raise UnknownUrlNameError(comissao_list)
url = has_iframe(url, self.request)
return url return url
@ -151,6 +173,8 @@ class RedirecionaPautaSessao(RedirectView):
args += "&tipo=&salvar=Pesquisar" args += "&tipo=&salvar=Pesquisar"
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -198,6 +222,8 @@ class RedirecionaSessaoPlenaria(RedirectView):
args += "&tipo=%s&salvar=Pesquisar" % (tipo_sessao) args += "&tipo=%s&salvar=Pesquisar" % (tipo_sessao)
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -210,6 +236,9 @@ class RedirecionaRelatoriosList(RedirectView):
url = reverse(relatorios_list) url = reverse(relatorios_list)
except NoReverseMatch: except NoReverseMatch:
raise UnknownUrlNameError(relatorios_list) raise UnknownUrlNameError(relatorios_list)
url = has_iframe(url, self.request)
return url return url
@ -253,6 +282,8 @@ class RedirecionaRelatoriosMateriasEmTramitacaoList(RedirectView):
args += "&salvar=%s" % (salvar) args += "&salvar=%s" % (salvar)
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -260,13 +291,18 @@ class RedirecionaMateriaLegislativaDetail(RedirectView):
permanent = True permanent = True
def get_redirect_url(self): def get_redirect_url(self):
url = EMPTY_STRING
pk = self.request.GET.get('cod_materia', EMPTY_STRING) pk = self.request.GET.get('cod_materia', EMPTY_STRING)
if pk: if pk:
kwargs = {'pk': pk} kwargs = {'pk': pk}
return reverse(materialegislativa_detail, kwargs=kwargs) url = reverse(materialegislativa_detail, kwargs=kwargs)
else: else:
return reverse(materialegislativa_list) url = reverse(materialegislativa_list)
url = has_iframe(url, self.request)
return url
class RedirecionaMateriaLegislativaList(RedirectView): class RedirecionaMateriaLegislativaList(RedirectView):
@ -339,6 +375,8 @@ class RedirecionaMateriaLegislativaList(RedirectView):
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -346,11 +384,14 @@ class RedirecionaMesaDiretoraView(RedirectView):
permanent = True permanent = True
def get_redirect_url(self): def get_redirect_url(self):
url = EMPTY_STRING
try: try:
url = reverse(parlamentar_mesa_diretora) url = reverse(parlamentar_mesa_diretora)
except NoReverseMatch: except NoReverseMatch:
raise UnknownUrlNameError(parlamentar_mesa_diretora) raise UnknownUrlNameError(parlamentar_mesa_diretora)
url = has_iframe(url, self.request)
return url return url
@ -358,13 +399,18 @@ class RedirecionaNormasJuridicasDetail(RedirectView):
permanent = True permanent = True
def get_redirect_url(self): def get_redirect_url(self):
url = EMPTY_STRING
pk_norma = self.request.GET.get('cod_norma', EMPTY_STRING) pk_norma = self.request.GET.get('cod_norma', EMPTY_STRING)
if pk_norma: if pk_norma:
kwargs = {'pk': pk_norma} kwargs = {'pk': pk_norma}
return reverse(norma_juridica_detail, kwargs=kwargs) url = reverse(norma_juridica_detail, kwargs=kwargs)
else: else:
return reverse(norma_juridica_pesquisa) url = reverse(norma_juridica_pesquisa)
url = has_iframe(url, self.request)
return url
class RedirecionaNormasJuridicasList(RedirectView): class RedirecionaNormasJuridicasList(RedirectView):
@ -420,6 +466,8 @@ class RedirecionaNormasJuridicasList(RedirectView):
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -475,6 +523,8 @@ class RedirecionaHistoricoTramitacoesList(RedirectView):
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -507,6 +557,8 @@ class RedirecionaAtasList(RedirectView):
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -539,6 +591,8 @@ class RedirecionaPresencaParlamentares(RedirectView):
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url
@ -553,6 +607,8 @@ class RedirecionaMateriasPorAutor(RedirectView):
except NoReverseMatch: except NoReverseMatch:
raise UnknownUrlNameError(relatorio_materia_por_autor) raise UnknownUrlNameError(relatorio_materia_por_autor)
url = has_iframe(url, self.request)
return url return url
@ -574,4 +630,6 @@ class RedirecionaMateriasPorAnoAutorTipo(RedirectView):
args += "&salvar=%s" % ('Pesquisar') args += "&salvar=%s" % ('Pesquisar')
url = "%s%s" % (url, args) url = "%s%s" % (url, args)
url = has_iframe(url, self.request)
return url return url

Loading…
Cancel
Save