diff --git a/sapl/materia/migrations/0054_merge_20190802_1117.py b/sapl/materia/migrations/0054_merge_20190802_1112.py similarity index 100% rename from sapl/materia/migrations/0054_merge_20190802_1117.py rename to sapl/materia/migrations/0054_merge_20190802_1112.py diff --git a/sapl/materia/migrations/0055_auto_20190816_0943.py b/sapl/materia/migrations/0055_auto_20190816_0943.py index 496d03df0..2f95add3c 100644 --- a/sapl/materia/migrations/0055_auto_20190816_0943.py +++ b/sapl/materia/migrations/0055_auto_20190816_0943.py @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('materia', '0054_merge_20190802_1117'), + ('materia', '0054_merge_20190802_1112'), ] operations = [ diff --git a/sapl/parlamentares/migrations/0032_auto_20190619_1509.py b/sapl/parlamentares/migrations/0032_auto_20190619_1509.py index 3dd56e096..c634673aa 100644 --- a/sapl/parlamentares/migrations/0032_auto_20190619_1509.py +++ b/sapl/parlamentares/migrations/0032_auto_20190619_1509.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('parlamentares', '0031_auto_20190614_1203'), - ('sessao', '0043_auto_20190506_1452'), + ('sessao', '0043_auto_20190712_1053'), ] state_operations = [ diff --git a/sapl/protocoloadm/migrations/0023_merge_20190802_1117.py b/sapl/protocoloadm/migrations/0023_merge_20190802_1112.py similarity index 100% rename from sapl/protocoloadm/migrations/0023_merge_20190802_1117.py rename to sapl/protocoloadm/migrations/0023_merge_20190802_1112.py diff --git a/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py b/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py index 07543e7e9..6bd5eea65 100644 --- a/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py +++ b/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('protocoloadm', '0023_auto_20190711_1755'), - ('protocoloadm', '0023_merge_20190802_1117'), + ('protocoloadm', '0023_merge_20190802_1112'), ] operations = [ diff --git a/sapl/sessao/migrations/0045_auto_20190809_1319.py b/sapl/sessao/migrations/0044_auto_20190816_1336.py similarity index 86% rename from sapl/sessao/migrations/0045_auto_20190809_1319.py rename to sapl/sessao/migrations/0044_auto_20190816_1336.py index 2254340a2..c6d74d88a 100644 --- a/sapl/sessao/migrations/0045_auto_20190809_1319.py +++ b/sapl/sessao/migrations/0044_auto_20190816_1336.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-09 16:19 +# Generated by Django 1.11.20 on 2019-08-16 16:36 from __future__ import unicode_literals from django.db import migrations, models @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('sessao', '0044_merge_20190802_1117'), + ('sessao', '0043_auto_20190712_1053'), ] operations = [ diff --git a/sapl/sessao/migrations/0044_merge_20190802_1117.py b/sapl/sessao/migrations/0044_merge_20190802_1117.py deleted file mode 100644 index aca952786..000000000 --- a/sapl/sessao/migrations/0044_merge_20190802_1117.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-02 14:17 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('sessao', '0043_auto_20190712_1053'), - ('sessao', '0043_auto_20190506_1452'), - ] - - operations = [ - ] diff --git a/sapl/sessao/migrations/0046_auto_20190809_1319.py b/sapl/sessao/migrations/0045_auto_20190816_1337.py similarity index 82% rename from sapl/sessao/migrations/0046_auto_20190809_1319.py rename to sapl/sessao/migrations/0045_auto_20190816_1337.py index 925c8df08..e835b5998 100644 --- a/sapl/sessao/migrations/0046_auto_20190809_1319.py +++ b/sapl/sessao/migrations/0045_auto_20190816_1337.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-09 16:19 +# Generated by Django 1.11.20 on 2019-08-16 16:37 from __future__ import unicode_literals from django.db import migrations @@ -7,16 +7,15 @@ from django.db import migrations def migra_ordenacao_tipos(apps, schema_editor): TipoExpediente = apps.get_model('sessao', 'TipoExpediente') - + for i,tipo in enumerate(TipoExpediente.objects.all().order_by('nome')): tipo.ordenacao=i+1 tipo.save() - class Migration(migrations.Migration): dependencies = [ - ('sessao', '0045_auto_20190809_1319'), + ('sessao', '0044_auto_20190816_1336'), ] operations = [ diff --git a/sapl/sessao/migrations/0046_auto_20190827_1228.py b/sapl/sessao/migrations/0046_auto_20190827_1228.py new file mode 100644 index 000000000..d37e2b200 --- /dev/null +++ b/sapl/sessao/migrations/0046_auto_20190827_1228.py @@ -0,0 +1,62 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-08-27 15:28 +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 = [ + ('materia', '0055_auto_20190816_0943'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('sessao', '0045_auto_20190816_1337'), + ] + + operations = [ + migrations.CreateModel( + name='RegistroLeitura', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('observacao', models.TextField(blank=True, verbose_name='Observações')), + ('ip', models.CharField(blank=True, default='', max_length=30, verbose_name='IP')), + ('data_hora', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Data/Hora')), + ], + options={ + 'verbose_name': 'Leitura', + 'verbose_name_plural': 'Leituras', + }, + ), + migrations.AlterField( + model_name='expedientemateria', + name='tipo_votacao', + field=models.PositiveIntegerField(choices=[(1, 'Simbólica'), (2, 'Nominal'), (3, 'Secreta'), (4, 'Leitura')], default=1, verbose_name='Tipo de votação'), + ), + migrations.AlterField( + model_name='ordemdia', + name='tipo_votacao', + field=models.PositiveIntegerField(choices=[(1, 'Simbólica'), (2, 'Nominal'), (3, 'Secreta'), (4, 'Leitura')], default=1, verbose_name='Tipo de votação'), + ), + migrations.AddField( + model_name='registroleitura', + name='expediente', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='sessao.ExpedienteMateria'), + ), + migrations.AddField( + model_name='registroleitura', + name='materia', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'), + ), + migrations.AddField( + model_name='registroleitura', + name='ordem', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='sessao.OrdemDia'), + ), + migrations.AddField( + model_name='registroleitura', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/sapl/sessao/migrations/0047_auto_20191001_1115.py b/sapl/sessao/migrations/0046_auto_20191001_1115.py similarity index 98% rename from sapl/sessao/migrations/0047_auto_20191001_1115.py rename to sapl/sessao/migrations/0046_auto_20191001_1115.py index 392ca1d23..5b773c293 100644 --- a/sapl/sessao/migrations/0047_auto_20191001_1115.py +++ b/sapl/sessao/migrations/0046_auto_20191001_1115.py @@ -10,7 +10,7 @@ import sapl.utils class Migration(migrations.Migration): dependencies = [ - ('sessao', '0046_auto_20190809_1319'), + ('sessao', '0045_auto_20190816_1337'), ] operations = [ diff --git a/sapl/sessao/migrations/0043_auto_20190506_1452.py b/sapl/sessao/migrations/0047_merge_20191009_1535.py similarity index 85% rename from sapl/sessao/migrations/0043_auto_20190506_1452.py rename to sapl/sessao/migrations/0047_merge_20191009_1535.py index 8827e906b..8ecdd8999 100644 --- a/sapl/sessao/migrations/0043_auto_20190506_1452.py +++ b/sapl/sessao/migrations/0047_merge_20191009_1535.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-05-06 17:52 +# Generated by Django 1.11.20 on 2019-10-09 18:35 from __future__ import unicode_literals from django.db import migrations @@ -8,7 +8,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('sessao', '0042_merge_20190612_0925'), + ('sessao', '0046_auto_20190827_1228'), + ('sessao', '0046_auto_20191001_1115'), ] database_operations = [ diff --git a/sapl/sessao/migrations/0048_auto_20191009_1550.py b/sapl/sessao/migrations/0048_auto_20191009_1550.py new file mode 100644 index 000000000..5b08dfb80 --- /dev/null +++ b/sapl/sessao/migrations/0048_auto_20191009_1550.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-10-09 18:50 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0047_merge_20191009_1535'), + ] + + operations = [ + migrations.RemoveField( + model_name='registroleitura', + name='expediente', + ), + migrations.RemoveField( + model_name='registroleitura', + name='materia', + ), + migrations.RemoveField( + model_name='registroleitura', + name='ordem', + ), + migrations.RemoveField( + model_name='registroleitura', + name='user', + ), + migrations.AlterField( + model_name='expedientemateria', + name='tipo_votacao', + field=models.PositiveIntegerField(choices=[(1, 'Simbólica'), (2, 'Nominal'), (3, 'Secreta')], default=1, verbose_name='Tipo de votação'), + ), + migrations.AlterField( + model_name='ordemdia', + name='tipo_votacao', + field=models.PositiveIntegerField(choices=[(1, 'Simbólica'), (2, 'Nominal'), (3, 'Secreta')], default=1, verbose_name='Tipo de votação'), + ), + migrations.DeleteModel( + name='RegistroLeitura', + ), + ]