From 622cbf994e64fc87a93cf12b2ddc2353a14e1035 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Wed, 7 Mar 2018 16:47:12 -0300 Subject: [PATCH] =?UTF-8?q?-=20Retira=20o=20campo=20tipo=20de=20cadastro?= =?UTF-8?q?=20de=20reuni=C3=A3o=20-=20Retira=20a=20obrigatoriedade=20do=20?= =?UTF-8?q?campo=20tema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/comissoes/legacy.yaml | 1 - .../migrations/0010_auto_20180307_1645.py | 29 +++++++++++++++++++ sapl/comissoes/models.py | 8 ++--- sapl/templates/comissoes/layouts.yaml | 2 +- 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 sapl/comissoes/migrations/0010_auto_20180307_1645.py diff --git a/sapl/comissoes/legacy.yaml b/sapl/comissoes/legacy.yaml index 2414df885..59aacf503 100644 --- a/sapl/comissoes/legacy.yaml +++ b/sapl/comissoes/legacy.yaml @@ -47,7 +47,6 @@ Participacao (ComposicaoComissao): Reuniao: periodo: periodo_reuniao comissao: cod_comissao - tipo: tipo_comissao numero: num_comissao nome: nom_reuniao tema: tem_reuniao diff --git a/sapl/comissoes/migrations/0010_auto_20180307_1645.py b/sapl/comissoes/migrations/0010_auto_20180307_1645.py new file mode 100644 index 000000000..45b86bec4 --- /dev/null +++ b/sapl/comissoes/migrations/0010_auto_20180307_1645.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-03-07 19:45 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0009_auto_20180301_1011'), + ] + + operations = [ + migrations.RemoveField( + model_name='reuniao', + name='tipo', + ), + migrations.AlterField( + model_name='reuniao', + name='nome', + field=models.CharField(max_length=150, verbose_name='Nome da Reunião'), + ), + migrations.AlterField( + model_name='reuniao', + name='tema', + field=models.CharField(blank=True, max_length=150, verbose_name='Tema da Reunião'), + ), + ] diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index 9f94a60da..fa12a36e0 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -202,15 +202,11 @@ class Reuniao(models.Model): Comissao, on_delete=models.PROTECT, verbose_name=_('Comissão')) - tipo = models.ForeignKey( - TipoComissao, - on_delete=models.PROTECT, - verbose_name=_('Tipo de Comissão')) numero = models.PositiveIntegerField(verbose_name=_('Número')) nome = models.CharField( - max_length=100, verbose_name=_('Nome da Reunião')) + max_length=150, verbose_name=_('Nome da Reunião')) tema = models.CharField( - max_length=100, verbose_name=_('Tema da Reunião')) + max_length=150, blank=True, verbose_name=_('Tema da Reunião')) data = models.DateField(verbose_name=_('Data')) hora_inicio = models.TimeField( verbose_name=_('Horário de Início (hh:mm)')) diff --git a/sapl/templates/comissoes/layouts.yaml b/sapl/templates/comissoes/layouts.yaml index 77dc344cc..5d0026ba2 100644 --- a/sapl/templates/comissoes/layouts.yaml +++ b/sapl/templates/comissoes/layouts.yaml @@ -46,7 +46,7 @@ ParticipacaoEdit: Reuniao: {% trans 'Reunião' %}: - - periodo numero tipo + - periodo numero - nome tema local_reuniao - data hora_inicio hora_fim - url_video url_audio