From fd277cb515e7699fdad5163c3cc3351ab6536141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= Date: Thu, 5 Oct 2017 14:59:00 -0300 Subject: [PATCH] Reordena a lista de parlamentares #1502 --- sapl/painel/views.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index 6ea0f3f17..83a3b3926 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -8,6 +8,7 @@ from django.http import HttpResponse, JsonResponse from django.http.response import Http404, HttpResponseRedirect from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ +from operator import itemgetter from sapl.crud.base import Crud from sapl.painel.apps import AppConfig @@ -257,13 +258,18 @@ def get_materia_aberta(pk): sessao_plenaria_id=pk, votacao_aberta=True).last() +def sort_nome_parlamentar(lista): + lista_ordenada = sorted(lista, key=itemgetter('nome')) + return lista_ordenada + + def get_presentes(pk, response, materia): if type(materia) == OrdemDia: presentes = PresencaOrdemDia.objects.filter( - sessao_plenaria_id=pk).order_by('parlamentar') + sessao_plenaria_id=pk) elif type(materia) == ExpedienteMateria: presentes = SessaoPlenariaPresenca.objects.filter( - sessao_plenaria_id=pk).order_by('parlamentar') + sessao_plenaria_id=pk) num_presentes = len(presentes) data_sessao = materia.sessao_plenaria.data_inicio @@ -292,6 +298,8 @@ def get_presentes(pk, response, materia): elif materia.tipo_votacao == 3: tipo_votacao = 'Secreta' + presentes_list = sort_nome_parlamentar(presentes_list) + response.update({ 'presentes': presentes_list, 'num_presentes': num_presentes,