Browse Source

Adiciona campo tipo ao model de casa

pull/588/head
Eduardo Edson Batista Cordeiro Alves 9 years ago
parent
commit
c8d5f0a186
  1. 2
      sapl/base/forms.py
  2. 20
      sapl/base/migrations/0017_casalegislativa_tipo.py
  3. 7
      sapl/base/models.py
  4. 3
      sapl/templates/base/layouts.yaml
  5. 5
      sapl/utils.py

2
sapl/base/forms.py

@ -242,6 +242,7 @@ class CasaLegislativaForm(ModelForm):
model = CasaLegislativa
fields = ['codigo',
'tipo',
'nome',
'sigla',
'endereco',
@ -257,6 +258,7 @@ class CasaLegislativaForm(ModelForm):
widgets = {
'uf': forms.Select(attrs={'class': 'selector'}),
'tipo': forms.Select(attrs={'class': 'selector'}),
'cep': forms.TextInput(attrs={'class': 'cep'}),
'telefone': forms.TextInput(attrs={'class': 'telefone'}),
'fax': forms.TextInput(attrs={'class': 'telefone'}),

20
sapl/base/migrations/0017_casalegislativa_tipo.py

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2016-09-19 13:26
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('base', '0016_auto_20160701_0940'),
]
operations = [
migrations.AddField(
model_name='casalegislativa',
name='tipo',
field=models.CharField(blank=True, choices=[('A', 'Assembleia Legislativa'), ('C', 'Casa Legislativa')], max_length=1, verbose_name='Tipo'),
),
]

7
sapl/base/models.py

@ -3,7 +3,7 @@ from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.utils.translation import ugettext_lazy as _
from sapl.utils import UF, YES_NO_CHOICES
from sapl.utils import UF, YES_NO_CHOICES, CASA_CHOICES
TIPO_DOCUMENTO_ADMINISTRATIVO = (('O', _('Ostensivo')),
('R', _('Restritivo')))
@ -50,6 +50,11 @@ class CasaLegislativa(models.Model):
blank=True,
verbose_name=_('Informação Geral'))
# Determina se é Assembleia ou Casa
tipo = models.CharField(
max_length=1, blank=True, verbose_name=_('Tipo'),
choices=CASA_CHOICES)
class Meta:
verbose_name = _('Casa Legislativa')
verbose_name_plural = _('Casa Legislativa')

3
sapl/templates/base/layouts.yaml

@ -1,7 +1,8 @@
{% load i18n %}
CasaLegislativa:
{% trans 'Casa Legislativa' %}:
- codigo:2 nome sigla
- codigo:1 tipo:3 nome sigla
- endereco:8 cep
- municipio:10 uf
- telefone fax

5
sapl/utils.py

@ -111,6 +111,11 @@ TURNO_TRAMITACAO_CHOICES = [
('C', _('2ª e 3ª Votação')),
]
CASA_CHOICES = [
('A', _('Assembleia Legislativa')),
('C', _('Casa Legislativa')),
]
def listify(function):
@wraps(function)

Loading…
Cancel
Save