mirror of https://github.com/interlegis/sigi.git
53 changed files with 934 additions and 416 deletions
@ -0,0 +1,31 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
import image_cropping.fields |
|||
import sigi.apps.utils |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
# ('metas', '0002_auto_20210406_1945'), |
|||
('contatos', '0002_auto_20151104_0810'), |
|||
('servidores', '0001_initial'), |
|||
# ('parlamentares', '0002_auto_20210406_1945'), |
|||
# ('servicos', '0005_auto_20210406_1945'), |
|||
('servicos', '0004_delete_casaatendida'), |
|||
# ('inventario', '0002_auto_20210406_1945'), |
|||
# ('convenios', '0003_auto_20210406_1945'), |
|||
# ('ocorrencias', '0003_auto_20210406_1945'), |
|||
# ('diagnosticos', '0004_auto_20210406_1945'), |
|||
# ('eventos', '0005_auto_20210406_1945'), |
|||
('casas', '0013_auto_20210406_1428'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.RenameModel( |
|||
old_name='CasaLegislativa', |
|||
new_name='Orgao', |
|||
), |
|||
] |
|||
@ -0,0 +1,28 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterModelOptions( |
|||
name='orgao', |
|||
options={'ordering': ('nome',), 'verbose_name': '\xd3rg\xe3o', 'verbose_name_plural': '\xd3rg\xe3os'}, |
|||
), |
|||
migrations.AddField( |
|||
model_name='tipoorgao', |
|||
name='legislativo', |
|||
field=models.BooleanField(default=False, verbose_name='Poder legislativo'), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterUniqueTogether( |
|||
name='orgao', |
|||
unique_together=set([]), |
|||
), |
|||
] |
|||
@ -0,0 +1,20 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('casas', '0015_auto_20210407_0801'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='orgao', |
|||
name='gerentes_interlegis', |
|||
field=models.ManyToManyField(related_name='casas_que_gerencia', verbose_name='Gerentes Interlegis', to='servidores.Servidor', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,21 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('convenios', '0002_convenio_duracao'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,78 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
import django.db.models.deletion |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('servidores', '0001_initial'), |
|||
('convenios', '0003_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.CreateModel( |
|||
name='StatusConvenio', |
|||
fields=[ |
|||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), |
|||
('nome', models.CharField(max_length=100)), |
|||
('cancela', models.BooleanField(default=False, verbose_name='Cancela o conv\xeanio')), |
|||
], |
|||
options={ |
|||
'ordering': ('nome',), |
|||
'verbose_name': 'Estado de convenios', |
|||
'verbose_name_plural': 'Estados de convenios', |
|||
}, |
|||
bases=(models.Model,), |
|||
), |
|||
migrations.AddField( |
|||
model_name='convenio', |
|||
name='acompanha', |
|||
field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='acompanhado por', blank=True, to='servidores.Servidor', null=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AddField( |
|||
model_name='convenio', |
|||
name='status', |
|||
field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='estado atual', blank=True, to='convenios.StatusConvenio', null=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='\xf3rg\xe3o conveniado', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='data_adesao', |
|||
field=models.DateField(null=True, verbose_name='aderidas', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='data_retorno_assinatura', |
|||
field=models.DateField(help_text='Conv\xeanio firmado.', null=True, verbose_name='conveniadas', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='data_termo_aceite', |
|||
field=models.DateField(help_text='Equipamentos recebidos.', null=True, verbose_name='equipadas', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='duracao', |
|||
field=models.PositiveIntegerField(help_text='Deixar em branco caso a dura\xe7\xe3o seja indefinida', null=True, verbose_name='dura\xe7\xe3o (meses)', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='convenio', |
|||
name='observacao', |
|||
field=models.TextField(null=True, verbose_name='observa\xe7\xf5es', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,26 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('convenios', '0004_auto_20210407_1928'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AddField( |
|||
model_name='convenio', |
|||
name='data_sigad', |
|||
field=models.DateField(null=True, verbose_name='data de cadastro no SIGAD', blank=True), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AddField( |
|||
model_name='convenio', |
|||
name='data_sigi', |
|||
field=models.DateField(auto_now_add=True, verbose_name='data de cadastro no SIGI', null=True), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -1,19 +1,61 @@ |
|||
{% extends "change_list_with_cart.html" %} |
|||
{% load i18n %} |
|||
|
|||
{% block search %} |
|||
<div id="toolbar"> |
|||
<form id="changelist-search" action="" method="get"> |
|||
<div><!-- DIV needed for valid HTML --> |
|||
<label for="searchbar"><img src="/static/admin/img/icon_searchbox.png" alt="Search" /></label> |
|||
<input type="text" size="40" name="q" value="" id="searchbar" /> |
|||
<label for="data_retorno_assinatura__gte">{% trans 'Conveniadas a partir de' %}:</label> |
|||
<input type="text" size="10" name="data_retorno_assinatura__gte" value="" id="data_retorno_assinatura__gte" class="vDateField"/> |
|||
<label for="data_retorno_assinatura__lte">{% trans 'até' %}:</label> |
|||
<input type="text" size="10" name="data_retorno_assinatura__lte" value="" id="data_retorno_assinatura__lte" /> |
|||
<input type="submit" value="Pesquisar" /> |
|||
{% trans 'Datas podem ser: Um ano (aaaa), um mês (aaaa-mm) ou um dia (aaaa-mm-dd)' %} |
|||
{% block extra_search %} |
|||
<nav class="navbar navbar-default"> |
|||
<div class="container-fluid"> |
|||
<div class="navbar-header"> |
|||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> |
|||
<span class="sr-only">Toggle navigation</span> |
|||
<span class="icon-bar"></span> |
|||
<span class="icon-bar"></span> |
|||
<span class="icon-bar"></span> |
|||
</button> |
|||
<a class="navbar-brand" href="#">Filtro de datas</a> |
|||
<p class="navbar-text">Use AAAA, AAAA-MM ou AAAA-MM-DD</p> |
|||
</div> |
|||
</form> |
|||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> |
|||
<form class="navbar-form navbar-left" role="extra-search" id="changelist-extrasearch" action="" method="get"> |
|||
<div class="form-group"> |
|||
<label for="data_retorno_assinatura__gte">{% trans 'Conveniadas a partir de' %}:</label> |
|||
<input type="text" class="form-control search-query" size="10" name="data_retorno_assinatura__gte" value="" id="data_retorno_assinatura__gte"> |
|||
<label for="data_retorno_assinatura__lte">{% trans 'até' %}:</label> |
|||
<input type="text" class="form-control search-query" size="10" name="data_retorno_assinatura__lte" value="" id="data_retorno_assinatura__lte"> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label for="data_sigad__gte">{% trans 'SIGAD a partir de' %}:</label> |
|||
<input type="text" class="form-control search-query" size="10" name="data_sigad__gte" value="" id="data_sigad__gte"> |
|||
<label for="data_sigad__lte">{% trans 'até' %}:</label> |
|||
<input type="text" class="form-control search-query" size="10" name="data_sigad__lte" value="" id="data_sigad__lte"> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label for="data_sigi__gte">{% trans 'SIGI a partir de' %}:</label> |
|||
<input type="text" class="form-control search-query" size="10" name="data_sigi__gte" value="" id="data_sigi__gte"> |
|||
<label for="data_sigi__lte">{% trans 'até' %}:</label> |
|||
<input type="text" class="form-control search-query" size="10" name="data_sigi__lte" value="" id="data_sigi__lte"> |
|||
</div> |
|||
<button type="submit" class="btn btn-default navbar-btn "> |
|||
<span class="glyphicon glyphicon-search"></span> |
|||
</button> |
|||
</form> |
|||
</div><!-- /.navbar-collapse --> |
|||
</div><!-- /.container-fluid --> |
|||
</nav> |
|||
{% comment %} |
|||
<form class="navbar-form navbar-right" role="extra-search" id="changelist-extrasearch" action="" method="get"> |
|||
<div class="form-group"><!-- DIV needed for valid HTML --> |
|||
<div class="input-group"> |
|||
<label for="data_retorno_assinatura__gte">{% trans 'Conveniadas a partir de' %}:</label> |
|||
<input type="text" class="form-control search-query" placeholder="YYYY ou YYYY-MM ou YYYY-MM-DD" size="10" name="data_retorno_assinatura__gte" value="" id="data_retorno_assinatura__gte"> |
|||
<label for="data_retorno_assinatura__lte">{% trans 'até' %}:</label> |
|||
<input type="text" class="form-control search-query" placeholder="YYYY ou YYYY-MM ou YYYY-MM-DD" size="10" name="data_retorno_assinatura__lte" value="" id="data_retorno_assinatura__lte"> |
|||
<span class="input-group-btn"> |
|||
<button class="btn btn-default" type="submit"> |
|||
<span class="glyphicon glyphicon-search"></span> |
|||
</button> |
|||
</span> |
|||
</div> |
|||
</div> |
|||
{% endblock %} |
|||
</form> |
|||
{% endcomment %} |
|||
{% endblock %} |
|||
@ -0,0 +1,21 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('diagnosticos', '0003_auto_20201101_2240'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='diagnostico', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,27 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('eventos', '0004_remove_evento_curso_moodle_id'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='convite', |
|||
name='casa', |
|||
field=models.ForeignKey(verbose_name='Casa convidada', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='evento', |
|||
name='casa_anfitria', |
|||
field=models.ForeignKey(verbose_name='Casa anfitri\xe3', blank=True, to='casas.Orgao', null=True), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,21 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('inventario', '0001_initial'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='bem', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,21 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('metas', '0001_initial'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='planodiretor', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,21 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('ocorrencias', '0002_auto_20160308_0828'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='ocorrencia', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,27 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('parlamentares', '0001_initial'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='legislatura', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='mesadiretora', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,17 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('servicos', '0003_auto_20170407_1003'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.DeleteModel( |
|||
name='CasaAtendida', |
|||
), |
|||
] |
|||
@ -0,0 +1,27 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('servicos', '0004_delete_casaatendida'), |
|||
('casas', '0014_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='casamanifesta', |
|||
name='casa_legislativa', |
|||
field=models.OneToOneField(to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
migrations.AlterField( |
|||
model_name='servico', |
|||
name='casa_legislativa', |
|||
field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'), |
|||
preserve_default=True, |
|||
), |
|||
] |
|||
@ -0,0 +1,25 @@ |
|||
# -*- coding: utf-8 -*- |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import models, migrations |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('casas', '0014_auto_20210406_1945'), |
|||
('servicos', '0005_auto_20210406_1945'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.CreateModel( |
|||
name='CasaAtendida', |
|||
fields=[ |
|||
], |
|||
options={ |
|||
'proxy': True, |
|||
'verbose_name_plural': 'Casas atendidas', |
|||
}, |
|||
bases=('casas.orgao',), |
|||
), |
|||
] |
|||
Loading…
Reference in new issue