diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index 3310129d3..2f861bc62 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -821,7 +821,7 @@ def compara_tramitacoes_doc(tramitacao1, tramitacao2): if not tramitacao1 or not tramitacao2: return False - lst_items = ['id', 'documento_id', 'timestamp'] + lst_items = ['id', 'documento_id', 'timestamp', 'ultima_edicao'] values = [(k,v) for k,v in tramitacao1.__dict__.items() if ((k not in lst_items) and (k[0] != '_'))] other_values = [(k,v) for k,v in tramitacao2.__dict__.items() if (k not in lst_items and k[0] != '_')] return values == other_values diff --git a/sapl/protocoloadm/migrations/0025_auto_20190815_1539.py b/sapl/protocoloadm/migrations/0025_auto_20190815_1539.py new file mode 100644 index 000000000..d635e2c39 --- /dev/null +++ b/sapl/protocoloadm/migrations/0025_auto_20190815_1539.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.23 on 2019-08-15 18:39 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0024_tramitacaoadministrativo_ultima_edicao'), + ] + + operations = [ + migrations.AlterField( + model_name='tramitacaoadministrativo', + name='ultima_edicao', + field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'), + ), + ] diff --git a/sapl/protocoloadm/models.py b/sapl/protocoloadm/models.py index ef355ffd7..da0c33016 100644 --- a/sapl/protocoloadm/models.py +++ b/sapl/protocoloadm/models.py @@ -340,7 +340,7 @@ class TramitacaoAdministrativo(models.Model): max_length=30, blank=True, default='') - ultima_edicao = models.DateField( + ultima_edicao = models.DateTimeField( verbose_name=_('Data e Hora da Edição'), blank=True, null=True ) diff --git a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html index 7d95f6c08..db93f045a 100644 --- a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html +++ b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html @@ -47,14 +47,14 @@ {% endif %} - {% if tramitacao.ultima_edicao %} -
+ {% if tramitacaoadministrativo.ultima_edicao %} +

Data e Hora da Edição

- {{ tramitacao.ultima_edicao }} + {{ tramitacaoadministrativo.ultima_edicao }}