From c37182421f4b2192da14c30f1edc192dcd142b84 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Mon, 14 Aug 2017 18:11:20 -0300 Subject: [PATCH] =?UTF-8?q?Insire=20novo=20campo=20em=20tipo=20resultado?= =?UTF-8?q?=20vota=C3=A7a=C3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0010_auto_20170814_1804.py | 25 +++++++++++++++++++ sapl/sessao/models.py | 7 +++++- sapl/templates/sessao/layouts.yaml | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 sapl/sessao/migrations/0010_auto_20170814_1804.py diff --git a/sapl/sessao/migrations/0010_auto_20170814_1804.py b/sapl/sessao/migrations/0010_auto_20170814_1804.py new file mode 100644 index 000000000..e4bc8393e --- /dev/null +++ b/sapl/sessao/migrations/0010_auto_20170814_1804.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2017-08-14 18:04 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0009_auto_20170619_1441'), + ] + + operations = [ + migrations.AddField( + model_name='tiporesultadovotacao', + name='natureza', + field=models.CharField(choices=[('A', 'Aprovado'), ('R', 'Rejeitado')], max_length=100, null=True, verbose_name='Natureza do Tipo'), + ), + migrations.AlterField( + model_name='tiporesultadovotacao', + name='nome', + field=models.CharField(max_length=100, verbose_name='Nome do Tipo'), + ), + ] diff --git a/sapl/sessao/models.py b/sapl/sessao/models.py index 89e986341..6d10ab1a1 100644 --- a/sapl/sessao/models.py +++ b/sapl/sessao/models.py @@ -368,7 +368,12 @@ class PresencaOrdemDia(models.Model): # OrdemDiaPresenca @reversion.register() class TipoResultadoVotacao(models.Model): - nome = models.CharField(max_length=100, verbose_name=_('Tipo')) + nome = models.CharField(max_length=100, verbose_name=_('Nome do Tipo')) + natureza = models.CharField(max_length=100, + null=True, + choices=(('A', 'Aprovado'), + ('R', 'Rejeitado')), + verbose_name=_('Natureza do Tipo')) class Meta: verbose_name = _('Tipo de Resultado de Votação') diff --git a/sapl/templates/sessao/layouts.yaml b/sapl/templates/sessao/layouts.yaml index 62494a856..53caa2db1 100644 --- a/sapl/templates/sessao/layouts.yaml +++ b/sapl/templates/sessao/layouts.yaml @@ -14,6 +14,7 @@ SessaoPlenaria: TipoResultadoVotacao: {% trans 'Tipo de Resultado da Votação' %}: - nome + - natureza TipoExpediente: {% trans 'Tipo de Expediente' %}: