From 7f57dfa2d7b1960d4b79410f51eda304a374c634 Mon Sep 17 00:00:00 2001
From: joaohortsenado <100957576+joaohortsenado@users.noreply.github.com>
Date: Sun, 26 Jun 2022 11:01:41 -0300
Subject: [PATCH] =?UTF-8?q?Inclus=C3=A3o=20da=20coluna=20texto=20da=20a?=
 =?UTF-8?q?=C3=A7=C3=A3o=20no=20relat=C3=B3rio=20de=20tramita=C3=A7=C3=A3o?=
 =?UTF-8?q?=20de=20mat=C3=A9ria=20(#3573)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: joao <joao@mezzoplanejamento.com.br>
---
 ...RelatorioMateriasPorTramitacao_filter.html | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
index b26c04924..a7236b444 100644
--- a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
+++ b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
@@ -37,30 +37,53 @@
     </table>
 
     <table class="table table-bordered table-hover">
+      <col>
+      <col>
+      <colgroup span="4"></colgroup>
       <thead class="thead-default" >
-        <tr class="active">
-          <th>Matéria</th>
-          <th>Ementa</th>
-          <th>Local Atual</th>
-          <th>Status</th>
-          <th>Autores</th>
+        <tr>
+          <th scope="col">Matéria</th>
+          <th scope="col">&nbsp;</th>
+          <th colspan="3" scope="colgroup">&nbsp;</th>
         </tr>
       </thead>
+      {% for materia_em_tramitacao in object_list %}
       <tbody>
-        {% for materia_em_tramitacao in object_list %}
-          <tr>
-            <td>
+        <tr>
+          <th rowspan="4" scope="rowgroup">
               <a href="{% url 'sapl.materia:materialegislativa_detail' materia_em_tramitacao.materia.pk %}">
-                {{ materia_em_tramitacao.materia.tipo.descricao }} {{ materia_em_tramitacao.materia.numero }}/{{ materia_em_tramitacao.materia.ano }}
+                  {{ materia_em_tramitacao.materia.tipo.descricao }} {{ materia_em_tramitacao.materia.numero }}/{{ materia_em_tramitacao.materia.ano }}
               </a>
-            </td>
-            <td>{{ materia_em_tramitacao.materia.ementa }}</td>
-            <td>{{ materia_em_tramitacao.materia.tramitacao_set.first.unidade_tramitacao_destino }}</td>
-            <td>{{ materia_em_tramitacao.materia.tramitacao_set.first.status }}</td>
-            <td>{% for autor in materia_em_tramitacao.materia.autores.all %} <p>{{autor}}</p>{% endfor %}</td>
-          </tr>
-        {% endfor %}
+          </th>
+          <th scope="row">Ementa</th>
+          <td colspan="3">{{ materia_em_tramitacao.materia.ementa }}</td>
+        </tr>
+        <tr>
+          <th scope="row">Autores</th>
+          <td colspan="3">
+              <p>
+                  {% for autor in materia_em_tramitacao.materia.autores.all %}
+                      {% if not forloop.last %}
+                        {{autor}},&nbsp;
+                      {% else %}
+                        {{autor}}
+                      {% endif%}
+                  {% endfor %}
+              </p>
+          </td>
+        </tr>
+        <tr>
+          <th scope="row">Local atual</th>
+          <td>{{ materia_em_tramitacao.materia.tramitacao_set.first.unidade_tramitacao_destino }}</td>
+          <th scope="col">Status</th>
+          <td>{{ materia_em_tramitacao.materia.tramitacao_set.first.status }}</td>
+        </tr>
+        <tr>
+          <th scope="row">Texto da Ação</th>
+          <td colspan="3">{{ materia_em_tramitacao.materia.tramitacao_set.first.texto }}</td>
+        </tr>
       </tbody>
+      {% endfor %}
     </table>
   {% endif %}
   {% include 'paginacao.html' %}