From eccadf6098fbca51d87033e6dbc25d28eae29d08 Mon Sep 17 00:00:00 2001
From: Mariana Mendes <mare.s.mendes@gmail.com>
Date: Thu, 1 Mar 2018 10:14:52 -0300
Subject: [PATCH] =?UTF-8?q?Corrige=20layout=20e=20model=20de=20reuni=C3=A3?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0009_auto_20180301_1011.py     | 41 +++++++++++++++++++
 sapl/comissoes/models.py                      | 10 ++---
 sapl/templates/comissoes/layouts.yaml         |  4 +-
 3 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 sapl/comissoes/migrations/0009_auto_20180301_1011.py

diff --git a/sapl/comissoes/migrations/0009_auto_20180301_1011.py b/sapl/comissoes/migrations/0009_auto_20180301_1011.py
new file mode 100644
index 000000000..db559de75
--- /dev/null
+++ b/sapl/comissoes/migrations/0009_auto_20180301_1011.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-03-01 13:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comissoes', '0008_auto_20180227_1111'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reuniao',
+            name='local_reuniao',
+            field=models.CharField(blank=True, max_length=100, verbose_name='Local da Reunião'),
+        ),
+        migrations.AlterField(
+            model_name='reuniao',
+            name='observacao',
+            field=models.TextField(blank=True, max_length=150, verbose_name='Observação'),
+        ),
+        migrations.AlterField(
+            model_name='reuniao',
+            name='tipo',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='comissoes.TipoComissao', verbose_name='Tipo de Comissão'),
+        ),
+        migrations.AlterField(
+            model_name='reuniao',
+            name='url_audio',
+            field=models.URLField(blank=True, max_length=150, verbose_name='URL do Arquivo de Áudio (Formatos MP3 / AAC)'),
+        ),
+        migrations.AlterField(
+            model_name='reuniao',
+            name='url_video',
+            field=models.URLField(blank=True, max_length=150, verbose_name='URL do Arquivo de Vídeo (Formatos MP4 / FLV / WebM)'),
+        ),
+    ]
diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py
index 379fa534d..88dfaee22 100644
--- a/sapl/comissoes/models.py
+++ b/sapl/comissoes/models.py
@@ -206,7 +206,7 @@ class Reuniao(models.Model):
     tipo = models.ForeignKey(
         TipoComissao,
         on_delete=models.PROTECT,
-        verbose_name=_('Tipo'))
+        verbose_name=_('Tipo de Comissão'))
     numero = models.PositiveIntegerField(verbose_name=_('Número'))
     nome = models.CharField(
         max_length=100, verbose_name=_('Nome da Reunião'))
@@ -218,15 +218,15 @@ class Reuniao(models.Model):
     hora_fim = models.CharField(
         max_length=5, verbose_name=_('Horário de Término (hh:mm)'))
     local_reuniao = models.CharField(
-        max_length=100, blank=True, verbose_name=_('Local Reunião'))
-    observacao = models.CharField(
+        max_length=100, blank=True, verbose_name=_('Local da Reunião'))
+    observacao = models.TextField(
         max_length=150, blank=True, verbose_name=_('Observação'))
     url_audio = models.URLField(
         max_length=150, blank=True, 
-        verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)'))
+        verbose_name=_('URL do Arquivo de Áudio (Formatos MP3 / AAC)'))
     url_video = models.URLField(
         max_length=150, blank=True, 
-        verbose_name=_('URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)'))
+        verbose_name=_('URL do Arquivo de Vídeo (Formatos MP4 / FLV / WebM)'))
     upload_pauta = models.FileField(
         blank=True, null=True,
         upload_to=pauta_upload_path,
diff --git a/sapl/templates/comissoes/layouts.yaml b/sapl/templates/comissoes/layouts.yaml
index 1c7c11d37..231477a9c 100644
--- a/sapl/templates/comissoes/layouts.yaml
+++ b/sapl/templates/comissoes/layouts.yaml
@@ -47,10 +47,10 @@ ParticipacaoEdit:
 Reuniao:
   {% trans 'Reunião' %}:
   - periodo numero tipo
-  - nome tema
+  - nome tema local_reuniao
   - data hora_inicio hora_fim 
   - url_video url_audio
-  - local_reuniao:4  observacao
+  - observacao
   - upload_pauta upload_ata upload_anexo
   - comissao