diff --git a/sapl/painel/forms.py b/sapl/painel/forms.py index a239f7bcf..063e82f42 100644 --- a/sapl/painel/forms.py +++ b/sapl/painel/forms.py @@ -18,4 +18,10 @@ class ConfiguracoesPainelForm(forms.ModelForm): class Meta: model = PainelConfig - fields = ['cronometro_ordem'] + fields = ['cronometro_ordem', + 'disparo_cronometro', + 'tempo_disparo_antecedencia'] + + def __init__(self, *args, **kwargs): + super(ConfiguracoesPainelForm, self).__init__(*args, **kwargs) + self.fields['tempo_disparo_antecedencia'].widget.attrs['class'] = 'cronometro' diff --git a/sapl/painel/migrations/0006_auto_20190612_1347.py b/sapl/painel/migrations/0006_auto_20190612_1347.py new file mode 100644 index 000000000..8f20a356d --- /dev/null +++ b/sapl/painel/migrations/0006_auto_20190612_1347.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-06-12 16:47 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('painel', '0005_painelconfig'), + ] + + operations = [ + migrations.AddField( + model_name='painelconfig', + name='disparo_cronometro', + field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=True, verbose_name='Cronômetros devem disparar com antecedência?'), + ), + migrations.AddField( + model_name='painelconfig', + name='tempo_disparo_antecedencia', + field=models.DurationField(blank=True, default='00:00:30', null=True, verbose_name='Cronômetros devem disparar com quanto tempo de antecedência?'), + ), + ] diff --git a/sapl/painel/models.py b/sapl/painel/models.py index 555899884..681c442ce 100644 --- a/sapl/painel/models.py +++ b/sapl/painel/models.py @@ -74,6 +74,16 @@ class PainelConfig(models.Model): verbose_name=_('Cronômetro da Questão de Ordem deve travar os demais?'), choices=YES_NO_CHOICES, default=True) + disparo_cronometro = models.BooleanField( + verbose_name=_('Cronômetros devem disparar com antecedência?'), + choices=YES_NO_CHOICES, default=True) + + tempo_disparo_antecedencia = models.DurationField( + verbose_name=_('Cronômetros devem disparar com quanto tempo de antecedência?'), + default="00:00:30", + blank=True, + null=True) + class Meta: verbose_name = _('Configurações do Painel') verbose_name_plural = _('Configurações do Painel') diff --git a/sapl/templates/painel/layouts.yaml b/sapl/templates/painel/layouts.yaml index b5a20d0bd..8accc94e6 100644 --- a/sapl/templates/painel/layouts.yaml +++ b/sapl/templates/painel/layouts.yaml @@ -6,4 +6,4 @@ Cronometro: PainelConfig: {% trans 'Configurações do Painel' %}: - cronometro_ordem - - tipo:6 duracao_cronometro:6 + - disparo_cronometro:6 tempo_disparo_antecedencia:6 diff --git a/sapl/templates/painel/painelconfig_form.html b/sapl/templates/painel/painelconfig_form.html index 990d81b7b..fb1bfe98b 100644 --- a/sapl/templates/painel/painelconfig_form.html +++ b/sapl/templates/painel/painelconfig_form.html @@ -6,8 +6,24 @@