diff --git a/comissoes/models.py b/comissoes/models.py index 41fc6a38b..448fae127 100644 --- a/comissoes/models.py +++ b/comissoes/models.py @@ -30,7 +30,7 @@ class Comissao(models.Model): local_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) - ind_unid_deliberativa = models.IntegerField() + unid_deliberativa = models.BooleanField() class PeriodoCompComissao(models.Model): @@ -40,7 +40,7 @@ class PeriodoCompComissao(models.Model): class CargoComissao(models.Model): nome = models.CharField(max_length=50) - ind_unico = models.IntegerField() + unico = models.BooleanField() class ComposicaoComissao(models.Model): @@ -48,7 +48,7 @@ class ComposicaoComissao(models.Model): comissao = models.ForeignKey(Comissao) periodo_comp = models.ForeignKey(PeriodoCompComissao) cargo = models.ForeignKey(CargoComissao) - ind_titular = models.IntegerField() + titular = models.BooleanField() data_designacao = models.DateField() data_desligamento = models.DateField(blank=True, null=True) descricao_motivo_desligamento = models.CharField(max_length=150, blank=True, null=True) diff --git a/materia/models.py b/materia/models.py index 3814f9a8c..f9fb152e8 100644 --- a/materia/models.py +++ b/materia/models.py @@ -7,7 +7,7 @@ from parlamentares.models import Parlamentar, Partido class TipoMateriaLegislativa(models.Model): sigla_tipo_materia = models.CharField(max_length=5) descricao_tipo_materia = models.CharField(max_length=50) - ind_num_automatica = models.IntegerField() + num_automatica = models.BooleanField() quorum_minimo_votacao = models.IntegerField() @@ -37,10 +37,10 @@ class MateriaLegislativa(models.Model): nome_apelido = models.CharField(max_length=50, blank=True, null=True) numero_dias_prazo = models.IntegerField(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) + indicador_tramitacao = models.BooleanField() + polemica = models.NullBooleanField(blank=True) descricao_objeto = models.CharField(max_length=150, blank=True, null=True) - ind_complementar = models.IntegerField(blank=True, null=True) + complementar = models.NullBooleanField(blank=True) txt_ementa = models.TextField() txt_indexacao = models.TextField(blank=True, null=True) txt_observacao = models.TextField(blank=True, null=True) @@ -86,7 +86,7 @@ class Autor(models.Model): class Autoria(models.Model): autor = models.ForeignKey(Autor) materia = models.ForeignKey(MateriaLegislativa) - ind_primeiro_autor = models.IntegerField() + primeiro_autor = models.BooleanField() class DespachoInicial(models.Model): @@ -126,7 +126,7 @@ class Numeracao(models.Model): class Orgao(models.Model): nome_orgao = models.CharField(max_length=60) sigla_orgao = models.CharField(max_length=10) - ind_unid_deliberativa = models.IntegerField() + unid_deliberativa = models.BooleanField() endereco_orgao = models.CharField(max_length=100, blank=True, null=True) numero_tel_orgao = models.CharField(max_length=50, blank=True, null=True) @@ -154,7 +154,7 @@ class Parecer(models.Model): class TipoProposicao(models.Model): descricao_tipo_proposicao = models.CharField(max_length=50) - ind_mat_ou_doc = models.CharField(max_length=1) + mat_ou_doc = models.BooleanField() tipo_mat_ou_doc = models.IntegerField() nome_modelo = models.CharField(max_length=50) @@ -175,8 +175,8 @@ class Proposicao(models.Model): class StatusTramitacao(models.Model): sigla_status = models.CharField(max_length=10) descricao_status = models.CharField(max_length=60) - ind_fim_tramitacao = models.IntegerField() - ind_retorno_tramitacao = models.IntegerField() + fim_tramitacao = models.BooleanField() + retorno_tramitacao = models.BooleanField() class UnidadeTramitacao(models.Model): @@ -192,8 +192,8 @@ class Tramitacao(models.Model): unid_tram_local = models.ForeignKey(UnidadeTramitacao, blank=True, null=True, related_name='+') 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() + ult_tramitacao = models.BooleanField() + urgencia = models.BooleanField() sigla_turno = models.CharField(max_length=1, blank=True, null=True) txt_tramitacao = models.TextField(blank=True, null=True) data_fim_prazo = models.DateField(blank=True, null=True) diff --git a/norma/models.py b/norma/models.py index ce8c7cd6a..9c2b66fd1 100644 --- a/norma/models.py +++ b/norma/models.py @@ -28,7 +28,7 @@ class NormaJuridica(models.Model): txt_ementa = models.TextField() txt_indexacao = models.TextField(blank=True, null=True) txt_observacao = models.TextField(blank=True, null=True) - ind_complemento = models.IntegerField(blank=True, null=True) + complemento = models.NullBooleanField(blank=True) assunto = models.ForeignKey(AssuntoNorma) # XXX was a CharField (attention on migrate) data_vigencia = models.DateField(blank=True, null=True) timestamp = models.DateTimeField() @@ -56,4 +56,4 @@ class VinculoNormaJuridica(models.Model): norma_referente = models.ForeignKey(NormaJuridica, related_name='+') norma_referida = models.ForeignKey(NormaJuridica, related_name='+') tipo_vinculo = models.CharField(max_length=1, blank=True, null=True) - ind_excluido = models.CharField(max_length=1) + excluido = models.BooleanField() diff --git a/parlamentares/models.py b/parlamentares/models.py index 42f713bdd..37714b57c 100644 --- a/parlamentares/models.py +++ b/parlamentares/models.py @@ -74,9 +74,9 @@ class Parlamentar(models.Model): nome_profissao = models.CharField(max_length=50, blank=True, null=True) endereco_email = 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() + ativo = models.BooleanField() txt_biografia = models.TextField(blank=True, null=True) - ind_unid_deliberativa = models.IntegerField() + unid_deliberativa = models.BooleanField() class TipoDependente(models.Model): @@ -103,8 +103,8 @@ class Filiacao(models.Model): class TipoAfastamento(models.Model): descricao_afastamento = models.CharField(max_length=50) - ind_afastamento = models.IntegerField() - ind_fim_mandato = models.IntegerField() + afastamento = models.BooleanField() + fim_mandato = models.BooleanField() descricao_dispositivo = models.CharField(max_length=50, blank=True, null=True) diff --git a/protocoloadm/models.py b/protocoloadm/models.py index d67ad57aa..be82f9ca7 100644 --- a/protocoloadm/models.py +++ b/protocoloadm/models.py @@ -18,7 +18,7 @@ class DocumentoAdministrativo(models.Model): autor = models.ForeignKey(Autor, blank=True, null=True) numero_dias_prazo = models.IntegerField(blank=True, null=True) data_fim_prazo = models.DateField(blank=True, null=True) - ind_tramitacao = models.IntegerField() + tramitacao = models.BooleanField() txt_assunto = models.TextField() txt_observacao = models.TextField(blank=True, null=True) @@ -49,7 +49,7 @@ class Protocolo(models.Model): tipo_materia = models.ForeignKey(TipoMateriaLegislativa, blank=True, null=True) numero_paginas = models.IntegerField(blank=True, null=True) txt_observacao = models.TextField(blank=True, null=True) - ind_anulado = models.IntegerField() + anulado = models.BooleanField() txt_user_anulacao = models.CharField(max_length=20, blank=True, null=True) txt_ip_anulacao = models.CharField(max_length=15, blank=True, null=True) txt_just_anulacao = models.CharField(max_length=60, blank=True, null=True) @@ -59,8 +59,8 @@ class Protocolo(models.Model): class StatusTramitacaoAdministrativo(models.Model): sigla_status = models.CharField(max_length=10) descricao_status = models.CharField(max_length=60) - ind_fim_tramitacao = models.IntegerField() - ind_retorno_tramitacao = models.IntegerField() + fim_tramitacao = models.BooleanField() + retorno_tramitacao = models.BooleanField() class TramitacaoAdministrativo(models.Model): @@ -70,6 +70,6 @@ class TramitacaoAdministrativo(models.Model): 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() + ult_tramitacao = models.BooleanField() txt_tramitacao = models.TextField(blank=True, null=True) data_fim_prazo = models.DateField(blank=True, null=True) diff --git a/sessao/models.py b/sessao/models.py index 3f9900efe..dd4e2ca71 100644 --- a/sessao/models.py +++ b/sessao/models.py @@ -51,7 +51,7 @@ class MesaSessaoPlenaria(models.Model): sessao_leg = models.ForeignKey(SessaoLegislativa) parlamentar = models.ForeignKey(Parlamentar) sessao_plen = models.ForeignKey(SessaoPlenaria) - ind_excluido = models.IntegerField(blank=True, null=True) + excluido = models.NullBooleanField(blank=True) class Oradores(models.Model):