|
- {{m.tipo.sigla}} {{m.numero}}/{{m.ano}} - {{m.tipo}}
+ {{m.tipo.sigla}} {{m.numero}}/{{m.ano}} - {{m.tipo}}
Ementa: {{ m.ementa|safe }}
@@ -99,7 +99,7 @@
{% if m.anexo_de.exists %}
{% for a in m.materia_anexada_set.all %}
Matéria Anexadora:
-
+
{{ a.materia_principal }}
Data Anexação: {{a.data_anexacao}}
@@ -109,7 +109,7 @@
{% if m.anexadas.all.exists %}
{% for anexada in m.materia_principal_set.all %}
Matéria Anexada:
-
+
{{ anexada.materia_anexada }}
Data Anexação: {{anexada.data_anexacao}}
diff --git a/sapl/templates/protocoloadm/anular_protocoloadm.html b/sapl/templates/protocoloadm/anular_protocoloadm.html
index b936ed7ad..cb4af2399 100644
--- a/sapl/templates/protocoloadm/anular_protocoloadm.html
+++ b/sapl/templates/protocoloadm/anular_protocoloadm.html
@@ -7,7 +7,7 @@
{{ block.super }}
{% endblock %}
diff --git a/sapl/templates/protocoloadm/documentoadministrativo_filter.html b/sapl/templates/protocoloadm/documentoadministrativo_filter.html
index a5b29ad42..987299560 100644
--- a/sapl/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/sapl/templates/protocoloadm/documentoadministrativo_filter.html
@@ -15,7 +15,7 @@
{% if filter_url %}
{% endif %}
{% endblock actions %}
@@ -36,7 +36,7 @@
{% for d in page_obj %}
|
|
- {{d.tipo.sigla}} {{d.numero}}/{{d.ano}} - {{d.tipo}}
+ {{d.tipo.sigla}} {{d.numero}}/{{d.ano}} - {{d.tipo}}
Interessado: {{ d.interessado|default_if_none:"Não informado"}}
Assunto: {{ d.assunto|safe }}
diff --git a/sapl/templates/protocoloadm/protocolar_documento.html b/sapl/templates/protocoloadm/protocolar_documento.html
index 9f2213128..5cb1fa789 100644
--- a/sapl/templates/protocoloadm/protocolar_documento.html
+++ b/sapl/templates/protocoloadm/protocolar_documento.html
@@ -7,7 +7,7 @@
{{ block.super }}
{% endblock %}
diff --git a/sapl/templates/protocoloadm/protocolar_materia.html b/sapl/templates/protocoloadm/protocolar_materia.html
index 21d0db47e..ca172eb92 100644
--- a/sapl/templates/protocoloadm/protocolar_materia.html
+++ b/sapl/templates/protocoloadm/protocolar_materia.html
@@ -6,7 +6,7 @@
{{ block.super }}
{% endblock %}
diff --git a/sapl/templates/protocoloadm/protocolo_filter.html b/sapl/templates/protocoloadm/protocolo_filter.html
index 94c5c8b8a..37f529f10 100644
--- a/sapl/templates/protocoloadm/protocolo_filter.html
+++ b/sapl/templates/protocoloadm/protocolo_filter.html
@@ -10,7 +10,7 @@
{% if filter_url %}
{% endif %}
@@ -38,13 +38,13 @@
|
Protocolo:
- {{ p.numero|stringformat:'06d' }}/{{ p.ano }} -
-
+ {{ p.numero|stringformat:'06d' }}/{{ p.ano }} -
+
{% if p.anulado %} ** NULO **{% endif %}
Assunto: {{ p.assunto_ementa|default_if_none:"Não informado"}}
Data Protocolo: {{ p.data|date:"d/m/Y"|default_if_none:"Não informado" }} - Horário: {{ p.hora|date:"G:i:s" }}
-
+
{% if p.tipo_processo == 0 %}
Interessado: {{ p.interessado|default_if_none:"Não informado" }}
{% elif p.tipo_processo == 1 %}
diff --git a/sapl/templates/protocoloadm/protocoloadm_detail.html b/sapl/templates/protocoloadm/protocoloadm_detail.html
index dc91ac252..3cdabaacb 100644
--- a/sapl/templates/protocoloadm/protocoloadm_detail.html
+++ b/sapl/templates/protocoloadm/protocoloadm_detail.html
@@ -2,8 +2,8 @@
{% load i18n %}
{% block editions %}
{% endblock editions %}
diff --git a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
index e5caab499..c3493ee66 100644
--- a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
+++ b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
@@ -4,7 +4,7 @@
{% load common_tags %}
-{% endblock actions %}
\ No newline at end of file
+{% endblock actions %}
diff --git a/sapl/templates/sessao/blocos_resumo/lista_presenca.html b/sapl/templates/sessao/blocos_resumo/lista_presenca.html
index c89f23588..60b487068 100644
--- a/sapl/templates/sessao/blocos_resumo/lista_presenca.html
+++ b/sapl/templates/sessao/blocos_resumo/lista_presenca.html
@@ -1,8 +1,10 @@
+{% load common_tags %}
+
\ No newline at end of file
diff --git a/sapl/templates/sessao/blocos_resumo/lista_presenca_ordem_dia.html b/sapl/templates/sessao/blocos_resumo/lista_presenca_ordem_dia.html
index 910e6a3d2..9ddb8fe1f 100644
--- a/sapl/templates/sessao/blocos_resumo/lista_presenca_ordem_dia.html
+++ b/sapl/templates/sessao/blocos_resumo/lista_presenca_ordem_dia.html
@@ -1,8 +1,10 @@
+{% load common_tags %}
+
\ No newline at end of file
diff --git a/sapl/utils.py b/sapl/utils.py
index 394dfd689..599c62aeb 100644
--- a/sapl/utils.py
+++ b/sapl/utils.py
@@ -29,6 +29,7 @@ from reversion.admin import VersionAdmin
from sapl.crispy_layout_mixin import SaplFormLayout, form_actions, to_row
from sapl.settings import BASE_DIR, PROJECT_DIR
+
sapl_logger = logging.getLogger(BASE_DIR.name)
@@ -597,6 +598,24 @@ def qs_override_django_filter(self):
return self._qs
+def filiacao_data(parlamentar, data):
+ from sapl.parlamentares.models import Filiacao
+
+ filiacoes_parlamentar = Filiacao.objects.filter(
+ parlamentar=parlamentar)
+
+ filiacoes = filiacoes_parlamentar.filter(Q(
+ data__lte=data,
+ data_desfiliacao__isnull=True) | Q(
+ data__lte=data,
+ data_desfiliacao__gte=data))
+
+ if filiacoes:
+ return filiacoes.last().partido.sigla
+ else:
+ return ''
+
+
def parlamentares_ativos(data_inicio, data_fim=None):
from sapl.parlamentares.models import Mandato, Parlamentar
'''
|