From f696e1e3af540c71bde920fca93ae33895632625 Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Tue, 7 Jan 2020 17:41:13 -0300 Subject: [PATCH] refatorando composicao_list --- sapl/templates/comissoes/composicao_list.html | 63 +++++++++++++++---- .../parlamentares/parlamentares_list.html | 1 + 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html index d3080d878..5d627efe8 100644 --- a/sapl/templates/comissoes/composicao_list.html +++ b/sapl/templates/comissoes/composicao_list.html @@ -1,5 +1,24 @@ -{% extends "crud/list.html" %} -{% load i18n common_tags crispy_forms_tags%} +{% extends "base.html" %} +{% load i18n %} +{% load crispy_forms_tags cropping%} +{% load common_tags %} +{% load render_bundle from webpack_loader %} +{% load webpack_static from webpack_loader %} + +{% block base_content %} + +
+ +
+ Selecione o Período +
+ +
+
{% block actions %} {% if user.is_authenticated and perms.comissoes.add_composicao %} @@ -54,20 +73,40 @@ - {% for p in participacao_set %} - + + - {{ p.parlamentar }} + [[ p.nome ]] - {{p.cargo}} - {{p.titular|yesno:"Sim,Não"}} - {{p.data_designacao}} - {{p.data_desligamento|default:""}} - {{p.motivo_desligamento}} - {{p.observacao}} + [[p.cargo]] + [[p.titular]] + [[p.data_designacao]] + [[p.data_desligamento]] + [[p.motivo_desligamento]] + [[p.observacao]] - {% endfor %}
{% endblock %} + + + + + + + + +{% endblock base_content %} + + +{% block webpack_loader_css %} + {{ block.super }} + {% render_bundle 'comissoes' 'css' %} +{% endblock %} + +{% block webpack_loader_js %} + {% render_chunk_vendors 'js' %} + {% render_bundle 'global' 'js' %} + {% render_bundle 'comissoes' 'js' %} +{% endblock %} diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html index 0285fa173..6123fe899 100644 --- a/sapl/templates/parlamentares/parlamentares_list.html +++ b/sapl/templates/parlamentares/parlamentares_list.html @@ -82,6 +82,7 @@ + {% endblock base_content %}