Browse Source

impl field resumo em NormaRelacionada

pull/3585/head
LeandroJatai 2 years ago
parent
commit
8adfe1170c
  1. 11
      sapl/norma/forms.py
  2. 18
      sapl/norma/migrations/0040_normarelacionada_resumo.py
  3. 5
      sapl/norma/models.py
  4. 5
      sapl/norma/views.py
  5. 2
      sapl/templates/norma/layouts.yaml

11
sapl/norma/forms.py

@ -1,6 +1,5 @@
import logging
import django_filters
from crispy_forms.layout import (Button, Fieldset, HTML, Layout)
from django import forms
from django.contrib.postgres.search import SearchVector
@ -9,6 +8,7 @@ from django.db.models import Q
from django.forms import ModelChoiceField, ModelForm, widgets
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
import django_filters
from sapl.base.models import TipoAutor
from sapl.crispy_layout_mixin import form_actions, SaplFormHelper, to_row
@ -18,6 +18,7 @@ from sapl.parlamentares.models import Partido
from sapl.utils import (autor_label, autor_modal, ANO_CHOICES, choice_anos_com_normas,
FileFieldCheckMixin, FilterOverridesMetaMixin,
NormaPesquisaOrderingFilter, validar_arquivo)
from .models import (AnexoNormaJuridica, AssuntoNorma, AutoriaNorma,
NormaJuridica, NormaRelacionada, TipoNormaJuridica)
@ -308,7 +309,6 @@ class AutoriaNormaForm(ModelForm):
if not self.instance:
self.fields['autor'].choices = []
class Meta:
model = AutoriaNorma
fields = ['tipo_autor', 'autor',
@ -397,7 +397,12 @@ class NormaRelacionadaForm(ModelForm):
class Meta:
model = NormaRelacionada
fields = ['orgao', 'tipo', 'numero', 'ano', 'ementa', 'tipo_vinculo']
fields = ['orgao', 'tipo', 'numero', 'ano',
'resumo', 'ementa', 'tipo_vinculo']
widgets = {
'resumo': forms.Textarea(
attrs={'id': 'texto-rico'})}
def __init__(self, *args, **kwargs):
super(NormaRelacionadaForm, self).__init__(*args, **kwargs)

18
sapl/norma/migrations/0040_normarelacionada_resumo.py

@ -0,0 +1,18 @@
# Generated by Django 2.2.28 on 2022-07-31 23:02
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('norma', '0039_auto_20220321_0934'),
]
operations = [
migrations.AddField(
model_name='normarelacionada',
name='resumo',
field=models.TextField(blank=True, default='', verbose_name='Resumo'),
),
]

5
sapl/norma/models.py

@ -407,6 +407,11 @@ class NormaRelacionada(models.Model):
TipoVinculoNormaJuridica,
on_delete=models.PROTECT,
verbose_name=_('Tipo de Vínculo'))
resumo = models.TextField(
blank=True,
default="",
verbose_name=_('Resumo'),
)
class Meta:
verbose_name = _('Norma Relacionada')

5
sapl/norma/views.py

@ -103,7 +103,8 @@ class PesquisarAssuntoNormaView(FilterView):
url = ''
if 'assunto' in self.request.META['QUERY_STRING'] or\
'page' in self.request.META['QUERY_STRING']: resultados = self.object_list
'page' in self.request.META['QUERY_STRING']:
resultados = self.object_list
else:
resultados = []
@ -125,7 +126,7 @@ class NormaRelacionadaCrud(MasterDetailCrud):
help_topic = 'norma_juridica'
class BaseMixin(MasterDetailCrud.BaseMixin):
list_field_names = ['norma_relacionada', 'tipo_vinculo']
list_field_names = ['norma_relacionada', 'tipo_vinculo', 'resujmo']
class CreateView(MasterDetailCrud.CreateView):
form_class = NormaRelacionadaForm

2
sapl/templates/norma/layouts.yaml

@ -65,11 +65,13 @@ NormaRelacionada:
- orgao tipo:4 numero:3 ano:2
- tipo_vinculo
- ementa
- resumo
NormaRelacionadaDetail:
{% trans 'Norma Relacionada' %}:
- norma_relacionada
- tipo_vinculo
- resumo
AutoriaNorma:
{% trans 'Autoria' %}:

Loading…
Cancel
Save