Browse Source

Fix #1566

pull/1750/head
Mariana Mendes 8 years ago
parent
commit
a652978efa
  1. 3
      sapl/comissoes/forms.py
  2. 2
      sapl/comissoes/models.py
  3. 18
      sapl/templates/comissoes/layouts.yaml
  4. 43
      sapl/templates/comissoes/reuniao_list.html

3
sapl/comissoes/forms.py

@ -12,9 +12,6 @@ from sapl.comissoes.models import (Comissao, Composicao, DocumentoAcessorio,
from sapl.parlamentares.models import Legislatura, Mandato, Parlamentar
class ParticipacaoCreateForm(forms.ModelForm):
parent_pk = forms.CharField(required=False) # widget=forms.HiddenInput())

2
sapl/comissoes/models.py

@ -292,7 +292,7 @@ class DocumentoAcessorio(models.Model):
data = models.DateField(blank=True, null=True, default=None, verbose_name=_('Data'))
autor = models.CharField(
max_length=50, blank=True, verbose_name=_('Autor'))
max_length=100, verbose_name=_('Autor'))
ementa = models.TextField(blank=True, verbose_name=_('Ementa'))
indexacao = models.TextField(blank=True)
arquivo = models.FileField(

18
sapl/templates/comissoes/layouts.yaml

@ -52,4 +52,20 @@ Reuniao:
- url_video url_audio
- observacao
- upload_pauta upload_ata upload_anexo
- comissao
- comissao
DocumentoAcessorio:
{% trans 'Documento Acessório' %}:
- nome data
- autor arquivo
- indexacao
- ementa
DocumentoAcessorioEdit:
{% trans 'Documento Acessório' %}:
- nome data
- autor arquivo
- indexacao
- ementa

43
sapl/templates/comissoes/reuniao_list.html

@ -1,43 +0,0 @@
{% extends "crud/list.html" %}
{% load i18n common_tags crispy_forms_tags%}
{% block base_content %}
{% if user.is_authenticated and perms.comissoes.add_reuniao %}
<div class="context-actions clearfix">
{% block actions %}
<div class="actions btn-group pull-right btn-group-lg" role="group">
{% if view.create_url %}
<a href="{{ view.create_url }}" class="btn btn-default">
{% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %}
</a>
{% endif %}
{% block more_buttons %}{% endblock more_buttons %}
</div>
{% endblock actions %}
</div>
{% endif %}
<fieldset class="form-group">
<legend>Selecione a Reunião</legend>
<form method="GET">
<select name="pk" class="form-control" onChange="form.submit();">
{% for r in reuniao_list %}
<option value="{{r.id}}" {% if reuniao_pk == r.id %} selected {% endif %}>
{{r}}
</option>
{% endfor %}
</select>
</form>
</fieldset>
<br/>
{% if user.is_authenticated and perms.comissoes.add_documentoacessorio %}
<div class="actions btn-group pull-right btn-group-lg" role="group">
<a href="{% url 'sapl.comissoes:documentoacessorio_create' reuniao_pk %}" class="btn btn-default">
Adicionar Documento Acessório em Reunião
</a>
</div>
{% endif %}
<br />
{% endblock base_content %}
Loading…
Cancel
Save