diff --git a/sapl/painel/migrations/0003_auto_20190603_0815.py b/sapl/painel/migrations/0003_auto_20190603_0815.py new file mode 100644 index 000000000..b58cc3bf6 --- /dev/null +++ b/sapl/painel/migrations/0003_auto_20190603_0815.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-06-03 11:15 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('painel', '0002_auto_20180523_1430'), + ] + + operations = [ + migrations.RemoveField( + model_name='cronometro', + name='data_cronometro', + ), + migrations.AddField( + model_name='cronometro', + name='duracao_cronometro', + field=models.DurationField(blank=True, null=True, verbose_name='Duração do cronômetro'), + ), + migrations.AlterField( + model_name='cronometro', + 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'), + ), + ] diff --git a/sapl/painel/migrations/0004_auto_20190603_0826.py b/sapl/painel/migrations/0004_auto_20190603_0826.py new file mode 100644 index 000000000..6c0481cc4 --- /dev/null +++ b/sapl/painel/migrations/0004_auto_20190603_0826.py @@ -0,0 +1,33 @@ +# -*- 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/0005_auto_20190603_0842.py new file mode 100644 index 000000000..beb5f2681 --- /dev/null +++ b/sapl/painel/migrations/0005_auto_20190603_0842.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-06-03 11:42 +from __future__ import unicode_literals + +from django.db import migrations + + +def create_default_tipos_cronometro(apps, schema_editor): + TipoCronometro = apps.get_model('painel', 'TipoCronometro') + tipos_default = ['Cronômetro do Discurso', 'Cronômetro do Aparte', + 'Cronômetro da Ordem', 'Cronômetro de Considerações Finais'] + for tipo in tipos_default: + TipoCronometro.objects.get_or_create(nome=tipo) + + +class Migration(migrations.Migration): + + dependencies = [ + ('painel', '0004_auto_20190603_0826'), + ] + + operations = [ + migrations.RunPython(create_default_tipos_cronometro) + ] diff --git a/sapl/painel/models.py b/sapl/painel/models.py index 702fb00fe..73a20869a 100644 --- a/sapl/painel/models.py +++ b/sapl/painel/models.py @@ -22,6 +22,19 @@ 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 = ( @@ -64,4 +77,4 @@ class Cronometro(models.Model): ordering = ['ordenacao'] def __str__(self): - return self.tipo \ No newline at end of file + return self.tipo diff --git a/sapl/templates/painel/layouts.yaml b/sapl/templates/painel/layouts.yaml index 0238e74db..67a806240 100644 --- a/sapl/templates/painel/layouts.yaml +++ b/sapl/templates/painel/layouts.yaml @@ -1,4 +1,4 @@ {% load i18n %} Cronometro: {% trans 'Cronometro' %}: - - tipo:4 duracao_cronometro:4 ativo:2 ordenacao:2 \ No newline at end of file + - tipo:4 duracao_cronometro:4 ativo:2 ordenacao:2