Browse Source

Corrige a model e o layout da tela de criação

pull/1614/head
Mariana Mendes 8 years ago
parent
commit
9298f0941d
  1. 2
      sapl/comissoes/forms.py
  2. 25
      sapl/comissoes/migrations/0007_auto_20180227_1025.py
  3. 4
      sapl/comissoes/models.py
  4. 6
      sapl/comissoes/views.py
  5. 6
      sapl/templates/comissoes/layouts.yaml

2
sapl/comissoes/forms.py

@ -195,5 +195,5 @@ class ReuniaoForm(ModelForm):
raise ValidationError(msg)
return self.cleaned_data
return self.cleaned_data

25
sapl/comissoes/migrations/0007_auto_20180227_1025.py

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.13 on 2018-02-27 13:25
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('comissoes', '0006_auto_20180227_0842'),
]
operations = [
migrations.AlterField(
model_name='reuniao',
name='hora_fim',
field=models.CharField(max_length=5, verbose_name='Horário de Término (hh:mm)'),
),
migrations.AlterField(
model_name='reuniao',
name='hora_inicio',
field=models.CharField(max_length=5, verbose_name='Horário de Início (hh:mm)'),
),
]

4
sapl/comissoes/models.py

@ -223,9 +223,9 @@ class Reuniao(models.Model):
max_length=100, verbose_name=_('Tema da Reunião'))
data = models.DateField(verbose_name=_('Data'))
hora_inicio = models.CharField(
max_length=5, verbose_name=_('Horário (hh:mm)'))
max_length=5, verbose_name=_('Horário de Início (hh:mm)'))
hora_fim = models.CharField(
max_length=5, verbose_name=_('Horário (hh:mm)'))
max_length=5, verbose_name=_('Horário de Término (hh:mm)'))
local_reuniao = models.CharField(
max_length=100, blank=True, verbose_name=_('Local Reunião'))
observacao = models.CharField(

6
sapl/comissoes/views.py

@ -153,16 +153,14 @@ class ReuniaoCrud(MasterDetailCrud):
public = [RP_LIST, RP_DETAIL, ]
class BaseMixin(MasterDetailCrud.BaseMixin):
list_field_names = ['data', 'comissao', 'tipo']
list_field_names = ['nome', 'tema', 'comissao']
@property
def list_url(self):
return ''
class ListView(MasterDetailCrud.ListView):
paginate_by = None
paginate_by = 10
class UpdateView(MasterDetailCrud.UpdateView):
form_class = ReuniaoForm

6
sapl/templates/comissoes/layouts.yaml

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

Loading…
Cancel
Save