diff --git a/sapl/parlamentares/urls.py b/sapl/parlamentares/urls.py index 6e175bafe..86c84859d 100644 --- a/sapl/parlamentares/urls.py +++ b/sapl/parlamentares/urls.py @@ -20,7 +20,7 @@ from sapl.parlamentares.views import (CargoMesaCrud, ColigacaoCrud, remove_parlamentar_composicao, parlamentares_filiados, BlocoCrud, PesquisarParlamentarView, VincularParlamentarView, - get_sessoes_legislatura) + get_sessoes_legislatura, get_all_legislaturas_json) from .apps import AppConfig @@ -95,4 +95,6 @@ urlpatterns = [ url(r'^parlamentar/get-sessoes-legislatura/$', get_sessoes_legislatura, name='get_sessoes_legislatura'), + url(r'^parlamentar/get-all-legislaturas_json/$', + get_all_legislaturas_json, name='get-all-legislaturas_json'), ] diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index af16dd6df..e0756c1b0 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -21,6 +21,7 @@ from django.views.generic import FormView from django.views.generic.edit import UpdateView from django_filters.views import FilterView from image_cropping.utils import get_backend +from django.core import serializers from sapl.base.forms import SessaoLegislativaForm, PartidoForm @@ -1203,4 +1204,8 @@ def get_sessoes_legislatura(request): for s in SessaoLegislativa.objects.filter(legislatura_id=legislatura_id): json_response['sessoes_legislativas'].append( (s.id, str(s)) ) - return JsonResponse(json_response) \ No newline at end of file + return JsonResponse(json_response) + +def get_all_legislaturas_json(request): + all_legislaturas = [(str(e),e.id) for e in Legislatura.objects.all()] + return JsonResponse({'legislaturas':all_legislaturas}) \ No newline at end of file diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html index a91d50da9..85183cdf0 100644 --- a/sapl/templates/parlamentares/parlamentares_list.html +++ b/sapl/templates/parlamentares/parlamentares_list.html @@ -1,7 +1,13 @@ -{% extends "crud/list.html" %} +{% extends "base.html" %} {% load i18n %} {% load crispy_forms_tags cropping%} -{% block actions %} +{% load common_tags %} +{% load render_bundle from webpack_loader %} +{% load webpack_static from webpack_loader %} + +{% block base_content %} + +
{{ NO_ENTRIES_MSG }}
{% else %} @@ -73,4 +86,17 @@ {% endif %} + +{% endblock base_content %} + + +{% block webpack_loader_css %} + {{ block.super }} + {% render_bundle 'parlamentar' 'css' %} +{% endblock %} + +{% block webpack_loader_js %} + {% render_chunk_vendors 'js' %} + {% render_bundle 'global' 'js' %} + {% render_bundle 'parlamentar' 'js' %} {% endblock %}