SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Adiciona opção de exibir nome da Casa Legislativa no painel (#2881) 

* Adiciona opcao de exibir nome da Casa legislativa no painel

* Fix Layouts.yaml de painelconfig
pull/2882/head
Cesar Augusto de Carvalho 6 years ago
committed by Edward
parent
edf394c11c
commit
4982f74191
6 changed files with 34 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      sapl/painel/forms.py
  2. 20
      sapl/painel/migrations/0008_painelconfig_exibir_nome_casa.py
  3. 4
      sapl/painel/models.py
  4. 3
      sapl/painel/views.py
  5. 5
      sapl/templates/painel/index.html
  6. 2
      sapl/templates/painel/layouts.yaml

3
sapl/painel/forms.py
View File

@ -21,7 +21,8 @@ class ConfiguracoesPainelForm(forms.ModelForm):
fields = ['cronometro_ordem', fields = ['cronometro_ordem',
'disparo_cronometro', 'disparo_cronometro',
'tempo_disparo_antecedencia', 'tempo_disparo_antecedencia',
'tempo_disparo_termino'] 'tempo_disparo_termino',
'exibir_nome_casa']
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(ConfiguracoesPainelForm, self).__init__(*args, **kwargs) super(ConfiguracoesPainelForm, self).__init__(*args, **kwargs)

20
sapl/painel/migrations/0008_painelconfig_exibir_nome_casa.py
View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-06-26 14:49
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('painel', '0007_painelconfig_tempo_disparo_termino'),
]
operations = [
migrations.AddField(
model_name='painelconfig',
name='exibir_nome_casa',
field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=True, verbose_name='Exibir nome da Casa Legislativa no painel?'),
),
]

4
sapl/painel/models.py
View File

@ -90,6 +90,10 @@ class PainelConfig(models.Model):
blank=True, blank=True,
null=True) null=True)
exibir_nome_casa = models.BooleanField(
verbose_name=_('Exibir nome da Casa Legislativa no painel?'),
choices=YES_NO_CHOICES, default=True)
class Meta: class Meta:
verbose_name = _('Configurações do Painel') verbose_name = _('Configurações do Painel')
verbose_name_plural = _('Configurações do Painel') verbose_name_plural = _('Configurações do Painel')

3
sapl/painel/views.py
View File

@ -339,7 +339,8 @@ def painel_view(request, pk):
context = {'head_title': str(_('Painel Plenário')), context = {'head_title': str(_('Painel Plenário')),
'sessao_id': pk, 'sessao_id': pk,
'cronometros': Cronometro.objects.filter(ativo=True).order_by('ordenacao'), 'cronometros': Cronometro.objects.filter(ativo=True).order_by('ordenacao'),
'painel_config': PainelConfig.objects.first() 'painel_config': PainelConfig.objects.first(),
'casa': CasaLegislativa.objects.last()
} }
return render(request, 'painel/index.html', context) return render(request, 'painel/index.html', context)

5
sapl/templates/painel/index.html
View File

@ -36,6 +36,11 @@
<body class="painel-principal"> <body class="painel-principal">
<audio type="hidden" id="audio" src="{% webpack_static 'audio/ring.mp3' %}"></audio> <audio type="hidden" id="audio" src="{% webpack_static 'audio/ring.mp3' %}"></audio>
{% if painel_config.exibir_nome_casa %}
<div class="d-flex justify-content-center">
<h1 id="casa_legislativa" class="title text-title" style="color:red">{{casa.nome}}</h1>
</div>
{% endif %}
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<h1 id="sessao_plenaria" class="title text-title"></h1> <h1 id="sessao_plenaria" class="title text-title"></h1>
</div> </div>

2
sapl/templates/painel/layouts.yaml
View File

@ -7,4 +7,4 @@ PainelConfig:
{% trans 'Configurações do Painel' %}: {% trans 'Configurações do Painel' %}:
- cronometro_ordem - cronometro_ordem
- disparo_cronometro:6 tempo_disparo_antecedencia:6 - disparo_cronometro:6 tempo_disparo_antecedencia:6
- tempo_disparo_termino:8 - tempo_disparo_termino:6 exibir_nome_casa:6

Write Preview
Loading…
Cancel
Save