diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 6c9ff032d..17ae1a309 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -177,7 +177,8 @@ class MateriaLegislativaForm(FileFieldCheckMixin, ModelForm): 'anexadas', 'data_ultima_atualizacao'] widgets = { 'user': forms.HiddenInput(), - 'ip': forms.HiddenInput() + 'ip': forms.HiddenInput(), + 'ultima_edicao': forms.HiddenInput() } def __init__(self, *args, **kwargs): diff --git a/sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py b/sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py new file mode 100644 index 000000000..9f8b0f4f2 --- /dev/null +++ b/sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-08-01 23:32 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0052_tramitacao_ultima_edicao'), + ] + + operations = [ + migrations.AddField( + model_name='materialegislativa', + name='ultima_edicao', + field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'), + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 4b5baa0ad..f4727a99a 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -295,6 +295,10 @@ class MateriaLegislativa(models.Model): blank=True, default='' ) + ultima_edicao = models.DateTimeField( + verbose_name=_('Data e Hora da Edição'), + blank=True, null=True + ) class Meta: verbose_name = _('Matéria Legislativa') diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 49d744d38..001816012 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1727,6 +1727,9 @@ class MateriaLegislativaCrud(Crud): initial['user'] = self.request.user initial['ip'] = get_client_ip(self.request) + tz = timezone.get_current_timezone() + initial['ultima_edicao'] = tz.localize(datetime.now()) + return initial @property @@ -1758,6 +1761,10 @@ class MateriaLegislativaCrud(Crud): if dict_objeto_antigo[atributo] != dict_objeto_novo[atributo]: self.object.user = self.request.user self.object.ip = get_client_ip(self.request) + + tz = timezone.get_current_timezone() + self.object.ultima_edicao = tz.localize(datetime.now()) + self.object.save() break diff --git a/sapl/templates/materia/materialegislativa_detail.html b/sapl/templates/materia/materialegislativa_detail.html index 3396653c2..1eef8091d 100644 --- a/sapl/templates/materia/materialegislativa_detail.html +++ b/sapl/templates/materia/materialegislativa_detail.html @@ -46,13 +46,13 @@ {% if user.is_superuser %}
{% if materia.user %} -
+

Usuário

@@ -60,12 +60,28 @@
{% endif %} {% if materia.ip %} -
+

IP

-
{{materia.ip}}
+
+ {{ materia.ip }} +
+
+
+
+
+ {% endif %} + {% if materia.ultima_edicao %} +
+
+

Data e Hora da Edição

+
+
+
+ {{ materia.ultima_edicao }} +