From a1ac00bba34556045f0639ab507ab5133978c4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= <sconetto.joao@gmail.com>
Date: Fri, 2 Mar 2018 11:12:27 -0300
Subject: [PATCH] =?UTF-8?q?Pequenas=20corre=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0003_auto_20180302_1111.py     | 36 +++++++++++++++++++
 sapl/audiencia/models.py                      |  7 ++--
 sapl/templates/audiencia/layouts.yaml         | 15 +++-----
 3 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 sapl/audiencia/migrations/0003_auto_20180302_1111.py

diff --git a/sapl/audiencia/migrations/0003_auto_20180302_1111.py b/sapl/audiencia/migrations/0003_auto_20180302_1111.py
new file mode 100644
index 000000000..4f6e0bdec
--- /dev/null
+++ b/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'),
+        ),
+    ]
diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py
index a8c990329..e0f07852e 100644
--- a/sapl/audiencia/models.py
+++ b/sapl/audiencia/models.py
@@ -52,6 +52,7 @@ class AudienciaPublica(models.Model):
         MateriaLegislativa,
         on_delete=models.PROTECT,
         null=True,
+        blank=True,
         verbose_name=_('Matéria Legislativa'))
     tipo = models.ForeignKey(TipoAudienciaPublica,
                              on_delete=models.PROTECT,
@@ -63,15 +64,15 @@ class AudienciaPublica(models.Model):
         max_length=100, verbose_name=_('Tema da Audiência Pública'))
     data = models.DateField(verbose_name=_('Data'))
     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(
-        max_length=5, verbose_name=_('Horário (hh:mm)'))
+        max_length=5, verbose_name=_('Horário Fim(hh:mm)'))
     observacao = models.TextField(
         max_length=500, blank=True, verbose_name=_('Observação'))
     audiencia_cancelada = models.BooleanField(
         default=False,
         choices=YES_NO_CHOICES,
-        verbose_name=_('Audiência Cancela?'))
+        verbose_name=_('Audiência Cancelada?'))
     url_audio = models.URLField(
         max_length=150, blank=True,
         verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)'))
diff --git a/sapl/templates/audiencia/layouts.yaml b/sapl/templates/audiencia/layouts.yaml
index 9c34bf2d7..3a6a460ee 100644
--- a/sapl/templates/audiencia/layouts.yaml
+++ b/sapl/templates/audiencia/layouts.yaml
@@ -1,16 +1,11 @@
 {% load i18n %}
 AudienciaPublica:
   {% trans 'Audiência Pública' %}:
-    - materia
-    - tipo
-    - numero
-    - nome
+    - nome:10 numero
     - tema
-    - data
-    - hora_inicio hora_fim
+    - materia tipo
+    - data hora_inicio hora_fim
+    - url_audio url_video
+    - upload_pauta upload_ata upload_anexo
     - observacao
     - audiencia_cancelada
-    - url_audio url_video
-    - upload_pauta
-    - upload_ata
-    - upload_anexo