mirror of https://github.com/interlegis/sapl.git
Browse Source
* Impl. #2909 - Tramitação de Matéria Legislativa * Impl. #2909 - Matéria Legislativa * Impl. #2909 - Norma Jurídica * Adicionar correções * Adicionar migrações * Impl. #2909 - Tramitação Documento Administrativo * Adicionar correções * Impl. #2936 * Evitar merge de migrações * Evitar merge de migrações * Evitar merge de migrações * Adicionar migrações * Adicionar migrationspull/3052/head
João Rodrigues
5 years ago
committed by
Edward
Edward
24 changed files with 643 additions and 147 deletions
@ -0,0 +1,25 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-08-29 15:06 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations, models |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('materia', '0055_auto_20190816_0943'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AddField( |
|||
model_name='materialegislativa', |
|||
name='ultima_edicao', |
|||
field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'), |
|||
), |
|||
migrations.AddField( |
|||
model_name='tramitacao', |
|||
name='ultima_edicao', |
|||
field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'), |
|||
), |
|||
] |
|||
@ -0,0 +1,16 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-09-26 15:50 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('materia', '0057_materiaemtramitacao'), |
|||
('materia', '0056_auto_20190829_1206'), |
|||
] |
|||
|
|||
operations = [ |
|||
] |
|||
@ -0,0 +1,16 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-10-09 21:14 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('materia', '0060_auto_20190930_1136'), |
|||
('materia', '0058_merge_20190926_1250'), |
|||
] |
|||
|
|||
operations = [ |
|||
] |
|||
@ -0,0 +1,20 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-08-29 14:41 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations, models |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('norma', '0026_auto_20190712_1053'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AddField( |
|||
model_name='normajuridica', |
|||
name='ultima_edicao', |
|||
field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'), |
|||
), |
|||
] |
|||
@ -0,0 +1,16 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-10-09 21:14 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('norma', '0027_normajuridica_ultima_edicao'), |
|||
('norma', '0027_auto_20191001_1115'), |
|||
] |
|||
|
|||
operations = [ |
|||
] |
|||
@ -0,0 +1,20 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-08-08 21:14 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations, models |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('protocoloadm', '0023_merge_20190802_1112'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AddField( |
|||
model_name='tramitacaoadministrativo', |
|||
name='ultima_edicao', |
|||
field=models.DateField(blank=True, null=True, verbose_name='Data e Hora da Edição'), |
|||
), |
|||
] |
|||
@ -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'), |
|||
), |
|||
] |
|||
@ -0,0 +1,33 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.23 on 2019-08-15 20:37 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.conf import settings |
|||
from django.db import migrations, models |
|||
import django.db.models.deletion |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
migrations.swappable_dependency(settings.AUTH_USER_MODEL), |
|||
('protocoloadm', '0025_auto_20190815_1539'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AddField( |
|||
model_name='documentoadministrativo', |
|||
name='ip', |
|||
field=models.CharField(blank=True, default='', max_length=30, verbose_name='IP'), |
|||
), |
|||
migrations.AddField( |
|||
model_name='documentoadministrativo', |
|||
name='ultima_edicao', |
|||
field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'), |
|||
), |
|||
migrations.AddField( |
|||
model_name='documentoadministrativo', |
|||
name='user', |
|||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Usuário'), |
|||
), |
|||
] |
|||
@ -0,0 +1,16 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-09-26 15:50 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('protocoloadm', '0026_auto_20190815_1737'), |
|||
('protocoloadm', '0024_merge_20190821_1418'), |
|||
] |
|||
|
|||
operations = [ |
|||
] |
|||
@ -0,0 +1,16 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.11.20 on 2019-10-09 21:14 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('protocoloadm', '0027_merge_20190926_1250'), |
|||
('protocoloadm', '0025_auto_20191001_1115'), |
|||
] |
|||
|
|||
operations = [ |
|||
] |
|||
@ -0,0 +1,54 @@ |
|||
{% extends "crud/detail.html" %} |
|||
{% load i18n %} |
|||
|
|||
{% block detail_content %} |
|||
{{ block.super }} |
|||
{% if user.is_superuser %} |
|||
<div class="row"> |
|||
{% if documentoadministrativo.user %} |
|||
<div class="col-sm-4"> |
|||
<div id="div_id_user" class="form-group"> |
|||
<p class="control-label">Usuário</p> |
|||
<div class="controls"> |
|||
<div class="form-control-static"> |
|||
<div class="dont-break-out"> |
|||
<a href="{% url 'sapl.base:user_edit' documentoadministrativo.user.pk %}"> |
|||
{{ documentoadministrativo.user }} |
|||
</a> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
{% endif %} |
|||
{% if documentoadministrativo.ip %} |
|||
<div class="col-sm-4"> |
|||
<div id="div_ip_user" class="form-group"> |
|||
<p class="control-label">IP</p> |
|||
<div class="controls"> |
|||
<div class="form-control-static"> |
|||
<div class="dont-break-out"> |
|||
{{ documentoadministrativo.ip }} |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
{% endif %} |
|||
{% if documentoadministrativo.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"> |
|||
{{ documentoadministrativo.ultima_edicao }} |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
{% endif %} |
|||
</div> |
|||
{% endif %} |
|||
{% endblock detail_content %} |
|||
Loading…
Reference in new issue