diff --git a/sapl/painel/migrations/0003_auto_20190603_1033.py b/sapl/painel/migrations/0003_auto_20190603_1033.py index 7df9c2b83..5a0851e09 100644 --- a/sapl/painel/migrations/0003_auto_20190603_1033.py +++ b/sapl/painel/migrations/0003_auto_20190603_1033.py @@ -28,7 +28,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cronometro', name='duracao_cronometro', - field=models.DurationField(verbose_name='Duração do cronômetro'), + field=models.DurationField(blank=True, null=True, verbose_name='Duração do cronômetro'), ), migrations.AddField( model_name='cronometro', diff --git a/sapl/painel/migrations/0003_auto_20190603_1009.py b/sapl/painel/migrations/0003_auto_20190603_1033.py~HEAD similarity index 60% rename from sapl/painel/migrations/0003_auto_20190603_1009.py rename to sapl/painel/migrations/0003_auto_20190603_1033.py~HEAD index a7c4f0611..7df9c2b83 100644 --- a/sapl/painel/migrations/0003_auto_20190603_1009.py +++ b/sapl/painel/migrations/0003_auto_20190603_1033.py~HEAD @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-03 13:09 +# Generated by Django 1.11.20 on 2019-06-03 13:33 from __future__ import unicode_literals from django.db import migrations, models @@ -14,16 +14,26 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='cronometro', - options={'ordering': ['tipo'], 'verbose_name': 'Cronômetro', 'verbose_name_plural': 'Cronômetros'}, + options={'ordering': ['ordenacao'], 'verbose_name': 'Cronômetro', 'verbose_name_plural': 'Cronômetros'}, ), migrations.RemoveField( model_name='cronometro', name='data_cronometro', ), + migrations.AddField( + model_name='cronometro', + name='ativo', + field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=False, verbose_name='Ativo?'), + ), migrations.AddField( model_name='cronometro', name='duracao_cronometro', - field=models.DurationField(blank=True, null=True, verbose_name='Duração do cronômetro'), + field=models.DurationField(verbose_name='Duração do cronômetro'), + ), + migrations.AddField( + model_name='cronometro', + name='ordenacao', + field=models.PositiveIntegerField(blank=True, null=True, verbose_name='Ordenação'), ), migrations.AlterField( model_name='cronometro', diff --git a/sapl/painel/migrations/0004_auto_20190603_1033.py b/sapl/painel/migrations/0004_auto_20190603_1033.py index f3256ae61..5a167e47c 100644 --- a/sapl/painel/migrations/0004_auto_20190603_1033.py +++ b/sapl/painel/migrations/0004_auto_20190603_1033.py @@ -7,11 +7,12 @@ from django.db import migrations def create_default_cronometros(apps, schema_editor): tipos_default = ['Cronômetro do Discurso', 'Cronômetro do Aparte', - 'Cronômetro da Questão de Ordem', 'Cronômetro de Considerações Finais'] + 'Cronômetro da Ordem', 'Cronômetro de Considerações Finais'] Cronometro = apps.get_model('painel', 'Cronometro') - - for i,tipo in enumerate(tipos_default): - Cronometro.objects.get_or_create(tipo=tipo, duracao_cronometro='00:05:00', status='S', ativo=True, ordenacao=i+1) + cont = 1 + for tipo in tipos_default: + Cronometro.objects.get_or_create(tipo=tipo, duracao_cronometro='00:30:00', status='S', ativo=True, ordenacao=cont) + cont += 1 class Migration(migrations.Migration): diff --git a/sapl/painel/migrations/0004_auto_20190603_1010.py b/sapl/painel/migrations/0004_auto_20190603_1033.py~HEAD similarity index 62% rename from sapl/painel/migrations/0004_auto_20190603_1010.py rename to sapl/painel/migrations/0004_auto_20190603_1033.py~HEAD index 939577d79..f3256ae61 100644 --- a/sapl/painel/migrations/0004_auto_20190603_1010.py +++ b/sapl/painel/migrations/0004_auto_20190603_1033.py~HEAD @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-03 13:10 +# Generated by Django 1.11.20 on 2019-06-03 13:33 from __future__ import unicode_literals from django.db import migrations @@ -7,16 +7,17 @@ from django.db import migrations def create_default_cronometros(apps, schema_editor): tipos_default = ['Cronômetro do Discurso', 'Cronômetro do Aparte', - 'Cronômetro da Ordem', 'Cronômetro de Considerações Finais'] + 'Cronômetro da Questão de Ordem', 'Cronômetro de Considerações Finais'] Cronometro = apps.get_model('painel', 'Cronometro') - for tipo in tipos_default: - Cronometro.objects.get_or_create(tipo=tipo, duracao_cronometro='00:30:00', status='S') + + for i,tipo in enumerate(tipos_default): + Cronometro.objects.get_or_create(tipo=tipo, duracao_cronometro='00:05:00', status='S', ativo=True, ordenacao=i+1) class Migration(migrations.Migration): dependencies = [ - ('painel', '0003_auto_20190603_1009'), + ('painel', '0003_auto_20190603_1033'), ] operations = [