diff --git a/sessao/layouts.yaml b/sessao/layouts.yaml index c4a18a93b..63529bf46 100644 --- a/sessao/layouts.yaml +++ b/sessao/layouts.yaml @@ -67,3 +67,7 @@ Bancada: - nome partido - data_criacao data_extincao - descricao + +CargoBancada: + Cargo de Bancada: + - nome_cargo:8 cargo_unico diff --git a/sessao/migrations/0019_cargobancada.py b/sessao/migrations/0019_cargobancada.py new file mode 100644 index 000000000..44a4db58a --- /dev/null +++ b/sessao/migrations/0019_cargobancada.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-17 17:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0018_auto_20160517_1435'), + ] + + operations = [ + migrations.CreateModel( + name='CargoBancada', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('nome_cargo', models.CharField(max_length=80, verbose_name='Cargo de Bancada')), + ('cargo_unico', models.NullBooleanField(choices=[(True, 'Sim'), (False, 'Não')], verbose_name='Cargo Único')), + ], + options={ + 'verbose_name_plural': 'Cargos de Bancada', + 'verbose_name': 'Cargo de Bancada', + }, + ), + ] diff --git a/sessao/migrations/0020_auto_20160517_1450.py b/sessao/migrations/0020_auto_20160517_1450.py new file mode 100644 index 000000000..85004c22f --- /dev/null +++ b/sessao/migrations/0020_auto_20160517_1450.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-17 17:50 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0019_cargobancada'), + ] + + operations = [ + migrations.AlterField( + model_name='cargobancada', + name='cargo_unico', + field=models.CharField(choices=[(True, 'Sim'), (False, 'Não')], default=False, max_length=10, verbose_name='Cargo Único'), + ), + ] diff --git a/sessao/models.py b/sessao/models.py index 45a4f724c..249956355 100644 --- a/sessao/models.py +++ b/sessao/models.py @@ -8,6 +8,23 @@ from parlamentares.models import (CargoMesa, Legislatura, Parlamentar, Partido, from sapl.utils import YES_NO_CHOICES, restringe_tipos_de_arquivo_txt +class CargoBancada(models.Model): + nome_cargo = models.CharField(max_length=80, + verbose_name=_('Cargo de Bancada')) + cargo_unico = models.CharField( + max_length=10, + verbose_name=_('Cargo Único'), + choices=YES_NO_CHOICES, + default=False) + + class Meta: + verbose_name = _('Cargo de Bancada') + verbose_name_plural = _('Cargos de Bancada') + + def __str__(self): + return self.nome_cargo + + class Bancada(models.Model): legislatura = models.ForeignKey(Legislatura, verbose_name=_('Legislatura')) nome = models.CharField( diff --git a/sessao/urls.py b/sessao/urls.py index 1110e1528..d075a7e13 100644 --- a/sessao/urls.py +++ b/sessao/urls.py @@ -2,11 +2,12 @@ from django.conf.urls import include, url from django.views.static import serve from sapl import settings -from sessao.views import (BancadaCrud, EditMateriaOrdemDiaView, - ExpedienteMateriaCrud, ExpedienteView, - ListMateriaOrdemDiaView, MateriaOrdemDiaView, - MesaView, OradorCrud, OradorExpedienteCrud, - PainelView, PautaExpedienteDetail, PautaOrdemDetail, +from sessao.views import (BancadaCrud, CargoBancadaCrud, + EditMateriaOrdemDiaView, ExpedienteMateriaCrud, + ExpedienteView, ListMateriaOrdemDiaView, + MateriaOrdemDiaView, MesaView, OradorCrud, + OradorExpedienteCrud, PainelView, + PautaExpedienteDetail, PautaOrdemDetail, PautaSessaoDetailView, PautaSessaoListView, PesquisarSessaoPlenariaView, PresencaOrdemDiaView, PresencaView, ResumoView, SessaoCrud, @@ -47,6 +48,8 @@ urlpatterns = [ include(TipoExpedienteCrud.get_urls())), url(r'^sistema/bancada/', include(BancadaCrud.get_urls())), + url(r'^sistema/cargo-bancada/', + include(CargoBancadaCrud.get_urls())), # PAUTA SESSÃO url(r'^pauta-sessao$', diff --git a/sessao/views.py b/sessao/views.py index f4f053c45..54155c84c 100644 --- a/sessao/views.py +++ b/sessao/views.py @@ -32,7 +32,7 @@ from .models import (CargoMesa, ExpedienteMateria, ExpedienteSessao, OradorExpediente, OrdemDia, PresencaOrdemDia, RegistroVotacao, SessaoPlenaria, SessaoPlenariaPresenca, TipoExpediente, TipoResultadoVotacao, TipoSessaoPlenaria, - VotoParlamentar, Bancada) + VotoParlamentar, Bancada, CargoBancada) TipoSessaoCrud = Crud.build(TipoSessaoPlenaria, 'tipo_sessao_plenaria') OrdemDiaCrud = Crud.build(OrdemDia, '') @@ -40,6 +40,7 @@ TipoResultadoVotacaoCrud = Crud.build( TipoResultadoVotacao, 'tipo_resultado_votacao') TipoExpedienteCrud = Crud.build(TipoExpediente, 'tipo_expediente') RegistroVotacaoCrud = Crud.build(RegistroVotacao, '') +CargoBancadaCrud = Crud.build(CargoBancada, '') def reordernar_materias_expediente(request, pk): diff --git a/templates/sistema.html b/templates/sistema.html index b1c59c4ee..7ae09972d 100644 --- a/templates/sistema.html +++ b/templates/sistema.html @@ -35,7 +35,7 @@