Browse Source

Fix #1898

pull/1917/head
Mariana Mendes 8 years ago
parent
commit
9a65b46a02
  1. 9
      sapl/sessao/views.py

9
sapl/sessao/views.py

@ -1,5 +1,6 @@
from re import sub from re import sub
from operator import itemgetter from operator import itemgetter
import unicodedata
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import permission_required from django.contrib.auth.decorators import permission_required
@ -385,6 +386,9 @@ def customize_link_materia(context, pk, has_permission, is_expediente):
context['rows'][i][3] = (resultado, None) context['rows'][i][3] = (resultado, None)
return context return context
def remove_accent(string):
return ''.join([c for c in unicodedata.normalize('NFD', string)
if unicodedata.category(c) != 'Mn'])
def get_presencas_generic(model, sessao, legislatura): def get_presencas_generic(model, sessao, legislatura):
presencas = model.objects.filter( presencas = model.objects.filter(
@ -392,10 +396,7 @@ def get_presencas_generic(model, sessao, legislatura):
presentes = [p.parlamentar for p in presencas] presentes = [p.parlamentar for p in presencas]
presentes = sorted(presentes, key=lambda x: x.nome_parlamentar) presentes = sorted(presentes, key=lambda x: remove_accent(x.nome_parlamentar))
mandato = Mandato.objects.filter(
legislatura=legislatura).order_by('parlamentar__nome_parlamentar')
for m in mandato: for m in mandato:
if m.parlamentar in presentes: if m.parlamentar in presentes:

Loading…
Cancel
Save