diff --git a/sapl/parlamentares/migrations/0023_auto_20180626_1524.py b/sapl/parlamentares/migrations/0023_auto_20180626_1524.py index 9bb00fce9..828fbe88b 100644 --- a/sapl/parlamentares/migrations/0023_auto_20180626_1524.py +++ b/sapl/parlamentares/migrations/0023_auto_20180626_1524.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-03-13 17:48 from __future__ import unicode_literals from django.db import migrations -from django.core.management import call_command import json import os +from django.core.management import call_command + def gera_partidos_tse(apps, schema_editor): Partido = apps.get_model("parlamentares", "Partido") @@ -27,10 +27,13 @@ def gera_partidos_tse(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ + # A dependencia real desse script é o arquivo 0001_initial.py, mas + # isso gera um erro (Conflicting migrations detected; multiple leaf + # nodes in the migration graph). para não ocasionar problemas de migração, + # vamos manter a ordem padrão do django. ('parlamentares', '0022_partido_observacao'), ] operations = [ migrations.RunPython(gera_partidos_tse), ] - diff --git a/sapl/parlamentares/migrations/0026_bloco.py b/sapl/parlamentares/migrations/0026_bloco.py index e30b89d3c..2ba9f2c07 100644 --- a/sapl/parlamentares/migrations/0026_bloco.py +++ b/sapl/parlamentares/migrations/0026_bloco.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -31,11 +30,6 @@ class Migration(migrations.Migration): }, bases=(models.Model,), ), - migrations.AlterField( - model_name='composicaocoligacao', - name='partido', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parlamentares.Partido', verbose_name='Partidos da Coligação'), - ), ] operations = [ diff --git a/sapl/parlamentares/migrations/0035_merge_20190802_0954.py b/sapl/parlamentares/migrations/0027_auto_20190430_0839.py similarity index 50% rename from sapl/parlamentares/migrations/0035_merge_20190802_0954.py rename to sapl/parlamentares/migrations/0027_auto_20190430_0839.py index a87db9134..454101416 100644 --- a/sapl/parlamentares/migrations/0035_merge_20190802_0954.py +++ b/sapl/parlamentares/migrations/0027_auto_20190430_0839.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-02 12:54 +# Generated by Django 1.11.20 on 2019-04-30 11:39 from __future__ import unicode_literals from django.db import migrations @@ -8,9 +8,12 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('parlamentares', '0033_auto_20190712_1132'), - ('parlamentares', '0034_auto_20190801_1408'), + ('parlamentares', '0026_bloco'), ] operations = [ + migrations.AlterModelTable( + name='bloco', + table=None, + ), ] diff --git a/sapl/parlamentares/migrations/0028_auto_20190515_1744.py b/sapl/parlamentares/migrations/0028_auto_20190515_1744.py index 587725d74..2c230d88c 100644 --- a/sapl/parlamentares/migrations/0028_auto_20190515_1744.py +++ b/sapl/parlamentares/migrations/0028_auto_20190515_1744.py @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('parlamentares', '0026_bloco'), + ('parlamentares', '0027_auto_20190430_0839'), ] operations = [ diff --git a/sapl/parlamentares/migrations/0030_auto_20190531_0848.py b/sapl/parlamentares/migrations/0030_auto_20190531_0848.py deleted file mode 100644 index c595f608e..000000000 --- a/sapl/parlamentares/migrations/0030_auto_20190531_0848.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-05-31 11:48 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import sapl.parlamentares.models -import sapl.utils - - -class Migration(migrations.Migration): - - dependencies = [ - ('parlamentares', '0029_auto_20190517_1531'), - ] - - operations = [ - migrations.CreateModel( - name='HistoricoPartido', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sigla', models.CharField(max_length=9, verbose_name='Sigla')), - ('nome', models.CharField(max_length=50, verbose_name='Nome')), - ('inicio_historico', models.DateField(verbose_name='Data Alteração')), - ('fim_historico', models.DateField(verbose_name='Data Alteração')), - ('logo_partido', models.ImageField(blank=True, null=True, upload_to=sapl.parlamentares.models.logo_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_img], verbose_name='Logo Partido')), - ('partido', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Partido')), - ], - ), - migrations.AlterModelTable( - name='bloco', - table=None, - ), - ] diff --git a/sapl/parlamentares/migrations/0031_auto_20190614_1203.py b/sapl/parlamentares/migrations/0030_auto_20190613_1133.py similarity index 66% rename from sapl/parlamentares/migrations/0031_auto_20190614_1203.py rename to sapl/parlamentares/migrations/0030_auto_20190613_1133.py index a35d9e502..3856a0de1 100644 --- a/sapl/parlamentares/migrations/0031_auto_20190614_1203.py +++ b/sapl/parlamentares/migrations/0030_auto_20190613_1133.py @@ -1,15 +1,14 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-05-31 14:09 +# Generated by Django 1.11.21 on 2019-06-13 14:33 from __future__ import unicode_literals -from django.db import migrations, models -import django.db.models.deletion +from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('parlamentares', '0030_auto_20190531_0848'), + ('parlamentares', '0029_auto_20190517_1531'), ] operations = [ diff --git a/sapl/parlamentares/migrations/0031_auto_20200407_1406.py b/sapl/parlamentares/migrations/0031_auto_20200407_1406.py new file mode 100644 index 000000000..874ea6733 --- /dev/null +++ b/sapl/parlamentares/migrations/0031_auto_20200407_1406.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-04-07 17:06 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0030_auto_20190613_1133'), + ] + + operations = [ + migrations.AlterField( + model_name='partido', + name='sigla', + field=models.CharField(max_length=20, verbose_name='Sigla'), + ), + ] diff --git a/sapl/parlamentares/migrations/0032_auto_20190619_1509.py b/sapl/parlamentares/migrations/0032_auto_20200513_1803.py similarity index 86% rename from sapl/parlamentares/migrations/0032_auto_20190619_1509.py rename to sapl/parlamentares/migrations/0032_auto_20200513_1803.py index c634673aa..c4a63f4ec 100644 --- a/sapl/parlamentares/migrations/0032_auto_20190619_1509.py +++ b/sapl/parlamentares/migrations/0032_auto_20200513_1803.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.21 on 2019-06-19 18:09 +# Generated by Django 1.11.29 on 2020-05-13 21:03 from __future__ import unicode_literals from django.db import migrations, models @@ -9,11 +9,16 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('parlamentares', '0031_auto_20190614_1203'), + ('parlamentares', '0031_auto_20200407_1406'), ('sessao', '0043_auto_20190712_1053'), ] state_operations = [ + migrations.AlterField( + model_name='composicaocoligacao', + name='partido', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parlamentares.Partido', verbose_name='Partidos da Coligação'), + ), migrations.CreateModel( name='Bancada', fields=[ @@ -55,4 +60,4 @@ class Migration(migrations.Migration): operations = [ migrations.SeparateDatabaseAndState(state_operations=state_operations) - ] + ] \ No newline at end of file diff --git a/sapl/parlamentares/migrations/0033_afastamentoparlamentar.py b/sapl/parlamentares/migrations/0033_afastamentoparlamentar.py deleted file mode 100644 index 212d1803b..000000000 --- a/sapl/parlamentares/migrations/0033_afastamentoparlamentar.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-01 15:35 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('parlamentares', '0032_auto_20190619_1509'), - ] - - operations = [ - migrations.CreateModel( - name='AfastamentoParlamentar', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('data_inicio', models.DateField(null=True, verbose_name='Início do Afastamento')), - ('data_fim', models.DateField(blank=True, null=True, verbose_name='Fim do Afastamento')), - ('observacao', models.TextField(blank=True, verbose_name='Observação')), - ('mandato', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parlamentares.Mandato', verbose_name='Mandato')), - ('parlamentar', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parlamentares.Parlamentar')), - ('tipo_afastamento', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='parlamentares.TipoAfastamento', verbose_name='Tipo de Afastamento')), - ], - options={ - 'verbose_name': 'Afastamento', - 'verbose_name_plural': 'Afastamentos', - }, - ), - ] diff --git a/sapl/parlamentares/migrations/0033_auto_20190712_1132.py b/sapl/parlamentares/migrations/0033_auto_20190712_1132.py deleted file mode 100644 index 45cfe337d..000000000 --- a/sapl/parlamentares/migrations/0033_auto_20190712_1132.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-07-12 14:32 -from __future__ import unicode_literals -from django.db import migrations, models -import django.db.models.deletion - -class Migration(migrations.Migration): - - dependencies = [ - ('parlamentares', '0032_auto_20190619_1509'), - ] - - operations = [ - migrations.CreateModel( - name='CargoBloco', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nome', models.CharField(max_length=80, verbose_name='Nome do Cargo')), - ('unico', models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=True, verbose_name='Cargo Único')), - ('descricao', models.TextField(blank=True, verbose_name='Descrição')), - ], - options={'ordering': ['nome'], 'verbose_name': 'Cargo de Bloco', 'verbose_name_plural': 'Cargos de Bloco'}, - ), - migrations.CreateModel( - name='CargoBlocoPartido', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('data_inicio', models.DateField(verbose_name='Data Início')), - ('data_fim', models.DateField(blank=True, null=True, verbose_name='Data Fim')), - ('bloco', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Bloco')), - ('cargo', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.CargoBloco')), - ('parlamentar', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Parlamentar')), - ], - options={'ordering': ['data_inicio'], 'verbose_name': 'Vinculo bloco parlamentar', 'verbose_name_plural': 'Vinculos bloco parlamentar'}, - ), - ] diff --git a/sapl/parlamentares/migrations/0034_auto_20190801_1408.py b/sapl/parlamentares/migrations/0034_auto_20190801_1408.py deleted file mode 100644 index 52da81042..000000000 --- a/sapl/parlamentares/migrations/0034_auto_20190801_1408.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-01 17:08 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('parlamentares', '0033_afastamentoparlamentar'), - ] - - operations = [ - migrations.AlterField( - model_name='mandato', - name='tipo_afastamento', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='parlamentares.TipoAfastamento', verbose_name='Tipo de Afastamento'), - ), - ]