Merge pull request #109 from interlegis/new_sigi

Alterando o submenu de Visitas

sigi/apps/casas/views.py

@@ -2,6 +2,8 @@
 import csv
 from datetime import datetime
 from functools import reduce
+
+from django.contrib import messages
 from sigi.apps.utils import to_ascii
 from geraldo.generators import PDFGenerator
 
@@ -446,7 +448,8 @@ def visualizar_carrinho(request):
 def excluir_carrinho(request):
     if 'carrinho_casas' in request.session:
         del request.session['carrinho_casas']
-    return HttpResponseRedirect('.')
+        messages.info(request, u'O carrinho foi esvaziado')
+    return HttpResponseRedirect('../../')
 
 
 @login_required

sigi/apps/convenios/models.py

@@ -10,7 +10,6 @@ from django.utils.translation import ugettext as _
 from sigi.apps.utils import SearchField, to_ascii
 from sigi.apps.casas.models import Orgao
 from sigi.apps.servidores.models import Servidor, Servico
-#from sigi.apps.convenios.admin import ConvenioAdmin
 
 class Projeto(models.Model):
     """ Modelo para representar os projetos do programa
@@ -66,6 +65,7 @@ class Convenio(models.Model):
         blank=True,
         help_text=_(u'Formatos:<br/>Antigo: <em>XXXXXX/XX-X</em>.<br/><em>SIGAD: XXXXX.XXXXXX/XXXX-XX</em>')
     )
+    # link_processo_stf = ('get_sigad_url')
     num_convenio = models.CharField(
         _(u'número do convênio'),
         max_length=10,
@@ -212,6 +212,14 @@ class Convenio(models.Model):
 
         return _(u"Indefinido")
 
+    def link_sigad(self, obj):
+        if obj.pk is None:
+            return ""
+        return obj.get_sigad_url()
+
+    link_sigad.short_description = _("Processo no Senado")
+    link_sigad.allow_tags = True
+
     def get_sigad_url(self):
         m = re.match(
             r'(?P<orgao>00100|00200)\.(?P<sequencial>\d{6})/(?P<ano>\d{4})-\d{2}',

sigi/apps/convenios/reports.py

@@ -52,6 +52,12 @@ class ConvenioReport(ReportDefault):
                 top=label_top,
                 width=2 * cm,
             ),
+            Label(
+                text=_(u"Projeto"),
+                left=label_left[5] * cm,
+                top=label_top + 0.4 * cm,
+                width=2 * cm,
+            ),
             Label(
                 text=_(u"Data do Convênio"),
                 left=label_left[3] * cm,
@@ -64,12 +70,6 @@ class ConvenioReport(ReportDefault):
                 top=label_top,
                 width=2 * cm,
             ),
-            Label(
-                text=_(u"Projeto"),
-                left=label_left[5] * cm,
-                top=label_top + 0.4 * cm,
-                width=2 * cm,
-            ),
             Label(
                 text=_(u"Orgão"),
                 left=label_left[6] * cm,
@@ -98,6 +98,10 @@ class ConvenioReport(ReportDefault):
                 attribute_name='num_convenio',
                 left=label_left[2] * cm
             ),
+            ObjectValue(
+                attribute_name='projeto.sigla',
+                left=label_left[5] * cm
+            ),
             ObjectValue(
                 attribute_name='data_retorno_assinatura',
                 left=label_left[3] * cm,
@@ -110,10 +114,6 @@ class ConvenioReport(ReportDefault):
                 get_value=lambda instance:
                     instance.data_pub_diario.strftime('%d/%m/%Y') if instance.data_pub_diario is not None else '-'
             ),
-            ObjectValue(
-                attribute_name='projeto.sigla',
-                left=label_left[5] * cm
-            ),
             ObjectValue(
                 attribute_name='casa_legislativa.nome',
                 left=label_left[6] * cm
@@ -162,14 +162,14 @@ class ConvenioReportSemAceite(ConvenioReport):
                 width=2 * cm,
             ),            
             Label(
-                text=_(u"Data do Convênio"),
+                text=_(u"Projeto"),
-                left=label_left[3] * cm,
+                left=label_left[4] * cm,
                 top=label_top,
                 width=2 * cm,
             ),
             Label(
-                text=_(u"Projeto"),
+                text=_(u"Data do Convênio"),
-                left=label_left[4] * cm,
+                left=label_left[3] * cm,
                 top=label_top,
                 width=2 * cm,
             ),
@@ -198,16 +198,16 @@ class ConvenioReportSemAceite(ConvenioReport):
                 attribute_name='num_convenio',
                 left=label_left[2] * cm
             ),
+            ObjectValue(
+                attribute_name='projeto.sigla',
+                left=label_left[4],
+            ),
             ObjectValue(
                 attribute_name='data_retorno_assinatura',
                 left=label_left[3] * cm,
                 get_value=lambda instance:
                     instance.data_retorno_assinatura.strftime('%d/%m/%Y') if instance.data_retorno_assinatura is not None else '-'
             ),
-            ObjectValue(
-                attribute_name='projeto.sigla',
-                left=label_left[4],
-            ),
             ObjectValue(
                 attribute_name='casa_legislativa.nome',
                 left=label_left[5] * cm

sigi/apps/convenios/views.py

@@ -2,6 +2,7 @@
 import csv
 
 import datetime
+from django.contrib import messages
 from django.http.response import HttpResponseForbidden
 import ho.pisa as pisa
 from django.conf import settings
@@ -114,7 +115,8 @@ def adicionar_convenios_carrinho(request, queryset=None, id=None):
 def excluir_carrinho(request):
     if 'carrinho_convenios' in request.session:
         del request.session['carrinho_convenios']
-    return HttpResponseRedirect('.')
+        messages.info(request, u'O carrinho foi esvaziado')
+    return HttpResponseRedirect('../../')
 
 @login_required
 def deleta_itens_carrinho(request):