From b871e94e505a109b981f4f7c54031863e5972703 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Mon, 3 Jun 2019 10:13:59 -0300 Subject: [PATCH] =?UTF-8?q?Corrige=20migra=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...603_0815.py => 0003_auto_20190603_1009.py} | 11 ++++++- .../migrations/0004_auto_20190603_0826.py | 33 ------------------- ...603_0842.py => 0004_auto_20190603_1010.py} | 12 +++---- sapl/painel/models.py | 30 +++++++---------- sapl/painel/urls.py | 7 ++-- sapl/painel/views.py | 3 +- sapl/templates/menu_tabelas_auxiliares.yaml | 4 +-- sapl/templates/painel/layouts.yaml | 6 +--- 8 files changed, 33 insertions(+), 73 deletions(-) rename sapl/painel/migrations/{0003_auto_20190603_0815.py => 0003_auto_20190603_1009.py} (66%) delete mode 100644 sapl/painel/migrations/0004_auto_20190603_0826.py rename sapl/painel/migrations/{0005_auto_20190603_0842.py => 0004_auto_20190603_1010.py} (51%) 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 5174abf06..80e565734 100644 --- a/sapl/painel/models.py +++ b/sapl/painel/models.py @@ -21,19 +21,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 = ( @@ -59,9 +46,14 @@ class Cronometro(models.Model): verbose_name=_('Duração do cronômetro'), blank=True, null=True) - # tipo = models.CharField( - # max_length=1, choices=CRONOMETRO_TYPES, - # verbose_name=_('Tipo Cronômetro')) - tipo = models.ForeignKey(TipoCronometro, - on_delete=models.PROTECT, - verbose_name=_('Tipo Cronômetro')) \ No newline at end of file + tipo = models.CharField(max_length=100, + verbose_name=_('Tipo Cronômetro'), + unique=True) + + class Meta: + verbose_name = _('Cronômetro') + verbose_name_plural = _('Cronômetros') + ordering = ['tipo'] + + def __str__(self): + return self.tipo \ No newline at end of file diff --git a/sapl/painel/urls.py b/sapl/painel/urls.py index aa8d93608..570fcaf00 100644 --- a/sapl/painel/urls.py +++ b/sapl/painel/urls.py @@ -3,8 +3,7 @@ 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, - switch_painel, verifica_painel, votante_view, CronometroPainelCrud, - TipoCronometroCrud) + switch_painel, verifica_painel, votante_view, CronometroPainelCrud) app_name = AppConfig.name @@ -21,9 +20,7 @@ urlpatterns = [ url(r'^painel/verifica-painel$', verifica_painel, name="verifica_painel"), url(r'^painel/cronometro$', cronometro_painel, name='cronometro_painel'), - # url(r'^painel/cronometro', include(CronometroPainelCrud.get_urls())), - url(r'^sistema/cronometro/tipo/', - include(TipoCronometroCrud.get_urls())), + url(r'^sistema/cronometro', include(CronometroPainelCrud.get_urls())), url(r'^voto-individual/$', votante_view, name='voto_individual'), diff --git a/sapl/painel/views.py b/sapl/painel/views.py index c23e35484..18489a6f6 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -24,12 +24,11 @@ from sapl.sessao.models import (ExpedienteMateria, OradorExpediente, OrdemDia, VotoParlamentar) from sapl.utils import filiacao_data, get_client_ip, sort_lista_chave -from .models import TipoCronometro, Cronometro +from .models import Cronometro VOTACAO_NOMINAL = 2 CronometroPainelCrud = CrudAux.build(Cronometro, '') -TipoCronometroCrud = CrudAux.build(TipoCronometro, 'tipo_cronometro') # FIXME mudar lógica diff --git a/sapl/templates/menu_tabelas_auxiliares.yaml b/sapl/templates/menu_tabelas_auxiliares.yaml index 9042b42b9..9b02fb73a 100644 --- a/sapl/templates/menu_tabelas_auxiliares.yaml +++ b/sapl/templates/menu_tabelas_auxiliares.yaml @@ -170,8 +170,8 @@ - title: {% trans 'Módulo Painel' %} css_class: head_title children: - - title: {% trans 'Tipo de Cronômetro' %} - url: sapl.painel:tipocronometro_list + - title: {% trans 'Cronômetro' %} + url: sapl.painel:cronometro_list css_class: btn btn-link - title: {% trans 'Módulo LexML' %} css_class: head_title diff --git a/sapl/templates/painel/layouts.yaml b/sapl/templates/painel/layouts.yaml index 8c3452732..1f270a142 100644 --- a/sapl/templates/painel/layouts.yaml +++ b/sapl/templates/painel/layouts.yaml @@ -1,8 +1,4 @@ {% load i18n %} Cronometro: {% trans 'Cronometro' %}: - - status:3 data_cronometro:6 tipo - -TipoCronometro: - {% trans 'Tipo de Cronômetro' %}: - - nome \ No newline at end of file + - tipo:6 duracao_cronometro:6 \ No newline at end of file