SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fixes #1589

pull/1607/head
Edward Ribeiro 7 years ago
committed by Leandro Roberto da Silva
parent
2fa01839a2
commit
5f87c02003
4 changed files with 148 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      sapl/materia/migrations/0018_auto_20171113_1339.py
  2. 38
      sapl/materia/models.py
  3. 26
      sapl/norma/migrations/0009_auto_20171113_1339.py
  4. 4
      sapl/norma/models.py

101
sapl/materia/migrations/0018_auto_20171113_1339.py
View File

@ -0,0 +1,101 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.11 on 2017-11-13 15:39
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('materia', '0017_auto_20170918_1257'),
]
operations = [
migrations.AlterField(
model_name='anexada',
name='materia_anexada',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materia_anexada_set', to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='anexada',
name='materia_principal',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materia_principal_set', to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='autoria',
name='autor',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='base.Autor', verbose_name='Autor'),
),
migrations.AlterField(
model_name='autoria',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa', verbose_name='Matéria Legislativa'),
),
migrations.AlterField(
model_name='despachoinicial',
name='comissao',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comissoes.Comissao'),
),
migrations.AlterField(
model_name='despachoinicial',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='documentoacessorio',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='materiaassunto',
name='assunto',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.AssuntoMateria', verbose_name='Assunto'),
),
migrations.AlterField(
model_name='materiaassunto',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa', verbose_name='Matéria'),
),
migrations.AlterField(
model_name='numeracao',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='parecer',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='parecer',
name='relatoria',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.Relatoria'),
),
migrations.AlterField(
model_name='proposicao',
name='materia_de_vinculo',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='proposicao_set', to='materia.MateriaLegislativa', verbose_name='Matéria anexadora'),
),
migrations.AlterField(
model_name='relatoria',
name='comissao',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='comissoes.Comissao', verbose_name='Comissão'),
),
migrations.AlterField(
model_name='relatoria',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='relatoria',
name='parlamentar',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parlamentares.Parlamentar', verbose_name='Parlamentar'),
),
migrations.AlterField(
model_name='tramitacao',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
]

38
sapl/materia/models.py
View File

@ -287,9 +287,9 @@ class MateriaLegislativa(models.Model):
class Autoria(models.Model): class Autoria(models.Model):
autor = models.ForeignKey(Autor, autor = models.ForeignKey(Autor,
verbose_name=_('Autor'), verbose_name=_('Autor'),
on_delete=models.PROTECT) on_delete=models.CASCADE)
materia = models.ForeignKey( materia = models.ForeignKey(
MateriaLegislativa, on_delete=models.PROTECT, MateriaLegislativa, on_delete=models.CASCADE,
verbose_name=_('Matéria Legislativa')) verbose_name=_('Matéria Legislativa'))
primeiro_autor = models.BooleanField(verbose_name=_('Primeiro Autor'), primeiro_autor = models.BooleanField(verbose_name=_('Primeiro Autor'),
choices=YES_NO_CHOICES, choices=YES_NO_CHOICES,
@ -302,14 +302,14 @@ class Autoria(models.Model):
ordering = ('-primeiro_autor', 'autor__nome') ordering = ('-primeiro_autor', 'autor__nome')
def __str__(self): def __str__(self):
return _('%(autor)s - %(materia)s') % { return _('Autoria: %(autor)s - %(materia)s') % {
'autor': self.autor, 'materia': self.materia} 'autor': self.autor, 'materia': self.materia}
@reversion.register() @reversion.register()
class AcompanhamentoMateria(models.Model): class AcompanhamentoMateria(models.Model):
usuario = models.CharField(max_length=50) usuario = models.CharField(max_length=50)
materia = models.ForeignKey(MateriaLegislativa) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
email = models.EmailField( email = models.EmailField(
max_length=100, verbose_name=_('E-mail')) max_length=100, verbose_name=_('E-mail'))
data_cadastro = models.DateField(auto_now_add=True) data_cadastro = models.DateField(auto_now_add=True)
@ -330,10 +330,10 @@ class AcompanhamentoMateria(models.Model):
class Anexada(models.Model): class Anexada(models.Model):
materia_principal = models.ForeignKey( materia_principal = models.ForeignKey(
MateriaLegislativa, related_name='materia_principal_set', MateriaLegislativa, related_name='materia_principal_set',
on_delete=models.PROTECT) on_delete=models.CASCADE)
materia_anexada = models.ForeignKey( materia_anexada = models.ForeignKey(
MateriaLegislativa, related_name='materia_anexada_set', MateriaLegislativa, related_name='materia_anexada_set',
on_delete=models.PROTECT) on_delete=models.CASCADE)
data_anexacao = models.DateField(verbose_name=_('Data Anexação')) data_anexacao = models.DateField(verbose_name=_('Data Anexação'))
data_desanexacao = models.DateField( data_desanexacao = models.DateField(
blank=True, null=True, verbose_name=_('Data Desanexação')) blank=True, null=True, verbose_name=_('Data Desanexação'))
@ -372,8 +372,8 @@ class DespachoInicial(models.Model):
# TODO M2M? # TODO M2M?
# TODO Despachos não são necessáriamente comissoes, podem ser outros # TODO Despachos não são necessáriamente comissoes, podem ser outros
# órgãos, ex: procuradorias # órgãos, ex: procuradorias
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
comissao = models.ForeignKey(Comissao, on_delete=models.PROTECT) comissao = models.ForeignKey(Comissao, on_delete=models.CASCADE)
class Meta: class Meta:
verbose_name = _('Despacho Inicial') verbose_name = _('Despacho Inicial')
@ -407,7 +407,7 @@ class TipoDocumento(models.Model):
@reversion.register() @reversion.register()
class DocumentoAcessorio(models.Model): class DocumentoAcessorio(models.Model):
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
tipo = models.ForeignKey(TipoDocumento, tipo = models.ForeignKey(TipoDocumento,
on_delete=models.PROTECT, on_delete=models.PROTECT,
verbose_name=_('Tipo')) verbose_name=_('Tipo'))
@ -477,11 +477,11 @@ class MateriaAssunto(models.Model):
# TODO M2M ?? # TODO M2M ??
assunto = models.ForeignKey( assunto = models.ForeignKey(
AssuntoMateria, AssuntoMateria,
on_delete=models.PROTECT, on_delete=models.CASCADE,
verbose_name=_('Assunto')) verbose_name=_('Assunto'))
materia = models.ForeignKey( materia = models.ForeignKey(
MateriaLegislativa, MateriaLegislativa,
on_delete=models.PROTECT, on_delete=models.CASCADE,
verbose_name=_('Matéria')) verbose_name=_('Matéria'))
class Meta: class Meta:
@ -495,7 +495,7 @@ class MateriaAssunto(models.Model):
@reversion.register() @reversion.register()
class Numeracao(models.Model): class Numeracao(models.Model):
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
tipo_materia = models.ForeignKey( tipo_materia = models.ForeignKey(
TipoMateriaLegislativa, TipoMateriaLegislativa,
on_delete=models.PROTECT, on_delete=models.PROTECT,
@ -564,9 +564,9 @@ class TipoFimRelatoria(models.Model):
@reversion.register() @reversion.register()
class Relatoria(models.Model): class Relatoria(models.Model):
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
parlamentar = models.ForeignKey(Parlamentar, parlamentar = models.ForeignKey(Parlamentar,
on_delete=models.PROTECT, on_delete=models.CASCADE,
verbose_name=_('Parlamentar')) verbose_name=_('Parlamentar'))
tipo_fim_relatoria = models.ForeignKey( tipo_fim_relatoria = models.ForeignKey(
TipoFimRelatoria, TipoFimRelatoria,
@ -576,7 +576,7 @@ class Relatoria(models.Model):
verbose_name=_('Motivo Fim Relatoria')) verbose_name=_('Motivo Fim Relatoria'))
comissao = models.ForeignKey( comissao = models.ForeignKey(
Comissao, blank=True, null=True, Comissao, blank=True, null=True,
on_delete=models.PROTECT, verbose_name=_('Comissão')) on_delete=models.CASCADE, verbose_name=_('Comissão'))
data_designacao_relator = models.DateField( data_designacao_relator = models.DateField(
verbose_name=_('Data Designação')) verbose_name=_('Data Designação'))
data_destituicao_relator = models.DateField( data_destituicao_relator = models.DateField(
@ -595,8 +595,8 @@ class Relatoria(models.Model):
@reversion.register() @reversion.register()
class Parecer(models.Model): class Parecer(models.Model):
relatoria = models.ForeignKey(Relatoria, on_delete=models.PROTECT) relatoria = models.ForeignKey(Relatoria, on_delete=models.CASCADE)
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
tipo_conclusao = models.CharField(max_length=3, blank=True) tipo_conclusao = models.CharField(max_length=3, blank=True)
tipo_apresentacao = models.CharField( tipo_apresentacao = models.CharField(
max_length=1, choices=TIPO_APRESENTACAO_CHOICES) max_length=1, choices=TIPO_APRESENTACAO_CHOICES)
@ -680,7 +680,7 @@ class Proposicao(models.Model):
# retire o comentário quando resolver # retire o comentário quando resolver
materia_de_vinculo = models.ForeignKey( materia_de_vinculo = models.ForeignKey(
MateriaLegislativa, blank=True, null=True, MateriaLegislativa, blank=True, null=True,
on_delete=models.PROTECT, on_delete=models.CASCADE,
verbose_name=_('Matéria anexadora'), verbose_name=_('Matéria anexadora'),
related_name=_('proposicao_set')) related_name=_('proposicao_set'))
@ -850,7 +850,7 @@ class Tramitacao(models.Model):
# bases tiverem sido corrigidas # bases tiverem sido corrigidas
null=True, null=True,
verbose_name=_('Status')) verbose_name=_('Status'))
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
data_tramitacao = models.DateField(verbose_name=_('Data Tramitação')) data_tramitacao = models.DateField(verbose_name=_('Data Tramitação'))
unidade_tramitacao_local = models.ForeignKey( unidade_tramitacao_local = models.ForeignKey(
UnidadeTramitacao, UnidadeTramitacao,

26
sapl/norma/migrations/0009_auto_20171113_1339.py
View File

@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.11 on 2017-11-13 15:39
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('norma', '0008_normajuridica_popula_tipo_vinculo_norma'),
]
operations = [
migrations.AlterField(
model_name='legislacaocitada',
name='materia',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materia.MateriaLegislativa'),
),
migrations.AlterField(
model_name='legislacaocitada',
name='norma',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='norma.NormaJuridica'),
),
]

4
sapl/norma/models.py
View File

@ -174,8 +174,8 @@ class NormaJuridica(models.Model):
@reversion.register() @reversion.register()
class LegislacaoCitada(models.Model): class LegislacaoCitada(models.Model):
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.PROTECT) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
norma = models.ForeignKey(NormaJuridica, on_delete=models.PROTECT) norma = models.ForeignKey(NormaJuridica, on_delete=models.CASCADE)
disposicoes = models.CharField( disposicoes = models.CharField(
max_length=15, blank=True, verbose_name=_('Disposição')) max_length=15, blank=True, verbose_name=_('Disposição'))
parte = models.CharField( parte = models.CharField(

Write Preview
Loading…
Cancel
Save