From 615796e299a438e4c7da7fd40956496cd3ac1971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Matheus?= Date: Thu, 24 Jan 2019 15:26:12 -0200 Subject: [PATCH] =?UTF-8?q?Identificar=20legislatura=20infind=C3=A1vel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/base/urls.py | 6 ++- sapl/base/views.py | 42 ++++++++++++++++++- .../base/legislatura_anterior_infindavel.html | 32 ++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 sapl/templates/base/legislatura_anterior_infindavel.html diff --git a/sapl/base/urls.py b/sapl/base/urls.py index fb7b81d5f..0a96d1acc 100644 --- a/sapl/base/urls.py +++ b/sapl/base/urls.py @@ -33,7 +33,8 @@ from .views import (AlterarSenha, AppConfigCrud, CasaLegislativaCrud, ListarMatProtocoloInexistenteView, ListarParlMandatosIntersecaoView, ListarAutoresDuplicadosView, - ListarBancadaComissaoAutorExternoView) + ListarBancadaComissaoAutorExternoView, + ListarLegislaturaAnteriorInfindavelView) app_name = AppConfig.name @@ -154,6 +155,9 @@ urlpatterns = [ url(r'^sistema/inconsistencias/bancada_comissao_autor_externo$', ListarBancadaComissaoAutorExternoView.as_view(), name='lista_bancada_comissao_autor_externo'), + url(r'^sistema/inconsistencias/legislatura_anterior_infindavel$', + ListarLegislaturaAnteriorInfindavelView.as_view(), + name='lista_legislatura_anterior_infindavel'), # todos os sublinks de sistema devem vir acima deste url(r'^sistema/$', permission_required('base.view_tabelas_auxiliares') diff --git a/sapl/base/views.py b/sapl/base/views.py index 378d7cf81..40c31482f 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -35,7 +35,7 @@ from sapl.crud.base import CrudAux, make_pagination from sapl.materia.models import (Autoria, MateriaLegislativa, TipoMateriaLegislativa, StatusTramitacao, UnidadeTramitacao) from sapl.norma.models import (NormaJuridica, NormaEstatisticas) -from sapl.parlamentares.models import Parlamentar +from sapl.parlamentares.models import Parlamentar, Legislatura from sapl.protocoloadm.models import Protocolo from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria, SessaoPlenariaPresenca, Bancada) @@ -1469,10 +1469,50 @@ class ListarInconsistenciasView(PermissionRequiredMixin, ListView): len(bancada_comissao_autor_externo()) ) ) + tabela.append( + ('legislatura_anterior_infindavel', + 'Legislaturas anteriores sem data fim', + len(legislatura_anterior_infindavel()) + ) + ) return tabela +def legislatura_anterior_infindavel(): + legislaturas = [] + + for legislatura in Legislatura.objects.all(): + if legislatura.data_fim == None: + legislaturas.append(legislatura) + + return legislaturas + + +class ListarLegislaturaAnteriorInfindavelView(PermissionRequiredMixin, ListView): + model = get_user_model() + template_name = 'base/legislatura_anterior_infindavel.html' + context_object_name = 'legislatura_anterior_infindavel' + permission_required = ('base.list_appconfig',) + paginate_by = 10 + + def get_queryset(self): + return legislatura_anterior_infindavel() + + def get_context_data(self, **kwargs): + context = super( + ListarLegislaturaAnteriorInfindavelView, self + ).get_context_data(**kwargs) + paginator = context['paginator'] + page_obj = context['page_obj'] + context['page_range'] = make_pagination( + page_obj.number, paginator.num_pages) + context[ + 'NO_ENTRIES_MSG' + ] = 'Nenhuma encontrada.' + return context + + def bancada_comissao_autor_externo(): lista_bancada_autor_externo = [] lista_comissao_autor_externo = [] diff --git a/sapl/templates/base/legislatura_anterior_infindavel.html b/sapl/templates/base/legislatura_anterior_infindavel.html new file mode 100644 index 000000000..9a35b2668 --- /dev/null +++ b/sapl/templates/base/legislatura_anterior_infindavel.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% load i18n %} +{% load tz %} +{% load common_tags %} +{% block base_content %} +
+

Lista de Legislaturas Anteriores sem Data Fim

+ {% if not legislatura_anterior_infindavel %} +

{{ NO_ENTRIES_MSG }}

+ {% else %} + + + + + + + + + + {% for legislatura in legislatura_anterior_infindavel %} + + + + + + {% endfor %} + +
LegislaturaData FimData Eleição
{{ legislatura.numero }}{{ legislatura.data_eleicao }}{{ legislatura.data_inicio }}
+ {% endif %} +
+ {% include 'paginacao.html'%} +{% endblock base_content %} \ No newline at end of file