Adiciona campo de arquivo em Documento Acessório

materia/forms.py

@@ -118,7 +118,7 @@ class DocumentoAcessorioForm(ModelForm):
 
     class Meta:
         model = DocumentoAcessorio
-        fields = ['tipo', 'nome', 'data', 'autor', 'ementa']
+        fields = ['tipo', 'nome', 'data', 'autor', 'ementa', 'arquivo']
 
         widgets = {'autor': forms.HiddenInput()}
 

materia/layouts.yaml

@@ -65,6 +65,7 @@ DocumentoAcessorio:
   - tipo nome data
   - autor
   - ementa
+  - arquivo
 
 Numeracao:
   Numeração:

materia/migrations/0032_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-10 12:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0031_merge'),
+        ('materia', '0031_auto_20160502_1131'),
+    ]
+
+    operations = [
+    ]

materia/migrations/0033_documentoacessorio_texto_original.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-10 12:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import materia.models
+import sapl.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0032_merge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='documentoacessorio',
+            name='texto_original',
+            field=models.FileField(blank=True, null=True, upload_to=materia.models.texto_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Texto Integral'),
+        ),
+    ]

materia/migrations/0034_auto_20160510_0946.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-10 12:46
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0033_documentoacessorio_texto_original'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='documentoacessorio',
+            old_name='texto_original',
+            new_name='arquivo',
+        ),
+    ]

materia/migrations/0035_auto_20160510_0949.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-10 12:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0034_auto_20160510_0946'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='documentoacessorio',
+            name='nome',
+            field=models.CharField(max_length=30, verbose_name='Nome'),
+        ),
+    ]

materia/models.py

@@ -271,12 +271,18 @@ class TipoDocumento(models.Model):
 class DocumentoAcessorio(models.Model):
     materia = models.ForeignKey(MateriaLegislativa)
     tipo = models.ForeignKey(TipoDocumento, verbose_name=_('Tipo'))
-    nome = models.CharField(max_length=30, verbose_name=_('Descrição'))
+    nome = models.CharField(max_length=30, verbose_name=_('Nome'))
     data = models.DateField(blank=True, null=True, verbose_name=_('Data'))
     autor = models.CharField(
         max_length=50, blank=True, verbose_name=_('Autor'))
     ementa = models.TextField(blank=True, verbose_name=_('Ementa'))
     indexacao = models.TextField(blank=True)
+    arquivo = models.FileField(
+        blank=True,
+        null=True,
+        upload_to=texto_upload_path,
+        verbose_name=_('Texto Integral'),
+        validators=[restringe_tipos_de_arquivo_txt])
 
     class Meta:
         verbose_name = _('Documento Acessório')

materia/views.py

@@ -133,6 +133,9 @@ class DocumentoAcessorioCrud(MasterDetailCrud):
     parent_field = 'materia'
     help_path = ''
 
+    class BaseMixin(MasterDetailCrud.BaseMixin):
+        list_field_names = ['nome', 'tipo', 'data', 'autor', 'arquivo']
+
     class CreateView(MasterDetailCrud.CreateView):
         form_class = DocumentoAcessorioForm
 
@@ -159,7 +162,7 @@ class DocumentoAcessorioCrud(MasterDetailCrud):
             self.helper.layout[1].pop()
 
             # Adiciona novos botões dentro do form
-            self.helper.layout[0][2][0].insert(1, form_actions(more=[
+            self.helper.layout[0][3][0].insert(1, form_actions(more=[
                 HTML('<a href="{{ view.cancel_url }}"'
                      ' class="btn btn-inverse">Cancelar</a>')]))
 
@@ -196,7 +199,7 @@ class DocumentoAcessorioCrud(MasterDetailCrud):
             self.helper.layout[1].pop()
 
             # Adiciona novos botões dentro do form
-            self.helper.layout[0][2][0].insert(1, form_actions(more=[
+            self.helper.layout[0][3][0].insert(1, form_actions(more=[
                 HTML('<a href="{{ view.cancel_url }}"'
                      ' class="btn btn-inverse">Cancelar</a>')]))
 

parlamentares/migrations/0018_auto_20160510_0943.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-10 12:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parlamentares', '0017_remove_parlamentar_unidade_deliberativa'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='filiacao',
+            options={'ordering': ('parlamentar', '-data', '-data_desfiliacao'), 'verbose_name': 'Filiação', 'verbose_name_plural': 'Filiações'},
+        ),
+    ]