From 7c5ed18ab691017fcfd068d66ca664b129056dee Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Tue, 4 Jun 2019 11:02:55 -0300
Subject: [PATCH] Filtra apenas por cronometros ativos

---
 .../migrations/0038_auto_20190604_1109.py     | 31 +++++++++++++++++++
 sapl/painel/views.py                          |  5 ++-
 sapl/sessao/views.py                          | 11 ++-----
 sapl/templates/painel/index.html              |  2 +-
 4 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 sapl/base/migrations/0038_auto_20190604_1109.py

diff --git a/sapl/base/migrations/0038_auto_20190604_1109.py b/sapl/base/migrations/0038_auto_20190604_1109.py
new file mode 100644
index 000000000..edc4703eb
--- /dev/null
+++ b/sapl/base/migrations/0038_auto_20190604_1109.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-06-04 14:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0037_auto_20190527_0901'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='appconfig',
+            name='cronometro_aparte',
+        ),
+        migrations.RemoveField(
+            model_name='appconfig',
+            name='cronometro_consideracoes',
+        ),
+        migrations.RemoveField(
+            model_name='appconfig',
+            name='cronometro_discurso',
+        ),
+        migrations.RemoveField(
+            model_name='appconfig',
+            name='cronometro_ordem',
+        ),
+    ]
diff --git a/sapl/painel/views.py b/sapl/painel/views.py
index aaaf19e81..4f066b79a 100644
--- a/sapl/painel/views.py
+++ b/sapl/painel/views.py
@@ -292,7 +292,7 @@ def votante_view(request):
 def painel_view(request, pk):
     context = {'head_title': str(_('Painel Plenário')), 
                'sessao_id': pk, 
-               'cronometros': Cronometro.objects.all().order_by('ordenacao')
+               'cronometros': Cronometro.objects.filter(ativo=True).order_by('ordenacao')
                }
     return render(request, 'painel/index.html', context)
 
@@ -344,7 +344,6 @@ CRONOMETRO_STATUS = {
 @user_passes_test(check_permission)
 def cronometro_painel(request):
     acao = request.GET['action']
-    request.session[request.GET['tipo']] = acao
     cronometro_id = request.GET['tipo'].split('cronometro_')[1]
     cronometro = Cronometro.objects.get(id=cronometro_id)
     cronometro.status = CRONOMETRO_STATUS[acao]
@@ -546,7 +545,7 @@ def get_dados_painel(request, pk):
         'C': 'increment'
     }
 
-    dict_status_cronometros = dict(Cronometro.objects.all().order_by('ordenacao').values_list('id', 'status'))
+    dict_status_cronometros = dict(Cronometro.objects.filter(ativo=True).order_by('ordenacao').values_list('id', 'status'))
 
     for key, value in dict_status_cronometros.items():
         dict_status_cronometros[key] = CRONOMETRO_STATUS[dict_status_cronometros[key]]
diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py
index 351d72d85..f959843d0 100755
--- a/sapl/sessao/views.py
+++ b/sapl/sessao/views.py
@@ -875,23 +875,16 @@ class PainelView(PermissionRequiredForAppCrudMixin, TemplateView):
         if request.user.is_anonymous():
             self.template_name = 'painel/index.html'
 
-        # request.session['discurso'] = 'stop'
-        # request.session['aparte'] = 'stop'
-        # request.session['ordem'] = 'stop'
-        # request.session['consideracoes'] = 'stop'
-
-        cronometros = Cronometro.objects.all().order_by('ordenacao')
+        cronometros = Cronometro.objects.filter(ativo=True).order_by('ordenacao')
         for cronometro in cronometros:
             cronometro.status = 'S' # Stop
             cronometro.save()
-            k = 'cronometro_' + str(cronometro.id)
-            request.session[k] = 'stop'
 
         return TemplateView.get(self, request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
 
-        cronometros = Cronometro.objects.all().order_by('ordenacao')
+        cronometros = Cronometro.objects.filter(ativo=True).order_by('ordenacao')
 
         if not cronometros:
 
diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html
index 30d6f07f5..e250a0c41 100644
--- a/sapl/templates/painel/index.html
+++ b/sapl/templates/painel/index.html
@@ -78,7 +78,7 @@
           </div>
 
           <div class="col-md-6 text-center painel">  
-            <h2 class="text-subtitle">Cronômetros</h2>
+            <h2 class="text-subtitle">{% if cronometros|length == 1 %}Cronômetro{% elif cronometros|length > 1%}Cronômetros{% endif %}</h2>
             <div class="text-value">
               {% for cronometro in cronometros %}
                 {{cronometro}}: <span id="cronometro_{{cronometro.id}}"></span><br>