Dividindo relatorio de convenio em relatorio de Camara Municipal e Assembleia Legislativa

sigi/apps/convenios/templates/convenios/change_list.html

@@ -4,7 +4,8 @@
 {% block object-tools %}
   {% if has_add_permission %}
     <ul class="object-tools">
-      <li><a href="reports/{{ query_str }}">Relatórios</a></li>
+      <li><a href="reports_por_cm/{{ query_str }}">Relatórios por Câmara Municipal</a></li>
+      <li><a href="reports_por_al/{{ query_str }}">Relatórios por Assembléia Legislativa</a></li>
       <li><a href="reportsRegiao/">Sumário Região</a></li>
       <li>
         <a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">

sigi/apps/convenios/views.py

@@ -5,8 +5,8 @@ from sigi.apps.convenios.reports import ConvenioReport, ConvenioReportRegiao
 from sigi.apps.casas.models import CasaLegislativa
 
 
-def report(request, id=None):
+def report_por_cm(request, id=None):
-    qs = Convenio.objects.all().order_by('casa_legislativa__municipio__uf','casa_legislativa')
+    qs = Convenio.objects.filter(casa_legislativa__tipo__sigla='CM').order_by('casa_legislativa__municipio__uf','casa_legislativa')
     if id:
         qs = qs.filter(pk=id)
     elif request.GET: #Se tiver algum parametro de pesquisa
@@ -28,6 +28,29 @@ def report(request, id=None):
     report.generate_by(PDFGenerator, filename=response)
     return response
 
+def report_por_al(request, id=None):
+    qs = Convenio.objects.filter(casa_legislativa__tipo__sigla='AL').order_by('casa_legislativa__municipio__uf','casa_legislativa')
+    if id:
+        qs = qs.filter(pk=id)
+    elif request.GET: #Se tiver algum parametro de pesquisa
+        kwargs = {}
+        ids = 0
+        for k, v in request.GET.iteritems():
+            kwargs[str(k)] = v
+            if(str(k)=='ids'):
+                ids = 1
+                break
+            qs = qs.filter(**kwargs)
+        if ids:
+            query = 'id IN ('+ kwargs['ids'].__str__()+')'
+            qs = Convenio.objects.extra(where=[query])
+    if not qs:
+        return HttpResponseRedirect('../')
+    response = HttpResponse(mimetype='application/pdf')
+    report = ConvenioReport(queryset=qs)
+    report.generate_by(PDFGenerator, filename=response)
+    return response
+
 class Relatorios(object):
     def __init__(self, regiao, casas, casas_conveniadas):
         self.regiao = regiao

sigi/urls.py

@@ -18,8 +18,10 @@ urlpatterns = patterns(
     'sigi.apps.casas.views.report'),
     (r'^casas/casalegislativa/casas_sem_convenio_report/',
     'sigi.apps.casas.views.casas_sem_convenio_report'),
-    (r'^convenios/convenio/reports/',
+    (r'^convenios/convenio/reports_por_cm/',
-     'sigi.apps.convenios.views.report'),
+     'sigi.apps.convenios.views.report_por_cm'),
+    (r'^convenios/convenio/reports_por_al/',
+     'sigi.apps.convenios.views.report_por_al'),
     (r'^convenios/convenio/reportsRegiao/',
      'sigi.apps.convenios.views.reportRegiao'),
     # automatic interface based on admin