From d3c5015057c221fb96b7972c2cdf28b72d1eb62f Mon Sep 17 00:00:00 2001 From: ulyssesBML Date: Thu, 19 Dec 2019 12:37:55 -0300 Subject: [PATCH 1/3] =?UTF-8?q?Fix=20#3007=20-=20Adcionando=20mudan=C3=A7a?= =?UTF-8?q?=20de=20apresenta=C3=A7=C3=A3o=20de=20oradores=20dependendo=20d?= =?UTF-8?q?a=20materia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/painel/views.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index 1dcb7bb49..a00c2b8f4 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -21,7 +21,7 @@ from sapl.parlamentares.models import Legislatura, Parlamentar, Votante from sapl.sessao.models import (ExpedienteMateria, OradorExpediente, OrdemDia, PresencaOrdemDia, RegistroVotacao, SessaoPlenaria, SessaoPlenariaPresenca, - VotoParlamentar, RegistroLeitura) + VotoParlamentar, RegistroLeitura, OradorOrdemDia) from sapl.utils import filiacao_data, get_client_ip, sort_lista_chave from .models import Cronometro @@ -368,17 +368,21 @@ def get_presentes(pk, response, materia): sessao = SessaoPlenaria.objects.get(id=pk) num_presentes = len(presentes) data_sessao = sessao.data_inicio - oradores = OradorExpediente.objects.filter( - sessao_plenaria_id=pk).order_by('numero_ordem') - + + if type(materia) is ExpedienteMateria: + oradores = OradorExpediente.objects.filter( + sessao_plenaria_id=pk).order_by('numero_ordem') + else: + oradores = OradorOrdemDia.objects.filter( + sessao_plenaria_id=pk).order_by('numero_ordem') + oradores_list = [] for o in oradores: - oradores_list.append( { 'nome': o.parlamentar.nome_parlamentar, 'numero': o.numero_ordem - }) + }) presentes_list = [] for p in presentes: From 8a3b29506b80bd5eac9af75ac026860ccb7c581d Mon Sep 17 00:00:00 2001 From: ulyssesBML Date: Mon, 20 Jan 2020 16:50:15 -0300 Subject: [PATCH 2/3] Colocando melhorias relatadas no PR --- sapl/painel/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index a00c2b8f4..f5c92aedf 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -358,7 +358,7 @@ def get_materia_aberta(pk): def get_presentes(pk, response, materia): - if type(materia) == OrdemDia: + if isinstance(materia, OrdemDia): presentes = PresencaOrdemDia.objects.filter( sessao_plenaria_id=pk) else: @@ -369,13 +369,15 @@ def get_presentes(pk, response, materia): num_presentes = len(presentes) data_sessao = sessao.data_inicio - if type(materia) is ExpedienteMateria: + if isinstance(materia, ExpedienteMateria): oradores = OradorExpediente.objects.filter( sessao_plenaria_id=pk).order_by('numero_ordem') - else: + elif isinstance(materia, OrdemDia): oradores = OradorOrdemDia.objects.filter( sessao_plenaria_id=pk).order_by('numero_ordem') - + else: + oradores = [] + oradores_list = [] for o in oradores: oradores_list.append( From f90bb453b65402d37632067691646afd2a461295 Mon Sep 17 00:00:00 2001 From: ulyssesBML Date: Mon, 13 Jul 2020 12:23:43 -0300 Subject: [PATCH 3/3] =?UTF-8?q?Adicionando=20recomenda=C3=A7=C3=B5es=20de?= =?UTF-8?q?=20codigo=20feitas=20no=20PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/painel/views.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index f5c92aedf..862e9dc3d 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -358,25 +358,26 @@ def get_materia_aberta(pk): def get_presentes(pk, response, materia): + ModelPresenca = None if isinstance(materia, OrdemDia): - presentes = PresencaOrdemDia.objects.filter( - sessao_plenaria_id=pk) + ModelPresenca = PresencaOrdemDia else: - presentes = SessaoPlenariaPresenca.objects.filter( + ModelPresenca = SessaoPlenariaPresenca + + presentes = ModelPresenca.objects.filter( sessao_plenaria_id=pk) sessao = SessaoPlenaria.objects.get(id=pk) num_presentes = len(presentes) data_sessao = sessao.data_inicio + ModelOrador = None if isinstance(materia, ExpedienteMateria): - oradores = OradorExpediente.objects.filter( - sessao_plenaria_id=pk).order_by('numero_ordem') + ModelOrador = OradorExpediente elif isinstance(materia, OrdemDia): - oradores = OradorOrdemDia.objects.filter( + ModelOrador = OradorOrdemDia + oradores = ModelOrador.objects.filter( sessao_plenaria_id=pk).order_by('numero_ordem') - else: - oradores = [] oradores_list = [] for o in oradores: