From 77be8e3cc7ae63262737e8d317a4f7873dbea8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= <sconetto.joao@gmail.com>
Date: Mon, 5 Mar 2018 10:32:11 -0300
Subject: [PATCH] =?UTF-8?q?Modifica=C3=A7=C3=A3o=20em=20Tipo=20Audi=C3=AAn?=
 =?UTF-8?q?cia=20e=20corre=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/audiencia/forms.py                       |  9 ++++++
 .../migrations/0004_auto_20180305_1006.py     | 31 +++++++++++++++++++
 sapl/audiencia/models.py                      |  9 ++++--
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 sapl/audiencia/migrations/0004_auto_20180305_1006.py

diff --git a/sapl/audiencia/forms.py b/sapl/audiencia/forms.py
index 3cd9e9fdb..03d57830d 100644
--- a/sapl/audiencia/forms.py
+++ b/sapl/audiencia/forms.py
@@ -5,9 +5,18 @@ from django.db import transaction
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 from sapl.audiencia.models import AudienciaPublica, TipoAudienciaPublica
+from sapl.materia.models import MateriaLegislativa
 
 class AudienciaForm(forms.ModelForm):
 
+    materia = forms.ModelChoiceField(required=False,
+                                     queryset=MateriaLegislativa.objects.all().select_related(
+                                         "tipo").order_by('tipo', '-ano', 'numero'))
+
+    tipo = forms.ModelChoiceField(required=True,
+                                  queryset=TipoAudienciaPublica.objects.all().order_by('nome'))
+
+
     class Meta:
         model = AudienciaPublica
         fields = '__all__'
diff --git a/sapl/audiencia/migrations/0004_auto_20180305_1006.py b/sapl/audiencia/migrations/0004_auto_20180305_1006.py
new file mode 100644
index 000000000..4208be958
--- /dev/null
+++ b/sapl/audiencia/migrations/0004_auto_20180305_1006.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-03-05 13:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('audiencia', '0003_auto_20180302_1111'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tipoaudienciapublica',
+            name='tipo',
+            field=models.CharField(choices=[('A', 'Audiência Pública'), ('P', 'Plebiscito'), ('R', 'Referendo'), ('I', 'Iniciativa Popular')], default='A', max_length=1, verbose_name='Tipo de Audiência Pública'),
+        ),
+        migrations.AlterField(
+            model_name='audienciapublica',
+            name='tipo',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='audiencia.TipoAudienciaPublica', verbose_name='Tipo de Audiência Pública'),
+        ),
+        migrations.AlterField(
+            model_name='tipoaudienciapublica',
+            name='nome',
+            field=models.CharField(default='Audiência Pública', max_length=50, verbose_name='Nome do Tipo de Audiência Pública'),
+        ),
+    ]
diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py
index e0f07852e..96ad8272a 100644
--- a/sapl/audiencia/models.py
+++ b/sapl/audiencia/models.py
@@ -35,7 +35,10 @@ class TipoAudienciaPublica(models.Model):
                                      ('I', 'iniciativa', _('Iniciativa Popular')))
 
     nome = models.CharField(
-        max_length=1, verbose_name=_('Tipo de Audiência Pública'), choices=TIPO_AUDIENCIA_CHOICES)
+        max_length=50, verbose_name=_('Nome do Tipo de Audiência Pública'), default='Audiência Pública')
+    tipo = models.CharField(
+        max_length=1, verbose_name=_('Tipo de Audiência Pública'), choices=TIPO_AUDIENCIA_CHOICES, default='A')
+
 
     class Meta:
         verbose_name = _('Tipo de Audiência Pública')
@@ -56,7 +59,9 @@ class AudienciaPublica(models.Model):
         verbose_name=_('Matéria Legislativa'))
     tipo = models.ForeignKey(TipoAudienciaPublica,
                              on_delete=models.PROTECT,
-                             verbose_name=_('Tipo'))
+                             null=True,
+                             blank=True,
+                             verbose_name=_('Tipo de Audiência Pública'))
     numero = models.PositiveIntegerField(blank=True, verbose_name=_('Número'))
     nome = models.CharField(
         max_length=100, verbose_name=_('Nome da Audiência Pública'))