From 511469dcf33a083be6c3e0159d036ab81eae7012 Mon Sep 17 00:00:00 2001 From: Eliseu Egewarth Date: Wed, 14 Jun 2017 15:33:55 -0300 Subject: [PATCH] =?UTF-8?q?Corrige=20status=20'N=C3=A3o=20Informado'=20par?= =?UTF-8?q?a=20''=20em=20numero=20de=20votos=20na=20listagem=20de=20Mandat?= =?UTF-8?q?o=20=09Corrige=20status=20'N=C3=A3o=20Informado'=20para=20'0'?= =?UTF-8?q?=20em=20numero=20de=20votos=20na=20listagem=20de=20coliga=C3=A7?= =?UTF-8?q?=C3=A3o=20=09Corrige=20status=20'N=C3=A3o=20Informado'=20para?= =?UTF-8?q?=20'0'=20em=20numero=20de=20votos=20do=20detalhe=20da=20coliga?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eliseu Egewarth --- sapl/parlamentares/views.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index 4ecfe0b83..0a1d1ae9c 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -183,6 +183,26 @@ class ColigacaoCrud(CrudAux): class ListView(CrudAux.ListView): ordering = ('-numero_votos', 'nome') + def get_context_data(self, **kwargs): + context = super(ColigacaoCrud.ListView, self).get_context_data(kwargs=kwargs) + rows = context['rows'] + coluna_votos_recebidos = 2 + for row in rows: + if not row[coluna_votos_recebidos][0]: + row[coluna_votos_recebidos] = ('0', None) + + return context + + class DetailView(CrudAux.DetailView): + + def get_context_data(self, **kwargs): + context = super(ColigacaoCrud.DetailView, self).get_context_data(kwargs=kwargs) + coligacao = context['coligacao'] + if not coligacao.numero_votos: + coligacao.numero_votos = '0' + + return context + class BaseMixin(CrudAux.BaseMixin): subnav_template_name = 'parlamentares/subnav_coligacao.yaml' @@ -200,6 +220,21 @@ class MandatoCrud(MasterDetailCrud): class ListView(MasterDetailCrud.ListView): ordering = ('-legislatura__numero') + def get_context_data(self, **kwargs): + context = super(MasterDetailCrud.ListView, self).get_context_data(kwargs=kwargs) + rows = context['rows'] + coluna_coligacao = 2 + coluna_votos_recebidos = 3 + for row in rows: + if not row[coluna_coligacao][0]: + row[coluna_coligacao] = (' ', None) + + if not row[coluna_votos_recebidos][0]: + row[coluna_votos_recebidos] = (' ', None) + + return context + + class CreateView(MasterDetailCrud.CreateView): form_class = MandatoForm