Browse Source

Alteração de forms.py, models.py e views.py de acordo com mudanças solicitadas.

pull/2319/head
AndreSouto 7 years ago
parent
commit
6cf2bca798
  1. 10
      sapl/audiencia/forms.py
  2. 28
      sapl/audiencia/migrations/0008_auto_20181023_1051.py
  3. 19
      sapl/audiencia/migrations/0009_remove_anexoaudienciapublica_indexacao.py
  4. 11
      sapl/audiencia/models.py
  5. 4
      sapl/audiencia/views.py
  6. 1
      sapl/templates/audiencia/layouts.yaml

10
sapl/audiencia/forms.py

@ -112,19 +112,13 @@ class AnexoAudienciaPublicaForm(forms.ModelForm):
class Meta:
model = AnexoAudienciaPublica
fields = ['nome',
'data',
'arquivo',
fields = ['arquivo',
'assunto']
widgets = {
'data': forms.DateInput(format='%d/%m/%Y')
}
def __init__(self, *args, **kwargs):
row1 = to_row(
[('nome', 4), ('data', 4), ('arquivo', 4)])
[('arquivo', 4)])
row2 = to_row(
[('assunto', 12)])

28
sapl/audiencia/migrations/0008_auto_20181023_1051.py

@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.8 on 2018-10-23 13:51
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('audiencia', '0007_anexoaudienciapublica'),
]
operations = [
migrations.AlterModelOptions(
name='anexoaudienciapublica',
options={'verbose_name': 'Anexo de Documento Acessório', 'verbose_name_plural': 'Anexo de Documentos Acessórios'},
),
migrations.RemoveField(
model_name='anexoaudienciapublica',
name='nome',
),
migrations.AlterField(
model_name='anexoaudienciapublica',
name='data',
field=models.DateField(auto_now=True, null=True),
),
]

19
sapl/audiencia/migrations/0009_remove_anexoaudienciapublica_indexacao.py

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.8 on 2018-10-23 13:55
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('audiencia', '0008_auto_20181023_1051'),
]
operations = [
migrations.RemoveField(
model_name='anexoaudienciapublica',
name='indexacao',
),
]

11
sapl/audiencia/models.py

@ -1,5 +1,6 @@
import reversion
from django.db import models
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from model_utils import Choices
from sapl.materia.models import MateriaLegislativa
@ -153,23 +154,21 @@ class AudienciaPublica(models.Model):
class AnexoAudienciaPublica(models.Model):
audiencia = models.ForeignKey(AudienciaPublica,
on_delete=models.PROTECT)
nome = models.CharField(max_length=30, verbose_name=_('Nome'))
arquivo = models.FileField(
blank=True,
null=True,
upload_to=texto_upload_path,
verbose_name=_('Arquivo'))
data = models.DateField(blank=True, null=True, verbose_name=_('Data'))
data = models.DateField(auto_now=timezone.now,blank=True, null=True)
assunto = models.TextField(
blank=True, verbose_name=_('Assunto'))
indexacao = models.TextField(blank=True)
class Meta:
verbose_name = _('Documento Acessório')
verbose_name_plural = _('Documentos Acessórios')
verbose_name = _('Anexo de Documento Acessório')
verbose_name_plural = _('Anexo de Documentos Acessórios')
def __str__(self):
return self.nome
return self.assunto
def delete(self, using=None, keep_parents=False):
if self.arquivo:

4
sapl/audiencia/views.py

@ -88,9 +88,7 @@ class AnexoAudienciaPublicaCrud(MasterDetailCrud):
help_topic = 'numeracao_docsacess'
class BaseMixin(MasterDetailCrud.BaseMixin):
list_field_names = ['nome',
'data',
'assunto']
list_field_names = ['assunto']
class CreateView(MasterDetailCrud.CreateView):
form_class = AnexoAudienciaPublicaForm

1
sapl/templates/audiencia/layouts.yaml

@ -25,6 +25,5 @@ AudienciaPublicaDetail:
AnexoAudienciaPublica:
{% trans 'Documento Acessório' %}:
- nome data
- assunto
- arquivo
Loading…
Cancel
Save