From 77a2e7a8e2e1a27689a1a739ca2b7524451dbe75 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Wed, 17 Oct 2018 18:52:54 -0300 Subject: [PATCH] adicionar documento acessorio funcionando --- sapl/audiencia/forms.py | 21 ++++++++++++++++++++- sapl/audiencia/views.py | 1 + sapl/templates/audiencia/layouts.yaml | 7 ++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/sapl/audiencia/forms.py b/sapl/audiencia/forms.py index 4124d4f55..4158bb085 100755 --- a/sapl/audiencia/forms.py +++ b/sapl/audiencia/forms.py @@ -3,6 +3,10 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.db import transaction from django.utils.translation import ugettext_lazy as _ from sapl.audiencia.models import AudienciaPublica, TipoAudienciaPublica, AnexoAudienciaPublica +from crispy_forms.layout import HTML, Button, Column, Fieldset, Layout + +from crispy_forms.helper import FormHelper +from sapl.crispy_layout_mixin import SaplFormLayout, form_actions, to_row from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa from sapl.utils import timezone @@ -115,4 +119,19 @@ class AnexoAudienciaPublicaForm(forms.ModelForm): widgets = { 'data': forms.DateInput(format='%d/%m/%Y') - } \ No newline at end of file + } + + def __init__(self, *args, **kwargs): + + row1 = to_row( + [('nome', 4), ('data', 4), ('arquivo', 4)]) + + row2 = to_row( + [('assunto', 12)]) + + self.helper = FormHelper() + self.helper.layout = SaplFormLayout( + Fieldset(_('Identificação Básica'), + row1, row2)) + super(AnexoAudienciaPublicaForm, self).__init__( + *args, **kwargs) diff --git a/sapl/audiencia/views.py b/sapl/audiencia/views.py index 93d61c30c..69636699c 100755 --- a/sapl/audiencia/views.py +++ b/sapl/audiencia/views.py @@ -94,6 +94,7 @@ class AnexoAudienciaPublicaCrud(MasterDetailCrud): class CreateView(MasterDetailCrud.CreateView): form_class = AnexoAudienciaPublicaForm + layout_key = None class UpdateView(MasterDetailCrud.UpdateView): form_class = AnexoAudienciaPublicaForm diff --git a/sapl/templates/audiencia/layouts.yaml b/sapl/templates/audiencia/layouts.yaml index 90433db63..5f923fa8e 100644 --- a/sapl/templates/audiencia/layouts.yaml +++ b/sapl/templates/audiencia/layouts.yaml @@ -21,4 +21,9 @@ AudienciaPublicaDetail: - url_audio url_video - upload_pauta upload_ata upload_anexo - observacao - - audiencia_cancelada \ No newline at end of file + - audiencia_cancelada + +AnexoAudienciaPublica: + {% trans 'Identificação Básica' %} + - 'nome' 'data' 'arquivo' + - 'assunto' \ No newline at end of file