From 95492729f62754cec663366a77b5fd08155eed18 Mon Sep 17 00:00:00 2001
From: Davi Galati <davigalati@gmail.com>
Date: Mon, 6 Dec 2021 11:42:12 -0300
Subject: [PATCH 1/2] Fix #120

---
 sigi/apps/convenios/admin.py  | 4 ++--
 sigi/apps/convenios/models.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sigi/apps/convenios/admin.py b/sigi/apps/convenios/admin.py
index 328f46f..8296c2c 100644
--- a/sigi/apps/convenios/admin.py
+++ b/sigi/apps/convenios/admin.py
@@ -68,9 +68,9 @@ class ConvenioAdmin(BaseModelAdmin):
     readonly_fields = ('data_sigi', 'atualizacao_gescon', 'observacao_gescon',)
     actions = ['adicionar_convenios']
     inlines = (AnexosInline,)
-    list_display = ('num_convenio', 'casa_legislativa', 'get_uf',
+    list_display = ('num_convenio', 'projeto','casa_legislativa', 'get_uf',
                     'status_convenio', 'link_sigad', 'data_retorno_assinatura',
-                    'data_termino_vigencia', 'projeto',)
+                    'data_termino_vigencia',)
     list_display_links = ('num_convenio', 'casa_legislativa',)
     list_filter = (('casa_legislativa__gerentes_interlegis',
                     GerentesInterlegisFilter), 'projeto',
diff --git a/sigi/apps/convenios/models.py b/sigi/apps/convenios/models.py
index cabc724..8c7f8d7 100644
--- a/sigi/apps/convenios/models.py
+++ b/sigi/apps/convenios/models.py
@@ -57,6 +57,7 @@ class Convenio(models.Model):
     projeto = models.ForeignKey(
         Projeto,
         on_delete=models.PROTECT,
+        verbose_name=_(u'Tipo de Convenio')
     )
     # numero designado pelo Senado Federal para o convênio
     num_processo_sf = models.CharField(

From 6dc4fa2a279b6802af796c9ed92cc46669aa2c4b Mon Sep 17 00:00:00 2001
From: Davi Galati <davigalati@gmail.com>
Date: Tue, 7 Dec 2021 11:20:53 -0300
Subject: [PATCH 2/2] Fix #118

---
 sigi/apps/metas/templatetags/mapa_tags.py | 4 ++--
 sigi/apps/metas/views.py                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sigi/apps/metas/templatetags/mapa_tags.py b/sigi/apps/metas/templatetags/mapa_tags.py
index 273176a..bd71770 100644
--- a/sigi/apps/metas/templatetags/mapa_tags.py
+++ b/sigi/apps/metas/templatetags/mapa_tags.py
@@ -3,7 +3,7 @@ from django import template
 from django.utils.safestring import mark_safe
 
 from sigi.apps.casas.models import Orgao
-from sigi.apps.metas.views import parliament_summary
+from sigi.apps.metas.views import openmap
 
 
 register = template.Library()
@@ -14,7 +14,7 @@ def descricao_servicos(casa):
     if not isinstance(casa, Orgao):
         return ""
 
-    summary = parliament_summary(casa)
+    summary = openmap(casa)
     result = ''.join('<li>%s</li>' % info for info in summary['info'])
     return mark_safe(result)
 descricao_servicos.is_safe = True
diff --git a/sigi/apps/metas/views.py b/sigi/apps/metas/views.py
index 6a8f9c9..59b22f3 100644
--- a/sigi/apps/metas/views.py
+++ b/sigi/apps/metas/views.py
@@ -232,4 +232,4 @@ def openmapsearch(request):
               'label': d['nome'],
               'lat': d['municipio__latitude'],
               'lng': d['municipio__longitude']} for d in dados]
-    return JsonResponse(list(dados), safe=False)
\ No newline at end of file
+    return JsonResponse(list(dados), safe=False)