diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 5c038f887..bb91e7dc7 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1411,6 +1411,7 @@ class DevolverProposicaoForm(forms.ModelForm): model = Proposicao fields = [ 'justificativa_devolucao', + 'observacao', ] def __init__(self, *args, **kwargs): @@ -1423,6 +1424,7 @@ class DevolverProposicaoForm(forms.ModelForm): Fieldset( _('Registro de Devolução'), to_column(('justificativa_devolucao', 12)), + to_column(('observacao', 12)), to_column( (form_actions(label=_('Devolver'), name='devolver', @@ -1510,8 +1512,6 @@ class ConfirmarProposicaoForm(ProposicaoForm): widgets = { 'descricao': widgets.Textarea( attrs={'readonly': 'readonly', 'rows': 4}), - 'observacao': widgets.Textarea( - attrs={'readonly': 'readonly', 'rows': 4}), 'data_envio': widgets.DateTimeInput( attrs={'readonly': 'readonly'}), diff --git a/sapl/materia/migrations/0033_proposicao_cancelado.py b/sapl/materia/migrations/0033_proposicao_cancelado.py new file mode 100644 index 000000000..93788c03f --- /dev/null +++ b/sapl/materia/migrations/0033_proposicao_cancelado.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-10-16 10:47 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0032_proposicao_observacao'), + ] + + operations = [ + migrations.AddField( + model_name='proposicao', + name='cancelado', + field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=False, verbose_name='Cancelada ?'), + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index f4d10a0e6..9e78092e5 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -280,6 +280,7 @@ class MateriaLegislativa(models.Model): for p in self.proposicao.all(): p.conteudo_gerado_related = None + p.cancelado = True p.save() return models.Model.delete( @@ -727,6 +728,9 @@ class Proposicao(models.Model): 'content_type', 'object_id', verbose_name=_('Conteúdo Gerado')) observacao = models.TextField( blank=True, verbose_name=_('Observação')) + cancelado = models.BooleanField(verbose_name=_('Cancelada ?'), + choices=YES_NO_CHOICES, + default=False) """# Ao ser recebida, irá gerar uma nova matéria ou um documento acessorio # de uma já existente