From 0b4dcd6252d9464bb965bdd40c87b4b4a38e2637 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 9 Jun 2015 16:05:07 -0300 Subject: [PATCH] Replace field prefix dat_ => data_ --- comissoes/models.py | 20 ++++++++++---------- materia/models.py | 32 ++++++++++++++++---------------- norma/models.py | 6 +++--- parlamentares/models.py | 16 ++++++++-------- protocoloadm/models.py | 16 ++++++++-------- sessao/models.py | 12 ++++++------ 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/comissoes/models.py b/comissoes/models.py index fd4bed20e..674a736ed 100644 --- a/comissoes/models.py +++ b/comissoes/models.py @@ -14,13 +14,13 @@ class Comissao(models.Model): tipo_comissao = models.ForeignKey(TipoComissao) nome_comissao = models.CharField(max_length=60) sgl_comissao = models.CharField(max_length=10) - dat_criacao = models.DateField() - dat_extincao = models.DateField(blank=True, null=True) + data_criacao = models.DateField() + data_extincao = models.DateField(blank=True, null=True) nome_apelido_temp = models.CharField(max_length=100, blank=True, null=True) - dat_instalacao_temp = models.DateField(blank=True, null=True) - dat_final_prevista_temp = models.DateField(blank=True, null=True) - dat_prorrogada_temp = models.DateField(blank=True, null=True) - dat_fim_comissao = models.DateField(blank=True, null=True) + data_instalacao_temp = models.DateField(blank=True, null=True) + data_final_prevista_temp = models.DateField(blank=True, null=True) + data_prorrogada_temp = models.DateField(blank=True, null=True) + data_fim_comissao = models.DateField(blank=True, null=True) nome_secretario = models.CharField(max_length=30, blank=True, null=True) num_tel_reuniao = models.CharField(max_length=15, blank=True, null=True) end_secretaria = models.CharField(max_length=100, blank=True, null=True) @@ -34,8 +34,8 @@ class Comissao(models.Model): class PeriodoCompComissao(models.Model): - dat_inicio_periodo = models.DateField() - dat_fim_periodo = models.DateField(blank=True, null=True) + data_inicio_periodo = models.DateField() + data_fim_periodo = models.DateField(blank=True, null=True) class CargoComissao(models.Model): @@ -49,7 +49,7 @@ class ComposicaoComissao(models.Model): periodo_comp = models.ForeignKey(PeriodoCompComissao) cargo = models.ForeignKey(CargoComissao) ind_titular = models.IntegerField() - dat_designacao = models.DateField() - dat_desligamento = models.DateField(blank=True, null=True) + data_designacao = models.DateField() + data_desligamento = models.DateField(blank=True, null=True) des_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 166f2bed5..16ec38176 100644 --- a/materia/models.py +++ b/materia/models.py @@ -25,18 +25,18 @@ class MateriaLegislativa(models.Model): num_protocolo = models.IntegerField(blank=True, null=True) num_ident_basica = models.IntegerField() ano_ident_basica = models.SmallIntegerField() - dat_apresentacao = models.DateField(blank=True, null=True) + data_apresentacao = models.DateField(blank=True, null=True) tipo_apresentacao = models.CharField(max_length=1, blank=True, null=True) regime_tramitacao = models.ForeignKey(RegimeTramitacao) - dat_publicacao = models.DateField(blank=True, null=True) + data_publicacao = models.DateField(blank=True, null=True) tipo_origem_externa = models.ForeignKey(TipoMateriaLegislativa, blank=True, null=True, related_name='+') num_origem_externa = models.CharField(max_length=5, blank=True, null=True) ano_origem_externa = models.SmallIntegerField(blank=True, null=True) - dat_origem_externa = models.DateField(blank=True, null=True) + data_origem_externa = models.DateField(blank=True, null=True) local_origem_externa = models.ForeignKey(Origem, blank=True, null=True) nome_apelido = models.CharField(max_length=50, blank=True, null=True) num_dias_prazo = models.IntegerField(blank=True, null=True) - dat_fim_prazo = models.DateField(blank=True, null=True) + 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) @@ -60,8 +60,8 @@ class AcompMateria(models.Model): class Anexada(models.Model): materia_principal = models.ForeignKey(MateriaLegislativa, related_name='+') materia_anexada = models.ForeignKey(MateriaLegislativa, related_name='+') - dat_anexacao = models.DateField() - dat_desanexacao = models.DateField(blank=True, null=True) + data_anexacao = models.DateField() + data_desanexacao = models.DateField(blank=True, null=True) class AssuntoMateria(models.Model): @@ -103,7 +103,7 @@ class DocumentoAcessorio(models.Model): materia = models.ForeignKey(MateriaLegislativa) tipo = models.ForeignKey(TipoDocumento) nome_documento = models.CharField(max_length=30) - dat_documento = models.DateField(blank=True, null=True) + data_documento = models.DateField(blank=True, null=True) nome_autor_documento = models.CharField(max_length=50, blank=True, null=True) txt_ementa = models.TextField(blank=True, null=True) txt_indexacao = models.TextField(blank=True, null=True) @@ -120,7 +120,7 @@ class Numeracao(models.Model): tipo_materia = models.ForeignKey(TipoMateriaLegislativa) num_materia = models.CharField(max_length=5) ano_materia = models.SmallIntegerField() - dat_materia = models.DateField(blank=True, null=True) + data_materia = models.DateField(blank=True, null=True) class Orgao(models.Model): @@ -140,8 +140,8 @@ class Relatoria(models.Model): parlamentar = models.ForeignKey(Parlamentar) tipo_fim_relatoria = models.ForeignKey(TipoFimRelatoria, blank=True, null=True) comissao = models.ForeignKey(Comissao, blank=True, null=True) - dat_desig_relator = models.DateField() - dat_destit_relator = models.DateField(blank=True, null=True) + data_desig_relator = models.DateField() + data_destit_relator = models.DateField(blank=True, null=True) class Parecer(models.Model): @@ -163,11 +163,11 @@ class Proposicao(models.Model): materia = models.ForeignKey(MateriaLegislativa, blank=True, null=True) autor = models.ForeignKey(Autor) tipo = models.ForeignKey(TipoProposicao) - dat_envio = models.DateTimeField() - dat_recebimento = models.DateTimeField(blank=True, null=True) + data_envio = models.DateTimeField() + data_recebimento = models.DateTimeField(blank=True, null=True) txt_descricao = models.CharField(max_length=100) cod_mat_ou_doc = models.IntegerField(blank=True, null=True) - dat_devolucao = models.DateTimeField(blank=True, null=True) + data_devolucao = models.DateTimeField(blank=True, null=True) txt_justif_devolucao = models.CharField(max_length=200, blank=True, null=True) num_proposicao = models.IntegerField(blank=True, null=True) @@ -188,12 +188,12 @@ class UnidadeTramitacao(models.Model): class Tramitacao(models.Model): status = models.ForeignKey(StatusTramitacao, blank=True, null=True) materia = models.ForeignKey(MateriaLegislativa) - dat_tramitacao = models.DateField(blank=True, null=True) + data_tramitacao = models.DateField(blank=True, null=True) unid_tram_local = models.ForeignKey(UnidadeTramitacao, blank=True, null=True, related_name='+') - dat_encaminha = models.DateField(blank=True, null=True) + data_encaminha = models.DateField(blank=True, null=True) unid_tram_dest = models.ForeignKey(UnidadeTramitacao, blank=True, null=True, related_name='+') ind_ult_tramitacao = models.IntegerField() ind_urgencia = models.IntegerField() sgl_turno = models.CharField(max_length=1, blank=True, null=True) txt_tramitacao = models.TextField(blank=True, null=True) - dat_fim_prazo = models.DateField(blank=True, null=True) + data_fim_prazo = models.DateField(blank=True, null=True) diff --git a/norma/models.py b/norma/models.py index 5bd74c419..883bb5634 100644 --- a/norma/models.py +++ b/norma/models.py @@ -20,8 +20,8 @@ class NormaJuridica(models.Model): num_norma = models.IntegerField() ano_norma = models.SmallIntegerField() tipo_esfera_federacao = models.CharField(max_length=1) - dat_norma = models.DateField(blank=True, null=True) - dat_publicacao = models.DateField(blank=True, null=True) + 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) num_pag_inicio_publ = models.IntegerField(blank=True, null=True) num_pag_fim_publ = models.IntegerField(blank=True, null=True) @@ -30,7 +30,7 @@ class NormaJuridica(models.Model): txt_observacao = models.TextField(blank=True, null=True) ind_complemento = models.IntegerField(blank=True, null=True) assunto = models.ForeignKey(AssuntoNorma) # XXX was a CharField (attention on migrate) - dat_vigencia = models.DateField(blank=True, null=True) + data_vigencia = models.DateField(blank=True, null=True) timestamp = models.DateTimeField() diff --git a/parlamentares/models.py b/parlamentares/models.py index 295e760a2..c8e08b0db 100644 --- a/parlamentares/models.py +++ b/parlamentares/models.py @@ -26,8 +26,8 @@ class Coligacao(models.Model): class Partido(models.Model): sgl_partido = models.CharField(max_length=9) nome_partido = models.CharField(max_length=50) - dat_criacao = models.DateField(blank=True, null=True) - dat_extincao = models.DateField(blank=True, null=True) + data_criacao = models.DateField(blank=True, null=True) + data_extincao = models.DateField(blank=True, null=True) class ComposicaoColigacao(models.Model): @@ -57,7 +57,7 @@ class Parlamentar(models.Model): nome_completo = models.CharField(max_length=50) nome_parlamentar = models.CharField(max_length=50, blank=True, null=True) sex_parlamentar = models.CharField(max_length=1) - dat_nascimento = models.DateField(blank=True, null=True) + data_nascimento = models.DateField(blank=True, null=True) num_cpf = models.CharField(max_length=14, blank=True, null=True) num_rg = models.CharField(max_length=15, blank=True, null=True) num_tit_eleitor = models.CharField(max_length=15, blank=True, null=True) @@ -88,17 +88,17 @@ class Dependente(models.Model): parlamentar = models.ForeignKey(Parlamentar) nome_dependente = models.CharField(max_length=50) sex_dependente = models.CharField(max_length=1) - dat_nascimento = models.DateField(blank=True, null=True) + data_nascimento = models.DateField(blank=True, null=True) num_cpf = models.CharField(max_length=14, blank=True, null=True) num_rg = models.CharField(max_length=15, blank=True, null=True) num_tit_eleitor = models.CharField(max_length=15, blank=True, null=True) class Filiacao(models.Model): - dat_filiacao = models.DateField() + data_filiacao = models.DateField() parlamentar = models.ForeignKey(Parlamentar) partido = models.ForeignKey(Partido) - dat_desfiliacao = models.DateField(blank=True, null=True) + data_desfiliacao = models.DateField(blank=True, null=True) class TipoAfastamento(models.Model): @@ -114,9 +114,9 @@ class Mandato(models.Model): legislatura = models.ForeignKey(Legislatura) coligacao = models.ForeignKey(Coligacao, blank=True, null=True) tipo_causa_fim_mandato = models.IntegerField(blank=True, null=True) - dat_fim_mandato = models.DateField(blank=True, null=True) + data_fim_mandato = models.DateField(blank=True, null=True) num_votos_recebidos = models.IntegerField(blank=True, null=True) - dat_expedicao_diploma = models.DateField(blank=True, null=True) + data_expedicao_diploma = models.DateField(blank=True, null=True) txt_observacao = models.TextField(blank=True, null=True) diff --git a/protocoloadm/models.py b/protocoloadm/models.py index d7daac1ac..2dd2b459d 100644 --- a/protocoloadm/models.py +++ b/protocoloadm/models.py @@ -12,12 +12,12 @@ class DocumentoAdministrativo(models.Model): tipo = models.ForeignKey(TipoDocumentoAdministrativo) num_documento = models.IntegerField() ano_documento = models.SmallIntegerField() - dat_documento = models.DateField() + data_documento = models.DateField() num_protocolo = models.IntegerField(blank=True, null=True) txt_interessado = models.CharField(max_length=50, blank=True, null=True) autor = models.ForeignKey(Autor, blank=True, null=True) num_dias_prazo = models.IntegerField(blank=True, null=True) - dat_fim_prazo = models.DateField(blank=True, null=True) + data_fim_prazo = models.DateField(blank=True, null=True) ind_tramitacao = models.IntegerField() txt_assunto = models.TextField() txt_observacao = models.TextField(blank=True, null=True) @@ -28,7 +28,7 @@ class DocumentoAcessorioAdministrativo(models.Model): tipo = models.ForeignKey(TipoDocumentoAdministrativo) nome_documento = models.CharField(max_length=30) nome_arquivo = models.CharField(max_length=100) - dat_documento = models.DateField(blank=True, null=True) + data_documento = models.DateField(blank=True, null=True) nome_autor_documento = models.CharField(max_length=50, blank=True, null=True) txt_assunto = models.TextField(blank=True, null=True) txt_indexacao = models.TextField(blank=True, null=True) @@ -37,9 +37,9 @@ class DocumentoAcessorioAdministrativo(models.Model): class Protocolo(models.Model): num_protocolo = models.IntegerField(blank=True, null=True) ano_protocolo = models.SmallIntegerField() - dat_protocolo = models.DateField() + data_protocolo = models.DateField() hor_protocolo = models.TimeField() - dat_timestamp = models.DateTimeField() + data_timestamp = models.DateTimeField() tipo_protocolo = models.IntegerField() tipo_processo = models.IntegerField() txt_interessado = models.CharField(max_length=60, blank=True, null=True) @@ -65,11 +65,11 @@ class StatusTramitacaoAdministrativo(models.Model): class TramitacaoAdministrativo(models.Model): documento = models.ForeignKey(DocumentoAdministrativo) - dat_tramitacao = models.DateField(blank=True, null=True) + data_tramitacao = models.DateField(blank=True, null=True) cod_unid_tram_local = models.IntegerField(blank=True, null=True) - dat_encaminha = models.DateField(blank=True, null=True) + data_encaminha = models.DateField(blank=True, null=True) cod_unid_tram_dest = models.IntegerField(blank=True, null=True) status = models.ForeignKey(StatusTramitacaoAdministrativo, blank=True, null=True) ind_ult_tramitacao = models.IntegerField() txt_tramitacao = models.TextField(blank=True, null=True) - dat_fim_prazo = models.DateField(blank=True, null=True) + data_fim_prazo = models.DateField(blank=True, null=True) diff --git a/sessao/models.py b/sessao/models.py index 9568b9bd3..c39ce7a7e 100644 --- a/sessao/models.py +++ b/sessao/models.py @@ -16,12 +16,12 @@ class SessaoPlenaria(models.Model): sessao_leg = models.ForeignKey(SessaoLegislativa) legislatura = models.ForeignKey(Legislatura) tipo_expediente = models.CharField(max_length=10) - dat_inicio_sessao = models.DateField() + data_inicio_sessao = models.DateField() dia_sessao = models.CharField(max_length=15) hr_inicio_sessao = models.CharField(max_length=5) hr_fim_sessao = models.CharField(max_length=5, blank=True, null=True) num_sessao_plen = models.IntegerField() - dat_fim_sessao = models.DateField(blank=True, null=True) + data_fim_sessao = models.DateField(blank=True, null=True) url_audio = models.CharField(max_length=150, blank=True, null=True) url_video = models.CharField(max_length=150, blank=True, null=True) @@ -29,7 +29,7 @@ class SessaoPlenaria(models.Model): class ExpedienteMateria(models.Model): sessao_plen = models.ForeignKey(SessaoPlenaria) materia = models.ForeignKey(MateriaLegislativa) - dat_ordem = models.DateField() + data_ordem = models.DateField() txt_observacao = models.TextField(blank=True, null=True) num_ordem = models.IntegerField() txt_resultado = models.TextField(blank=True, null=True) @@ -71,7 +71,7 @@ class OradoresExpediente(models.Model): class OrdemDia(models.Model): sessao_plen = models.ForeignKey(SessaoPlenaria) materia = models.ForeignKey(MateriaLegislativa) - dat_ordem = models.DateField() + data_ordem = models.DateField() txt_observacao = models.TextField(blank=True, null=True) num_ordem = models.IntegerField() txt_resultado = models.TextField(blank=True, null=True) @@ -81,7 +81,7 @@ class OrdemDia(models.Model): class OrdemDiaPresenca(models.Model): sessao_plen = models.ForeignKey(SessaoPlenaria) parlamentar = models.ForeignKey(Parlamentar) - dat_ordem = models.DateField() + data_ordem = models.DateField() class TipoResultadoVotacao(models.Model): @@ -107,4 +107,4 @@ class RegistroVotacaoParlamentar(models.Model): class SessaoPlenariaPresenca(models.Model): sessao_plen = models.ForeignKey(SessaoPlenaria) parlamentar = models.ForeignKey(Parlamentar) - dat_sessao = models.DateField(blank=True, null=True) + data_sessao = models.DateField(blank=True, null=True)