Browse Source

Corrige layout e model de reunião

pull/1614/head
Mariana Mendes 8 years ago
parent
commit
eccadf6098
  1. 41
      sapl/comissoes/migrations/0009_auto_20180301_1011.py
  2. 10
      sapl/comissoes/models.py
  3. 4
      sapl/templates/comissoes/layouts.yaml

41
sapl/comissoes/migrations/0009_auto_20180301_1011.py

@ -0,0 +1,41 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.13 on 2018-03-01 13:11
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('comissoes', '0008_auto_20180227_1111'),
]
operations = [
migrations.AlterField(
model_name='reuniao',
name='local_reuniao',
field=models.CharField(blank=True, max_length=100, verbose_name='Local da Reunião'),
),
migrations.AlterField(
model_name='reuniao',
name='observacao',
field=models.TextField(blank=True, max_length=150, verbose_name='Observação'),
),
migrations.AlterField(
model_name='reuniao',
name='tipo',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='comissoes.TipoComissao', verbose_name='Tipo de Comissão'),
),
migrations.AlterField(
model_name='reuniao',
name='url_audio',
field=models.URLField(blank=True, max_length=150, verbose_name='URL do Arquivo de Áudio (Formatos MP3 / AAC)'),
),
migrations.AlterField(
model_name='reuniao',
name='url_video',
field=models.URLField(blank=True, max_length=150, verbose_name='URL do Arquivo de Vídeo (Formatos MP4 / FLV / WebM)'),
),
]

10
sapl/comissoes/models.py

@ -206,7 +206,7 @@ class Reuniao(models.Model):
tipo = models.ForeignKey( tipo = models.ForeignKey(
TipoComissao, TipoComissao,
on_delete=models.PROTECT, on_delete=models.PROTECT,
verbose_name=_('Tipo')) verbose_name=_('Tipo de Comissão'))
numero = models.PositiveIntegerField(verbose_name=_('Número')) numero = models.PositiveIntegerField(verbose_name=_('Número'))
nome = models.CharField( nome = models.CharField(
max_length=100, verbose_name=_('Nome da Reunião')) max_length=100, verbose_name=_('Nome da Reunião'))
@ -218,15 +218,15 @@ class Reuniao(models.Model):
hora_fim = models.CharField( hora_fim = models.CharField(
max_length=5, verbose_name=_('Horário de Término (hh:mm)')) max_length=5, verbose_name=_('Horário de Término (hh:mm)'))
local_reuniao = models.CharField( local_reuniao = models.CharField(
max_length=100, blank=True, verbose_name=_('Local Reunião')) max_length=100, blank=True, verbose_name=_('Local da Reunião'))
observacao = models.CharField( observacao = models.TextField(
max_length=150, blank=True, verbose_name=_('Observação')) max_length=150, blank=True, verbose_name=_('Observação'))
url_audio = models.URLField( url_audio = models.URLField(
max_length=150, blank=True, max_length=150, blank=True,
verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)')) verbose_name=_('URL do Arquivo de Áudio (Formatos MP3 / AAC)'))
url_video = models.URLField( url_video = models.URLField(
max_length=150, blank=True, max_length=150, blank=True,
verbose_name=_('URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)')) verbose_name=_('URL do Arquivo de Vídeo (Formatos MP4 / FLV / WebM)'))
upload_pauta = models.FileField( upload_pauta = models.FileField(
blank=True, null=True, blank=True, null=True,
upload_to=pauta_upload_path, upload_to=pauta_upload_path,

4
sapl/templates/comissoes/layouts.yaml

@ -47,10 +47,10 @@ ParticipacaoEdit:
Reuniao: Reuniao:
{% trans 'Reunião' %}: {% trans 'Reunião' %}:
- periodo numero tipo - periodo numero tipo
- nome tema - nome tema local_reuniao
- data hora_inicio hora_fim - data hora_inicio hora_fim
- url_video url_audio - url_video url_audio
- local_reuniao:4 observacao - observacao
- upload_pauta upload_ata upload_anexo - upload_pauta upload_ata upload_anexo
- comissao - comissao

Loading…
Cancel
Save