From 202e5614a99e41cfbad6933e4e0809682612ee90 Mon Sep 17 00:00:00 2001
From: "Starlone (Estagiario)" <starlone>
Date: Tue, 3 Aug 2010 18:35:36 +0000
Subject: [PATCH] Relatorio de casas sem convenio usando filtros

---
 sigi/apps/casas/reports.py                       |  6 +++++-
 sigi/apps/casas/templates/casas/change_list.html |  2 +-
 sigi/apps/casas/views.py                         | 12 +++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sigi/apps/casas/reports.py b/sigi/apps/casas/reports.py
index a656c71..9fc7231 100644
--- a/sigi/apps/casas/reports.py
+++ b/sigi/apps/casas/reports.py
@@ -131,4 +131,8 @@ class CasasLegislativasReport(ReportDefault):
                 borders={'top': True},
             )
         )
-    ]
\ No newline at end of file
+    ]
+
+
+class CasasSemConvenioReport(CasasLegislativasReport):
+    title = u'Relatório de Casas Legislativas sem Convênio'
\ No newline at end of file
diff --git a/sigi/apps/casas/templates/casas/change_list.html b/sigi/apps/casas/templates/casas/change_list.html
index 625b3c5..279b3cd 100644
--- a/sigi/apps/casas/templates/casas/change_list.html
+++ b/sigi/apps/casas/templates/casas/change_list.html
@@ -5,7 +5,7 @@
   {% if has_add_permission %}
     <ul class="object-tools">
         <li><a href="reports/{{query_str}}">Relatório</a> </li>
-        <li><a href="casas_sem_convenio_report">Casas sem convênio</a> </li>
+        <li><a href="casas_sem_convenio_report/{{query_str}}">Casas sem convênio</a> </li>
         <li><a href="labels/{{ query_str }}">Gerar etiquetas</a></li>
         <li>
             <a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">
diff --git a/sigi/apps/casas/views.py b/sigi/apps/casas/views.py
index e8dc0e8..f22c8e5 100644
--- a/sigi/apps/casas/views.py
+++ b/sigi/apps/casas/views.py
@@ -3,6 +3,7 @@ from geraldo.generators import PDFGenerator
 from sigi.apps.casas.models import CasaLegislativa
 from sigi.apps.casas.reports import CasasLegislativasLabels
 from sigi.apps.casas.reports import CasasLegislativasReport
+from sigi.apps.casas.reports import CasasSemConvenioReport
 
 
 def labels_report(request, id=None):
@@ -43,8 +44,17 @@ def report(request, id=None):
 
 def casas_sem_convenio_report(request):
     qs = CasaLegislativa.objects.filter(convenio=None).order_by('municipio__uf','nome')
+    
+    if request.GET:        
+        kwargs = {}
+        for k, v in request.GET.iteritems():
+            kwargs[str(k)] = v
+            qs = qs.filter(**kwargs)
+    if not qs:
+        return HttpResponseRedirect('../')
 
+    #qs.order_by('municipio__uf','nome')
     response = HttpResponse(mimetype='application/pdf')
-    report = CasasLegislativasReport(queryset=qs)
+    report = CasasSemConvenioReport(queryset=qs)
     report.generate_by(PDFGenerator, filename=response)
     return response