Browse Source

add orgao como fk para normas

pull/3357/head
Leandro Roberto 5 years ago
parent
commit
5bac25bda5
  1. 18
      sapl/base/migrations/0045_auto_20210301_1537.py
  2. 20
      sapl/norma/migrations/0038_normajuridica_orgao.py
  3. 5
      sapl/norma/models.py
  4. 5
      sapl/templates/menu_tabelas_auxiliares.yaml

18
sapl/base/migrations/0045_auto_20210301_1537.py

@ -0,0 +1,18 @@
# Generated by Django 2.2.13 on 2021-03-01 18:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('base', '0044_appconfig_sapl_as_sapn'),
]
operations = [
migrations.AlterField(
model_name='appconfig',
name='sapl_as_sapn',
field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=False, verbose_name='Utilizar SAPL como SAPN?'),
),
]

20
sapl/norma/migrations/0038_normajuridica_orgao.py

@ -0,0 +1,20 @@
# Generated by Django 2.2.13 on 2021-03-01 18:37
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('materia', '0077_auto_20210209_1047'),
('norma', '0037_auto_20210107_1408'),
]
operations = [
migrations.AddField(
model_name='normajuridica',
name='orgao',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='materia.Orgao', verbose_name='Órgão'),
),
]

5
sapl/norma/models.py

@ -8,7 +8,7 @@ import reversion
from sapl.base.models import Autor from sapl.base.models import Autor
from sapl.compilacao.models import TextoArticulado from sapl.compilacao.models import TextoArticulado
from sapl.materia.models import MateriaLegislativa from sapl.materia.models import MateriaLegislativa, Orgao
from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES,
restringe_tipos_de_arquivo_txt, restringe_tipos_de_arquivo_txt,
texto_upload_path, texto_upload_path,
@ -151,6 +151,9 @@ class NormaJuridica(models.Model):
materia = models.ForeignKey( materia = models.ForeignKey(
MateriaLegislativa, blank=True, null=True, MateriaLegislativa, blank=True, null=True,
on_delete=models.PROTECT, verbose_name=_('Matéria')) on_delete=models.PROTECT, verbose_name=_('Matéria'))
orgao = models.ForeignKey(
Orgao, blank=True, null=True,
on_delete=models.PROTECT, verbose_name=_('Órgão'))
numero = models.CharField( numero = models.CharField(
max_length=8, max_length=8,
verbose_name=_('Número')) verbose_name=_('Número'))

5
sapl/templates/menu_tabelas_auxiliares.yaml

@ -187,6 +187,11 @@
- title: {% trans 'Adicionar Assunto de Norma Jurídica' %} - title: {% trans 'Adicionar Assunto de Norma Jurídica' %}
url: sapl.norma:assuntonorma_create url: sapl.norma:assuntonorma_create
css_class: btn btn-link css_class: btn btn-link
{% if sapl_as_sapn %}
- title: {% trans 'Órgão' %}
url: sapl.materia:orgao_list
css_class: btn btn-link
{% endif %}
- title: {% trans 'Módulo Textos Articulados' %} - title: {% trans 'Módulo Textos Articulados' %}
css_class: head_title css_class: head_title

Loading…
Cancel
Save