diff --git a/sapl/painel/migrations/0003_auto_20190603_0815.py b/sapl/painel/migrations/0003_auto_20190603_1009.py similarity index 66% rename from sapl/painel/migrations/0003_auto_20190603_0815.py rename to sapl/painel/migrations/0003_auto_20190603_1009.py index b58cc3bf6..a7c4f0611 100644 --- a/sapl/painel/migrations/0003_auto_20190603_0815.py +++ b/sapl/painel/migrations/0003_auto_20190603_1009.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-03 11:15 +# Generated by Django 1.11.20 on 2019-06-03 13:09 from __future__ import unicode_literals from django.db import migrations, models @@ -12,6 +12,10 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AlterModelOptions( + name='cronometro', + options={'ordering': ['tipo'], 'verbose_name': 'Cronômetro', 'verbose_name_plural': 'Cronômetros'}, + ), migrations.RemoveField( model_name='cronometro', name='data_cronometro', @@ -26,4 +30,9 @@ class Migration(migrations.Migration): name='status', field=models.CharField(choices=[('I', 'Start'), ('R', 'Reset'), ('S', 'Stop'), ('C', 'Increment')], default='S', max_length=1, verbose_name='Status do cronômetro'), ), + migrations.AlterField( + model_name='cronometro', + name='tipo', + field=models.CharField(max_length=100, unique=True, verbose_name='Tipo Cronômetro'), + ), ] diff --git a/sapl/painel/migrations/0004_auto_20190603_0826.py b/sapl/painel/migrations/0004_auto_20190603_0826.py deleted file mode 100644 index 6c0481cc4..000000000 --- a/sapl/painel/migrations/0004_auto_20190603_0826.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-03 11:26 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('painel', '0003_auto_20190603_0815'), - ] - - operations = [ - migrations.CreateModel( - name='TipoCronometro', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nome', models.CharField(max_length=100, verbose_name='Tipo Cronômetro')), - ], - options={ - 'verbose_name': 'Tipo de Cronômetro', - 'verbose_name_plural': 'Tipos de Cronômetro', - 'ordering': ['nome'], - }, - ), - migrations.AlterField( - model_name='cronometro', - name='tipo', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='painel.TipoCronometro', verbose_name='Tipo Cronômetro'), - ), - ] diff --git a/sapl/painel/migrations/0005_auto_20190603_0842.py b/sapl/painel/migrations/0004_auto_20190603_1010.py similarity index 51% rename from sapl/painel/migrations/0005_auto_20190603_0842.py rename to sapl/painel/migrations/0004_auto_20190603_1010.py index beb5f2681..939577d79 100644 --- a/sapl/painel/migrations/0005_auto_20190603_0842.py +++ b/sapl/painel/migrations/0004_auto_20190603_1010.py @@ -1,24 +1,24 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-03 11:42 +# Generated by Django 1.11.20 on 2019-06-03 13:10 from __future__ import unicode_literals from django.db import migrations -def create_default_tipos_cronometro(apps, schema_editor): - TipoCronometro = apps.get_model('painel', 'TipoCronometro') +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'] + Cronometro = apps.get_model('painel', 'Cronometro') for tipo in tipos_default: - TipoCronometro.objects.get_or_create(nome=tipo) + Cronometro.objects.get_or_create(tipo=tipo, duracao_cronometro='00:30:00', status='S') class Migration(migrations.Migration): dependencies = [ - ('painel', '0004_auto_20190603_0826'), + ('painel', '0003_auto_20190603_1009'), ] operations = [ - migrations.RunPython(create_default_tipos_cronometro) + migrations.RunPython(create_default_cronometros) ] diff --git a/sapl/painel/models.py b/sapl/painel/models.py index 35d5b643e..555899884 100644 --- a/sapl/painel/models.py +++ b/sapl/painel/models.py @@ -22,19 +22,6 @@ class Painel(models.Model): return str(self.aberto) + ":" + self.data_painel.strftime("%d/%m/%Y") -@reversion.register() -class TipoCronometro(models.Model): - nome = models.CharField(max_length=30, verbose_name=_('Tipo Cronômetro')) - - class Meta: - verbose_name = _('Tipo de Cronômetro') - verbose_name_plural = _('Tipos de Cronômetro') - ordering = ['nome'] - - def __str__(self): - return self.nome - - @reversion.register() class Cronometro(models.Model): CRONOMETRO_TYPES = ( diff --git a/sapl/painel/urls.py b/sapl/painel/urls.py index 4b94e2d1e..fa54a96d4 100644 --- a/sapl/painel/urls.py +++ b/sapl/painel/urls.py @@ -3,12 +3,16 @@ from django.conf.urls import url, include from .apps import AppConfig from .views import (cronometro_painel, get_dados_painel, painel_mensagem_view, painel_parlamentar_view, painel_view, painel_votacao_view, +<<<<<<< HEAD switch_painel, verifica_painel, votante_view, CronometroPainelCrud, <<<<<<< HEAD PainelConfigCrud) ======= TipoCronometroCrud) >>>>>>> Fix #2828 - Adiciona tipo de cronômetro +======= + switch_painel, verifica_painel, votante_view, CronometroPainelCrud) +>>>>>>> Corrige migrações app_name = AppConfig.name @@ -25,7 +29,6 @@ urlpatterns = [ url(r'^painel/verifica-painel$', verifica_painel, name="verifica_painel"), url(r'^painel/cronometro$', cronometro_painel, name='cronometro_painel'), - url(r'^sistema/cronometro/', include(CronometroPainelCrud.get_urls())), url(r'^sistema/painel-config/', include(PainelConfigCrud.get_urls())), diff --git a/sapl/templates/painel/layouts.yaml b/sapl/templates/painel/layouts.yaml index 47957549e..b5a20d0bd 100644 --- a/sapl/templates/painel/layouts.yaml +++ b/sapl/templates/painel/layouts.yaml @@ -6,3 +6,4 @@ Cronometro: PainelConfig: {% trans 'Configurações do Painel' %}: - cronometro_ordem + - tipo:6 duracao_cronometro:6