diff --git a/sigi/apps/convenios/admin.py b/sigi/apps/convenios/admin.py index 368f8f8..16de30e 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', 'link_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 39eeeac..7e69675 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( 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('
  • %s
  • ' % 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)