Browse Source

Pequenas correções

pull/1743/head
João Pedro Sconetto 8 years ago
parent
commit
a1ac00bba3
  1. 36
      sapl/audiencia/migrations/0003_auto_20180302_1111.py
  2. 7
      sapl/audiencia/models.py
  3. 15
      sapl/templates/audiencia/layouts.yaml

36
sapl/audiencia/migrations/0003_auto_20180302_1111.py

@ -0,0 +1,36 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.13 on 2018-03-02 14:11
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('audiencia', '0002_auto_20180302_0926'),
]
operations = [
migrations.AlterField(
model_name='audienciapublica',
name='audiencia_cancelada',
field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=False, verbose_name='Audiência Cancelada?'),
),
migrations.AlterField(
model_name='audienciapublica',
name='hora_fim',
field=models.CharField(max_length=5, verbose_name='Horário Fim(hh:mm)'),
),
migrations.AlterField(
model_name='audienciapublica',
name='hora_inicio',
field=models.CharField(max_length=5, verbose_name='Horário Início(hh:mm)'),
),
migrations.AlterField(
model_name='audienciapublica',
name='materia',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='materia.MateriaLegislativa', verbose_name='Matéria Legislativa'),
),
]

7
sapl/audiencia/models.py

@ -52,6 +52,7 @@ class AudienciaPublica(models.Model):
MateriaLegislativa, MateriaLegislativa,
on_delete=models.PROTECT, on_delete=models.PROTECT,
null=True, null=True,
blank=True,
verbose_name=_('Matéria Legislativa')) verbose_name=_('Matéria Legislativa'))
tipo = models.ForeignKey(TipoAudienciaPublica, tipo = models.ForeignKey(TipoAudienciaPublica,
on_delete=models.PROTECT, on_delete=models.PROTECT,
@ -63,15 +64,15 @@ class AudienciaPublica(models.Model):
max_length=100, verbose_name=_('Tema da Audiência Pública')) max_length=100, verbose_name=_('Tema da Audiência Pública'))
data = models.DateField(verbose_name=_('Data')) data = models.DateField(verbose_name=_('Data'))
hora_inicio = models.CharField( hora_inicio = models.CharField(
max_length=5, verbose_name=_('Horário (hh:mm)')) max_length=5, verbose_name=_('Horário Início(hh:mm)'))
hora_fim = models.CharField( hora_fim = models.CharField(
max_length=5, verbose_name=_('Horário (hh:mm)')) max_length=5, verbose_name=_('Horário Fim(hh:mm)'))
observacao = models.TextField( observacao = models.TextField(
max_length=500, blank=True, verbose_name=_('Observação')) max_length=500, blank=True, verbose_name=_('Observação'))
audiencia_cancelada = models.BooleanField( audiencia_cancelada = models.BooleanField(
default=False, default=False,
choices=YES_NO_CHOICES, choices=YES_NO_CHOICES,
verbose_name=_('Audiência Cancela?')) verbose_name=_('Audiência Cancelada?'))
url_audio = models.URLField( url_audio = models.URLField(
max_length=150, blank=True, max_length=150, blank=True,
verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)')) verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)'))

15
sapl/templates/audiencia/layouts.yaml

@ -1,16 +1,11 @@
{% load i18n %} {% load i18n %}
AudienciaPublica: AudienciaPublica:
{% trans 'Audiência Pública' %}: {% trans 'Audiência Pública' %}:
- materia - nome:10 numero
- tipo
- numero
- nome
- tema - tema
- data - materia tipo
- hora_inicio hora_fim - data hora_inicio hora_fim
- url_audio url_video
- upload_pauta upload_ata upload_anexo
- observacao - observacao
- audiencia_cancelada - audiencia_cancelada
- url_audio url_video
- upload_pauta
- upload_ata
- upload_anexo

Loading…
Cancel
Save