HOT-FIX: conserta migrações sessão e parlamentares

6 years ago · 3e67fd9210
8 changed files with 191 additions and 144 deletions
--- a/sapl/comissoes/migrations/0022_comissao_autor.py
+++ b/sapl/comissoes/migrations/0022_comissao_autor.py
@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-08 16:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0037_auto_20190527_0901'),
+        ('comissoes', '0021_auto_20191001_1115'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='comissao',
+            name='autor',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='base.Autor', verbose_name='Comissão'),
+        ),
+    ]
--- a/sapl/comissoes/migrations/0023_remove_comissao_autor.py
+++ b/sapl/comissoes/migrations/0023_remove_comissao_autor.py
@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-09 15:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comissoes', '0022_comissao_autor'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='comissao',
+            name='autor',
+        ),
+    ]
--- a/sapl/parlamentares/migrations/0031_parlamentar_autor.py
+++ b/sapl/parlamentares/migrations/0031_parlamentar_autor.py
@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-08 15:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0037_auto_20190527_0901'),
+        ('parlamentares', '0030_auto_20190613_1133'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='parlamentar',
+            name='autor',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='base.Autor', verbose_name='Autor'),
+        ),
+    ]
--- a/sapl/parlamentares/migrations/0032_remove_parlamentar_autor.py
+++ b/sapl/parlamentares/migrations/0032_remove_parlamentar_autor.py
@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-09 15:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parlamentares', '0031_parlamentar_autor'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='parlamentar',
+            name='autor',
+        ),
+    ]
--- a/sapl/sessao/migrations/0046_auto_20190827_1228.py
+++ b/sapl/sessao/migrations/0046_auto_20190827_1228.py
@ -1,62 +0,0 @@
-# -*- 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),
-        ),
-    ]
--- a/sapl/sessao/migrations/0046_auto_20191001_1115.py
+++ b/sapl/sessao/migrations/0046_auto_20191001_1115.py
@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-10-01 14:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import sapl.sessao.models
-import sapl.utils
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sessao', '0045_auto_20190816_1337'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='justificativaausencia',
-            name='upload_anexo',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo de Justificativa'),
-        ),
-        migrations.AlterField(
-            model_name='orador',
-            name='upload_anexo',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo do Orador'),
-        ),
-        migrations.AlterField(
-            model_name='oradorexpediente',
-            name='upload_anexo',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo do Orador'),
-        ),
-        migrations.AlterField(
-            model_name='oradorordemdia',
-            name='upload_anexo',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo do Orador'),
-        ),
-        migrations.AlterField(
-            model_name='sessaoplenaria',
-            name='upload_anexo',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo da Sessão'),
-        ),
-        migrations.AlterField(
-            model_name='sessaoplenaria',
-            name='upload_ata',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.ata_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Ata da Sessão'),
-        ),
-        migrations.AlterField(
-            model_name='sessaoplenaria',
-            name='upload_pauta',
-            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.pauta_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Pauta da Sessão'),
-        ),
-    ]
--- a/sapl/sessao/migrations/0046_auto_20191009_1241.py
+++ b/sapl/sessao/migrations/0046_auto_20191009_1241.py
@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-09 15:41
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import sapl.sessao.models
+import sapl.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('materia', '0060_auto_20190930_1136'),
+        ('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=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='justificativaausencia',
+            name='upload_anexo',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo de Justificativa'),
+        ),
+        migrations.AlterField(
+            model_name='orador',
+            name='upload_anexo',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo do Orador'),
+        ),
+        migrations.AlterField(
+            model_name='oradorexpediente',
+            name='upload_anexo',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo do Orador'),
+        ),
+        migrations.AlterField(
+            model_name='oradorordemdia',
+            name='upload_anexo',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo do Orador'),
+        ),
+        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.AlterField(
+            model_name='registrovotacao',
+            name='data_hora',
+            field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'),
+        ),
+        migrations.AlterField(
+            model_name='sessaoplenaria',
+            name='upload_anexo',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo da Sessão'),
+        ),
+        migrations.AlterField(
+            model_name='sessaoplenaria',
+            name='upload_ata',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.ata_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Ata da Sessão'),
+        ),
+        migrations.AlterField(
+            model_name='sessaoplenaria',
+            name='upload_pauta',
+            field=models.FileField(blank=True, max_length=200, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.pauta_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Pauta da Sessão'),
+        ),
+        migrations.AlterField(
+            model_name='votoparlamentar',
+            name='data_hora',
+            field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'),
+        ),
+        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),
+        ),
+    ]
--- a/sapl/sessao/migrations/0047_auto_20190829_1253.py
+++ b/sapl/sessao/migrations/0047_auto_20190829_1253.py
@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-29 15:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sessao', '0046_auto_20190827_1228'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='registroleitura',
-            name='data_hora',
-            field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'),
-        ),
-        migrations.AlterField(
-            model_name='registrovotacao',
-            name='data_hora',
-            field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'),
-        ),
-        migrations.AlterField(
-            model_name='votoparlamentar',
-            name='data_hora',
-            field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'),
-        ),
-    ]