SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Atualizando campo assinatura na ata e pauta da sessao (#3513)
continuous-integration/drone/push Build is passing
Details

* Atualizando campo assinautra na ata e pauta da sessao

* Update sapl/sessao/views.py

Co-authored-by: Edward <9326037+edwardoliveira@users.noreply.github.com>

* Update sapl/sessao/views.py

Co-authored-by: Edward <9326037+edwardoliveira@users.noreply.github.com>

Co-authored-by: Edward <9326037+edwardoliveira@users.noreply.github.com>
pull/3517/head
Gustavo274 3 years ago
committed by GitHub
parent
28a4cfde5e
commit
a2fe7ecc26
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      sapl/sessao/views.py
  2. 16
      sapl/templates/relatorios/relatorio_ata.html
  3. 18
      sapl/templates/relatorios/relatorio_pauta_sessao.html

14
sapl/sessao/views.py
View File

@ -2076,6 +2076,19 @@ def get_assinaturas(sessao_plenaria):
return context
def get_assinaturas_presidente(sessao_plenaria):
mesa_dia = get_mesa_diretora(sessao_plenaria)['mesa']
presidente_dia = [m['parlamentar'] for m in mesa_dia if m['cargo'].descricao == 'Presidente']
presidente_dia = presidente_dia[0] if presidente_dia else ''
context = {}
assinatura_presidente = [
{'parlamentar': presidente_dia, 'cargo': "Presidente"}]
context.update({'assinatura_mesa': assinatura_presidente})
return context
def get_materias_ordem_do_dia(sessao_plenaria):
materias_ordem = []
@ -3718,6 +3731,7 @@ class PautaSessaoDetailView(DetailView):
_(f'Encerramento: {encerramento} - {hora_fim}')
]
})
context.update(get_assinaturas_presidente(self.object))
# =====================================================================
# Matérias Expediente
materias_expediente = []

16
sapl/templates/relatorios/relatorio_ata.html
View File

@ -30,14 +30,14 @@
{% if forloop.counter0|divisibleby:2 %}
<tr style="margin-top:20px">
<td>
<div style="float: left; position: relative; top: -50px; left: 8px; width: 120px">____________________ </br>
<div style="float: left; position: relative; top: 0px; left: 8px; width: 120px">____________________ </br>
<p style="font-size:8pt"><b>{{p.cargo}}: </b> {{p.parlamentar.nome_completo}} / {% if p.parlamentar|filiacao_data_filter:object.data_inicio %} {{ p.parlamentar|filiacao_data_filter:object.data_inicio }} {% else %} Sem partido {% endif %}</p>
</br></br></br>
</br></br>
</div>
{% else %}
<div style="float: left; position: relative; top: -50px; left: 142px; width: 120px; margin-right:-220px;">____________________ </br>
<div style="float: left; position: relative; top: 0px; left: 142px; width: 120px; margin-right:-220px;">____________________ </br>
<p style="font-size:8pt"><b>{{p.cargo}}: </b> {{p.parlamentar.nome_completo}} / {% if p.parlamentar|filiacao_data_filter:object.data_inicio %} {{ p.parlamentar|filiacao_data_filter:object.data_inicio }} {% else %} Sem partido {% endif %}</p>
</br></br></br>
</br></br>
</div>
</td>
</tr>
@ -48,15 +48,15 @@
{% if forloop.counter0|divisibleby:2 %}
<tr style="margin-top:20px">
<td>
<div style="float: left; position: relative;top: -50px; left: 8px; width: 120px;">_____________________</br>
<div style="float: left; position: relative;top: 0px; left: 8px; width: 120px;">_____________________</br>
<p style="font-size:8pt">
{{p.nome_completo}} / {% if p|filiacao_data_filter:object.data_inicio %} {{ p|filiacao_data_filter:object.data_inicio }} {% else %} Sem partido {% endif %}</p>
</br></br></br>
</br></br>
</div>
{% else %}
<div style="float: left; position: relative; top: -50px;left: 142px; width: 120px; margin-right:-220px;">_____________________ </br>
<div style="float: left; position: relative; top: 0px;left: 142px; width: 120px; margin-right:-220px;">_____________________ </br>
<p style="font-size:8pt">{{p.nome_completo}} / {% if p|filiacao_data_filter:object.data_inicio %} {{ p|filiacao_data_filter:object.data_inicio }} {% else %} Sem partido {% endif %}</p>
</br></br></br>
</br></br>
</div>
</td>
</tr>

18
sapl/templates/relatorios/relatorio_pauta_sessao.html
View File

@ -66,4 +66,22 @@
{% else %}
<b>Não existem Matérias de Ordem do Dia para essa Sessão Plenária</b>
{% endif %}
<fieldset>
{% for n in assinatura_mesa %}
{% if n.parlamentar %}
<div class="row">
</br></br>
{% for p in assinatura_mesa %}
</br></br></br>
<center>
<div class="col-md-6">___________________________________________ </br>
<b>{{p.parlamentar.nome_completo}}</b> </br>{{p.cargo}}
</br></br></br>
</div>
</center>
{% endfor %}
{% endif %}
{% endfor %}
</div>
</fieldset>
{% endblock content %}

Write Preview
Loading…
Cancel
Save