From 2d2731fe97e6172e5c88fcf25bf3225a43766b6d Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Tue, 4 Jun 2019 10:45:34 -0300 Subject: [PATCH] =?UTF-8?q?Cron=C3=B4metros=20na=20tela=20do=20painel=20fu?= =?UTF-8?q?ncionando?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/painel/views.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index 2421f527b..ea9b00a1d 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -551,7 +551,11 @@ def get_dados_painel(request, pk): 'C': 'increment' } +<<<<<<< HEAD dict_status_cronometros = dict(Cronometro.objects.filter(ativo=True).order_by('ordenacao').values_list('id', 'status')) +======= + dict_status_cronometros = dict(Cronometro.objects.all().order_by('ordenacao').values_list('id', 'status')) +>>>>>>> Cronômetros na tela do painel funcionando for key, value in dict_status_cronometros.items(): dict_status_cronometros[key] = CRONOMETRO_STATUS[dict_status_cronometros[key]] @@ -561,8 +565,11 @@ def get_dados_painel(request, pk): 'sessao_plenaria_data': sessao.data_inicio.strftime('%d/%m/%Y'), 'sessao_plenaria_hora_inicio': sessao.hora_inicio, 'cronometros': dict_status_cronometros, +<<<<<<< HEAD 'sessao_solene': sessao.tipo.nome == "Solene", 'tema_solene': sessao.tema_solene, +======= +>>>>>>> Cronômetros na tela do painel funcionando 'status_painel': sessao.painel_aberto, 'brasao': brasao }