Browse Source

Impl. #2909 - Matéria Legislativa

pull/2919/head
João Rodrigues 6 years ago
parent
commit
3f5386d19e
  1. 3
      sapl/materia/forms.py
  2. 20
      sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py
  3. 4
      sapl/materia/models.py
  4. 7
      sapl/materia/views.py
  5. 22
      sapl/templates/materia/materialegislativa_detail.html

3
sapl/materia/forms.py

@ -177,7 +177,8 @@ class MateriaLegislativaForm(FileFieldCheckMixin, ModelForm):
'anexadas', 'data_ultima_atualizacao'] 'anexadas', 'data_ultima_atualizacao']
widgets = { widgets = {
'user': forms.HiddenInput(), 'user': forms.HiddenInput(),
'ip': forms.HiddenInput() 'ip': forms.HiddenInput(),
'ultima_edicao': forms.HiddenInput()
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

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

4
sapl/materia/models.py

@ -295,6 +295,10 @@ class MateriaLegislativa(models.Model):
blank=True, blank=True,
default='' default=''
) )
ultima_edicao = models.DateTimeField(
verbose_name=_('Data e Hora da Edição'),
blank=True, null=True
)
class Meta: class Meta:
verbose_name = _('Matéria Legislativa') verbose_name = _('Matéria Legislativa')

7
sapl/materia/views.py

@ -1727,6 +1727,9 @@ class MateriaLegislativaCrud(Crud):
initial['user'] = self.request.user initial['user'] = self.request.user
initial['ip'] = get_client_ip(self.request) initial['ip'] = get_client_ip(self.request)
tz = timezone.get_current_timezone()
initial['ultima_edicao'] = tz.localize(datetime.now())
return initial return initial
@property @property
@ -1758,6 +1761,10 @@ class MateriaLegislativaCrud(Crud):
if dict_objeto_antigo[atributo] != dict_objeto_novo[atributo]: if dict_objeto_antigo[atributo] != dict_objeto_novo[atributo]:
self.object.user = self.request.user self.object.user = self.request.user
self.object.ip = get_client_ip(self.request) self.object.ip = get_client_ip(self.request)
tz = timezone.get_current_timezone()
self.object.ultima_edicao = tz.localize(datetime.now())
self.object.save() self.object.save()
break break

22
sapl/templates/materia/materialegislativa_detail.html

@ -46,7 +46,7 @@
{% if user.is_superuser %} {% if user.is_superuser %}
<div class="row"> <div class="row">
{% if materia.user %} {% if materia.user %}
<div class="col-sm-6"> <div class="col-sm-4">
<div id="div_id_user" class="form-group"> <div id="div_id_user" class="form-group">
<p class="control-label">Usuário</p> <p class="control-label">Usuário</p>
<div class="controls"> <div class="controls">
@ -60,12 +60,28 @@
</div> </div>
{% endif %} {% endif %}
{% if materia.ip %} {% if materia.ip %}
<div class="col-sm-6"> <div class="col-sm-4">
<div id="div_ip_user" class="form-group"> <div id="div_ip_user" class="form-group">
<p class="control-label">IP</p> <p class="control-label">IP</p>
<div class="controls"> <div class="controls">
<div class="form-control-static"> <div class="form-control-static">
<div class="dont-break-out">{{materia.ip}}</div> <div class="dont-break-out">
{{ materia.ip }}
</div>
</div>
</div>
</div>
</div>
{% endif %}
{% if materia.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">
{{ materia.ultima_edicao }}
</div>
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save