From 37b982c3b526e051c65f9602a8398b84b7b08446 Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Tue, 8 Aug 2017 10:40:07 -0300 Subject: [PATCH 1/5] Define obrigatorio campo data e arquivo, pega data atual, para documentos acessorios --- sapl/materia/forms.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index a125c6f84..33c21b9f1 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -165,6 +165,10 @@ class AcompanhamentoMateriaForm(ModelForm): class DocumentoAcessorioForm(ModelForm): + + data = forms.DateField(required=True) + arquivo = forms.FileField(required=True) + class Meta: model = DocumentoAcessorio From 941524b797261c01b508d398085504e0f044b73d Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Tue, 8 Aug 2017 10:47:32 -0300 Subject: [PATCH 2/5] Fix campos_obrigatorios_docacessorio --- sapl/materia/views.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index b587d027b..e975ff22d 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1,4 +1,5 @@ from datetime import datetime, date +from django.utils import timezone from random import choice from string import ascii_letters, digits @@ -1065,6 +1066,10 @@ class DocumentoAcessorioCrud(MasterDetailCrud): def __init__(self, **kwargs): super(MasterDetailCrud.CreateView, self).__init__(**kwargs) + def get_initial(self): + self.initial['data'] = timezone.now() + return self.initial + def get_context_data(self, **kwargs): context = super( MasterDetailCrud.CreateView, self).get_context_data(**kwargs) From fb9fd4c8e8e7184571d5f36e00361528e79897d0 Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Tue, 8 Aug 2017 13:34:13 -0300 Subject: [PATCH 3/5] reteste travis --- sapl/materia/forms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 33c21b9f1..97f41381b 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -165,7 +165,6 @@ class AcompanhamentoMateriaForm(ModelForm): class DocumentoAcessorioForm(ModelForm): - data = forms.DateField(required=True) arquivo = forms.FileField(required=True) From 50df4c157b57c74d7fcfa328e8fb5fcdc41a519f Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Tue, 8 Aug 2017 16:55:33 -0300 Subject: [PATCH 4/5] ajuste teste do travis --- sapl/materia/forms.py | 3 --- sapl/materia/models.py | 4 +--- sapl/materia/tests/test_materia.py | 5 +++++ sapl/materia/views.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 97f41381b..a125c6f84 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -165,9 +165,6 @@ class AcompanhamentoMateriaForm(ModelForm): class DocumentoAcessorioForm(ModelForm): - data = forms.DateField(required=True) - arquivo = forms.FileField(required=True) - class Meta: model = DocumentoAcessorio diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 8d9eae4f5..9eec1b0ce 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -411,14 +411,12 @@ class DocumentoAcessorio(models.Model): on_delete=models.PROTECT, verbose_name=_('Tipo')) nome = models.CharField(max_length=50, verbose_name=_('Nome')) - data = models.DateField(blank=True, null=True, verbose_name=_('Data')) + data = models.DateField(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=anexo_upload_path, verbose_name=_('Texto Integral'), validators=[restringe_tipos_de_arquivo_txt]) diff --git a/sapl/materia/tests/test_materia.py b/sapl/materia/tests/test_materia.py index 20f3a12fa..6ff2d6d82 100644 --- a/sapl/materia/tests/test_materia.py +++ b/sapl/materia/tests/test_materia.py @@ -217,6 +217,9 @@ def test_documento_acessorio_submit(admin_client): # Cria um tipo de documento tipo = mommy.make(TipoDocumento, descricao='Teste') + + file_content = 'file_content' + arquivo = SimpleUploadedFile("file.txt", file_content.encode('UTF-8')) # Testa POST response = admin_client.post(reverse( @@ -227,6 +230,8 @@ def test_documento_acessorio_submit(admin_client): 'data_materia': '2016-03-21', 'autor': autor, 'ementa': 'teste_ementa', + 'data': '2016-03-21', + 'arquivo': arquivo, 'salvar': 'salvar'}, follow=True) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index e975ff22d..94292b024 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1,5 +1,4 @@ from datetime import datetime, date -from django.utils import timezone from random import choice from string import ascii_letters, digits @@ -1067,7 +1066,8 @@ class DocumentoAcessorioCrud(MasterDetailCrud): super(MasterDetailCrud.CreateView, self).__init__(**kwargs) def get_initial(self): - self.initial['data'] = timezone.now() + self.initial['data'] = datetime.now().date() + return self.initial def get_context_data(self, **kwargs): From e108e10ba80d7bb6ebef474f7ee4df85e6fc3318 Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Tue, 8 Aug 2017 17:16:51 -0300 Subject: [PATCH 5/5] migrate --- .../migrations/0007_auto_20170808_1713.py | 19 +++++++++++++ .../migrations/0010_auto_20170808_1713.py | 27 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sapl/base/migrations/0007_auto_20170808_1713.py create mode 100644 sapl/materia/migrations/0010_auto_20170808_1713.py diff --git a/sapl/base/migrations/0007_auto_20170808_1713.py b/sapl/base/migrations/0007_auto_20170808_1713.py new file mode 100644 index 000000000..2fb323adf --- /dev/null +++ b/sapl/base/migrations/0007_auto_20170808_1713.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-08-08 17:13 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0006_auto_20170802_1908'), + ] + + operations = [ + migrations.AlterModelOptions( + name='autor', + options={'ordering': ('nome',), 'verbose_name': 'Autor', 'verbose_name_plural': 'Autores'}, + ), + ] diff --git a/sapl/materia/migrations/0010_auto_20170808_1713.py b/sapl/materia/migrations/0010_auto_20170808_1713.py new file mode 100644 index 000000000..c5806e6c8 --- /dev/null +++ b/sapl/materia/migrations/0010_auto_20170808_1713.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-08-08 17:13 +from __future__ import unicode_literals + +from django.db import migrations, models +import sapl.materia.models +import sapl.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0009_auto_20170712_0951'), + ] + + operations = [ + migrations.AlterField( + model_name='documentoacessorio', + name='arquivo', + field=models.FileField(upload_to=sapl.materia.models.anexo_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Texto Integral'), + ), + migrations.AlterField( + model_name='documentoacessorio', + name='data', + field=models.DateField(verbose_name='Data'), + ), + ]