From 2ec57d6e673fcf37b8e0e4640360d18c881ed892 Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Wed, 7 Nov 2018 15:51:08 -0200
Subject: [PATCH] votacao em bloco - em andamento

---
 sapl/sessao/urls.py                                      | 4 ++--
 sapl/sessao/views.py                                     | 5 +++++
 .../sessao/adicionar_varias_materias_expediente.html     | 9 +++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py
index e8a8f3142..72fc54577 100644
--- a/sapl/sessao/urls.py
+++ b/sapl/sessao/urls.py
@@ -112,8 +112,8 @@ urlpatterns = [
     url(r'^sessao/(?P<pk>\d+)/presencaordemdia$',
         PresencaOrdemDiaView.as_view(),
         name='presencaordemdia'),
-    url(r'^sessao/votacao-bloco$',
-        PresencaOrdemDiaView.as_view(),
+    url(r'^sessao/(?P<pk>\d+)/votacao-bloco$',
+        AdicionarVariasMateriasOrdemDia.as_view(),
         name='votacao-bloco'),
     url(r'^sessao/(?P<pk>\d+)/resumo$',
         ResumoView.as_view(), name='resumo'),
diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py
index f1280b803..0770408dc 100755
--- a/sapl/sessao/views.py
+++ b/sapl/sessao/views.py
@@ -3215,3 +3215,8 @@ class JustificativaAusenciaCrud(MasterDetailCrud):
 
     class DeleteView(MasterDetailCrud.DeleteView):
         pass
+
+
+class VotacaoEmBloco(PermissionRequiredForAppCrudMixin,
+                     MateriaLegislativaPesquisaView):
+    pass
\ No newline at end of file
diff --git a/sapl/templates/sessao/adicionar_varias_materias_expediente.html b/sapl/templates/sessao/adicionar_varias_materias_expediente.html
index c9c8c5e5d..2a01d732e 100644
--- a/sapl/templates/sessao/adicionar_varias_materias_expediente.html
+++ b/sapl/templates/sessao/adicionar_varias_materias_expediente.html
@@ -28,18 +28,19 @@
     {% if not filter_url %}
       {% crispy filter.form %}
     {% endif %}
-  {%  endif %}
+  {% endif %}
 
   <p></p>
   {% if filter_url and not filter.form.errors %}
   <table class="table table-striped table-bordered">
-        <thead class="thead-default">
+        
+        {% if paginator.count %}
+          <thead class="thead-default">
             <tr>
               <td><h3>{% trans "Matérias" %}</h3></td>
               <td><h3>{% trans "Tipo de Votação" %}</h3></td>
             </tr>
-        </thead>
-        {% if paginator.count %}
+          </thead>
           {% if paginator.count > 1 %}
               <h3>{% blocktrans with paginator.count as total_materias %}Pesquisa concluída com sucesso! Foram encontradas {{total_materias}} matérias.{% endblocktrans %}</h3>
             {% elif paginator.count == 1 %}