From 8f1c624ddf29c38e12b79736365f4a637cc6d16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Thu, 14 May 2020 13:32:30 -0300 Subject: [PATCH] =?UTF-8?q?Fix=20sessao=20migrations=20(ap=C3=B3s=20c?= =?UTF-8?q?=C3=B3pia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0047_auto_20190829_1253.py | 2 +- .../migrations/0048_auto_20191029_1418.py | 2 +- ...009_1535.py => 0051_auto_20200416_1538.py} | 5 +- .../migrations/0051_merge_20191209_0910.py | 13 --- .../migrations/0052_auto_20191209_0828.py | 91 ------------------- 5 files changed, 4 insertions(+), 109 deletions(-) rename sapl/sessao/migrations/{0047_merge_20191009_1535.py => 0051_auto_20200416_1538.py} (85%) delete mode 100644 sapl/sessao/migrations/0051_merge_20191209_0910.py delete mode 100644 sapl/sessao/migrations/0052_auto_20191209_0828.py diff --git a/sapl/sessao/migrations/0047_auto_20190829_1253.py b/sapl/sessao/migrations/0047_auto_20190829_1253.py index ae484f420..ba9a41753 100644 --- a/sapl/sessao/migrations/0047_auto_20190829_1253.py +++ b/sapl/sessao/migrations/0047_auto_20190829_1253.py @@ -28,4 +28,4 @@ class Migration(migrations.Migration): name='data_hora', field=models.DateTimeField(auto_now=True, null=True, verbose_name='Data/Hora'), ), - ] \ No newline at end of file + ] diff --git a/sapl/sessao/migrations/0048_auto_20191029_1418.py b/sapl/sessao/migrations/0048_auto_20191029_1418.py index 3f7458932..e2ceacf4b 100644 --- a/sapl/sessao/migrations/0048_auto_20191029_1418.py +++ b/sapl/sessao/migrations/0048_auto_20191029_1418.py @@ -10,7 +10,7 @@ import sapl.utils class Migration(migrations.Migration): dependencies = [ - ('sessao', '0047_auto_20190829_1253') + ('sessao', '0047_auto_20190829_1253'), ] operations = [ diff --git a/sapl/sessao/migrations/0047_merge_20191009_1535.py b/sapl/sessao/migrations/0051_auto_20200416_1538.py similarity index 85% rename from sapl/sessao/migrations/0047_merge_20191009_1535.py rename to sapl/sessao/migrations/0051_auto_20200416_1538.py index 303f92600..1590e7378 100644 --- a/sapl/sessao/migrations/0047_merge_20191009_1535.py +++ b/sapl/sessao/migrations/0051_auto_20200416_1538.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-10-09 18:35 +# Generated by Django 1.11.29 on 2020-04-16 18:38 from __future__ import unicode_literals from django.db import migrations, models @@ -8,8 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('sessao', '0046_auto_20190827_1228'), - ('sessao', '0046_auto_20191001_1115'), + ('sessao', '0050_auto_20191029_1441'), ] database_operations = [ diff --git a/sapl/sessao/migrations/0051_merge_20191209_0910.py b/sapl/sessao/migrations/0051_merge_20191209_0910.py deleted file mode 100644 index 395507e33..000000000 --- a/sapl/sessao/migrations/0051_merge_20191209_0910.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-10-09 18:35 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('sessao', '0047_merge_20191009_1535'), - ('sessao', '0050_auto_20191029_1441') - ] \ No newline at end of file diff --git a/sapl/sessao/migrations/0052_auto_20191209_0828.py b/sapl/sessao/migrations/0052_auto_20191209_0828.py deleted file mode 100644 index 90cd6e933..000000000 --- a/sapl/sessao/migrations/0052_auto_20191209_0828.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-12-09 11:28 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('parlamentares', '0035_merge_20190802_0954'), - ('painel', '0011_cronometro_last_stop_duration'), - ('sessao', '0051_merge_20191209_0910'), - ] - - operations = [ - migrations.CreateModel( - name='CronometroLista', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('cronometro', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='painel.Cronometro')), - ], - options={ - 'verbose_name': 'Tipo de Lista de Discurso - Cronômetro', - 'verbose_name_plural': 'Tipo de Listas de Discurso - Cronômetros', - 'ordering': ['tipo_lista', 'cronometro'], - }, - ), - migrations.CreateModel( - name='ListaDiscurso', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('orador_atual', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Parlamentar')), - ('sessao_plenaria', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sessao.SessaoPlenaria', verbose_name='Sessão Plenária')), - ], - options={ - 'verbose_name': 'Lista de Discurso', - 'verbose_name_plural': 'Listas de Discurso', - 'ordering': ['tipo', 'sessao_plenaria'], - }, - ), - migrations.CreateModel( - name='ParlamentarLista', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ordenacao', models.PositiveIntegerField(blank=True, null=True, verbose_name='Ordenação')), - ('lista', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sessao.ListaDiscurso')), - ('parlamentar', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='parlamentares.Parlamentar')), - ], - options={ - 'verbose_name': 'Lista de Discurso - Parlamentar', - 'verbose_name_plural': 'Listas de Discurso - Parlamentares', - 'ordering': ['lista', 'parlamentar', 'ordenacao'], - }, - ), - migrations.CreateModel( - name='TipoListaDiscurso', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nome', models.CharField(max_length=100, verbose_name='Tipo')), - ], - options={ - 'verbose_name': 'Tipo de Lista de Discurso', - 'verbose_name_plural': 'Tipos de Lista de Discurso', - 'ordering': ['nome'], - }, - ), - migrations.AddField( - model_name='listadiscurso', - name='tipo', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sessao.TipoListaDiscurso', verbose_name='Tipo de Lista de Discurso'), - ), - migrations.AddField( - model_name='cronometrolista', - name='tipo_lista', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sessao.TipoListaDiscurso'), - ), - migrations.AlterUniqueTogether( - name='parlamentarlista', - unique_together=set([('lista', 'parlamentar')]), - ), - migrations.AlterUniqueTogether( - name='listadiscurso', - unique_together=set([('tipo', 'sessao_plenaria')]), - ), - migrations.AlterUniqueTogether( - name='cronometrolista', - unique_together=set([('tipo_lista', 'cronometro')]), - ), - ]