From 4cc60674554fd90cbedbfc5b02c5c073d272d338 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 10 May 2016 09:51:36 -0300 Subject: [PATCH] =?UTF-8?q?Adiciona=20campo=20de=20arquivo=20em=20Document?= =?UTF-8?q?o=20Acess=C3=B3rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- materia/forms.py | 2 +- materia/layouts.yaml | 1 + materia/migrations/0032_merge.py | 16 ++++++++++++++ .../0033_documentoacessorio_texto_original.py | 22 +++++++++++++++++++ materia/migrations/0034_auto_20160510_0946.py | 20 +++++++++++++++++ materia/migrations/0035_auto_20160510_0949.py | 20 +++++++++++++++++ materia/models.py | 8 ++++++- materia/views.py | 7 ++++-- .../migrations/0018_auto_20160510_0943.py | 19 ++++++++++++++++ 9 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 materia/migrations/0032_merge.py create mode 100644 materia/migrations/0033_documentoacessorio_texto_original.py create mode 100644 materia/migrations/0034_auto_20160510_0946.py create mode 100644 materia/migrations/0035_auto_20160510_0949.py create mode 100644 parlamentares/migrations/0018_auto_20160510_0943.py diff --git a/materia/forms.py b/materia/forms.py index 88c15e7d1..e7f5fd4e1 100644 --- a/materia/forms.py +++ b/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()} diff --git a/materia/layouts.yaml b/materia/layouts.yaml index 74bb98c40..272cb006e 100644 --- a/materia/layouts.yaml +++ b/materia/layouts.yaml @@ -65,6 +65,7 @@ DocumentoAcessorio: - tipo nome data - autor - ementa + - arquivo Numeracao: Numeração: diff --git a/materia/migrations/0032_merge.py b/materia/migrations/0032_merge.py new file mode 100644 index 000000000..0592ea507 --- /dev/null +++ b/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 = [ + ] diff --git a/materia/migrations/0033_documentoacessorio_texto_original.py b/materia/migrations/0033_documentoacessorio_texto_original.py new file mode 100644 index 000000000..e7f37e1f5 --- /dev/null +++ b/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'), + ), + ] diff --git a/materia/migrations/0034_auto_20160510_0946.py b/materia/migrations/0034_auto_20160510_0946.py new file mode 100644 index 000000000..eac94fc88 --- /dev/null +++ b/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', + ), + ] diff --git a/materia/migrations/0035_auto_20160510_0949.py b/materia/migrations/0035_auto_20160510_0949.py new file mode 100644 index 000000000..eacd9db10 --- /dev/null +++ b/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'), + ), + ] diff --git a/materia/models.py b/materia/models.py index b50c48afd..2c610cb8e 100644 --- a/materia/models.py +++ b/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') diff --git a/materia/views.py b/materia/views.py index a8e73ca4b..345123cda 100644 --- a/materia/views.py +++ b/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('Cancelar')])) @@ -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('Cancelar')])) diff --git a/parlamentares/migrations/0018_auto_20160510_0943.py b/parlamentares/migrations/0018_auto_20160510_0943.py new file mode 100644 index 000000000..7546f4001 --- /dev/null +++ b/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'}, + ), + ]