From 424a925afbbf5ce6e5f06d443970cf1dd3912d73 Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Mon, 12 Nov 2018 17:47:29 -0200
Subject: [PATCH] tela votacao em bloco exibindo as informacoes corretas

---
 sapl/materia/models.py                        |  1 +
 sapl/sessao/views.py                          | 14 ++++--------
 sapl/templates/auth/user_list.html            |  3 +--
 .../votacao/votacao_bloco_expediente.html     | 22 ++++++++++++++-----
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/sapl/materia/models.py b/sapl/materia/models.py
index 6f322c09c..cfcb71ffc 100644
--- a/sapl/materia/models.py
+++ b/sapl/materia/models.py
@@ -16,6 +16,7 @@ from sapl.comissoes.models import Comissao
 from sapl.compilacao.models import (PerfilEstruturalTextoArticulado,
                                     TextoArticulado)
 from sapl.parlamentares.models import Parlamentar
+#from sapl.protocoloadm.models import Protocolo
 from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, SaplGenericForeignKey,
                         SaplGenericRelation, restringe_tipos_de_arquivo_txt,
                         texto_upload_path)
diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py
index 509904623..a6ee40e22 100755
--- a/sapl/sessao/views.py
+++ b/sapl/sessao/views.py
@@ -42,7 +42,7 @@ from .forms import (AdicionarVariasMateriasFilterSet, BancadaForm, BlocoForm,
                     MesaForm, OradorExpedienteForm, OradorForm, PautaSessaoFilterSet,
                     PresencaForm, ResumoOrdenacaoForm, SessaoPlenariaFilterSet,
                     SessaoPlenariaForm, VotacaoEditForm, VotacaoForm,
-                    VotacaoNominalForm, VotacaoEmBlocoFilterSet)
+                    VotacaoNominalForm)
 from .models import (Bancada, Bloco, CargoBancada, CargoMesa, ExpedienteMateria,
                      ExpedienteSessao, JustificativaAusencia, OcorrenciaSessao, IntegranteMesa,
                      MateriaLegislativa, Orador, OradorExpediente, OrdemDia,
@@ -3225,8 +3225,6 @@ class VotacaoEmBlocoExpediente(PermissionRequiredForAppCrudMixin,
     app_label = AppConfig.label
     logger = logging.getLogger(__name__)
 
-    import ipdb; ipdb.set_trace()
-
     def get_filterset_kwargs(self, filterset_class):
         super(VotacaoEmBlocoExpediente,
               self).get_filterset_kwargs(filterset_class)
@@ -3317,7 +3315,7 @@ class VotacaoEmBlocoOrdemDia(ListView):
     template_name = 'sessao/votacao/votacao_bloco_ordem.html'
     app_label = AppConfig.label
     logger = logging.getLogger(__name__)
-    context_object_name = 'ordemdia'
+    context_object_name = 'ordem_dia'
 
     def get_queryset(self):
         kwargs = self.kwargs
@@ -3326,12 +3324,8 @@ class VotacaoEmBlocoOrdemDia(ListView):
 
     def get_context_data(self, **kwargs):
         context = super(VotacaoEmBlocoOrdemDia, self).get_context_data(**kwargs)
-        import ipdb; ipdb.set_trace()
-        # paginator = context['paginator']
-        context['page_obj']  = context['object_list']
-
-        # context['page_range'] = make_pagination(
-        #     page_obj.number, paginator.num_pages)
+        context['turno_choices'] = Tramitacao.TURNO_CHOICES
+        
         return context
 
 
diff --git a/sapl/templates/auth/user_list.html b/sapl/templates/auth/user_list.html
index b24cb764e..949e544cb 100644
--- a/sapl/templates/auth/user_list.html
+++ b/sapl/templates/auth/user_list.html
@@ -29,7 +29,6 @@
                 </tbody>
             </table>
         {% endif %}
-        <a  class="btn btn-default" href="{% url 'sapl.base:user_create' %}">Criar Usuário</a>
+        <a class="btn btn-default" href="{% url 'sapl.base:user_create' %}">Criar Usuário</a>
     </fieldset>
- {% include 'paginacao.html'%}
 {% endblock base_content %}
diff --git a/sapl/templates/sessao/votacao/votacao_bloco_expediente.html b/sapl/templates/sessao/votacao/votacao_bloco_expediente.html
index bee161829..33b5c8c8f 100644
--- a/sapl/templates/sessao/votacao/votacao_bloco_expediente.html
+++ b/sapl/templates/sessao/votacao/votacao_bloco_expediente.html
@@ -58,12 +58,14 @@
                 </tr>
               </thead>
               
-                {% for m in page_obj %}
+                {% for m in ordem_dia %}
                     <tr>
                         <td>
                             <input type="checkbox" name="materia_id" id="{{m.id}}" value="{{m.id}}" {% if check %} checked {% endif %}>
                             <strong><a href="{% url 'sapl.materia:materialegislativa_detail' m.id %}">{{m.materia.tipo.sigla}} {{m.materia.numero}}/{{m.materia.ano}} - {{m.materia.tipo}}</strong></a></br>
-                            <strong>Processo:</strong> &nbsp;</br>
+                            {% if m.materia.numeracao_set.last %}
+                              <strong>Processo:</strong> &nbsp; {{m.materia.numeracao_set.last}}</br>
+                            {% endif %}
                             <strong>Autor:</strong>
                             {% for a in m.materia.autoria_set.all %}
                               {% if not forloop.first %}
@@ -73,9 +75,19 @@
                               {% endif %}
                             {% endfor %}
                             </br>
-                            <strong>Status:</strong> &nbsp;</br>
-                            <strong>Protocolo:</strong> &nbsp;</br>
-                            <strong>Turno:</strong>&nbsp;</br>
+                            {% if m.materia.numero_protocolo %}
+                              <strong>Protocolo:</strong> &nbsp; {{m.materia.numero_protocolo}}</br>
+                            {% endif %}
+                            {% if  m.materia.tramitacao_set.last %}
+                              {% if m.materia.tramitacao_set.last.turno %}
+                                <strong>Turno:</strong>&nbsp;
+                                {% for t in turno_choices %}
+                                  {% if t.0 == m.materia.tramitacao_set.last.turno %}
+                                    {{ t.1 }}
+                                  {% endif %}
+                                {% endfor %}</br>
+                              {% endif %}
+                            {% endif %}
                             <strong>Ementa:</strong>&nbsp;{{ m.ementa|safe }}</br>
                             <p></p>
                         </td>