diff --git a/sapl/comissoes/migrations/0005_comissao_ativa.py b/sapl/comissoes/migrations/0005_comissao_ativa.py new file mode 100644 index 000000000..930bf276c --- /dev/null +++ b/sapl/comissoes/migrations/0005_comissao_ativa.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-08-05 18:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0004_auto_20160307_0905'), + ] + + operations = [ + migrations.AddField( + model_name='comissao', + name='ativa', + field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=True, verbose_name='Comissão Ativa?'), + preserve_default=False, + ), + ] diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index b5ca44d31..304456c8f 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -73,6 +73,9 @@ class Comissao(models.Model): unidade_deliberativa = models.BooleanField( choices=YES_NO_CHOICES, verbose_name=_('Unidade Deliberativa')) + ativa = models.BooleanField( + choices=YES_NO_CHOICES, + verbose_name=_('Comissão Ativa?')) class Meta: verbose_name = _('Comissão') diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index f8ca4a813..4ca5bb768 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -84,7 +84,7 @@ class ComissaoCrud(Crud): help_path = 'modulo_comissoes' class BaseMixin(CrudBaseMixin): - list_field_names = ['nome', 'sigla', 'tipo', 'data_criacao'] + list_field_names = ['nome', 'sigla', 'tipo', 'data_criacao', 'ativa'] class MateriasTramitacaoListView(ListView): diff --git a/sapl/templates/comissoes/layouts.yaml b/sapl/templates/comissoes/layouts.yaml index e881b0b1e..dd333483d 100644 --- a/sapl/templates/comissoes/layouts.yaml +++ b/sapl/templates/comissoes/layouts.yaml @@ -14,7 +14,7 @@ TipoComissao: Comissao: {% trans 'Dados Básicos' %}: - - nome:8 sigla + - nome:7 sigla ativa - tipo data_criacao unidade_deliberativa data_extincao {% trans 'Dados Complementares' %}: - local_reuniao agenda_reuniao telefone_reuniao