Browse Source

Adicionar correções

pull/2919/head
João Rodrigues 6 years ago
parent
commit
f98a501359
  1. 2
      sapl/protocoloadm/forms.py
  2. 20
      sapl/protocoloadm/migrations/0025_auto_20190815_1539.py
  3. 2
      sapl/protocoloadm/models.py
  4. 6
      sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html

2
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

20
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'),
),
]

2
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
)

6
sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html

@ -47,14 +47,14 @@
</div>
</div>
{% endif %}
{% if tramitacao.ultima_edicao %}
<div class="sol-sm-4">
{% if tramitacaoadministrativo.ultima_edicao %}
<div class="col-sm-4">
<div id="div_ud_user" class="form-group">
<p class="control-label">Data e Hora da Edição</p>
<div class="controls">
<div class="form-control-static">
<div class="dont-break-out">
{{ tramitacao.ultima_edicao }}
{{ tramitacaoadministrativo.ultima_edicao }}
</div>
</div>
</div>

Loading…
Cancel
Save