diff --git a/base/migrations/0001_initial.py b/base/migrations/0001_initial.py index 6c3957624..c0dfb383a 100644 --- a/base/migrations/0001_initial.py +++ b/base/migrations/0001_initial.py @@ -14,22 +14,20 @@ class Migration(migrations.Migration): name='CasaLegislativa', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('cod_casa', models.CharField(max_length=100, verbose_name='C\xf3digo')), - ('nom_casa', models.CharField(max_length=100, verbose_name='Nome')), - ('sgl_casa', models.CharField(max_length=100, verbose_name='Sigla')), - ('end_casa', models.CharField(max_length=100, verbose_name='Endere\xe7o')), - ('num_cep', models.CharField(max_length=100, verbose_name='CEP')), + ('nome', models.CharField(max_length=100, verbose_name='Nome')), + ('sigla', models.CharField(max_length=100, verbose_name='Sigla')), + ('endereco', models.CharField(max_length=100, verbose_name='Endere\xe7o')), + ('cep', models.CharField(max_length=100, verbose_name='CEP')), ('municipio', models.CharField(max_length=100, verbose_name='Munic\xedpio')), - ('sgl_uf', models.CharField(max_length=100, verbose_name='UF')), - ('num_tel', models.CharField(max_length=100, verbose_name='Telefone')), - ('num_fax', models.CharField(max_length=100, verbose_name='Fax')), - ('txt_senha_inicial', models.CharField(max_length=100, verbose_name='Senha')), + ('uf', models.CharField(max_length=100, verbose_name='UF')), + ('telefone', models.CharField(max_length=100, verbose_name='Telefone')), + ('fax', models.CharField(max_length=100, verbose_name='Fax')), ('cor_fundo', models.CharField(max_length=100, verbose_name='Cor de fundo')), ('cor_borda', models.CharField(max_length=100, verbose_name='Cor da borda')), ('cor_principal', models.CharField(max_length=100, verbose_name='Cor principal')), - ('nom_logo', models.CharField(max_length=100, verbose_name='Logotipo')), - ('end_web_casa', models.CharField(max_length=100, verbose_name='HomePage')), - ('end_email_casa', models.CharField(max_length=100, verbose_name='E-mail')), + ('logotipo', models.CharField(max_length=100, verbose_name='Logotipo')), + ('endereco_web', models.CharField(max_length=100, verbose_name='HomePage')), + ('email', models.CharField(max_length=100, verbose_name='E-mail')), ('informacao_geral', models.CharField(max_length=100, verbose_name='Informa\xe7\xe3o Geral')), ], options={ diff --git a/comissoes/migrations/0001_initial.py b/comissoes/migrations/0001_initial.py index a406eaee7..ef979518b 100644 --- a/comissoes/migrations/0001_initial.py +++ b/comissoes/migrations/0001_initial.py @@ -31,21 +31,21 @@ class Migration(migrations.Migration): ('sigla', models.CharField(max_length=10, verbose_name='Sigla')), ('data_criacao', models.DateField(verbose_name='Data de Cria\xe7\xe3o')), ('data_extincao', models.DateField(null=True, verbose_name='Data de Extin\xe7\xe3o', blank=True)), - ('nome_apelido_temp', models.CharField(max_length=100, null=True, verbose_name='Apelido', blank=True)), + ('apelido_temp', models.CharField(max_length=100, null=True, verbose_name='Apelido', blank=True)), ('data_instalacao_temp', models.DateField(null=True, verbose_name='Data Instala\xe7\xe3o', blank=True)), ('data_final_prevista_temp', models.DateField(null=True, verbose_name='Data Prevista T\xe9rmino', blank=True)), ('data_prorrogada_temp', models.DateField(null=True, verbose_name='Novo Prazo', blank=True)), ('data_fim_comissao', models.DateField(null=True, verbose_name='Data T\xe9rmino', blank=True)), - ('nome_secretario', models.CharField(max_length=30, null=True, verbose_name='Secret\xe1rio', blank=True)), - ('numero_tel_reuniao', models.CharField(max_length=15, null=True, verbose_name='Tel. Sala Reuni\xe3o', blank=True)), + ('secretario', models.CharField(max_length=30, null=True, verbose_name='Secret\xe1rio', blank=True)), + ('telefone_reuniao', models.CharField(max_length=15, null=True, verbose_name='Tel. Sala Reuni\xe3o', blank=True)), ('endereco_secretaria', models.CharField(max_length=100, null=True, verbose_name='Endere\xe7o Secretaria', blank=True)), - ('numero_tel_secretaria', models.CharField(max_length=15, null=True, verbose_name='Tel. Secretaria', blank=True)), - ('numero_fax_secretaria', models.CharField(max_length=15, null=True, verbose_name='Fax Secretaria', blank=True)), - ('descricao_agenda_reuniao', models.CharField(max_length=100, null=True, verbose_name='Data/Hora Reuni\xe3o', blank=True)), + ('telefone_secretaria', models.CharField(max_length=15, null=True, verbose_name='Tel. Secretaria', blank=True)), + ('fax_secretaria', models.CharField(max_length=15, null=True, verbose_name='Fax Secretaria', blank=True)), + ('agenda_reuniao', models.CharField(max_length=100, null=True, verbose_name='Data/Hora Reuni\xe3o', blank=True)), ('local_reuniao', models.CharField(max_length=100, null=True, verbose_name='Local Reuni\xe3o', blank=True)), - ('txt_finalidade', models.TextField(null=True, verbose_name='Finalidade', blank=True)), + ('finalidade', models.TextField(null=True, verbose_name='Finalidade', blank=True)), ('email', models.CharField(max_length=100, null=True, verbose_name='E-mail', blank=True)), - ('unid_deliberativa', models.BooleanField()), + ('unidade_deliberativa', models.BooleanField()), ], options={ 'verbose_name': 'Comiss\xe3o', @@ -56,8 +56,12 @@ class Migration(migrations.Migration): name='Composicao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('comissao', models.ForeignKey(to='comissoes.Comissao')), + ('comissao', models.ForeignKey(verbose_name='Comiss\xe3o', to='comissoes.Comissao')), ], + options={ + 'verbose_name': 'Composi\xe7\xe3o de Comiss\xe3o', + 'verbose_name_plural': 'Composi\xe7\xf5es de Comiss\xe3o', + }, ), migrations.CreateModel( name='Participacao', @@ -73,8 +77,8 @@ class Migration(migrations.Migration): ('parlamentar', models.ForeignKey(to='parlamentares.Parlamentar')), ], options={ - 'verbose_name': 'Composi\xe7\xe3o de Comiss\xe3o', - 'verbose_name_plural': 'Composi\xe7\xf5es de Comiss\xe3o', + 'verbose_name': 'Participa\xe7\xe3o em Comiss\xe3o', + 'verbose_name_plural': 'Participa\xe7\xf5es em Comiss\xe3o', }, ), migrations.CreateModel( @@ -94,7 +98,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('nome', models.CharField(max_length=50, verbose_name='Nome')), - ('natureza_comissao', models.CharField(default=b'P', max_length=1, verbose_name='Natureza', choices=[(b'T', 'Tempor\xe1ria'), (b'P', 'Permanente')])), + ('natureza', models.CharField(max_length=1, verbose_name='Natureza', choices=[(b'T', 'Tempor\xe1ria'), (b'P', 'Permanente')])), ('sigla', models.CharField(max_length=10, verbose_name='Sigla')), ('dispositivo_regimental', models.CharField(max_length=50, null=True, verbose_name='Dispositivo Regimental', blank=True)), ], @@ -106,7 +110,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='composicao', name='periodo', - field=models.ForeignKey(to='comissoes.Periodo'), + field=models.ForeignKey(verbose_name='Per\xedodo', to='comissoes.Periodo'), ), migrations.AddField( model_name='comissao', diff --git a/lexml/migrations/0001_initial.py b/lexml/migrations/0001_initial.py index e6873475e..d5bdf0307 100644 --- a/lexml/migrations/0001_initial.py +++ b/lexml/migrations/0001_initial.py @@ -11,17 +11,17 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='LexmlRegistroProvedor', + name='LexmlProvedor', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id_provedor', models.IntegerField(verbose_name='Id do provedor')), - ('nome_provedor', models.CharField(max_length=255, verbose_name='Nome do provedor')), - ('sigla_provedor', models.CharField(max_length=15)), - ('adm_email', models.CharField(max_length=50, null=True, verbose_name='E-mail do respons\xe1vel', blank=True)), + ('nome', models.CharField(max_length=255, verbose_name='Nome do provedor')), + ('sigla', models.CharField(max_length=15)), + ('email_responsavel', models.CharField(max_length=50, null=True, verbose_name='E-mail do respons\xe1vel', blank=True)), ('nome_responsavel', models.CharField(max_length=255, null=True, verbose_name='Nome do respons\xe1vel', blank=True)), ('tipo', models.CharField(max_length=50)), ('id_responsavel', models.IntegerField(null=True, verbose_name='Id do respons\xe1vel', blank=True)), - ('xml_provedor', models.TextField(null=True, verbose_name='XML fornecido pela equipe do LexML:', blank=True)), + ('xml', models.TextField(null=True, verbose_name='XML fornecido pela equipe do LexML:', blank=True)), ], options={ 'verbose_name': 'Provedor Lexml', @@ -33,8 +33,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id_publicador', models.IntegerField(verbose_name='Id do publicador')), - ('nome_publicador', models.CharField(max_length=255, verbose_name='Nome do publicador')), - ('adm_email', models.CharField(max_length=50, null=True, verbose_name='E-mail do respons\xe1vel', blank=True)), + ('nome', models.CharField(max_length=255, verbose_name='Nome do publicador')), + ('email_responsavel', models.CharField(max_length=50, null=True, verbose_name='E-mail do respons\xe1vel', blank=True)), ('sigla', models.CharField(max_length=255, null=True, verbose_name='Sigla do Publicador', blank=True)), ('nome_responsavel', models.CharField(max_length=255, null=True, verbose_name='Nome do respons\xe1vel', blank=True)), ('tipo', models.CharField(max_length=50)), diff --git a/materia/migrations/0001_initial.py b/materia/migrations/0001_initial.py index d328f5ec6..cbc03e6da 100644 --- a/materia/migrations/0001_initial.py +++ b/materia/migrations/0001_initial.py @@ -13,11 +13,11 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='AcompMateria', + name='AcompanhamentoMateria', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('endereco_email', models.CharField(max_length=100, verbose_name='Endere\xe7o de E-mail')), - ('txt_hash', models.CharField(max_length=8)), + ('email', models.CharField(max_length=100, verbose_name='Endere\xe7o de E-mail')), + ('hash', models.CharField(max_length=8)), ], options={ 'verbose_name': 'Acompanhamento de Mat\xe9ria', @@ -40,8 +40,8 @@ class Migration(migrations.Migration): name='AssuntoMateria', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_assunto', models.CharField(max_length=200)), - ('descricao_dispositivo', models.CharField(max_length=50)), + ('assunto', models.CharField(max_length=200)), + ('dispositivo', models.CharField(max_length=50)), ], options={ 'verbose_name': 'Assunto de Mat\xe9ria', @@ -52,9 +52,9 @@ class Migration(migrations.Migration): name='Autor', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome_autor', models.CharField(max_length=50, null=True, verbose_name='Autor', blank=True)), - ('descricao_cargo', models.CharField(max_length=50, null=True, blank=True)), - ('col_username', models.CharField(max_length=50, null=True, blank=True)), + ('nome', models.CharField(max_length=50, null=True, verbose_name='Autor', blank=True)), + ('cargo', models.CharField(max_length=50, null=True, blank=True)), + ('username', models.CharField(max_length=50, null=True, blank=True)), ('comissao', models.ForeignKey(blank=True, to='comissoes.Comissao', null=True)), ('parlamentar', models.ForeignKey(blank=True, to='parlamentares.Parlamentar', null=True)), ('partido', models.ForeignKey(blank=True, to='parlamentares.Partido', null=True)), @@ -92,11 +92,11 @@ class Migration(migrations.Migration): name='DocumentoAcessorio', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome_documento', models.CharField(max_length=30, verbose_name='Descri\xe7\xe3o')), - ('data_documento', models.DateField(null=True, verbose_name='Data', blank=True)), - ('nome_autor_documento', models.CharField(max_length=50, null=True, verbose_name='Autor', blank=True)), - ('txt_ementa', models.TextField(null=True, verbose_name='Ementa', blank=True)), - ('txt_indexacao', models.TextField(null=True, blank=True)), + ('nome', models.CharField(max_length=30, verbose_name='Descri\xe7\xe3o')), + ('data', models.DateField(null=True, verbose_name='Data', blank=True)), + ('autor', models.CharField(max_length=50, null=True, verbose_name='Autor', blank=True)), + ('ementa', models.TextField(null=True, verbose_name='Ementa', blank=True)), + ('indexacao', models.TextField(null=True, blank=True)), ], options={ 'verbose_name': 'Documento Acess\xf3rio', @@ -122,22 +122,22 @@ class Migration(migrations.Migration): ('numero_ident_basica', models.IntegerField(verbose_name='N\xfamero')), ('ano_ident_basica', models.SmallIntegerField(verbose_name='Ano')), ('data_apresentacao', models.DateField(null=True, verbose_name='Data Apresenta\xe7\xe3o', blank=True)), - ('tipo_apresentacao', models.CharField(max_length=1, null=True, verbose_name='Tipo de Apresenta\xe7\xe3o', blank=True)), + ('tipo_apresentacao', models.CharField(blank=True, max_length=1, null=True, verbose_name='Tipo de Apresenta\xe7\xe3o', choices=[(b'O', 'Oral'), (b'E', 'Escrita')])), ('data_publicacao', models.DateField(null=True, verbose_name='Data Publica\xe7\xe3o', blank=True)), ('numero_origem_externa', models.CharField(max_length=5, null=True, verbose_name='N\xfamero', blank=True)), ('ano_origem_externa', models.SmallIntegerField(null=True, verbose_name='Ano', blank=True)), ('data_origem_externa', models.DateField(null=True, verbose_name='Data', blank=True)), - ('nome_apelido', models.CharField(max_length=50, null=True, verbose_name='Apelido', blank=True)), - ('numero_dias_prazo', models.IntegerField(null=True, verbose_name='Dias Prazo', blank=True)), + ('apelido', models.CharField(max_length=50, null=True, verbose_name='Apelido', blank=True)), + ('dias_prazo', models.IntegerField(null=True, verbose_name='Dias Prazo', blank=True)), ('data_fim_prazo', models.DateField(null=True, verbose_name='Data Fim Prazo', blank=True)), - ('indicador_tramitacao', models.BooleanField(verbose_name='Em Tramita\xe7\xe3o?')), + ('em_tramitacao', models.BooleanField(verbose_name='Em Tramita\xe7\xe3o?')), ('polemica', models.NullBooleanField(verbose_name='Mat\xe9ria Pol\xeamica?')), - ('descricao_objeto', models.CharField(max_length=150, null=True, verbose_name='Objeto', blank=True)), + ('objeto', models.CharField(max_length=150, null=True, verbose_name='Objeto', blank=True)), ('complementar', models.NullBooleanField(verbose_name='\xc9 Complementar?')), - ('txt_ementa', models.TextField(verbose_name='Ementa')), - ('txt_indexacao', models.TextField(null=True, verbose_name='Indexa\xe7\xe3o', blank=True)), - ('txt_observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), - ('txt_resultado', models.TextField(null=True, blank=True)), + ('ementa', models.TextField(verbose_name='Ementa')), + ('indexacao', models.TextField(null=True, verbose_name='Indexa\xe7\xe3o', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), + ('resultado', models.TextField(null=True, blank=True)), ('anexadas', models.ManyToManyField(related_name='anexo_de', through='materia.Anexada', to='materia.MateriaLegislativa')), ], options={ @@ -164,11 +164,11 @@ class Migration(migrations.Migration): name='Orgao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome_orgao', models.CharField(max_length=60, verbose_name='Nome')), - ('sigla_orgao', models.CharField(max_length=10, verbose_name='Sigla')), - ('unid_deliberativa', models.BooleanField(verbose_name='Unidade Deliberativa')), - ('endereco_orgao', models.CharField(max_length=100, null=True, verbose_name='Endere\xe7o', blank=True)), - ('numero_tel_orgao', models.CharField(max_length=50, null=True, verbose_name='Telefone', blank=True)), + ('nome', models.CharField(max_length=60, verbose_name='Nome')), + ('sigla', models.CharField(max_length=10, verbose_name='Sigla')), + ('unidade_deliberativa', models.BooleanField(verbose_name='Unidade Deliberativa')), + ('endereco', models.CharField(max_length=100, null=True, verbose_name='Endere\xe7o', blank=True)), + ('telefone', models.CharField(max_length=50, null=True, verbose_name='Telefone', blank=True)), ], options={ 'verbose_name': '\xd3rg\xe3o', @@ -179,8 +179,8 @@ class Migration(migrations.Migration): name='Origem', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('sigla_origem', models.CharField(max_length=10, verbose_name='Sigla')), - ('nome_origem', models.CharField(max_length=50, verbose_name='Nome')), + ('sigla', models.CharField(max_length=10, verbose_name='Sigla')), + ('nome', models.CharField(max_length=50, verbose_name='Nome')), ], options={ 'verbose_name': 'Origem', @@ -193,7 +193,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('tipo_conclusao', models.CharField(max_length=3, null=True, blank=True)), ('tipo_apresentacao', models.CharField(max_length=1)), - ('txt_parecer', models.TextField(null=True, blank=True)), + ('parecer', models.TextField(null=True, blank=True)), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ], options={ @@ -205,15 +205,15 @@ class Migration(migrations.Migration): name='Proposicao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('data_envio', models.DateTimeField(null=True)), - ('data_recebimento', models.DateTimeField(null=True, blank=True)), - ('txt_descricao', models.CharField(max_length=100, verbose_name='Descri\xe7\xe3o')), - ('cod_mat_ou_doc', models.IntegerField(null=True, blank=True)), - ('data_devolucao', models.DateTimeField(null=True, blank=True)), - ('txt_justif_devolucao', models.CharField(max_length=200, null=True, blank=True)), - ('numero_proposicao', models.IntegerField(null=True, blank=True)), + ('data_envio', models.DateTimeField(null=True, verbose_name='Data de Envio')), + ('data_recebimento', models.DateTimeField(null=True, verbose_name='Data de Incorpora\xe7\xe3o', blank=True)), + ('descricao', models.CharField(max_length=100, verbose_name='Descri\xe7\xe3o')), + ('data_devolucao', models.DateTimeField(null=True, verbose_name='Data de devolu\xe7\xe3o', blank=True)), + ('justificativa_devolucao', models.CharField(max_length=200, null=True, verbose_name='Justificativa da Devolu\xe7\xe3o', blank=True)), + ('numero_proposicao', models.IntegerField(null=True, verbose_name='', blank=True)), ('autor', models.ForeignKey(to='materia.Autor')), - ('materia', models.ForeignKey(blank=True, to='materia.MateriaLegislativa', null=True)), + ('documento', models.ForeignKey(verbose_name='Documento', blank=True, to='materia.DocumentoAcessorio', null=True)), + ('materia', models.ForeignKey(verbose_name='Mat\xe9ria', blank=True, to='materia.MateriaLegislativa', null=True)), ], options={ 'verbose_name': 'Proposi\xe7\xe3o', @@ -224,7 +224,7 @@ class Migration(migrations.Migration): name='RegimeTramitacao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_regime_tramitacao', models.CharField(max_length=50)), + ('descricao', models.CharField(max_length=50)), ], options={ 'verbose_name': 'Regime Tramita\xe7\xe3o', @@ -235,8 +235,8 @@ class Migration(migrations.Migration): name='Relatoria', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('data_desig_relator', models.DateField(verbose_name='Data Designa\xe7\xe3o')), - ('data_destit_relator', models.DateField(null=True, verbose_name='Data Destitui\xe7\xe3o', blank=True)), + ('data_designacao_relator', models.DateField(verbose_name='Data Designa\xe7\xe3o')), + ('data_destituicao_relator', models.DateField(null=True, verbose_name='Data Destitui\xe7\xe3o', blank=True)), ('comissao', models.ForeignKey(verbose_name='Localiza\xe7\xe3o Atual', blank=True, to='comissoes.Comissao', null=True)), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ('parlamentar', models.ForeignKey(verbose_name='Parlamentar', to='parlamentares.Parlamentar')), @@ -250,10 +250,9 @@ class Migration(migrations.Migration): name='StatusTramitacao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('sigla_status', models.CharField(max_length=10, verbose_name='Sigla')), - ('descricao_status', models.CharField(max_length=60, verbose_name='Descri\xe7\xe3o')), - ('fim_tramitacao', models.BooleanField()), - ('retorno_tramitacao', models.BooleanField()), + ('sigla', models.CharField(max_length=10, verbose_name='Sigla')), + ('descricao', models.CharField(max_length=60, verbose_name='Descri\xe7\xe3o')), + ('indicador', models.CharField(max_length=1, verbose_name='Indicador da Tramita\xe7\xe3o', choices=[(b'F', 'Fim'), (b'R', 'Retorno')])), ], options={ 'verbose_name': 'Status de Tramita\xe7\xe3o', @@ -264,7 +263,7 @@ class Migration(migrations.Migration): name='TipoAutor', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_tipo_autor', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), + ('descricao', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), ], options={ 'verbose_name': 'Tipo de Autor', @@ -275,7 +274,7 @@ class Migration(migrations.Migration): name='TipoDocumento', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_tipo_documento', models.CharField(max_length=50, verbose_name='Tipo Documento')), + ('descricao', models.CharField(max_length=50, verbose_name='Tipo Documento')), ], options={ 'verbose_name': 'Tipo de Documento', @@ -286,7 +285,7 @@ class Migration(migrations.Migration): name='TipoFimRelatoria', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_fim_relatoria', models.CharField(max_length=50, verbose_name='Tipo Fim Relatoria')), + ('descricao', models.CharField(max_length=50, verbose_name='Tipo Fim Relatoria')), ], options={ 'verbose_name': 'Tipo Fim de Relatoria', @@ -297,8 +296,8 @@ class Migration(migrations.Migration): name='TipoMateriaLegislativa', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('sigla_tipo_materia', models.CharField(max_length=5, verbose_name='Sigla')), - ('descricao_tipo_materia', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o ')), + ('sigla', models.CharField(max_length=5, verbose_name='Sigla')), + ('descricao', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o ')), ('num_automatica', models.BooleanField()), ('quorum_minimo_votacao', models.IntegerField()), ], @@ -311,10 +310,11 @@ class Migration(migrations.Migration): name='TipoProposicao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_tipo_proposicao', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), - ('mat_ou_doc', models.BooleanField(verbose_name='Gera')), - ('tipo_mat_ou_doc', models.IntegerField(verbose_name='Tipo Documento')), - ('nome_modelo', models.CharField(max_length=50, verbose_name='Modelo XML')), + ('descricao', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), + ('materia_ou_documento', models.CharField(max_length=1, verbose_name='Gera', choices=[(b'M', 'Mat\xe9ria'), (b'D', 'Documento')])), + ('modelo', models.CharField(max_length=50, verbose_name='Modelo XML')), + ('tipo_documento', models.ForeignKey(verbose_name='Tipo Documento', blank=True, to='materia.TipoDocumento', null=True)), + ('tipo_materia', models.ForeignKey(verbose_name='Tipo Mat\xe9ria', blank=True, to='materia.TipoMateriaLegislativa', null=True)), ], options={ 'verbose_name': 'Tipo de Proposi\xe7\xe3o', @@ -326,11 +326,11 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('data_tramitacao', models.DateField(null=True, verbose_name='Data Tramita\xe7\xe3o', blank=True)), - ('data_encaminha', models.DateField(null=True, verbose_name='Data Encaminhamento', blank=True)), - ('ult_tramitacao', models.BooleanField()), - ('urgencia', models.BooleanField(verbose_name='Urgente ?')), - ('sigla_turno', models.CharField(max_length=1, null=True, verbose_name='Turno', blank=True)), - ('txt_tramitacao', models.TextField(null=True, verbose_name='Texto da A\xe7\xe3o', blank=True)), + ('data_encaminhamento', models.DateField(null=True, verbose_name='Data Encaminhamento', blank=True)), + ('ultima', models.BooleanField()), + ('urgente', models.BooleanField(verbose_name='Urgente ?')), + ('turno', models.CharField(blank=True, max_length=1, null=True, verbose_name='Turno', choices=[(b'P', 'Primeiro'), (b'S', 'Segundo'), (b'\xc3\x9a', '\xdanico'), (b'L', 'Suplementar'), (b'F', 'Final'), (b'A', 'Vota\xe7\xe3o \xfanica em Regime de Urg\xeancia'), (b'B', '1\xaa Vota\xe7\xe3o'), (b'C', '2\xaa e 3\xaa Vota\xe7\xe3o')])), + ('texto', models.TextField(null=True, verbose_name='Texto da A\xe7\xe3o', blank=True)), ('data_fim_prazo', models.DateField(null=True, verbose_name='Data Fim Prazo', blank=True)), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ('status', models.ForeignKey(verbose_name='Status', blank=True, to='materia.StatusTramitacao', null=True)), @@ -355,12 +355,12 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='tramitacao', - name='unid_tram_dest', + name='unidade_tramitacao_destino', field=models.ForeignKey(related_name='+', verbose_name='Unidade Destino', blank=True, to='materia.UnidadeTramitacao', null=True), ), migrations.AddField( model_name='tramitacao', - name='unid_tram_local', + name='unidade_tramitacao_local', field=models.ForeignKey(related_name='+', verbose_name='Unidade Local', blank=True, to='materia.UnidadeTramitacao', null=True), ), migrations.AddField( @@ -444,7 +444,7 @@ class Migration(migrations.Migration): field=models.ForeignKey(related_name='+', to='materia.MateriaLegislativa'), ), migrations.AddField( - model_name='acompmateria', + model_name='acompanhamentomateria', name='materia', field=models.ForeignKey(to='materia.MateriaLegislativa'), ), diff --git a/norma/migrations/0001_initial.py b/norma/migrations/0001_initial.py index 4cc374e46..86933b59a 100644 --- a/norma/migrations/0001_initial.py +++ b/norma/migrations/0001_initial.py @@ -15,8 +15,8 @@ class Migration(migrations.Migration): name='AssuntoNorma', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_assunto', models.CharField(max_length=50, verbose_name='Assunto')), - ('descricao_estendida', models.CharField(max_length=250, null=True, verbose_name='Descri\xe7\xe3o', blank=True)), + ('assunto', models.CharField(max_length=50, verbose_name='Assunto')), + ('descricao', models.CharField(max_length=250, null=True, verbose_name='Descri\xe7\xe3o', blank=True)), ], options={ 'verbose_name': 'Assunto de Norma', @@ -27,18 +27,18 @@ class Migration(migrations.Migration): name='LegislacaoCitada', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_disposicoes', models.CharField(max_length=15, null=True, verbose_name='Disposi\xe7\xe3o', blank=True)), - ('descricao_parte', models.CharField(max_length=8, null=True, verbose_name='Parte', blank=True)), - ('descricao_livro', models.CharField(max_length=7, null=True, verbose_name='Livro', blank=True)), - ('descricao_titulo', models.CharField(max_length=7, null=True, verbose_name='T\xedtulo', blank=True)), - ('descricao_capitulo', models.CharField(max_length=7, null=True, verbose_name='Cap\xedtulo', blank=True)), - ('descricao_secao', models.CharField(max_length=7, null=True, verbose_name='Se\xe7\xe3o', blank=True)), - ('descricao_subsecao', models.CharField(max_length=7, null=True, verbose_name='Subse\xe7\xe3o', blank=True)), - ('descricao_artigo', models.CharField(max_length=4, null=True, verbose_name='Artigo', blank=True)), - ('descricao_paragrafo', models.CharField(max_length=3, null=True, verbose_name='Par\xe1grafo', blank=True)), - ('descricao_inciso', models.CharField(max_length=10, null=True, verbose_name='Inciso', blank=True)), - ('descricao_alinea', models.CharField(max_length=3, null=True, verbose_name='Al\xednea', blank=True)), - ('descricao_item', models.CharField(max_length=3, null=True, verbose_name='Item', blank=True)), + ('disposicoes', models.CharField(max_length=15, null=True, verbose_name='Disposi\xe7\xe3o', blank=True)), + ('parte', models.CharField(max_length=8, null=True, verbose_name='Parte', blank=True)), + ('livro', models.CharField(max_length=7, null=True, verbose_name='Livro', blank=True)), + ('titulo', models.CharField(max_length=7, null=True, verbose_name='T\xedtulo', blank=True)), + ('capitulo', models.CharField(max_length=7, null=True, verbose_name='Cap\xedtulo', blank=True)), + ('secao', models.CharField(max_length=7, null=True, verbose_name='Se\xe7\xe3o', blank=True)), + ('subsecao', models.CharField(max_length=7, null=True, verbose_name='Subse\xe7\xe3o', blank=True)), + ('artigo', models.CharField(max_length=4, null=True, verbose_name='Artigo', blank=True)), + ('paragrafo', models.CharField(max_length=3, null=True, verbose_name='Par\xe1grafo', blank=True)), + ('inciso', models.CharField(max_length=10, null=True, verbose_name='Inciso', blank=True)), + ('alinea', models.CharField(max_length=3, null=True, verbose_name='Al\xednea', blank=True)), + ('item', models.CharField(max_length=3, null=True, verbose_name='Item', blank=True)), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ], options={ @@ -50,17 +50,17 @@ class Migration(migrations.Migration): name='NormaJuridica', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('numero_norma', models.IntegerField(verbose_name='N\xfamero')), - ('ano_norma', models.SmallIntegerField(verbose_name='Ano')), - ('tipo_esfera_federacao', models.CharField(max_length=1, verbose_name='Esfera Federa\xe7\xe3o')), - ('data_norma', models.DateField(null=True, verbose_name='Data', blank=True)), + ('numero', models.IntegerField(verbose_name='N\xfamero')), + ('ano', models.SmallIntegerField(verbose_name='Ano')), + ('esfera_federacao', models.CharField(max_length=1, verbose_name='Esfera Federa\xe7\xe3o', choices=[(b'M', 'Municipal'), (b'E', 'Estadual'), (b'F', 'Federal')])), + ('data', models.DateField(null=True, verbose_name='Data', blank=True)), ('data_publicacao', models.DateField(null=True, verbose_name='Data Publica\xe7\xe3o', blank=True)), - ('descricao_veiculo_publicacao', models.CharField(max_length=30, null=True, verbose_name='Ve\xedculo Publica\xe7\xe3o', blank=True)), - ('numero_pag_inicio_publ', models.IntegerField(null=True, verbose_name='Pg. In\xedcio', blank=True)), - ('numero_pag_fim_publ', models.IntegerField(null=True, verbose_name='Pg. Fim', blank=True)), - ('txt_ementa', models.TextField(verbose_name='Ementa')), - ('txt_indexacao', models.TextField(null=True, verbose_name='Indexa\xe7\xe3o', blank=True)), - ('txt_observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), + ('veiculo_publicacao', models.CharField(max_length=30, null=True, verbose_name='Ve\xedculo Publica\xe7\xe3o', blank=True)), + ('pagina_inicio_publicacao', models.IntegerField(null=True, verbose_name='Pg. In\xedcio', blank=True)), + ('pagina_fim_publicacao', models.IntegerField(null=True, verbose_name='Pg. Fim', blank=True)), + ('ementa', models.TextField(verbose_name='Ementa')), + ('indexacao', models.TextField(null=True, verbose_name='Indexa\xe7\xe3o', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), ('complemento', models.NullBooleanField(verbose_name='Complementar ?')), ('data_vigencia', models.DateField(null=True, blank=True)), ('timestamp', models.DateTimeField()), @@ -76,9 +76,9 @@ class Migration(migrations.Migration): name='TipoNormaJuridica', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('voc_lexml', models.CharField(max_length=50, null=True, verbose_name='Equivalente LexML', blank=True)), - ('sigla_tipo_norma', models.CharField(max_length=3, verbose_name='Sigla')), - ('descricao_tipo_norma', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), + ('equivalente_lexml', models.CharField(blank=True, max_length=50, null=True, verbose_name='Equivalente LexML', choices=[(b'constituicao', b'constituicao'), (b'ementa.constitucional', b'ementa.constitucional'), (b'lei.complementar', b'lei.complementar'), (b'lei.delegada', b'lei.delegada'), (b'lei', b'lei'), (b'decreto.lei', b'decreto.lei'), (b'medida.provisoria', b'medida.provisoria'), (b'decreto', b'decreto'), (b'lei.organica', b'lei.organica'), (b'emenda.lei.organica', b'emenda.lei.organica'), (b'decreto.legislativo', b'decreto.legislativo'), (b'resolucao', b'resolucao'), (b'regimento.interno', b'regimento.interno')])), + ('sigla', models.CharField(max_length=3, verbose_name='Sigla')), + ('descricao', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), ], options={ 'verbose_name': 'Tipo de Norma Jur\xeddica', @@ -89,7 +89,7 @@ class Migration(migrations.Migration): name='VinculoNormaJuridica', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('tipo_vinculo', models.CharField(max_length=1, null=True, blank=True)), + ('tipo_vinculo', models.CharField(blank=True, max_length=1, null=True, choices=[(b'A', 'Altera a norma'), (b'R', 'Revoga a norma'), (b'P', 'Revoga parcialmente a norma'), (b'T', 'Revoga por consolida\xe7\xe3o a norma'), (b'C', 'Norma correlata'), (b'I', 'Suspende a execu\xe7\xe3o da norma'), (b'G', 'Regulamenta a norma')])), ('norma_referente', models.ForeignKey(related_name='+', to='norma.NormaJuridica')), ('norma_referida', models.ForeignKey(related_name='+', to='norma.NormaJuridica')), ], diff --git a/parlamentares/migrations/0001_initial.py b/parlamentares/migrations/0001_initial.py index f285a8b5c..e622969cb 100644 --- a/parlamentares/migrations/0001_initial.py +++ b/parlamentares/migrations/0001_initial.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): name='CargoMesa', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome', models.CharField(max_length=50, verbose_name='Cargo na Mesa')), + ('descricao', models.CharField(max_length=50, verbose_name='Cargo na Mesa')), ('unico', models.BooleanField(verbose_name='Cargo \xdanico')), ], options={ @@ -26,8 +26,8 @@ class Migration(migrations.Migration): name='Coligacao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome_coligacao', models.CharField(max_length=50, verbose_name='Nome')), - ('numero_votos_coligacao', models.IntegerField(null=True, verbose_name='N\xba Votos Recebidos', blank=True)), + ('nome', models.CharField(max_length=50, verbose_name='Nome')), + ('numero_votos', models.IntegerField(null=True, verbose_name='N\xba Votos Recebidos', blank=True)), ], options={ 'verbose_name': 'Coliga\xe7\xe3o', @@ -56,12 +56,12 @@ class Migration(migrations.Migration): name='Dependente', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome_dependente', models.CharField(max_length=50, verbose_name='Nome')), - ('sexo', models.CharField(max_length=1, verbose_name='Sexo')), + ('nome', models.CharField(max_length=50, verbose_name='Nome')), + ('sexo', models.CharField(max_length=1, verbose_name='Sexo', choices=[(b'F', 'Feminino'), (b'M', 'Masculino')])), ('data_nascimento', models.DateField(null=True, verbose_name='Data Nascimento', blank=True)), - ('numero_cpf', models.CharField(max_length=14, null=True, verbose_name='CPF', blank=True)), - ('numero_rg', models.CharField(max_length=15, null=True, verbose_name='RG', blank=True)), - ('numero_tit_eleitor', models.CharField(max_length=15, null=True, verbose_name='N\xba T\xedtulo Eleitor', blank=True)), + ('cpf', models.CharField(max_length=14, null=True, verbose_name='CPF', blank=True)), + ('rg', models.CharField(max_length=15, null=True, verbose_name='RG', blank=True)), + ('titulo_eleitor', models.CharField(max_length=15, null=True, verbose_name='N\xba T\xedtulo Eleitor', blank=True)), ], options={ 'verbose_name': 'Dependente', @@ -72,7 +72,7 @@ class Migration(migrations.Migration): name='Filiacao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('data_filiacao', models.DateField(verbose_name='Data Filia\xe7\xe3o')), + ('data', models.DateField(verbose_name='Data Filia\xe7\xe3o')), ('data_desfiliacao', models.DateField(null=True, verbose_name='Data Desfilia\xe7\xe3o', blank=True)), ], options={ @@ -93,30 +93,15 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Legislaturas', }, ), - migrations.CreateModel( - name='Localidade', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nome_localidade', models.CharField(max_length=50, null=True, blank=True)), - ('nome_localidade_pesq', models.CharField(max_length=50, null=True, blank=True)), - ('tipo_localidade', models.CharField(max_length=1, null=True, blank=True)), - ('sigla_uf', models.CharField(max_length=2, null=True, blank=True)), - ('sigla_regiao', models.CharField(max_length=2, null=True, blank=True)), - ], - options={ - 'verbose_name': 'Munic\xedpio', - 'verbose_name_plural': 'Munic\xedpios', - }, - ), migrations.CreateModel( name='Mandato', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('tipo_causa_fim_mandato', models.IntegerField(null=True, blank=True)), ('data_fim_mandato', models.DateField(null=True, verbose_name='Fim do Mandato', blank=True)), - ('numero_votos_recebidos', models.IntegerField(null=True, verbose_name='Votos Recebidos', blank=True)), + ('votos_recebidos', models.IntegerField(null=True, verbose_name='Votos Recebidos', blank=True)), ('data_expedicao_diploma', models.DateField(null=True, verbose_name='Expedi\xe7\xe3o do Diploma', blank=True)), - ('txt_observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), ('coligacao', models.ForeignKey(verbose_name='Coliga\xe7\xe3o', blank=True, to='parlamentares.Coligacao', null=True)), ('legislatura', models.ForeignKey(verbose_name='Legislatura', to='parlamentares.Legislatura')), ], @@ -125,11 +110,24 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Mandatos', }, ), + migrations.CreateModel( + name='Municipio', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('nome', models.CharField(max_length=50, null=True, blank=True)), + ('uf', models.CharField(blank=True, max_length=2, null=True, choices=[(b'AC', 'Acre'), (b'AL', 'Alagoas'), (b'AP', 'Amap\xe1'), (b'AM', 'Amazonas'), (b'BA', 'Bahia'), (b'CE', 'Cear\xe1'), (b'DF', 'Distrito Federal'), (b'ES', 'Esp\xedrito Santo'), (b'GO', 'Goi\xe1s'), (b'MA', 'Maranh\xe3o'), (b'MT', 'Mato Grosso'), (b'MS', 'Mato Grosso do Sul'), (b'MG', 'Minas Gerais'), (b'PR', 'Paran\xe1'), (b'PB', 'Para\xedba'), (b'PA', 'Par\xe1'), (b'PE', 'Pernambuco'), (b'PI', 'Piau\xed'), (b'RJ', 'Rio de Janeiro'), (b'RN', 'Rio Grande do Norte'), (b'RS', 'Rio Grande do Sul'), (b'RO', 'Rond\xf4nia'), (b'RR', 'Roraima'), (b'SC', 'Santa Catarina'), (b'SE', 'Sergipe'), (b'SP', 'S\xe3o Paulo'), (b'TO', 'Tocantins'), (b'EX', 'Exterior')])), + ('regiao', models.CharField(blank=True, max_length=2, null=True, choices=[(b'CO', 'Centro-Oeste'), (b'NE', 'Nordeste'), (b'NO', 'Norte'), (b'SE', 'Sudeste'), (b'SL', 'Sul'), (b'EX', 'Exterior')])), + ], + options={ + 'verbose_name': 'Munic\xedpio', + 'verbose_name_plural': 'Munic\xedpios', + }, + ), migrations.CreateModel( name='NivelInstrucao', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('nivel_instrucao', models.CharField(max_length=50, verbose_name='N\xedvel de Instru\xe7\xe3o')), + ('descricao', models.CharField(max_length=50, verbose_name='N\xedvel de Instru\xe7\xe3o')), ], options={ 'verbose_name': 'N\xedvel Instru\xe7\xe3o', @@ -142,27 +140,27 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('nome_completo', models.CharField(max_length=50, verbose_name='Nome Completo')), ('nome_parlamentar', models.CharField(max_length=50, null=True, verbose_name='Nome Parlamentar', blank=True)), - ('sexo', models.CharField(max_length=1, verbose_name='Sexo')), + ('sexo', models.CharField(max_length=1, verbose_name='Sexo', choices=[(b'F', 'Feminino'), (b'M', 'Masculino')])), ('data_nascimento', models.DateField(null=True, verbose_name='Data Nascimento', blank=True)), - ('numero_cpf', models.CharField(max_length=14, null=True, verbose_name='C.P.F', blank=True)), - ('numero_rg', models.CharField(max_length=15, null=True, verbose_name='R.G.', blank=True)), - ('numero_tit_eleitor', models.CharField(max_length=15, null=True, verbose_name='T\xedtulo de Eleitor', blank=True)), + ('cpf', models.CharField(max_length=14, null=True, verbose_name='C.P.F', blank=True)), + ('rg', models.CharField(max_length=15, null=True, verbose_name='R.G.', blank=True)), + ('titulo_eleitor', models.CharField(max_length=15, null=True, verbose_name='T\xedtulo de Eleitor', blank=True)), ('cod_casa', models.IntegerField()), ('numero_gab_parlamentar', models.CharField(max_length=10, null=True, verbose_name='N\xba Gabinete', blank=True)), - ('numero_tel_parlamentar', models.CharField(max_length=50, null=True, verbose_name='Telefone', blank=True)), - ('numero_fax_parlamentar', models.CharField(max_length=50, null=True, verbose_name='Fax', blank=True)), - ('endereco_residencial', models.CharField(max_length=100, null=True, verbose_name='Endere\xe7o Residencial', blank=True)), - ('numero_cep_resid', models.CharField(max_length=9, null=True, verbose_name='CEP', blank=True)), - ('numero_tel_resid', models.CharField(max_length=50, null=True, verbose_name='Telefone Residencial', blank=True)), - ('numero_fax_resid', models.CharField(max_length=50, null=True, verbose_name='Fax Residencial', blank=True)), + ('telefone', models.CharField(max_length=50, null=True, verbose_name='Telefone', blank=True)), + ('fax', models.CharField(max_length=50, null=True, verbose_name='Fax', blank=True)), + ('endereco_residencia', models.CharField(max_length=100, null=True, verbose_name='Endere\xe7o Residencial', blank=True)), + ('cep_residencia', models.CharField(max_length=9, null=True, verbose_name='CEP', blank=True)), + ('telefone_residencia', models.CharField(max_length=50, null=True, verbose_name='Telefone Residencial', blank=True)), + ('fax_residencia', models.CharField(max_length=50, null=True, verbose_name='Fax Residencial', blank=True)), ('endereco_web', models.CharField(max_length=100, null=True, verbose_name='HomePage', blank=True)), - ('nome_profissao', models.CharField(max_length=50, null=True, verbose_name='Profiss\xe3o', blank=True)), - ('endereco_email', models.CharField(max_length=100, null=True, verbose_name='Correio Eletr\xf4nico', blank=True)), - ('descricao_local_atuacao', models.CharField(max_length=100, null=True, verbose_name='Locais de Atua\xe7\xe3o', blank=True)), + ('profissao', models.CharField(max_length=50, null=True, verbose_name='Profiss\xe3o', blank=True)), + ('email', models.CharField(max_length=100, null=True, verbose_name='Correio Eletr\xf4nico', blank=True)), + ('locais_atuacao', models.CharField(max_length=100, null=True, verbose_name='Locais de Atua\xe7\xe3o', blank=True)), ('ativo', models.BooleanField(verbose_name='Ativo na Casa?')), - ('txt_biografia', models.TextField(null=True, verbose_name='Biografia', blank=True)), - ('unid_deliberativa', models.BooleanField()), - ('localidade_resid', models.ForeignKey(verbose_name='Munic\xedpio', blank=True, to='parlamentares.Localidade', null=True)), + ('biografia', models.TextField(null=True, verbose_name='Biografia', blank=True)), + ('unidade_deliberativa', models.BooleanField()), + ('municipio_residencia', models.ForeignKey(verbose_name='Munic\xedpio', blank=True, to='parlamentares.Municipio', null=True)), ('nivel_instrucao', models.ForeignKey(verbose_name='N\xedvel Instru\xe7\xe3o', blank=True, to='parlamentares.NivelInstrucao', null=True)), ], options={ @@ -174,8 +172,8 @@ class Migration(migrations.Migration): name='Partido', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('sigla_partido', models.CharField(max_length=9, verbose_name='Sigla')), - ('nome_partido', models.CharField(max_length=50, verbose_name='Nome')), + ('sigla', models.CharField(max_length=9, verbose_name='Sigla')), + ('nome', models.CharField(max_length=50, verbose_name='Nome')), ('data_criacao', models.DateField(null=True, verbose_name='Data Cria\xe7\xe3o', blank=True)), ('data_extincao', models.DateField(null=True, verbose_name='Data Extin\xe7\xe3o', blank=True)), ], @@ -189,7 +187,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('numero', models.IntegerField(verbose_name='N\xfamero')), - ('tipo', models.CharField(max_length=1, verbose_name='Tipo')), + ('tipo', models.CharField(max_length=1, verbose_name='Tipo', choices=[(b'O', 'Ordin\xe1ria'), (b'E', 'Extraordin\xe1ria')])), ('data_inicio', models.DateField(verbose_name='Data In\xedcio')), ('data_fim', models.DateField(verbose_name='Data Fim')), ('data_inicio_intervalo', models.DateField(null=True, verbose_name='In\xedcio Intervalo', blank=True)), @@ -205,7 +203,7 @@ class Migration(migrations.Migration): name='SituacaoMilitar', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_tipo_situacao', models.CharField(max_length=50, verbose_name='Situa\xe7\xe3o Militar')), + ('descricao', models.CharField(max_length=50, verbose_name='Situa\xe7\xe3o Militar')), ], options={ 'verbose_name': 'Tipo Situa\xe7\xe3o Militar', @@ -216,10 +214,10 @@ class Migration(migrations.Migration): name='TipoAfastamento', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_afastamento', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), + ('descricao', models.CharField(max_length=50, verbose_name='Descri\xe7\xe3o')), ('afastamento', models.BooleanField(verbose_name='Indicador')), ('fim_mandato', models.BooleanField(verbose_name='Indicador')), - ('descricao_dispositivo', models.CharField(max_length=50, null=True, verbose_name='Dispositivo', blank=True)), + ('dispositivo', models.CharField(max_length=50, null=True, verbose_name='Dispositivo', blank=True)), ], options={ 'verbose_name': 'Tipo de Afastamento', @@ -230,7 +228,7 @@ class Migration(migrations.Migration): name='TipoDependente', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('descricao_tipo_dependente', models.CharField(max_length=50)), + ('descricao', models.CharField(max_length=50)), ], options={ 'verbose_name': 'Tipo de Dependente', @@ -269,7 +267,7 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='dependente', - name='tipo_dependente', + name='tipo', field=models.ForeignKey(verbose_name='Tipo', to='parlamentares.TipoDependente'), ), migrations.AddField( diff --git a/protocoloadm/migrations/0001_initial.py b/protocoloadm/migrations/0001_initial.py index a63e678db..e822329c2 100644 --- a/protocoloadm/migrations/0001_initial.py +++ b/protocoloadm/migrations/0001_initial.py @@ -19,8 +19,8 @@ class Migration(migrations.Migration): ('nome_arquivo', models.CharField(max_length=100, verbose_name='Arquivo')), ('data_documento', models.DateField(null=True, verbose_name='Data', blank=True)), ('nome_autor_documento', models.CharField(max_length=50, null=True, verbose_name='Autor', blank=True)), - ('txt_assunto', models.TextField(null=True, verbose_name='Assunto', blank=True)), - ('txt_indexacao', models.TextField(null=True, blank=True)), + ('assunto', models.TextField(null=True, verbose_name='Assunto', blank=True)), + ('indexacao', models.TextField(null=True, blank=True)), ], options={ 'verbose_name': 'Documento Acess\xf3rio', @@ -35,12 +35,12 @@ class Migration(migrations.Migration): ('ano_documento', models.SmallIntegerField(verbose_name='Ano')), ('data_documento', models.DateField(verbose_name='Data')), ('numero_protocolo', models.IntegerField(null=True, verbose_name='N\xfam. Protocolo', blank=True)), - ('txt_interessado', models.CharField(max_length=50, null=True, verbose_name='Interessado', blank=True)), + ('interessado', models.CharField(max_length=50, null=True, verbose_name='Interessado', blank=True)), ('numero_dias_prazo', models.IntegerField(null=True, verbose_name='Dias Prazo', blank=True)), ('data_fim_prazo', models.DateField(null=True, verbose_name='Data Fim Prazo', blank=True)), ('tramitacao', models.BooleanField(verbose_name='Em Tramita\xe7\xe3o?')), - ('txt_assunto', models.TextField(verbose_name='Assunto')), - ('txt_observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), + ('assunto', models.TextField(verbose_name='Assunto')), + ('observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), ('autor', models.ForeignKey(blank=True, to='materia.Autor', null=True)), ], options={ @@ -59,14 +59,14 @@ class Migration(migrations.Migration): ('data_timestamp', models.DateTimeField()), ('tipo_protocolo', models.IntegerField(verbose_name='Tipo de Protocolo')), ('tipo_processo', models.IntegerField()), - ('txt_interessado', models.CharField(max_length=60, null=True, verbose_name='Interessado', blank=True)), - ('txt_assunto_ementa', models.TextField(null=True, blank=True)), + ('interessado', models.CharField(max_length=60, null=True, verbose_name='Interessado', blank=True)), + ('assunto_ementa', models.TextField(null=True, blank=True)), ('numero_paginas', models.IntegerField(null=True, verbose_name='N\xfam. P\xe1ginas', blank=True)), - ('txt_observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Observa\xe7\xe3o', blank=True)), ('anulado', models.BooleanField()), - ('txt_user_anulacao', models.CharField(max_length=20, null=True, blank=True)), - ('txt_ip_anulacao', models.CharField(max_length=15, null=True, blank=True)), - ('txt_just_anulacao', models.CharField(max_length=60, null=True, blank=True)), + ('user_anulacao', models.CharField(max_length=20, null=True, blank=True)), + ('ip_anulacao', models.CharField(max_length=15, null=True, blank=True)), + ('just_anulacao', models.CharField(max_length=60, null=True, blank=True)), ('timestamp_anulacao', models.DateTimeField(null=True, blank=True)), ('autor', models.ForeignKey(blank=True, to='materia.Autor', null=True)), ], @@ -110,7 +110,7 @@ class Migration(migrations.Migration): ('data_encaminha', models.DateField(null=True, verbose_name='Data Encaminhamento', blank=True)), ('cod_unid_tram_dest', models.IntegerField(null=True, verbose_name='Unidade Destino', blank=True)), ('ult_tramitacao', models.BooleanField()), - ('txt_tramitacao', models.TextField(null=True, verbose_name='Texto da A\xe7\xe3o', blank=True)), + ('tramitacao', models.TextField(null=True, verbose_name='Texto da A\xe7\xe3o', blank=True)), ('data_fim_prazo', models.DateField(null=True, verbose_name='Data Fim do Prazo', blank=True)), ('documento', models.ForeignKey(to='protocoloadm.DocumentoAdministrativo')), ('status', models.ForeignKey(verbose_name='Status', blank=True, to='protocoloadm.StatusTramitacaoAdministrativo', null=True)), diff --git a/sessao/migrations/0001_initial.py b/sessao/migrations/0001_initial.py index 5eb98641c..7e3a4c31c 100644 --- a/sessao/migrations/0001_initial.py +++ b/sessao/migrations/0001_initial.py @@ -17,9 +17,9 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('data_ordem', models.DateField(verbose_name='Data da Sess\xe3o')), - ('txt_observacao', models.TextField(null=True, verbose_name='Ementa', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Ementa', blank=True)), ('numero_ordem', models.IntegerField(verbose_name='N\xba Ordem')), - ('txt_resultado', models.TextField(null=True, blank=True)), + ('resultado', models.TextField(null=True, blank=True)), ('tipo_votacao', models.IntegerField(verbose_name='Tipo de vota\xe7\xe3o')), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ], @@ -32,7 +32,7 @@ class Migration(migrations.Migration): name='ExpedienteSessaoPlenaria', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('txt_expediente', models.TextField(null=True, blank=True)), + ('expediente', models.TextField(null=True, blank=True)), ], options={ 'verbose_name': 'Expediente de Sess\xe3o Plenaria', @@ -83,9 +83,9 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('data_ordem', models.DateField(verbose_name='Data da Sess\xe3o')), - ('txt_observacao', models.TextField(null=True, verbose_name='Ementa', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Ementa', blank=True)), ('numero_ordem', models.IntegerField(verbose_name='N\xba Ordem')), - ('txt_resultado', models.TextField(null=True, blank=True)), + ('resultado', models.TextField(null=True, blank=True)), ('tipo_votacao', models.IntegerField(verbose_name='Tipo de vota\xe7\xe3o')), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ], @@ -113,7 +113,7 @@ class Migration(migrations.Migration): ('numero_votos_sim', models.IntegerField(verbose_name='Sim:')), ('numero_votos_nao', models.IntegerField(verbose_name='N\xe3o:')), ('numero_abstencao', models.IntegerField(verbose_name='Absten\xe7\xf5es:')), - ('txt_observacao', models.TextField(null=True, verbose_name='Observa\xe7\xf5es', blank=True)), + ('observacao', models.TextField(null=True, verbose_name='Observa\xe7\xf5es', blank=True)), ('materia', models.ForeignKey(to='materia.MateriaLegislativa')), ('ordem', models.ForeignKey(to='sessao.OrdemDia')), ], @@ -239,11 +239,6 @@ class Migration(migrations.Migration): name='sessao_plen', field=models.ForeignKey(to='sessao.SessaoPlenaria'), ), - migrations.AddField( - model_name='expedientesessaoplenaria', - name='expediente', - field=models.ForeignKey(to='sessao.TipoExpediente'), - ), migrations.AddField( model_name='expedientesessaoplenaria', name='sessao_plen',