diff --git a/comissoes/models.py b/comissoes/models.py index c1da014e1..ae15565b2 100644 --- a/comissoes/models.py +++ b/comissoes/models.py @@ -7,7 +7,7 @@ class TipoComissao(models.Model): nome_tipo_comissao = models.CharField(max_length=50) sgl_natureza_comissao = models.CharField(max_length=1) sgl_tipo_comissao = models.CharField(max_length=10) - des_dispositivo_regimental = models.CharField(max_length=50, blank=True, null=True) + descricao_dispositivo_regimental = models.CharField(max_length=50, blank=True, null=True) class Comissao(models.Model): @@ -26,7 +26,7 @@ class Comissao(models.Model): endereco_secretaria = models.CharField(max_length=100, blank=True, null=True) num_tel_secretaria = models.CharField(max_length=15, blank=True, null=True) num_fax_secretaria = models.CharField(max_length=15, blank=True, null=True) - des_agenda_reuniao = models.CharField(max_length=100, blank=True, null=True) + descricao_agenda_reuniao = models.CharField(max_length=100, blank=True, null=True) loc_reuniao = models.CharField(max_length=100, blank=True, null=True) txt_finalidade = models.TextField(blank=True, null=True) endereco_email = models.CharField(max_length=100, blank=True, null=True) @@ -51,5 +51,5 @@ class ComposicaoComissao(models.Model): ind_titular = models.IntegerField() data_designacao = models.DateField() data_desligamento = models.DateField(blank=True, null=True) - des_motivo_desligamento = models.CharField(max_length=150, blank=True, null=True) + descricao_motivo_desligamento = models.CharField(max_length=150, blank=True, null=True) obs_composicao = models.CharField(max_length=150, blank=True, null=True) diff --git a/materia/models.py b/materia/models.py index 0de64ec4b..70fdd01cb 100644 --- a/materia/models.py +++ b/materia/models.py @@ -6,13 +6,13 @@ from parlamentares.models import Parlamentar, Partido class TipoMateriaLegislativa(models.Model): sgl_tipo_materia = models.CharField(max_length=5) - des_tipo_materia = models.CharField(max_length=50) + descricao_tipo_materia = models.CharField(max_length=50) ind_num_automatica = models.IntegerField() quorum_minimo_votacao = models.IntegerField() class RegimeTramitacao(models.Model): - des_regime_tramitacao = models.CharField(max_length=50) + descricao_regime_tramitacao = models.CharField(max_length=50) class Origem(models.Model): @@ -39,7 +39,7 @@ class MateriaLegislativa(models.Model): data_fim_prazo = models.DateField(blank=True, null=True) ind_tramitacao = models.IntegerField() ind_polemica = models.IntegerField(blank=True, null=True) - des_objeto = models.CharField(max_length=150, blank=True, null=True) + descricao_objeto = models.CharField(max_length=150, blank=True, null=True) ind_complementar = models.IntegerField(blank=True, null=True) txt_ementa = models.TextField() txt_indexacao = models.TextField(blank=True, null=True) @@ -65,12 +65,12 @@ class Anexada(models.Model): class AssuntoMateria(models.Model): - des_assunto = models.CharField(max_length=200) - des_dispositivo = models.CharField(max_length=50) + descricao_assunto = models.CharField(max_length=200) + descricao_dispositivo = models.CharField(max_length=50) class TipoAutor(models.Model): - des_tipo_autor = models.CharField(max_length=50) + descricao_tipo_autor = models.CharField(max_length=50) class Autor(models.Model): @@ -79,7 +79,7 @@ class Autor(models.Model): parlamentar = models.ForeignKey(Parlamentar, blank=True, null=True) tipo = models.ForeignKey(TipoAutor) nome_autor = models.CharField(max_length=50, blank=True, null=True) - des_cargo = models.CharField(max_length=50, blank=True, null=True) + descricao_cargo = models.CharField(max_length=50, blank=True, null=True) col_username = models.CharField(max_length=50, blank=True, null=True) @@ -96,7 +96,7 @@ class DespachoInicial(models.Model): class TipoDocumento(models.Model): - des_tipo_documento = models.CharField(max_length=50) + descricao_tipo_documento = models.CharField(max_length=50) class DocumentoAcessorio(models.Model): @@ -132,7 +132,7 @@ class Orgao(models.Model): class TipoFimRelatoria(models.Model): - des_fim_relatoria = models.CharField(max_length=50) + descricao_fim_relatoria = models.CharField(max_length=50) class Relatoria(models.Model): @@ -153,7 +153,7 @@ class Parecer(models.Model): class TipoProposicao(models.Model): - des_tipo_proposicao = models.CharField(max_length=50) + descricao_tipo_proposicao = models.CharField(max_length=50) ind_mat_ou_doc = models.CharField(max_length=1) tipo_mat_ou_doc = models.IntegerField() nome_modelo = models.CharField(max_length=50) @@ -174,7 +174,7 @@ class Proposicao(models.Model): class StatusTramitacao(models.Model): sgl_status = models.CharField(max_length=10) - des_status = models.CharField(max_length=60) + descricao_status = models.CharField(max_length=60) ind_fim_tramitacao = models.IntegerField() ind_retorno_tramitacao = models.IntegerField() diff --git a/norma/models.py b/norma/models.py index 883bb5634..6f1516ac2 100644 --- a/norma/models.py +++ b/norma/models.py @@ -4,14 +4,14 @@ from materia.models import MateriaLegislativa class AssuntoNorma(models.Model): - des_assunto = models.CharField(max_length=50) - des_estendida = models.CharField(max_length=250, blank=True, null=True) + descricao_assunto = models.CharField(max_length=50) + descricao_estendida = models.CharField(max_length=250, blank=True, null=True) class TipoNormaJuridica(models.Model): voc_lexml = models.CharField(max_length=50, blank=True, null=True) sgl_tipo_norma = models.CharField(max_length=3) - des_tipo_norma = models.CharField(max_length=50) + descricao_tipo_norma = models.CharField(max_length=50) class NormaJuridica(models.Model): @@ -22,7 +22,7 @@ class NormaJuridica(models.Model): tipo_esfera_federacao = models.CharField(max_length=1) data_norma = models.DateField(blank=True, null=True) data_publicacao = models.DateField(blank=True, null=True) - des_veiculo_publicacao = models.CharField(max_length=30, blank=True, null=True) + descricao_veiculo_publicacao = models.CharField(max_length=30, blank=True, null=True) num_pag_inicio_publ = models.IntegerField(blank=True, null=True) num_pag_fim_publ = models.IntegerField(blank=True, null=True) txt_ementa = models.TextField() @@ -38,18 +38,18 @@ class NormaJuridica(models.Model): class LegislacaoCitada(models.Model): materia = models.ForeignKey(MateriaLegislativa) norma = models.ForeignKey(NormaJuridica) - des_disposicoes = models.CharField(max_length=15, blank=True, null=True) - des_parte = models.CharField(max_length=8, blank=True, null=True) - des_livro = models.CharField(max_length=7, blank=True, null=True) - des_titulo = models.CharField(max_length=7, blank=True, null=True) - des_capitulo = models.CharField(max_length=7, blank=True, null=True) - des_secao = models.CharField(max_length=7, blank=True, null=True) - des_subsecao = models.CharField(max_length=7, blank=True, null=True) - des_artigo = models.CharField(max_length=4, blank=True, null=True) - des_paragrafo = models.CharField(max_length=3, blank=True, null=True) - des_inciso = models.CharField(max_length=10, blank=True, null=True) - des_alinea = models.CharField(max_length=3, blank=True, null=True) - des_item = models.CharField(max_length=3, blank=True, null=True) + descricao_disposicoes = models.CharField(max_length=15, blank=True, null=True) + descricao_parte = models.CharField(max_length=8, blank=True, null=True) + descricao_livro = models.CharField(max_length=7, blank=True, null=True) + descricao_titulo = models.CharField(max_length=7, blank=True, null=True) + descricao_capitulo = models.CharField(max_length=7, blank=True, null=True) + descricao_secao = models.CharField(max_length=7, blank=True, null=True) + descricao_subsecao = models.CharField(max_length=7, blank=True, null=True) + descricao_artigo = models.CharField(max_length=4, blank=True, null=True) + descricao_paragrafo = models.CharField(max_length=3, blank=True, null=True) + descricao_inciso = models.CharField(max_length=10, blank=True, null=True) + descricao_alinea = models.CharField(max_length=3, blank=True, null=True) + descricao_item = models.CharField(max_length=3, blank=True, null=True) class VinculoNormaJuridica(models.Model): diff --git a/parlamentares/models.py b/parlamentares/models.py index 9c52b9af7..17f027262 100644 --- a/parlamentares/models.py +++ b/parlamentares/models.py @@ -48,7 +48,7 @@ class NivelInstrucao(models.Model): class SituacaoMilitar(models.Model): - des_tipo_situacao = models.CharField(max_length=50) + descricao_tipo_situacao = models.CharField(max_length=50) class Parlamentar(models.Model): @@ -73,14 +73,14 @@ class Parlamentar(models.Model): endereco_web = models.CharField(max_length=100, blank=True, null=True) nome_profissao = models.CharField(max_length=50, blank=True, null=True) endereco_email = models.CharField(max_length=100, blank=True, null=True) - des_local_atuacao = models.CharField(max_length=100, blank=True, null=True) + descricao_local_atuacao = models.CharField(max_length=100, blank=True, null=True) ind_ativo = models.IntegerField() txt_biografia = models.TextField(blank=True, null=True) ind_unid_deliberativa = models.IntegerField() class TipoDependente(models.Model): - des_tipo_dependente = models.CharField(max_length=50) + descricao_tipo_dependente = models.CharField(max_length=50) class Dependente(models.Model): @@ -102,10 +102,10 @@ class Filiacao(models.Model): class TipoAfastamento(models.Model): - des_afastamento = models.CharField(max_length=50) + descricao_afastamento = models.CharField(max_length=50) ind_afastamento = models.IntegerField() ind_fim_mandato = models.IntegerField() - des_dispositivo = models.CharField(max_length=50, blank=True, null=True) + descricao_dispositivo = models.CharField(max_length=50, blank=True, null=True) class Mandato(models.Model): diff --git a/protocoloadm/models.py b/protocoloadm/models.py index 97e8e176a..4232b6478 100644 --- a/protocoloadm/models.py +++ b/protocoloadm/models.py @@ -5,7 +5,7 @@ from materia.models import Autor, TipoMateriaLegislativa class TipoDocumentoAdministrativo(models.Model): sgl_tipo_documento = models.CharField(max_length=5) - des_tipo_documento = models.CharField(max_length=50) + descricao_tipo_documento = models.CharField(max_length=50) class DocumentoAdministrativo(models.Model): @@ -58,7 +58,7 @@ class Protocolo(models.Model): class StatusTramitacaoAdministrativo(models.Model): sgl_status = models.CharField(max_length=10) - des_status = models.CharField(max_length=60) + descricao_status = models.CharField(max_length=60) ind_fim_tramitacao = models.IntegerField() ind_retorno_tramitacao = models.IntegerField()