diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index b244af69a..5c038f887 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1238,6 +1238,7 @@ class ProposicaoForm(forms.ModelForm): fields = ['tipo', 'receber_recibo', 'descricao', + 'observacao', 'texto_original', 'materia_de_vinculo', @@ -1249,6 +1250,7 @@ class ProposicaoForm(forms.ModelForm): widgets = { 'descricao': widgets.Textarea(attrs={'rows': 4}), + 'observacao': widgets.Textarea(attrs={'rows': 4}), 'tipo': TipoProposicaoSelect(), 'hash_code': forms.HiddenInput(), } @@ -1274,6 +1276,7 @@ class ProposicaoForm(forms.ModelForm): css_class="ementa_materia hidden alert-info", dismiss=False), 12)), to_column(('descricao', 12)), + to_column(('observacao', 12)), ] @@ -1500,12 +1503,15 @@ class ConfirmarProposicaoForm(ProposicaoForm): fields = [ 'data_envio', 'descricao', + 'observacao', 'gerar_protocolo', 'numero_de_paginas' ] widgets = { 'descricao': widgets.Textarea( attrs={'readonly': 'readonly', 'rows': 4}), + 'observacao': widgets.Textarea( + attrs={'readonly': 'readonly', 'rows': 4}), 'data_envio': widgets.DateTimeInput( attrs={'readonly': 'readonly'}), @@ -1552,7 +1558,8 @@ class ConfirmarProposicaoForm(ProposicaoForm): to_column(('tipo_readonly', 4)), to_column(('data_envio', 3)), to_column(('autor_readonly', 5)), - to_column(('descricao', 12)))] + to_column(('descricao', 12)), + to_column(('observacao', 12)))] fields.append( Fieldset(_('Vinculado a Matéria Legislativa'), diff --git a/sapl/materia/migrations/0032_proposicao_observacao.py b/sapl/materia/migrations/0032_proposicao_observacao.py new file mode 100644 index 000000000..b7c3ca4e9 --- /dev/null +++ b/sapl/materia/migrations/0032_proposicao_observacao.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-10-10 13:07 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0031_auto_20180924_1724'), + ] + + operations = [ + migrations.AddField( + model_name='proposicao', + name='observacao', + field=models.TextField(blank=True, verbose_name='Observação'), + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index dd9f8ddab..f4d10a0e6 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -725,6 +725,8 @@ class Proposicao(models.Model): blank=True, null=True, default=None) conteudo_gerado_related = SaplGenericForeignKey( 'content_type', 'object_id', verbose_name=_('Conteúdo Gerado')) + observacao = models.TextField( + blank=True, verbose_name=_('Observação')) """# Ao ser recebida, irá gerar uma nova matéria ou um documento acessorio # de uma já existente diff --git a/sapl/templates/materia/layouts.yaml b/sapl/templates/materia/layouts.yaml index 7c0c17e4e..26d603f99 100644 --- a/sapl/templates/materia/layouts.yaml +++ b/sapl/templates/materia/layouts.yaml @@ -93,6 +93,7 @@ Proposicao: {% trans 'Proposição' %}: - tipo data_envio - descricao + - observacao {% trans 'Materia' %}: - materia_de_vinculo {% trans 'Complemento' %}: diff --git a/sapl/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html index e9779f2fd..4b5cd667a 100644 --- a/sapl/templates/materia/proposicao_detail.html +++ b/sapl/templates/materia/proposicao_detail.html @@ -111,6 +111,17 @@ +
{%field_verbose_name object 'observacao'%}
+