From dc9df3cd4b1e62f215d13e0470d32631f62409a2 Mon Sep 17 00:00:00 2001
From: Sesostris Vieira <sesostris@interlegis.leg.br>
Date: Tue, 23 Oct 2012 10:01:57 +0000
Subject: [PATCH] =?UTF-8?q?Corrige=20dashboard=20SEIT=20para=20mostrar=20a?=
 =?UTF-8?q?penas=20servi=C3=A7os=20ativos=20e=20inclui=20o=20m=C3=AAs/ano?=
 =?UTF-8?q?=20no=20t=C3=ADtulo=20das=20colunas=20na=20tabela?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sigi/context_processors.py                            | 11 +++++++----
 sigi/templates/snippets/modules/charts-convenios.html | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sigi/context_processors.py b/sigi/context_processors.py
index 1ad8d6d..a2701fe 100644
--- a/sigi/context_processors.py
+++ b/sigi/context_processors.py
@@ -123,14 +123,17 @@ def busca_informacoes_seit():
     mes_atual = datetime.date.today().replace(day=1)
     mes_anterior = mes_atual - datetime.timedelta(days=1)
 
-    result = []
+    result = [{'nome': '',
+               'total': 'Total de casas atendidas',
+               'novos_mes_anterior': 'Novas casas em %s/%s' % (mes_anterior.month, mes_anterior.year),
+               'novos_mes_atual': 'Novas casas em %s/%s' % (mes_atual.month, mes_atual.year)}]
     
     for tipo_servico in TipoServico.objects.all():
         result.append(
             {'nome': tipo_servico.nome,
-             'total': tipo_servico.servico_set.count(),
-             'novos_mes_anterior': tipo_servico.servico_set.filter(data_ativacao__year=mes_anterior.year, data_ativacao__month=mes_anterior.month).count(),
-             'novos_mes_atual': tipo_servico.servico_set.filter(data_ativacao__year=mes_atual.year, data_ativacao__month=mes_atual.month).count(),
+             'total': tipo_servico.servico_set.filter(data_desativacao=None).count(),
+             'novos_mes_anterior': tipo_servico.servico_set.filter(data_desativacao=None, data_ativacao__year=mes_anterior.year, data_ativacao__month=mes_anterior.month).count(),
+             'novos_mes_atual': tipo_servico.servico_set.filter(data_desativacao=None, data_ativacao__year=mes_atual.year, data_ativacao__month=mes_atual.month).count(),
             }
         )
 
diff --git a/sigi/templates/snippets/modules/charts-convenios.html b/sigi/templates/snippets/modules/charts-convenios.html
index 6f50f6d..2a6e3ff 100644
--- a/sigi/templates/snippets/modules/charts-convenios.html
+++ b/sigi/templates/snippets/modules/charts-convenios.html
@@ -64,18 +64,21 @@
 
     <table>            
     	<tr>
-    		<th style="width: 40%; vertical-align:bottom;">&nbsp;</th>
-    		<th style="width: 20%; vertical-align:bottom; text-align: right;">Total de casas atendidas</th>
-    		<th style="width: 20%; vertical-align:bottom; text-align: right;">Novas casas no mês anterior</th>
-    		<th style="width: 20%; vertical-align:bottom; text-align: right;">Novas casas no mês atual</th>
     	</tr>
 	
 	{% for servico in tabela_resumo_seit %}
 		<tr>
+		{% if forloop.first %}
+    		<th style="width: 40%; vertical-align:bottom;">{{ servico.nome }}</th>
+    		<th style="width: 20%; vertical-align:bottom; text-align: right;">{{ servico.total }}</th>
+    		<th style="width: 20%; vertical-align:bottom; text-align: right;">{{ servico.novos_mes_anterior }}</th>
+    		<th style="width: 20%; vertical-align:bottom; text-align: right;">{{ servico.novos_mes_atual }}</th>
+    	{% else %}
 			<th style="width: 40%;">{{ servico.nome }}</th>
 			<td style="text-align: right;">{{ servico.total }}</td>
 			<td style="text-align: right;">{{ servico.novos_mes_anterior }}</td>
 			<td style="text-align: right;">{{ servico.novos_mes_atual }}</td>
+		{% endif %}
 		</tr>
 	{% endfor %}
 	</table>