From 6cf2bca79875f7572fbfd65673b55cf3b0f425f5 Mon Sep 17 00:00:00 2001
From: AndreSouto <andre_luisferreira@hotmail.com>
Date: Tue, 23 Oct 2018 11:01:36 -0300
Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20de=20forms.py,=20models.p?=
 =?UTF-8?q?y=20e=20views.py=20de=20acordo=20com=20mudan=C3=A7as=20solicita?=
 =?UTF-8?q?das.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/audiencia/forms.py                       | 10 ++-----
 .../migrations/0008_auto_20181023_1051.py     | 28 +++++++++++++++++++
 ..._remove_anexoaudienciapublica_indexacao.py | 19 +++++++++++++
 sapl/audiencia/models.py                      | 11 ++++----
 sapl/audiencia/views.py                       |  4 +--
 sapl/templates/audiencia/layouts.yaml         |  1 -
 6 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 sapl/audiencia/migrations/0008_auto_20181023_1051.py
 create mode 100644 sapl/audiencia/migrations/0009_remove_anexoaudienciapublica_indexacao.py

diff --git a/sapl/audiencia/forms.py b/sapl/audiencia/forms.py
index 4158bb085..4bd265b72 100755
--- a/sapl/audiencia/forms.py
+++ b/sapl/audiencia/forms.py
@@ -112,19 +112,13 @@ class AnexoAudienciaPublicaForm(forms.ModelForm):
 
     class Meta:
         model = AnexoAudienciaPublica
-        fields = ['nome',
-                  'data',
-                  'arquivo',
+        fields = ['arquivo',
                   'assunto']
 
-        widgets = {
-            'data': forms.DateInput(format='%d/%m/%Y')
-        }
-
     def __init__(self, *args, **kwargs):
 
         row1 = to_row(
-            [('nome', 4), ('data', 4), ('arquivo', 4)])
+            [('arquivo', 4)])
 
         row2 = to_row(
             [('assunto', 12)])
diff --git a/sapl/audiencia/migrations/0008_auto_20181023_1051.py b/sapl/audiencia/migrations/0008_auto_20181023_1051.py
new file mode 100644
index 000000000..70c491a4c
--- /dev/null
+++ b/sapl/audiencia/migrations/0008_auto_20181023_1051.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2018-10-23 13:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('audiencia', '0007_anexoaudienciapublica'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='anexoaudienciapublica',
+            options={'verbose_name': 'Anexo de Documento Acessório', 'verbose_name_plural': 'Anexo de Documentos Acessórios'},
+        ),
+        migrations.RemoveField(
+            model_name='anexoaudienciapublica',
+            name='nome',
+        ),
+        migrations.AlterField(
+            model_name='anexoaudienciapublica',
+            name='data',
+            field=models.DateField(auto_now=True, null=True),
+        ),
+    ]
diff --git a/sapl/audiencia/migrations/0009_remove_anexoaudienciapublica_indexacao.py b/sapl/audiencia/migrations/0009_remove_anexoaudienciapublica_indexacao.py
new file mode 100644
index 000000000..e35a7a2a7
--- /dev/null
+++ b/sapl/audiencia/migrations/0009_remove_anexoaudienciapublica_indexacao.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2018-10-23 13:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('audiencia', '0008_auto_20181023_1051'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='anexoaudienciapublica',
+            name='indexacao',
+        ),
+    ]
diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py
index d2f62b74c..684f27625 100755
--- a/sapl/audiencia/models.py
+++ b/sapl/audiencia/models.py
@@ -1,5 +1,6 @@
 import reversion
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from model_utils import Choices
 from sapl.materia.models import MateriaLegislativa
@@ -153,23 +154,21 @@ class AudienciaPublica(models.Model):
 class AnexoAudienciaPublica(models.Model):
     audiencia = models.ForeignKey(AudienciaPublica,
                                   on_delete=models.PROTECT)
-    nome = models.CharField(max_length=30, verbose_name=_('Nome'))
     arquivo = models.FileField(
         blank=True,
         null=True,
         upload_to=texto_upload_path,
         verbose_name=_('Arquivo'))
-    data = models.DateField(blank=True, null=True, verbose_name=_('Data'))
+    data = models.DateField(auto_now=timezone.now,blank=True, null=True)
     assunto = models.TextField(
         blank=True, verbose_name=_('Assunto'))
-    indexacao = models.TextField(blank=True)
 
     class Meta:
-        verbose_name = _('Documento Acessório')
-        verbose_name_plural = _('Documentos Acessórios')
+        verbose_name = _('Anexo de Documento Acessório')
+        verbose_name_plural = _('Anexo de Documentos Acessórios')
 
     def __str__(self):
-        return self.nome
+        return self.assunto
 
     def delete(self, using=None, keep_parents=False):
         if self.arquivo:
diff --git a/sapl/audiencia/views.py b/sapl/audiencia/views.py
index d2263ea66..93d214683 100755
--- a/sapl/audiencia/views.py
+++ b/sapl/audiencia/views.py
@@ -88,9 +88,7 @@ class AnexoAudienciaPublicaCrud(MasterDetailCrud):
     help_topic = 'numeracao_docsacess'
 
     class BaseMixin(MasterDetailCrud.BaseMixin):
-        list_field_names = ['nome',
-                            'data',
-                            'assunto']
+        list_field_names = ['assunto']
 
     class CreateView(MasterDetailCrud.CreateView):
         form_class = AnexoAudienciaPublicaForm
diff --git a/sapl/templates/audiencia/layouts.yaml b/sapl/templates/audiencia/layouts.yaml
index ce26b8b61..8e93b9f3a 100644
--- a/sapl/templates/audiencia/layouts.yaml
+++ b/sapl/templates/audiencia/layouts.yaml
@@ -25,6 +25,5 @@ AudienciaPublicaDetail:
 
 AnexoAudienciaPublica:
   {% trans 'Documento Acessório' %}:
-  - nome  data
   - assunto
   - arquivo
\ No newline at end of file