Browse Source

Ajusta campo natureza em TipoResultadoVotacao

pull/1831/head
Marcio Mazza 7 years ago
parent
commit
bf64fc896d
  1. 20
      sapl/sessao/migrations/0019_auto_20180404_1437.py
  2. 14
      sapl/sessao/models.py

20
sapl/sessao/migrations/0019_auto_20180404_1437.py

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.13 on 2018-04-04 17:37
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('sessao', '0018_auto_20180327_1433'),
]
operations = [
migrations.AlterField(
model_name='tiporesultadovotacao',
name='natureza',
field=models.CharField(blank=True, choices=[('A', 'Aprovado'), ('R', 'Rejeitado')], max_length=1, verbose_name='Natureza do Tipo'),
),
]

14
sapl/sessao/models.py

@ -225,9 +225,9 @@ class SessaoPlenaria(models.Model):
@reversion.register()
class AbstractOrdemDia(models.Model):
TIPO_VOTACAO_CHOICES = Choices(
(1, 'simbolica', (('Simbólica'))),
(2, 'nominal', (('Nominal'))),
(3, 'secreta', (('Secreta'))),
(1, 'simbolica', 'Simbólica'),
(2, 'nominal', 'Nominal'),
(3, 'secreta', 'Secreta'),
)
sessao_plenaria = models.ForeignKey(SessaoPlenaria,
@ -380,11 +380,13 @@ class PresencaOrdemDia(models.Model): # OrdemDiaPresenca
@reversion.register()
class TipoResultadoVotacao(models.Model):
NATUREZA_CHOICES = Choices(
('A', 'aprovado', 'Aprovado'),
('R', 'rejeitado', 'Rejeitado'))
nome = models.CharField(max_length=100, verbose_name=_('Nome do Tipo'))
natureza = models.CharField(max_length=100,
natureza = models.CharField(max_length=1,
blank=True,
choices=(('A', 'Aprovado'),
('R', 'Rejeitado')),
choices=NATUREZA_CHOICES,
verbose_name=_('Natureza do Tipo'))
class Meta:

Loading…
Cancel
Save