Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #3007 - Adcionando mudança de apresentação de oradores dependendo… #3068

Open
wants to merge 3 commits into
base: 3.1.x
Choose a base branch
from
Open

Fix #3007 - Adcionando mudança de apresentação de oradores dependendo… #3068

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3c5015
Fix #3007 - Adcionando mudança de apresentação de oradores dependendo…
ulyssesBML Dec 19, 2019
8a3b295
Colocando melhorias relatadas no PR
ulyssesBML Jan 20, 2020
f90bb45
Adicionando recomendações de codigo feitas no PR
ulyssesBML Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 16 additions & 9 deletions sapl/painel/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
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
Expand Down Expand Up @@ -358,27 +358,34 @@ def get_materia_aberta(pk):


def get_presentes(pk, response, materia):
if type(materia) == OrdemDia:
presentes = PresencaOrdemDia.objects.filter(
sessao_plenaria_id=pk)
ModelPresenca = None
if isinstance(materia, OrdemDia):
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
oradores = OradorExpediente.objects.filter(
sessao_plenaria_id=pk).order_by('numero_ordem')

ModelOrador = None
if isinstance(materia, ExpedienteMateria):
ModelOrador = OradorExpediente
elif isinstance(materia, OrdemDia):
ModelOrador = OradorOrdemDia
oradores = ModelOrador.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:
Expand Down