From 11384f4ebadd0cbc26250c7cb1896310b99714f9 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 29 May 2018 10:05:29 -0300 Subject: [PATCH 01/45] =?UTF-8?q?Exec=20migrate=20s=C3=B3=20depois=20de=20?= =?UTF-8?q?testar=20tag=20marco?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/management/commands/migracao_25_31.py | 2 -- sapl/legacy/migracao.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sapl/legacy/management/commands/migracao_25_31.py b/sapl/legacy/management/commands/migracao_25_31.py index 4541425c4..e3864ad0f 100644 --- a/sapl/legacy/management/commands/migracao_25_31.py +++ b/sapl/legacy/management/commands/migracao_25_31.py @@ -1,4 +1,3 @@ -from django.core import management from django.core.management.base import BaseCommand from sapl.legacy.migracao import migrar @@ -9,5 +8,4 @@ class Command(BaseCommand): help = 'Migração de dados do SAPL 2.5 para o SAPL 3.1' def handle(self, *args, **options): - management.call_command('migrate') migrar(interativo=False) diff --git a/sapl/legacy/migracao.py b/sapl/legacy/migracao.py index ffd0d2a18..c2d863b36 100644 --- a/sapl/legacy/migracao.py +++ b/sapl/legacy/migracao.py @@ -2,6 +2,7 @@ import subprocess from getpass import getpass import requests +from django.core import management from unipath import Path from sapl.legacy.migracao_dados import (REPO, TAG_MARCO, gravar_marco, info, @@ -24,6 +25,7 @@ def migrar(interativo=False): assert TAG_ZOPE in REPO.tags, adornar_msg( 'Antes de migrar ' 'é necessário fazer a exportação de documentos do zope') + management.call_command('migrate') migrar_dados(interativo=interativo) migrar_usuarios(REPO.working_dir) migrar_documentos(REPO) From e71f549d94374e1ff27c198262cdd59922c63c94 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 29 May 2018 15:28:29 -0300 Subject: [PATCH 02/45] =?UTF-8?q?Adapta=20exporta=C3=A7=C3=A3o=20do=20zope?= =?UTF-8?q?=20para=20DocumentosSapl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit e encoding flexível --- .../scripts/exporta_zope/exporta_zope.py | 59 +++++++++++++++---- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index 20c7d21e7..424d0c7f4 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -275,35 +275,62 @@ def find_sapl(app): id, meta_type = obj['id'], obj['meta_type'] if id.startswith('cm_') and meta_type == 'Folder': cm_zzz = br(app[id]) - sapl = br(cm_zzz.get('sapl', None)) - if sapl and 'sapl_documentos' in sapl and 'acl_users' in sapl: - return sapl + return find_sapl(cm_zzz) + elif id == 'sapl' and meta_type in ['SAPL', 'Folder']: + sapl = br(app['sapl']) + return sapl -def dump_propriedades(docs, path, salvar, encoding='iso-8859-1'): +def detectar_encoding(fonte): + desc = magic.from_buffer(fonte) + for termo, enc in [('ISO-8859', 'latin1'), ('UTF-8', 'utf-8')]: + if termo in desc: + return enc + return None + + +def autodecode(fonte): + if isinstance(fonte, str): + enc = detectar_encoding(fonte) + return fonte.decode(enc) if enc else fonte + else: + return fonte + + +def dump_propriedades(docs, path, salvar): props_sapl = br(docs['props_sapl']) ids = [p['id'] for p in props_sapl['_properties']] props = {id: props_sapl[id] for id in ids} - props = {id: p.decode(encoding) if isinstance(p, str) else p - for id, p in props.items()} + props = {id: autodecode(p) for id, p in props.items()} save_as_yaml(path, 'sapl_documentos/propriedades.yaml', props, salvar) def dump_usuarios(sapl, path, salvar): users = br(br(sapl['acl_users'])['data']) - users = {k: br(v) for k, v in users['data'].items()} + users = {autodecode(k): br(v) for k, v in users['data'].items()} save_as_yaml(path, 'usuarios.yaml', users, salvar) -def _dump_sapl(data_fs_path, destino, salvar): +def _dump_sapl(data_fs_path, documentos_fs_path, destino, salvar): assert Path(data_fs_path).exists() + assert Path(documentos_fs_path).exists() + app, close_db = get_app(data_fs_path) try: sapl = find_sapl(app) - # extrai folhas XSLT - dump_folder(br(sapl['XSLT']), destino, salvar) # extrai usuários com suas senhas e perfis dump_usuarios(sapl, destino, salvar) + # garantindo que a pasta XSLT não está aqui + assert 'XSLT' not in sapl + finally: + close_db() + + app, close_db = get_app(documentos_fs_path) + try: + sapl = find_sapl(app) + # extrai folhas XSLT + if 'XSLT' in sapl: + dump_folder(br(sapl['XSLT']), destino, salvar) # extrai documentos docs = br(sapl['sapl_documentos']) @@ -355,9 +382,15 @@ def build_salvar(repo): def dump_sapl(sigla): sigla = sigla[-3:] # ignora prefixo (por ex. 'sapl_cm_') - data_fs_path = DIR_DADOS_MIGRACAO.child('datafs', - 'Data_cm_{}.fs'.format(sigla)) + data_fs_path, documentos_fs_path = [ + DIR_DADOS_MIGRACAO.child( + 'datafs', '{}_cm_{}.fs'.format(prefixo, sigla)) + for prefixo in ('Data', 'DocumentosSapl')] + assert data_fs_path.exists(), 'Origem não existe: {}'.format(data_fs_path) + if not documentos_fs_path.exists(): + documentos_fs_path = data_fs_path + nome_banco_legado = 'sapl_cm_{}'.format(sigla) destino = DIR_DADOS_MIGRACAO.child('repos', nome_banco_legado) destino.mkdir(parents=True) @@ -372,7 +405,7 @@ def dump_sapl(sigla): salvar = build_salvar(repo) try: finalizado = False - _dump_sapl(data_fs_path, destino, salvar) + _dump_sapl(data_fs_path, documentos_fs_path, destino, salvar) finalizado = True finally: # grava mundaças From 695206b8a47f143ab7608e94109f90459b01a5d3 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 30 May 2018 11:05:12 -0300 Subject: [PATCH 03/45] =?UTF-8?q?Corrige=20dump=20de=20XSLT=20na=20exporta?= =?UTF-8?q?=C3=A7=C3=A3o=20do=20zope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index 424d0c7f4..7507ffb87 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -320,8 +320,6 @@ def _dump_sapl(data_fs_path, documentos_fs_path, destino, salvar): sapl = find_sapl(app) # extrai usuários com suas senhas e perfis dump_usuarios(sapl, destino, salvar) - # garantindo que a pasta XSLT não está aqui - assert 'XSLT' not in sapl finally: close_db() From 76824dcc7a1af590bea5418304e33e7e2879ad73 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 30 May 2018 11:32:50 -0300 Subject: [PATCH 04/45] =?UTF-8?q?Retira=20restri=C3=A7=C3=A3o=20de=20num?= =?UTF-8?q?=20de=20superusers=20ao=20migrar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/migracao_usuarios.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sapl/legacy/migracao_usuarios.py b/sapl/legacy/migracao_usuarios.py index be0478c82..51b3348c8 100644 --- a/sapl/legacy/migracao_usuarios.py +++ b/sapl/legacy/migracao_usuarios.py @@ -95,16 +95,7 @@ def migrar_usuarios(dir_repo): usuario.groups.add(PERFIL_LEGADO_PARA_NOVO[perfil]) usuario.save() - # restringe e configura administradores - if len(admins) > 2: - admins = ( - # ususários com admin no nome - [u for u in admins if 'admin' in u.username] - # senão, o usuário saploper, apenas - or [u for u in admins if 'saploper' == u.username] - # senão, simplesmente até os dois primeiros da lista - or admins[:2] - ) + # configura administradores for admin in admins: admin.is_superuser = True admin.save() From da44d3c7c9e5c105fca962fa2b6c248d7fd152ae Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 30 May 2018 14:29:00 -0300 Subject: [PATCH 05/45] =?UTF-8?q?Autodecodifica=20nomes=20de=20usu=C3=A1ri?= =?UTF-8?q?os=20ao=20exportar=20zope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index 7507ffb87..a29a0b83b 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -17,12 +17,12 @@ from functools import partial import git import magic import yaml -import ZODB.DB -import ZODB.FileStorage from unipath import Path -from ZODB.broken import Broken +import ZODB.DB +import ZODB.FileStorage from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE +from ZODB.broken import Broken EXTENSOES = { 'application/msword': '.doc', @@ -308,6 +308,8 @@ def dump_propriedades(docs, path, salvar): def dump_usuarios(sapl, path, salvar): users = br(br(sapl['acl_users'])['data']) users = {autodecode(k): br(v) for k, v in users['data'].items()} + for dados in users.values(): + dados['name'] = autodecode(dados['name']) save_as_yaml(path, 'usuarios.yaml', users, salvar) From 3de1e2b99d6dadf77661dffb87bf567ca5c7722c Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Sat, 2 Jun 2018 12:23:14 -0300 Subject: [PATCH 06/45] =?UTF-8?q?Pula=20pastas=20*=5Fold=20na=20exporta?= =?UTF-8?q?=C3=A7=C3=A3o=20do=20zope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 3 +++ 1 file changed, 3 insertions(+) mode change 100755 => 100644 sapl/legacy/scripts/exporta_zope/exporta_zope.py diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py old mode 100755 new mode 100644 index a29a0b83b..75c21b033 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -186,6 +186,9 @@ def dump_folder(folder, path, salvar, enum=enumerate_folder): if not os.path.exists(path): os.makedirs(path) for id, obj, meta_type in enum(folder): + # pula pastas *_old (presentes em várias bases) + if id.endswith('_old') and meta_type in ['Folder', 'BTreeFolder2']: + continue dump = DUMP_FUNCTIONS.get(meta_type, '?') if dump == '?': nao_identificados[meta_type].append(path + '/' + id) From 37720a91ce1c6e3defab104a9914994185ae36b8 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Sat, 2 Jun 2018 14:08:44 -0300 Subject: [PATCH 07/45] =?UTF-8?q?Reconhece=20arquivos=20corrompidos=20na?= =?UTF-8?q?=20exporta=C3=A7=C3=A3o=20do=20zope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripts/exporta_zope/exporta_zope.py | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) mode change 100644 => 100755 sapl/legacy/scripts/exporta_zope/exporta_zope.py diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py old mode 100644 new mode 100755 index 75c21b033..12819f512 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -17,12 +17,13 @@ from functools import partial import git import magic import yaml -from unipath import Path - import ZODB.DB import ZODB.FileStorage -from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE +from unipath import Path from ZODB.broken import Broken +from ZODB.POSException import POSKeyError + +from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE EXTENSOES = { 'application/msword': '.doc', @@ -95,6 +96,9 @@ def guess_extension(fullname, buffer): return '.DESCONHECIDO.{}'.format(mime.replace('/', '__')) +CONTEUDO_ARQUIVO_CORROMPIDO = 'ARQUIVO CORROMPIDO' + + def get_conteudo_file(doc): # A partir daqui usamos dict.pop('...') nos __Broken_state__ # para contornar um "vazamento" de memória que ocorre @@ -105,25 +109,30 @@ def get_conteudo_file(doc): # # Essa medida descarta quase todos os dados retornados # e só funciona na primeira passagem + try: + pdata = br(doc.pop('data')) + if isinstance(pdata, str): + # Retrocedemos se pdata ja eh uma str (necessario em Images) + doc['data'] = pdata + pdata = doc - pdata = br(doc.pop('data')) - if isinstance(pdata, str): - # Retrocedemos se pdata ja eh uma str (necessario em Images) - doc['data'] = pdata - pdata = doc - - output = cStringIO.StringIO() - while pdata: - output.write(pdata.pop('data')) - pdata = br(pdata.pop('next', None)) + output = cStringIO.StringIO() + while pdata: + output.write(pdata.pop('data')) + pdata = br(pdata.pop('next', None)) - return output.getvalue() + return output.getvalue() + except POSKeyError: + return CONTEUDO_ARQUIVO_CORROMPIDO def dump_file(doc, path, salvar, get_conteudo=get_conteudo_file): name = doc['__name__'] fullname = os.path.join(path, name) conteudo = get_conteudo(doc) + if conteudo == CONTEUDO_ARQUIVO_CORROMPIDO: + fullname = fullname + '.CORROMPIDO' + print('ATENÇÃO: arquivo corrompido: {}'.format(fullname)) if conteudo: # pula arquivos vazios salvar(fullname, conteudo) From e3317eebe7e25abd0c975c6e0a5765879617e274 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Mon, 11 Jun 2018 11:15:57 -0300 Subject: [PATCH 08/45] =?UTF-8?q?Ajusta=20nome=20de=20arquivo=20corrompido?= =?UTF-8?q?=20na=20exporta=C3=A7=C3=A3o=20do=20zope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index 12819f512..f1a4b791f 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -131,7 +131,7 @@ def dump_file(doc, path, salvar, get_conteudo=get_conteudo_file): fullname = os.path.join(path, name) conteudo = get_conteudo(doc) if conteudo == CONTEUDO_ARQUIVO_CORROMPIDO: - fullname = fullname + '.CORROMPIDO' + fullname = fullname + '_CORROMPIDO' print('ATENÇÃO: arquivo corrompido: {}'.format(fullname)) if conteudo: # pula arquivos vazios From 8d16524d858427d4d02df823d5ff58c037451b88 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Mon, 11 Jun 2018 11:20:38 -0300 Subject: [PATCH 09/45] =?UTF-8?q?Adiciona=20tag=20zope=20ao=20exportar=20z?= =?UTF-8?q?ope=20mesmo=20sem=20mudan=C3=A7a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index f1a4b791f..d6af2c535 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -17,14 +17,14 @@ from functools import partial import git import magic import yaml +from unipath import Path + import ZODB.DB import ZODB.FileStorage -from unipath import Path +from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE from ZODB.broken import Broken from ZODB.POSException import POSKeyError -from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE - EXTENSOES = { 'application/msword': '.doc', 'application/pdf': '.pdf', @@ -427,8 +427,8 @@ def dump_sapl(sigla): # se de fato existe mudança status = 'completa' if finalizado else 'parcial' repo.index.commit(u'Exportação do zope {}'.format(status)) - if finalizado: - repo.git.execute('git tag -f'.split() + [TAG_ZOPE]) + if finalizado: + repo.git.execute('git tag -f'.split() + [TAG_ZOPE]) if __name__ == "__main__": From a3d5321e097642c3c288c1fc27fb478d6262c7ed Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 12 Jun 2018 13:37:37 -0300 Subject: [PATCH 10/45] Ajusta sessao_plenaria_presenca.dat_sessao antes de migrar --- sapl/legacy/migracao_dados.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index 88758c8b1..87646cd07 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -626,12 +626,13 @@ def uniformiza_banco(): ''') update_specs = ''' -vinculo_norma_juridica| ind_excluido = '' | trim(ind_excluido) = '0' -unidade_tramitacao | cod_parlamentar = NULL | cod_parlamentar = 0 -parlamentar | cod_nivel_instrucao = NULL | cod_nivel_instrucao = 0 -parlamentar | tip_situacao_militar = NULL | tip_situacao_militar = 0 -mandato | tip_afastamento = NULL | tip_afastamento = 0 -relatoria | tip_fim_relatoria = NULL | tip_fim_relatoria = 0 +vinculo_norma_juridica | ind_excluido = '' | trim(ind_excluido) = '0' +unidade_tramitacao | cod_parlamentar = NULL | cod_parlamentar = 0 +parlamentar | cod_nivel_instrucao = NULL | cod_nivel_instrucao = 0 +parlamentar | tip_situacao_militar = NULL | tip_situacao_militar = 0 +mandato | tip_afastamento = NULL | tip_afastamento = 0 +relatoria | tip_fim_relatoria = NULL | tip_fim_relatoria = 0 +sessao_plenaria_presenca | dat_sessao = NULL | dat_sessao = 0 '''.strip().splitlines() for spec in update_specs: @@ -794,7 +795,7 @@ def roda_comando_shell(cmd): assert res == 0, 'O comando falhou: {}'.format(cmd) -def migrar_dados(interativo=True): +def migrar_dados(interativo=False): # restaura dump arq_dump = Path(DIR_DADOS_MIGRACAO.child( From f5246f1d4c594d4b522db14851b60dbfa19383b9 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 13 Jun 2018 09:16:05 -0300 Subject: [PATCH 11/45] =?UTF-8?q?Retira=20c=C3=B3digo=20desnecess=C3=A1rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/migracao.py | 2 +- sapl/legacy/migracao_dados.py | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/sapl/legacy/migracao.py b/sapl/legacy/migracao.py index c2d863b36..746dff6f8 100644 --- a/sapl/legacy/migracao.py +++ b/sapl/legacy/migracao.py @@ -26,7 +26,7 @@ def migrar(interativo=False): 'Antes de migrar ' 'é necessário fazer a exportação de documentos do zope') management.call_command('migrate') - migrar_dados(interativo=interativo) + migrar_dados() migrar_usuarios(REPO.working_dir) migrar_documentos(REPO) gravar_marco() diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index 87646cd07..fb5020437 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -795,7 +795,7 @@ def roda_comando_shell(cmd): assert res == 0, 'O comando falhou: {}'.format(cmd) -def migrar_dados(interativo=False): +def migrar_dados(): # restaura dump arq_dump = Path(DIR_DADOS_MIGRACAO.child( @@ -814,17 +814,6 @@ def migrar_dados(interativo=False): uniformiza_banco() # excluindo database antigo. - if interativo: - info('Todos os dados do banco serão excluidos. ' - 'Recomendamos que faça backup do banco sapl ' - 'antes de continuar.') - info('Deseja continuar? [s/n]') - resposta = input() - if resposta.lower() in ['s', 'sim', 'y', 'yes']: - pass - else: - info('Migração cancelada.') - return 0 info('Excluindo entradas antigas do banco destino.') call([PROJECT_DIR.child('manage.py'), 'flush', '--database=default', '--no-input'], stdout=PIPE) From 5a27d9127b19addb637070501bb8209f8c0a0c4e Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 13 Jun 2018 09:38:20 -0300 Subject: [PATCH 12/45] =?UTF-8?q?Loga=20ocorrencias=20em=20toda=20a=20migr?= =?UTF-8?q?a=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/migracao_dados.py | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index fb5020437..c6ca892f0 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -796,36 +796,36 @@ def roda_comando_shell(cmd): def migrar_dados(): - - # restaura dump - arq_dump = Path(DIR_DADOS_MIGRACAO.child( - 'dumps_mysql', '{}.sql'.format(NOME_BANCO_LEGADO))) - assert arq_dump.exists(), 'Dump do mysql faltando: {}'.format(arq_dump) - info('Restaurando dump mysql de [{}]'.format(arq_dump)) - normaliza_dump_mysql(arq_dump) - roda_comando_shell('mysql -uroot < {}'.format(arq_dump)) - - # executa ajustes pré-migração, se existirem - arq_ajustes_pre_migracao = DIR_DADOS_MIGRACAO.child( - 'ajustes_pre_migracao', '{}.sql'.format(sigla_casa)) - if arq_ajustes_pre_migracao.exists(): - exec_legado(arq_ajustes_pre_migracao.read_file()) - - uniformiza_banco() - - # excluindo database antigo. - info('Excluindo entradas antigas do banco destino.') - call([PROJECT_DIR.child('manage.py'), 'flush', - '--database=default', '--no-input'], stdout=PIPE) - - # apaga tipos de autor padrão (criados no flush acima) - TipoAutor.objects.all().delete() - - fill_vinculo_norma_juridica() - fill_dados_basicos() - info('Começando migração: ...') try: ocorrencias.clear() + + # restaura dump + arq_dump = Path(DIR_DADOS_MIGRACAO.child( + 'dumps_mysql', '{}.sql'.format(NOME_BANCO_LEGADO))) + assert arq_dump.exists(), 'Dump do mysql faltando: {}'.format(arq_dump) + info('Restaurando dump mysql de [{}]'.format(arq_dump)) + normaliza_dump_mysql(arq_dump) + roda_comando_shell('mysql -uroot < {}'.format(arq_dump)) + + # executa ajustes pré-migração, se existirem + arq_ajustes_pre_migracao = DIR_DADOS_MIGRACAO.child( + 'ajustes_pre_migracao', '{}.sql'.format(sigla_casa)) + if arq_ajustes_pre_migracao.exists(): + exec_legado(arq_ajustes_pre_migracao.read_file()) + + uniformiza_banco() + + # excluindo database antigo. + info('Excluindo entradas antigas do banco destino.') + call([PROJECT_DIR.child('manage.py'), 'flush', + '--database=default', '--no-input'], stdout=PIPE) + + # apaga tipos de autor padrão (criados no flush acima) + TipoAutor.objects.all().delete() + + fill_vinculo_norma_juridica() + fill_dados_basicos() + info('Começando migração: ...') migrar_todos_os_models() except Exception as e: ocorrencias['traceback'] = str(traceback.format_exc()) From b2c46e8370012bb2b38bc1b0da491277e253360f Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 13 Jun 2018 15:11:45 -0300 Subject: [PATCH 13/45] HOT-FIX: ordena atas por data (desc) --- sapl/base/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/base/forms.py b/sapl/base/forms.py index 8114a0137..e60ffe072 100644 --- a/sapl/base/forms.py +++ b/sapl/base/forms.py @@ -529,7 +529,7 @@ class RelatorioAtasFilterSet(django_filters.FilterSet): def qs(self): parent = super(RelatorioAtasFilterSet, self).qs return parent.distinct().prefetch_related('tipo').exclude( - upload_ata='').order_by('-legislatura', 'tipo', 'numero') + upload_ata='').order_by('-data_inicio', 'tipo', 'numero') def __init__(self, *args, **kwargs): super(RelatorioAtasFilterSet, self).__init__( From 0a38515b60b0ea330c4980fa919215abeab39b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= Date: Wed, 13 Jun 2018 17:56:26 -0300 Subject: [PATCH 14/45] Fix #1999 (#2009) --- sapl/painel/views.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sapl/painel/views.py b/sapl/painel/views.py index 0cb151382..a185fed3b 100644 --- a/sapl/painel/views.py +++ b/sapl/painel/views.py @@ -315,10 +315,7 @@ def get_presentes(pk, response, materia): presentes_list = [] for p in presentes: - now_year = timezone.now().year - # Recupera a legislatura vigente - legislatura = Legislatura.objects.get(data_inicio__year__lte=now_year, - data_fim__year__gte=now_year) + legislatura = sessao.legislatura # Recupera os mandatos daquele parlamentar mandatos = p.parlamentar.mandato_set.filter(legislatura=legislatura) From c7f69e09ca341606feda30ac663c7f059931ba6f Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 13 Jun 2018 19:26:00 -0300 Subject: [PATCH 15/45] =?UTF-8?q?Pula=20diret=C3=B3rios=20corrompidos=20ao?= =?UTF-8?q?=20exportar=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index d6af2c535..7494dca17 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -146,8 +146,16 @@ def get_conteudo_dtml_method(doc): def enumerate_by_key_list(folder, key_list, type_key): for entry in folder.get(key_list, []): id, meta_type = entry['id'], entry[type_key] - obj = br(folder.get(id, None)) - yield id, obj, meta_type + try: + obj = br(folder.get(id, None)) + except POSKeyError: + print('#' * 80) + print('#' * 80) + print('ATENÇÃO: DIRETÓRIO corrompido: {}'.format(id)) + print('#' * 80) + print('#' * 80) + else: + yield id, obj, meta_type enumerate_folder = partial(enumerate_by_key_list, From f81b678bac859a5cd9625146ef4c8328ecf23db9 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 13 Jun 2018 19:27:22 -0300 Subject: [PATCH 16/45] =?UTF-8?q?Suspende=20compacta=C3=A7=C3=A3o=20de=20m?= =?UTF-8?q?edia=20ao=20migrar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/migracao.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/legacy/migracao.py b/sapl/legacy/migracao.py index 746dff6f8..9ed09360f 100644 --- a/sapl/legacy/migracao.py +++ b/sapl/legacy/migracao.py @@ -30,7 +30,7 @@ def migrar(interativo=False): migrar_usuarios(REPO.working_dir) migrar_documentos(REPO) gravar_marco() - compactar_media() + # compactar_media() def compactar_media(): From 6a3f2c77a4df9de4a09bc3c0ee7e2ed84540ca03 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Wed, 13 Jun 2018 21:33:32 -0300 Subject: [PATCH 17/45] =?UTF-8?q?Migra=20dados=20de=20reuni=C3=A3o=20de=20?= =?UTF-8?q?comiss=C3=A3o=20(do=20sapl=203.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/comissoes/legacy.yaml | 7 ++++ .../migrations/0015_auto_20180613_2023.py | 25 ++++++++++++++ .../migrations/0016_auto_20180613_2121.py | 21 ++++++++++++ sapl/comissoes/models.py | 11 ++++-- sapl/comissoes/views.py | 34 +++++++++++-------- sapl/legacy/migracao_dados.py | 22 ++++++++++-- sapl/legacy/models.py | 14 ++++++++ 7 files changed, 115 insertions(+), 19 deletions(-) create mode 100644 sapl/comissoes/migrations/0015_auto_20180613_2023.py create mode 100644 sapl/comissoes/migrations/0016_auto_20180613_2121.py diff --git a/sapl/comissoes/legacy.yaml b/sapl/comissoes/legacy.yaml index 66ed8b060..8e1040510 100644 --- a/sapl/comissoes/legacy.yaml +++ b/sapl/comissoes/legacy.yaml @@ -42,3 +42,10 @@ Participacao (ComposicaoComissao): observacao: obs_composicao parlamentar: cod_parlamentar titular: ind_titular + +Reuniao (ReuniaoComissao): + comissao: cod_comissao + numero: num_reuniao + data: dat_inicio_reuniao + observacao: txt_observacao + diff --git a/sapl/comissoes/migrations/0015_auto_20180613_2023.py b/sapl/comissoes/migrations/0015_auto_20180613_2023.py new file mode 100644 index 000000000..b6602cfc3 --- /dev/null +++ b/sapl/comissoes/migrations/0015_auto_20180613_2023.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-06-13 23:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0014_auto_20180503_1055'), + ] + + operations = [ + migrations.AlterField( + model_name='reuniao', + name='hora_fim', + field=models.TimeField(null=True, verbose_name='Horário de Término (hh:mm)'), + ), + migrations.AlterField( + model_name='reuniao', + name='hora_inicio', + field=models.TimeField(null=True, verbose_name='Horário de Início (hh:mm)'), + ), + ] diff --git a/sapl/comissoes/migrations/0016_auto_20180613_2121.py b/sapl/comissoes/migrations/0016_auto_20180613_2121.py new file mode 100644 index 000000000..77c1894f8 --- /dev/null +++ b/sapl/comissoes/migrations/0016_auto_20180613_2121.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-06-14 00:21 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0015_auto_20180613_2023'), + ] + + operations = [ + migrations.AlterField( + model_name='reuniao', + name='periodo', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='comissoes.Periodo', verbose_name='Periodo da Composicão da Comissão'), + ), + ] diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index 0c3240fc6..a2477ef1d 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -184,13 +184,16 @@ class Participacao(models.Model): # ComposicaoComissao def get_comissao_media_path(instance, subpath, filename): return './sapl/comissao/%s/%s/%s' % (instance.numero, subpath, filename) + def pauta_upload_path(instance, filename): return texto_upload_path(instance, filename, subpath='pauta', pk_first=True) + def ata_upload_path(instance, filename): return texto_upload_path(instance, filename, subpath='ata', pk_first=True) + def anexo_upload_path(instance, filename): return texto_upload_path(instance, filename, subpath='anexo', pk_first=True) @@ -198,6 +201,7 @@ def anexo_upload_path(instance, filename): class Reuniao(models.Model): periodo = models. ForeignKey( Periodo, + null=True, on_delete=models.PROTECT, verbose_name=_('Periodo da Composicão da Comissão')) comissao = models.ForeignKey( @@ -211,8 +215,10 @@ class Reuniao(models.Model): max_length=150, blank=True, verbose_name=_('Tema da Reunião')) data = models.DateField(verbose_name=_('Data')) hora_inicio = models.TimeField( + null=True, verbose_name=_('Horário de Início (hh:mm)')) hora_fim = models.TimeField( + null=True, verbose_name=_('Horário de Término (hh:mm)')) local_reuniao = models.CharField( max_length=100, blank=True, verbose_name=_('Local da Reunião')) @@ -287,12 +293,13 @@ class Reuniao(models.Model): @reversion.register() class DocumentoAcessorio(models.Model): - reuniao = models.ForeignKey(Reuniao, + reuniao = models.ForeignKey(Reuniao, related_name='documentoacessorio_set', on_delete=models.PROTECT) nome = models.CharField(max_length=50, verbose_name=_('Nome')) - data = models.DateField(blank=True, null=True, default=None, verbose_name=_('Data')) + data = models.DateField(blank=True, null=True, + default=None, verbose_name=_('Data')) autor = models.CharField( max_length=100, verbose_name=_('Autor')) ementa = models.TextField(blank=True, verbose_name=_('Ementa')) diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index c5870389e..78e639168 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -8,20 +8,20 @@ from django.views.generic.base import RedirectView from django.views.generic.detail import DetailView from django.views.generic.edit import FormMixin - from sapl.base.models import AppConfig as AppsAppConfig -from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, - CrudAux, MasterDetailCrud, - PermissionRequiredForAppCrudMixin) -from sapl.comissoes.forms import (ComissaoForm, ComposicaoForm, DocumentoAcessorioCreateForm, - DocumentoAcessorioEditForm, ParticipacaoCreateForm, - ParticipacaoEditForm, ReuniaoForm, PeriodoForm) +from sapl.comissoes.apps import AppConfig +from sapl.comissoes.forms import (ComissaoForm, ComposicaoForm, + DocumentoAcessorioCreateForm, + DocumentoAcessorioEditForm, + ParticipacaoCreateForm, ParticipacaoEditForm, + PeriodoForm, ReuniaoForm) +from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux, + MasterDetailCrud, + PermissionRequiredForAppCrudMixin) from sapl.materia.models import MateriaLegislativa, Tramitacao - from .models import (CargoComissao, Comissao, Composicao, DocumentoAcessorio, - Participacao, Periodo, TipoComissao, Reuniao) -from sapl.comissoes.apps import AppConfig + Participacao, Periodo, Reuniao, TipoComissao) def pegar_url_composicao(pk): @@ -30,6 +30,7 @@ def pegar_url_composicao(pk): url = reverse('sapl.comissoes:composicao_detail', kwargs={'pk': comp_pk}) return url + def pegar_url_reuniao(pk): documentoacessorio = DocumentoAcessorio.objects.get(id=pk) r_pk = documentoacessorio.reuniao.pk @@ -42,6 +43,7 @@ TipoComissaoCrud = CrudAux.build( TipoComissao, 'tipo_comissao', list_field_names=[ 'sigla', 'nome', 'natureza', 'dispositivo_regimental']) + class PeriodoComposicaoCrud(CrudAux): model = Periodo @@ -77,6 +79,7 @@ class ParticipacaoCrud(MasterDetailCrud): form_class = ParticipacaoEditForm class DeleteView(MasterDetailCrud.DeleteView): + def get_success_url(self): composicao_comissao_pk = self.object.composicao.comissao.pk composicao_pk = self.object.composicao.pk @@ -93,12 +96,11 @@ class ComposicaoCrud(MasterDetailCrud): class CreateView(MasterDetailCrud.CreateView): form_class = ComposicaoForm - + def get_initial(self): comissao = Comissao.objects.get(id=self.kwargs['pk']) return {'comissao': comissao} - class ListView(MasterDetailCrud.ListView): template_name = "comissoes/composicao_list.html" paginate_by = None @@ -180,6 +182,7 @@ class MateriasTramitacaoListView(ListView): context['object'] = Comissao.objects.get(id=self.kwargs['pk']) return context + class ReuniaoCrud(MasterDetailCrud): model = Reuniao parent_field = 'comissao' @@ -187,7 +190,7 @@ class ReuniaoCrud(MasterDetailCrud): public = [RP_LIST, RP_DETAIL, ] class BaseMixin(MasterDetailCrud.BaseMixin): - list_field_names = [ 'nome', 'tema', 'data'] + list_field_names = ['data', 'nome', 'tema'] class ListView(MasterDetailCrud.ListView): paginate_by = 10 @@ -228,9 +231,9 @@ class ReuniaoCrud(MasterDetailCrud): form_class = ReuniaoForm def get_initial(self): - comissao = Comissao.objects.get(id=self.kwargs['pk']) + comissao = Comissao.objects.get(id=self.kwargs['pk']) - return {'comissao': comissao} + return {'comissao': comissao} class DocumentoAcessorioCrud(MasterDetailCrud): @@ -256,6 +259,7 @@ class DocumentoAcessorioCrud(MasterDetailCrud): form_class = DocumentoAcessorioEditForm class DeleteView(MasterDetailCrud.DeleteView): + def delete(self, *args, **kwargs): obj = self.get_object() obj.delete() diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index c6ca892f0..96bb0905f 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -29,7 +29,7 @@ from unipath import Path from sapl.base.models import AppConfig as AppConf from sapl.base.models import Autor, TipoAutor, cria_models_tipo_autor -from sapl.comissoes.models import Comissao, Composicao, Participacao +from sapl.comissoes.models import Comissao, Composicao, Participacao, Reuniao from sapl.legacy import scripts from sapl.legacy.models import NormaJuridica as OldNormaJuridica from sapl.legacy.models import TipoNumeracaoProtocolo @@ -58,6 +58,8 @@ from .timezonesbrasil import get_timezone appconfs = [apps.get_app_config(n) for n in [ 'parlamentares', 'comissoes', + # base precisa vir depois dos apps parlamentares e comissoes + # pois Autor os referencia 'base', 'materia', 'norma', @@ -99,7 +101,7 @@ def get_renames(): model_name, old_name = match.groups() else: old_name = None - model = getattr(app.models_module, model_name) + model = app.get_model(model_name) if old_name: model_renames[model] = old_name field_renames[model] = renames @@ -212,6 +214,10 @@ class ForeignKeyFaltando(ObjectDoesNotExist): 'Uma FK aponta para um registro inexistente' def __init__(self, field, valor, old): + if (field.related_model.__name__ == 'Comissao' + and old.__class__.__name__ == 'ReuniaoComissao' + and valor == 1): + __import__('pdb').set_trace() self.field = field self.valor = valor self.old = old @@ -1237,6 +1243,17 @@ def adjust_tiporesultadovotacao(new, old): {'pk': new.pk, 'nome': new.nome}) +def str_to_time(fonte): + if not fonte.strip(): + return None + tempo = datetime.datetime.strptime(fonte, '%H:%M') + return tempo.time() if tempo else None + + +def adjust_reuniao_comissao(new, old): + new.hora_inicio = str_to_time(old.hr_inicio_reuniao) + + def remove_style(conteudo): if 'style' not in conteudo: return conteudo # atalho que acelera muito os casos sem style @@ -1274,6 +1291,7 @@ AJUSTE_ANTES_SALVAR = { Tramitacao: adjust_tramitacao, TipoResultadoVotacao: adjust_tiporesultadovotacao, ExpedienteSessao: adjust_expediente_sessao, + Reuniao: adjust_reuniao_comissao, } AJUSTE_DEPOIS_SALVAR = { diff --git a/sapl/legacy/models.py b/sapl/legacy/models.py index 7d341624d..cd6d433df 100644 --- a/sapl/legacy/models.py +++ b/sapl/legacy/models.py @@ -779,6 +779,20 @@ class Relatoria(models.Model): db_table = 'relatoria' +class ReuniaoComissao(models.Model): + cod_reuniao = models.AutoField(primary_key=True) + cod_comissao = models.IntegerField() + num_reuniao = models.IntegerField() + dat_inicio_reuniao = models.DateField() + hr_inicio_reuniao = models.CharField(max_length=5, blank=True, null=True) + txt_observacao = models.TextField(blank=True, null=True) + ind_excluido = models.IntegerField() + + class Meta: + managed = False + db_table = 'reuniao_comissao' + + class SessaoLegislativa(models.Model): cod_sessao_leg = models.AutoField(primary_key=True) num_legislatura = models.IntegerField() From e9f38dd062232c5ddc876ff806f8249e83b5b678 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 14 Jun 2018 10:58:55 -0300 Subject: [PATCH 18/45] Corrige mapeamento dos campos legados de models abstratos --- sapl/legacy/migracao_dados.py | 22 +++++++++------------- sapl/sessao/legacy.yaml | 12 ++++++------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index 96bb0905f..24ee536e0 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -87,15 +87,24 @@ for a1, s1 in name_sets: # RENAMES ################################################################### MODEL_RENAME_PATTERN = re.compile('(.+) \((.+)\)') +MODEL_RENAME_INCLUDE_PATTERN = re.compile('<(.+)>') def get_renames(): field_renames = {} model_renames = {} + includes = {} for app in appconfs: app_rename_data = yaml.load( pkg_resources.resource_string(app.module.__name__, 'legacy.yaml')) for model_name, renames in app_rename_data.items(): + # armazena ou substitui includes + if MODEL_RENAME_INCLUDE_PATTERN.match(model_name): + includes[model_name] = renames + continue + elif isinstance(renames, str): + renames = includes[renames] + # detecta mudança de nome match = MODEL_RENAME_PATTERN.match(model_name) if match: model_name, old_name = match.groups() @@ -106,19 +115,6 @@ def get_renames(): model_renames[model] = old_name field_renames[model] = renames - # collect renames from parent classes - for model, renames in field_renames.items(): - if any(parent in field_renames for parent in model.__mro__[1:]): - renames = {} - for parent in reversed(model.__mro__): - if parent in field_renames: - renames.update(field_renames[parent]) - field_renames[model] = renames - - # remove abstract classes - field_renames = {m: r for m, r in field_renames.items() - if not m._meta.abstract} - return field_renames, model_renames diff --git a/sapl/sessao/legacy.yaml b/sapl/sessao/legacy.yaml index e7b55095a..6df4dd90d 100644 --- a/sapl/sessao/legacy.yaml +++ b/sapl/sessao/legacy.yaml @@ -15,7 +15,7 @@ SessaoPlenaria: url_audio: url_audio url_video: url_video -AbstractOrdemDia: +: data_ordem: dat_ordem materia: cod_materia numero_ordem: num_ordem @@ -24,7 +24,7 @@ AbstractOrdemDia: sessao_plenaria: cod_sessao_plen tipo_votacao: tip_votacao -ExpedienteMateria: {} +ExpedienteMateria: TipoExpediente: nome: nom_expediente @@ -39,17 +39,17 @@ IntegranteMesa (MesaSessaoPlenaria): parlamentar: cod_parlamentar sessao_plenaria: cod_sessao_plen -AbstractOrador: +: numero_ordem: num_ordem parlamentar: cod_parlamentar sessao_plenaria: cod_sessao_plen url_discurso: url_discurso -Orador (Oradores): {} +Orador (Oradores): -OradorExpediente (OradoresExpediente): {} +OradorExpediente (OradoresExpediente): -OrdemDia: {} +OrdemDia: PresencaOrdemDia (OrdemDiaPresenca): parlamentar: cod_parlamentar From 392dd92df6b2966b476d1c365036c228bcee62f4 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 14 Jun 2018 11:05:46 -0300 Subject: [PATCH 19/45] =?UTF-8?q?Congela=20ocorr=C3=AAncias=20ao=20final?= =?UTF-8?q?=20da=20migra=C3=A7=C3=A3o=20de=20dados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/migracao_dados.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index 24ee536e0..da0ca270a 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -800,6 +800,7 @@ def roda_comando_shell(cmd): def migrar_dados(): try: ocorrencias.clear() + ocorrencias.default_factory = list # restaura dump arq_dump = Path(DIR_DADOS_MIGRACAO.child( @@ -833,7 +834,8 @@ def migrar_dados(): ocorrencias['traceback'] = str(traceback.format_exc()) raise e finally: - # grava ocorrências + # congela e grava ocorrências + ocorrencias.default_factory = None arq_ocorrencias = Path(REPO.working_dir, 'ocorrencias.yaml') with open(arq_ocorrencias, 'w') as arq: pyaml.dump(ocorrencias, arq, vspacing=1) From 6b9d6d11da17537f58015ebf576902f9e8d9fb53 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 14 Jun 2018 14:33:31 -0300 Subject: [PATCH 20/45] =?UTF-8?q?Vincula=20docs=20de=20reuni=C3=B5es=20aos?= =?UTF-8?q?=20dados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/migracao_documentos.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sapl/legacy/migracao_documentos.py b/sapl/legacy/migracao_documentos.py index 2bb17c53e..a759e3667 100644 --- a/sapl/legacy/migracao_documentos.py +++ b/sapl/legacy/migracao_documentos.py @@ -8,6 +8,7 @@ from django.db import transaction from image_cropping.fields import ImageCropField from sapl.base.models import CasaLegislativa +from sapl.comissoes.models import Reuniao from sapl.legacy.migracao_dados import exec_legado from sapl.materia.models import (DocumentoAcessorio, MateriaLegislativa, Proposicao) @@ -26,6 +27,8 @@ DOCS = { MateriaLegislativa: [('texto_original', 'materia/{}_texto_integral')], DocumentoAcessorio: [('arquivo', 'materia/{}')], NormaJuridica: [('texto_integral', 'norma_juridica/{}_texto_integral')], + Reuniao: [('upload_pauta', 'reuniao_comissao/{}_pauta'), + ('upload_ata', 'reuniao_comissao/{}_ata')], SessaoPlenaria: [('upload_pauta', 'pauta_sessao/{}_pauta_sessao'), ('upload_ata', 'ata_sessao/{}_ata_sessao'), ('upload_anexo', 'anexo_sessao/{}_texto_anexado')], @@ -40,9 +43,12 @@ DOCS = {model: [(campo, join('sapl_documentos', origem)) for model, campos in DOCS.items()} -def mover_documento(repo, origem, destino): +def mover_documento(repo, origem, destino, ignora_origem_ausente=False): origem, destino = [join(repo.working_dir, c) if not os.path.isabs(c) else c for c in (origem, destino)] + if ignora_origem_ausente and not os.path.exists(origem): + print('Origem ignorada ao mover documento: {}'.format(origem)) + return os.makedirs(os.path.dirname(destino), exist_ok=True) repo.git.mv(origem, destino) @@ -52,7 +58,8 @@ def migrar_logotipo(repo, casa, propriedades): [(campo, origem)] = DOCS[CasaLegislativa] # a extensão do logo pode ter sido ajustada pelo tipo real do arquivo nome_nas_propriedades = os.path.splitext(propriedades['id_logo'])[0] - arquivos = glob(join(repo.working_dir, origem.format(nome_nas_propriedades))) + arquivos = glob( + join(repo.working_dir, origem.format(nome_nas_propriedades))) if arquivos: assert len(arquivos) == 1, 'Há mais de um logotipo para a casa' [logo] = arquivos @@ -145,7 +152,8 @@ def migrar_documentos(repo): # Isto significa que para rodar novamente esta função é preciso # restaurar o repo ao estado anterior - mover_documento(repo, 'XSLT', 'sapl/public/XSLT') + mover_documento(repo, 'XSLT', 'sapl/public/XSLT', + ignora_origem_ausente=True) migrar_propriedades_da_casa(repo) From c610220003aabb28c50a478dfb60017bce534311 Mon Sep 17 00:00:00 2001 From: cristian-longhi Date: Thu, 14 Jun 2018 16:45:16 -0300 Subject: [PATCH 21/45] =?UTF-8?q?Exibe=20assunto=20e=20interessado=20se=20?= =?UTF-8?q?o=20comprovante=20=C3=A9=20de=20protocolo=20admnistrativo=20(#2?= =?UTF-8?q?016)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/protocoloadm/comprovante.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sapl/templates/protocoloadm/comprovante.html b/sapl/templates/protocoloadm/comprovante.html index 1de22d402..e4258c263 100644 --- a/sapl/templates/protocoloadm/comprovante.html +++ b/sapl/templates/protocoloadm/comprovante.html @@ -70,6 +70,15 @@ Autor {{ protocolo.autor }} + {% else %} + + Assunto + {{ protocolo.assunto_ementa }} + + + Interessado + {{ protocolo.interessado }} + {% endif %} Natureza From 13cc50fd4988f63c10986ac3bbd70138d6e0ddc6 Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Thu, 14 Jun 2018 16:45:43 -0300 Subject: [PATCH 22/45] Fix #2001 (#2015) --- sapl/templates/painel/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html index 3ba84b141..6e4242df4 100644 --- a/sapl/templates/painel/index.html +++ b/sapl/templates/painel/index.html @@ -121,6 +121,8 @@

+ + From 55e37aec70ab8ae91ec3c0325bc715d1b1ee992f Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 14 Jun 2018 17:11:46 -0300 Subject: [PATCH 23/45] 2018 mudanca titulo lote (#2019) * Fix #2014 * Fixes #2018 --- sapl/materia/forms.py | 67 ++++++++++++++++++- sapl/materia/urls.py | 5 +- sapl/materia/views.py | 23 ++++++- .../materia/em_lote/excluir_tramitacao.html | 7 ++ .../templates/materia/em_lote/tramitacao.html | 2 +- sapl/templates/navbar.yaml | 3 + 6 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 sapl/templates/materia/em_lote/excluir_tramitacao.html diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index d14fad28c..20518cfdd 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -32,7 +32,8 @@ from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column, to_row) from sapl.materia.models import (AssuntoMateria, Autoria, MateriaAssunto, MateriaLegislativa, Orgao, RegimeTramitacao, - TipoDocumento, TipoProposicao) + TipoDocumento, TipoProposicao, StatusTramitacao, + UnidadeTramitacao) from sapl.norma.models import (LegislacaoCitada, NormaJuridica, TipoNormaJuridica) from sapl.parlamentares.models import Legislatura @@ -2032,3 +2033,67 @@ class FichaSelecionaForm(forms.Form): form_actions(label='Gerar Impresso') ) ) + + +class ExcluirTramitacaoEmLote(forms.Form): + + data_tramitacao = forms.DateField(required=True, + label=_('Data da Tramitação')) + + unidade_tramitacao_local = forms.ModelChoiceField(label=_('Unidade Local'), + required=True, + queryset=UnidadeTramitacao.objects.all(), + empty_label='------') + + unidade_tramitacao_destino = forms.ModelChoiceField(label=_('Unidade Destino'), + required=True, + queryset=UnidadeTramitacao.objects.all(), + empty_label='------') + + status = forms.ModelChoiceField(label=_('Status'), + required=True, + queryset=StatusTramitacao.objects.all(), + empty_label='------') + + def clean(self): + super(ExcluirTramitacaoEmLote, self).clean() + + cleaned_data = self.cleaned_data + + if not self.is_valid(): + return cleaned_data + + data_tramitacao = cleaned_data['data_tramitacao'] + unidade_tramitacao_local = cleaned_data['unidade_tramitacao_local'] + unidade_tramitacao_destino = cleaned_data['unidade_tramitacao_destino'] + status = cleaned_data['status'] + + tramitacao_set = Tramitacao.objects.filter(data_tramitacao=data_tramitacao, + unidade_tramitacao_local=unidade_tramitacao_local, + unidade_tramitacao_destino=unidade_tramitacao_destino, + status=status) + if not tramitacao_set.exists(): + raise forms.ValidationError( + _("Não existem tramitações com os dados informados.")) + + return cleaned_data + + def __init__(self, *args, **kwargs): + super(ExcluirTramitacaoEmLote, self).__init__(*args, **kwargs) + + row1 = to_row( + [('data_tramitacao', 6), + ('status', 6),]) + row2 = to_row( + [('unidade_tramitacao_local', 6), + ('unidade_tramitacao_destino', 6)]) + + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_('Dados das Tramitações'), + row1, + row2, + HTML(" "), + form_actions(label='Excluir') + ) + ) diff --git a/sapl/materia/urls.py b/sapl/materia/urls.py index 934c4dbac..f2c89c908 100644 --- a/sapl/materia/urls.py +++ b/sapl/materia/urls.py @@ -23,7 +23,8 @@ from sapl.materia.views import (AcompanhamentoConfirmarView, TipoFimRelatoriaCrud, TipoMateriaCrud, TipoProposicaoCrud, TramitacaoCrud, TramitacaoEmLoteView, UnidadeTramitacaoCrud, - proposicao_texto, recuperar_materia) + proposicao_texto, recuperar_materia, + ExcluirTramitacaoEmLoteView) from sapl.norma.views import NormaPesquisaSimplesView from .apps import AppConfig @@ -90,6 +91,8 @@ urlpatterns_materia = [ name='primeira_tramitacao_em_lote'), url(r'^materia/tramitacao-em-lote', TramitacaoEmLoteView.as_view(), name='tramitacao_em_lote'), + url(r'^materia/excluir-tramitacao-em-lote', ExcluirTramitacaoEmLoteView.as_view(), + name='excluir_tramitacao_em_lote'), ] diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 807db3d9c..0a8b466c4 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -57,7 +57,8 @@ from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm, TramitacaoEmLoteFilterSet, UnidadeTramitacaoForm, filtra_tramitacao_destino, filtra_tramitacao_destino_and_status, - filtra_tramitacao_status) + filtra_tramitacao_status, + ExcluirTramitacaoEmLote) from .models import (AcompanhamentoMateria, Anexada, AssuntoMateria, Autoria, DespachoInicial, DocumentoAcessorio, MateriaAssunto, MateriaLegislativa, Numeracao, Orgao, Origem, Proposicao, @@ -1972,3 +1973,23 @@ class FichaSelecionaView(PermissionRequiredMixin, FormView): return gerar_pdf_impressos(self.request, context, 'materia/impressos/ficha_pdf.html') + + +class ExcluirTramitacaoEmLoteView(PermissionRequiredMixin, FormView): + + template_name = 'materia/em_lote/excluir_tramitacao.html' + permission_required = ('materia.add_tramitacao',) + form_class = ExcluirTramitacaoEmLote + form_valid_message = _('Tramitações excluídas com sucesso!') + + def get_success_url(self): + return reverse('sapl.materia:excluir_tramitacao_em_lote') + + def form_valid(self, form): + + tramitacao_set = Tramitacao.objects.filter(data_tramitacao=form.cleaned_data['data_tramitacao'], + unidade_tramitacao_local=form.cleaned_data['unidade_tramitacao_local'], + unidade_tramitacao_destino=form.cleaned_data['unidade_tramitacao_destino'], + status=form.cleaned_data['status']) + tramitacao_set.delete() + return redirect(self.get_success_url()) \ No newline at end of file diff --git a/sapl/templates/materia/em_lote/excluir_tramitacao.html b/sapl/templates/materia/em_lote/excluir_tramitacao.html new file mode 100644 index 000000000..b74faa593 --- /dev/null +++ b/sapl/templates/materia/em_lote/excluir_tramitacao.html @@ -0,0 +1,7 @@ +{% extends "crud/detail.html" %} +{% load i18n crispy_forms_tags %} + +{% block actions %}{% endblock %} +{% block detail_content %} + {% crispy form %} +{% endblock detail_content %} \ No newline at end of file diff --git a/sapl/templates/materia/em_lote/tramitacao.html b/sapl/templates/materia/em_lote/tramitacao.html index 08483d88d..9ed94c84d 100644 --- a/sapl/templates/materia/em_lote/tramitacao.html +++ b/sapl/templates/materia/em_lote/tramitacao.html @@ -91,7 +91,7 @@


- 2. Selecione as matérias para primeira tramitação: + 2. Selecione as matérias para tramitação:

diff --git a/sapl/templates/navbar.yaml b/sapl/templates/navbar.yaml index c997e2e41..b80cb7acd 100644 --- a/sapl/templates/navbar.yaml +++ b/sapl/templates/navbar.yaml @@ -54,6 +54,9 @@ - title: {% trans 'Tramitação em Lote' %} url: sapl.materia:primeira_tramitacao_em_lote check_permission: materia.list_tramitacao {% comment %} FIXME transformar para checagens de menu_[funcionalidade]{% endcomment%} + - title: {% trans 'Excluir Tramitação em Lote' %} + url: sapl.materia:excluir_tramitacao_em_lote + check_permission: materia.list_tramitacao {% comment %} FIXME transformar para checagens de menu_[funcionalidade]{% endcomment%} - title: {% trans 'Normas Jurídicas' %} children: From 8c72d253a0aeca79b29c8ff8945bea6d3b72b875 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Thu, 14 Jun 2018 17:12:41 -0300 Subject: [PATCH 24/45] Revert "2018 mudanca titulo lote (#2019)" This reverts commit 55e37aec70ab8ae91ec3c0325bc715d1b1ee992f. --- sapl/materia/forms.py | 67 +------------------ sapl/materia/urls.py | 5 +- sapl/materia/views.py | 23 +------ .../materia/em_lote/excluir_tramitacao.html | 7 -- .../templates/materia/em_lote/tramitacao.html | 2 +- sapl/templates/navbar.yaml | 3 - 6 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 sapl/templates/materia/em_lote/excluir_tramitacao.html diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 20518cfdd..d14fad28c 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -32,8 +32,7 @@ from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column, to_row) from sapl.materia.models import (AssuntoMateria, Autoria, MateriaAssunto, MateriaLegislativa, Orgao, RegimeTramitacao, - TipoDocumento, TipoProposicao, StatusTramitacao, - UnidadeTramitacao) + TipoDocumento, TipoProposicao) from sapl.norma.models import (LegislacaoCitada, NormaJuridica, TipoNormaJuridica) from sapl.parlamentares.models import Legislatura @@ -2033,67 +2032,3 @@ class FichaSelecionaForm(forms.Form): form_actions(label='Gerar Impresso') ) ) - - -class ExcluirTramitacaoEmLote(forms.Form): - - data_tramitacao = forms.DateField(required=True, - label=_('Data da Tramitação')) - - unidade_tramitacao_local = forms.ModelChoiceField(label=_('Unidade Local'), - required=True, - queryset=UnidadeTramitacao.objects.all(), - empty_label='------') - - unidade_tramitacao_destino = forms.ModelChoiceField(label=_('Unidade Destino'), - required=True, - queryset=UnidadeTramitacao.objects.all(), - empty_label='------') - - status = forms.ModelChoiceField(label=_('Status'), - required=True, - queryset=StatusTramitacao.objects.all(), - empty_label='------') - - def clean(self): - super(ExcluirTramitacaoEmLote, self).clean() - - cleaned_data = self.cleaned_data - - if not self.is_valid(): - return cleaned_data - - data_tramitacao = cleaned_data['data_tramitacao'] - unidade_tramitacao_local = cleaned_data['unidade_tramitacao_local'] - unidade_tramitacao_destino = cleaned_data['unidade_tramitacao_destino'] - status = cleaned_data['status'] - - tramitacao_set = Tramitacao.objects.filter(data_tramitacao=data_tramitacao, - unidade_tramitacao_local=unidade_tramitacao_local, - unidade_tramitacao_destino=unidade_tramitacao_destino, - status=status) - if not tramitacao_set.exists(): - raise forms.ValidationError( - _("Não existem tramitações com os dados informados.")) - - return cleaned_data - - def __init__(self, *args, **kwargs): - super(ExcluirTramitacaoEmLote, self).__init__(*args, **kwargs) - - row1 = to_row( - [('data_tramitacao', 6), - ('status', 6),]) - row2 = to_row( - [('unidade_tramitacao_local', 6), - ('unidade_tramitacao_destino', 6)]) - - self.helper = FormHelper() - self.helper.layout = Layout( - Fieldset(_('Dados das Tramitações'), - row1, - row2, - HTML(" "), - form_actions(label='Excluir') - ) - ) diff --git a/sapl/materia/urls.py b/sapl/materia/urls.py index f2c89c908..934c4dbac 100644 --- a/sapl/materia/urls.py +++ b/sapl/materia/urls.py @@ -23,8 +23,7 @@ from sapl.materia.views import (AcompanhamentoConfirmarView, TipoFimRelatoriaCrud, TipoMateriaCrud, TipoProposicaoCrud, TramitacaoCrud, TramitacaoEmLoteView, UnidadeTramitacaoCrud, - proposicao_texto, recuperar_materia, - ExcluirTramitacaoEmLoteView) + proposicao_texto, recuperar_materia) from sapl.norma.views import NormaPesquisaSimplesView from .apps import AppConfig @@ -91,8 +90,6 @@ urlpatterns_materia = [ name='primeira_tramitacao_em_lote'), url(r'^materia/tramitacao-em-lote', TramitacaoEmLoteView.as_view(), name='tramitacao_em_lote'), - url(r'^materia/excluir-tramitacao-em-lote', ExcluirTramitacaoEmLoteView.as_view(), - name='excluir_tramitacao_em_lote'), ] diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 0a8b466c4..807db3d9c 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -57,8 +57,7 @@ from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm, TramitacaoEmLoteFilterSet, UnidadeTramitacaoForm, filtra_tramitacao_destino, filtra_tramitacao_destino_and_status, - filtra_tramitacao_status, - ExcluirTramitacaoEmLote) + filtra_tramitacao_status) from .models import (AcompanhamentoMateria, Anexada, AssuntoMateria, Autoria, DespachoInicial, DocumentoAcessorio, MateriaAssunto, MateriaLegislativa, Numeracao, Orgao, Origem, Proposicao, @@ -1973,23 +1972,3 @@ class FichaSelecionaView(PermissionRequiredMixin, FormView): return gerar_pdf_impressos(self.request, context, 'materia/impressos/ficha_pdf.html') - - -class ExcluirTramitacaoEmLoteView(PermissionRequiredMixin, FormView): - - template_name = 'materia/em_lote/excluir_tramitacao.html' - permission_required = ('materia.add_tramitacao',) - form_class = ExcluirTramitacaoEmLote - form_valid_message = _('Tramitações excluídas com sucesso!') - - def get_success_url(self): - return reverse('sapl.materia:excluir_tramitacao_em_lote') - - def form_valid(self, form): - - tramitacao_set = Tramitacao.objects.filter(data_tramitacao=form.cleaned_data['data_tramitacao'], - unidade_tramitacao_local=form.cleaned_data['unidade_tramitacao_local'], - unidade_tramitacao_destino=form.cleaned_data['unidade_tramitacao_destino'], - status=form.cleaned_data['status']) - tramitacao_set.delete() - return redirect(self.get_success_url()) \ No newline at end of file diff --git a/sapl/templates/materia/em_lote/excluir_tramitacao.html b/sapl/templates/materia/em_lote/excluir_tramitacao.html deleted file mode 100644 index b74faa593..000000000 --- a/sapl/templates/materia/em_lote/excluir_tramitacao.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n crispy_forms_tags %} - -{% block actions %}{% endblock %} -{% block detail_content %} - {% crispy form %} -{% endblock detail_content %} \ No newline at end of file diff --git a/sapl/templates/materia/em_lote/tramitacao.html b/sapl/templates/materia/em_lote/tramitacao.html index 9ed94c84d..08483d88d 100644 --- a/sapl/templates/materia/em_lote/tramitacao.html +++ b/sapl/templates/materia/em_lote/tramitacao.html @@ -91,7 +91,7 @@


- 2. Selecione as matérias para tramitação: + 2. Selecione as matérias para primeira tramitação:
diff --git a/sapl/templates/navbar.yaml b/sapl/templates/navbar.yaml index b80cb7acd..c997e2e41 100644 --- a/sapl/templates/navbar.yaml +++ b/sapl/templates/navbar.yaml @@ -54,9 +54,6 @@ - title: {% trans 'Tramitação em Lote' %} url: sapl.materia:primeira_tramitacao_em_lote check_permission: materia.list_tramitacao {% comment %} FIXME transformar para checagens de menu_[funcionalidade]{% endcomment%} - - title: {% trans 'Excluir Tramitação em Lote' %} - url: sapl.materia:excluir_tramitacao_em_lote - check_permission: materia.list_tramitacao {% comment %} FIXME transformar para checagens de menu_[funcionalidade]{% endcomment%} - title: {% trans 'Normas Jurídicas' %} children: From ea48e6956654030d6a2cc3fac4fbce768f3ad078 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Thu, 14 Jun 2018 17:13:40 -0300 Subject: [PATCH 25/45] HOT-FIX: Fixes #2018 --- sapl/templates/materia/em_lote/tramitacao.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/templates/materia/em_lote/tramitacao.html b/sapl/templates/materia/em_lote/tramitacao.html index 08483d88d..9ed94c84d 100644 --- a/sapl/templates/materia/em_lote/tramitacao.html +++ b/sapl/templates/materia/em_lote/tramitacao.html @@ -91,7 +91,7 @@


- 2. Selecione as matérias para primeira tramitação: + 2. Selecione as matérias para tramitação:
From f257c13dd145699b9477f14ffd43d59b36234dfb Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 14 Jun 2018 20:33:31 -0300 Subject: [PATCH 26/45] =?UTF-8?q?Corrige=20busca=20do=20sapl=20dentro=20do?= =?UTF-8?q?=20Data.fs=20na=20exporta=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/legacy/scripts/exporta_zope/exporta_zope.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sapl/legacy/scripts/exporta_zope/exporta_zope.py b/sapl/legacy/scripts/exporta_zope/exporta_zope.py index 7494dca17..270c90583 100755 --- a/sapl/legacy/scripts/exporta_zope/exporta_zope.py +++ b/sapl/legacy/scripts/exporta_zope/exporta_zope.py @@ -17,14 +17,14 @@ from functools import partial import git import magic import yaml -from unipath import Path - import ZODB.DB import ZODB.FileStorage -from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE +from unipath import Path from ZODB.broken import Broken from ZODB.POSException import POSKeyError +from variaveis_comuns import DIR_DADOS_MIGRACAO, TAG_ZOPE + EXTENSOES = { 'application/msword': '.doc', 'application/pdf': '.pdf', @@ -291,8 +291,10 @@ def get_app(data_fs_path): def find_sapl(app): - for obj in app['_objects']: - id, meta_type = obj['id'], obj['meta_type'] + ids_meta_types = [(obj['id'], obj['meta_type']) for obj in app['_objects']] + # estar ordenado é muito importante para que a busca dê prioridade + # a um id "cm_zzz" antes do id "sapl" + for id, meta_type in sorted(ids_meta_types): if id.startswith('cm_') and meta_type == 'Folder': cm_zzz = br(app[id]) return find_sapl(cm_zzz) From bec2532f9029fb8d32169bc613d681a4a7449238 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 14 Jun 2018 20:34:41 -0300 Subject: [PATCH 27/45] =?UTF-8?q?Migra=20reuni=C3=B5es=20apenas=20quando?= =?UTF-8?q?=20existirem=20no=20legado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Só acontece em bases de sapl 3.0 --- sapl/legacy/migracao_dados.py | 4 ++++ sapl/legacy/migracao_documentos.py | 26 ++++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sapl/legacy/migracao_dados.py b/sapl/legacy/migracao_dados.py index da0ca270a..41c7b9934 100644 --- a/sapl/legacy/migracao_dados.py +++ b/sapl/legacy/migracao_dados.py @@ -857,6 +857,10 @@ def move_para_depois_de(lista, movido, referencias): def get_models_a_migrar(): models = [model for app in appconfs for model in app.models.values() if model in field_renames] + # retira reuniões quando não existe na base legada + # (só existe no sapl 3.0) + if 'reuniao_comissao' not in list(exec_legado('show tables')): + models.remove(Reuniao) # Devido à referência TipoProposicao.tipo_conteudo_related # a migração de TipoProposicao precisa ser feita # após TipoMateriaLegislativa e TipoDocumento diff --git a/sapl/legacy/migracao_documentos.py b/sapl/legacy/migracao_documentos.py index a759e3667..fd692aa47 100644 --- a/sapl/legacy/migracao_documentos.py +++ b/sapl/legacy/migracao_documentos.py @@ -22,13 +22,10 @@ from sapl.sessao.models import SessaoPlenaria DOCS = { - CasaLegislativa: [('logotipo', 'props_sapl/{}.*')], Parlamentar: [('fotografia', 'parlamentar/fotos/{}_foto_parlamentar')], MateriaLegislativa: [('texto_original', 'materia/{}_texto_integral')], DocumentoAcessorio: [('arquivo', 'materia/{}')], NormaJuridica: [('texto_integral', 'norma_juridica/{}_texto_integral')], - Reuniao: [('upload_pauta', 'reuniao_comissao/{}_pauta'), - ('upload_ata', 'reuniao_comissao/{}_ata')], SessaoPlenaria: [('upload_pauta', 'pauta_sessao/{}_pauta_sessao'), ('upload_ata', 'ata_sessao/{}_ata_sessao'), ('upload_anexo', 'anexo_sessao/{}_texto_anexado')], @@ -38,8 +35,14 @@ DOCS = { DocumentoAcessorioAdministrativo: [('arquivo', 'administrativo/{}')], } +# acrescenta reuniões (que só existem no sapl 3.0) +if 'reuniao_comissao' in set(exec_legado('show tables')): + DOCS[Reuniao] = [('upload_pauta', 'reuniao_comissao/{}_pauta'), + ('upload_ata', 'reuniao_comissao/{}_ata')], + + DOCS = {model: [(campo, join('sapl_documentos', origem)) - for campo, origem, in campos] + for campo, origem in campos] for model, campos in DOCS.items()} @@ -55,7 +58,7 @@ def mover_documento(repo, origem, destino, ignora_origem_ausente=False): def migrar_logotipo(repo, casa, propriedades): print('.... Migrando logotipo da casa ....') - [(campo, origem)] = DOCS[CasaLegislativa] + campo, origem = 'logotipo', 'sapl_documentos/props_sapl/{}.*' # a extensão do logo pode ter sido ajustada pelo tipo real do arquivo nome_nas_propriedades = os.path.splitext(propriedades['id_logo'])[0] arquivos = glob( @@ -102,10 +105,10 @@ def migrar_propriedades_da_casa(repo): migrar_logotipo(repo, casa, propriedades) casa.save() - repo.git.rm(caminho) def migrar_docs_por_ids(repo, model): + for campo, base_origem in DOCS[model]: print('#### Migrando {} de {} ####'.format(campo, model.__name__)) @@ -161,16 +164,7 @@ def migrar_documentos(repo): # (necessário para o cropping de imagem) repo.git.execute('git annex get sapl_documentos/parlamentar'.split()) - for model in [ - Parlamentar, - MateriaLegislativa, - DocumentoAcessorio, - NormaJuridica, - SessaoPlenaria, - Proposicao, - DocumentoAdministrativo, - DocumentoAcessorioAdministrativo, - ]: + for model in DOCS: migrar_docs_por_ids(repo, model) sobrando = [join(dir, file) From d561025fc793843784188f291a9dbc78d23e55a4 Mon Sep 17 00:00:00 2001 From: Talitha Pumar Date: Mon, 18 Jun 2018 12:10:39 -0300 Subject: [PATCH 28/45] Fix #2022 (#2023) --- sapl/sessao/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 8b695f10d..a0c727ec1 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -2824,7 +2824,8 @@ class AdicionarVariasMateriasOrdemDia(AdicionarVariasMateriasExpediente): ordem_dia.tipo_votacao = tipo_votacao ordem_dia.save() - return self.get(request, self.kwargs) + return HttpResponseRedirect( + reverse('sapl.sessao:ordemdia_list', kwargs=self.kwargs)) @csrf_exempt From 8e92fc55506bee088b9463fcada9a47ce17f4a9d Mon Sep 17 00:00:00 2001 From: Edward Date: Mon, 18 Jun 2018 12:10:54 -0300 Subject: [PATCH 29/45] Fixes: #2024 (#2025) --- sapl/parlamentares/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index 093bb83bd..ee67f2733 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -462,12 +462,14 @@ class ParlamentarCrud(Crud): return l.id if legislaturas: return legislaturas[0].id - return 0 + return -1 def get_queryset(self): queryset = super().get_queryset() legislatura_id = self.take_legislatura_id() - if legislatura_id != 0: + # Pelo menos uma casa legislativa criou uma + # legislatura de numero zero, o que é um absurdo + if legislatura_id >= 0: return queryset.filter( mandato__legislatura_id=legislatura_id).annotate( mandato_titular=F('mandato__titular')) From f37a754a458726a7a8836e065c13ede778ebb3ae Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 18 Jun 2018 12:21:44 -0300 Subject: [PATCH 30/45] HOT-FIX: adiciona logs no file system do container --- Dockerfile | 3 ++- docker-compose.yml | 3 ++- gunicorn_start.sh | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 693230025..9f89509d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,8 @@ RUN rm -rf /var/interlegis/sapl/sapl/.env && \ RUN chmod +x /var/interlegis/sapl/start.sh && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log + ln -sf /dev/stderr /var/log/nginx/error.log && \ + mkdir /var/log/sapl/ VOLUME ["/var/interlegis/sapl/data", "/var/interlegis/sapl/media"] diff --git a/docker-compose.yml b/docker-compose.yml index f3ca2cef8..59d13d8a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,8 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.87 + # image: interlegis/sapl:3.1.87 + build: . restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/gunicorn_start.sh b/gunicorn_start.sh index 6247a0b27..4f58022ce 100755 --- a/gunicorn_start.sh +++ b/gunicorn_start.sh @@ -44,6 +44,6 @@ exec gunicorn ${DJANGO_WSGI_MODULE}:application \ --workers $NUM_WORKERS \ --max-requests $MAX_REQUESTS \ --user $USER \ - --access-logfile - \ - --error-logfile - \ + --access-logfile /var/log/sapl/access.log \ + --error-logfile /var/log/sapl/error.log \ --bind=unix:$SOCKFILE From 543b4a6adb6406795e707af5f3a169338341bf88 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 18 Jun 2018 12:22:10 -0300 Subject: [PATCH 31/45] Release: 3.1.88 --- docker-compose.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 59d13d8a9..a607b27df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - # image: interlegis/sapl:3.1.87 + # image: interlegis/sapl:3.1.88 build: . restart: always environment: diff --git a/setup.py b/setup.py index e25cde8b6..61e420d8a 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.87', + version='3.1.88', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', From d055b2c86a50ee4af9b6ac19278c1dabaeb35cdd Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Mon, 18 Jun 2018 13:27:05 -0300 Subject: [PATCH 32/45] 2014 exclui tramitacao lote (#2020) * Fix #2014 * Adiciona condicao para excluir --- sapl/materia/forms.py | 67 ++++++++++++++++++- sapl/materia/urls.py | 5 +- sapl/materia/views.py | 27 +++++++- .../materia/em_lote/excluir_tramitacao.html | 7 ++ sapl/templates/navbar.yaml | 3 + 5 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 sapl/templates/materia/em_lote/excluir_tramitacao.html diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index d14fad28c..20518cfdd 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -32,7 +32,8 @@ from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column, to_row) from sapl.materia.models import (AssuntoMateria, Autoria, MateriaAssunto, MateriaLegislativa, Orgao, RegimeTramitacao, - TipoDocumento, TipoProposicao) + TipoDocumento, TipoProposicao, StatusTramitacao, + UnidadeTramitacao) from sapl.norma.models import (LegislacaoCitada, NormaJuridica, TipoNormaJuridica) from sapl.parlamentares.models import Legislatura @@ -2032,3 +2033,67 @@ class FichaSelecionaForm(forms.Form): form_actions(label='Gerar Impresso') ) ) + + +class ExcluirTramitacaoEmLote(forms.Form): + + data_tramitacao = forms.DateField(required=True, + label=_('Data da Tramitação')) + + unidade_tramitacao_local = forms.ModelChoiceField(label=_('Unidade Local'), + required=True, + queryset=UnidadeTramitacao.objects.all(), + empty_label='------') + + unidade_tramitacao_destino = forms.ModelChoiceField(label=_('Unidade Destino'), + required=True, + queryset=UnidadeTramitacao.objects.all(), + empty_label='------') + + status = forms.ModelChoiceField(label=_('Status'), + required=True, + queryset=StatusTramitacao.objects.all(), + empty_label='------') + + def clean(self): + super(ExcluirTramitacaoEmLote, self).clean() + + cleaned_data = self.cleaned_data + + if not self.is_valid(): + return cleaned_data + + data_tramitacao = cleaned_data['data_tramitacao'] + unidade_tramitacao_local = cleaned_data['unidade_tramitacao_local'] + unidade_tramitacao_destino = cleaned_data['unidade_tramitacao_destino'] + status = cleaned_data['status'] + + tramitacao_set = Tramitacao.objects.filter(data_tramitacao=data_tramitacao, + unidade_tramitacao_local=unidade_tramitacao_local, + unidade_tramitacao_destino=unidade_tramitacao_destino, + status=status) + if not tramitacao_set.exists(): + raise forms.ValidationError( + _("Não existem tramitações com os dados informados.")) + + return cleaned_data + + def __init__(self, *args, **kwargs): + super(ExcluirTramitacaoEmLote, self).__init__(*args, **kwargs) + + row1 = to_row( + [('data_tramitacao', 6), + ('status', 6),]) + row2 = to_row( + [('unidade_tramitacao_local', 6), + ('unidade_tramitacao_destino', 6)]) + + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_('Dados das Tramitações'), + row1, + row2, + HTML(" "), + form_actions(label='Excluir') + ) + ) diff --git a/sapl/materia/urls.py b/sapl/materia/urls.py index 934c4dbac..f2c89c908 100644 --- a/sapl/materia/urls.py +++ b/sapl/materia/urls.py @@ -23,7 +23,8 @@ from sapl.materia.views import (AcompanhamentoConfirmarView, TipoFimRelatoriaCrud, TipoMateriaCrud, TipoProposicaoCrud, TramitacaoCrud, TramitacaoEmLoteView, UnidadeTramitacaoCrud, - proposicao_texto, recuperar_materia) + proposicao_texto, recuperar_materia, + ExcluirTramitacaoEmLoteView) from sapl.norma.views import NormaPesquisaSimplesView from .apps import AppConfig @@ -90,6 +91,8 @@ urlpatterns_materia = [ name='primeira_tramitacao_em_lote'), url(r'^materia/tramitacao-em-lote', TramitacaoEmLoteView.as_view(), name='tramitacao_em_lote'), + url(r'^materia/excluir-tramitacao-em-lote', ExcluirTramitacaoEmLoteView.as_view(), + name='excluir_tramitacao_em_lote'), ] diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 807db3d9c..d5c4884c9 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -57,7 +57,8 @@ from .forms import (AcessorioEmLoteFilterSet, AcompanhamentoMateriaForm, TramitacaoEmLoteFilterSet, UnidadeTramitacaoForm, filtra_tramitacao_destino, filtra_tramitacao_destino_and_status, - filtra_tramitacao_status) + filtra_tramitacao_status, + ExcluirTramitacaoEmLote) from .models import (AcompanhamentoMateria, Anexada, AssuntoMateria, Autoria, DespachoInicial, DocumentoAcessorio, MateriaAssunto, MateriaLegislativa, Numeracao, Orgao, Origem, Proposicao, @@ -1972,3 +1973,27 @@ class FichaSelecionaView(PermissionRequiredMixin, FormView): return gerar_pdf_impressos(self.request, context, 'materia/impressos/ficha_pdf.html') + + +class ExcluirTramitacaoEmLoteView(PermissionRequiredMixin, FormView): + + template_name = 'materia/em_lote/excluir_tramitacao.html' + permission_required = ('materia.add_tramitacao',) + form_class = ExcluirTramitacaoEmLote + form_valid_message = _('Tramitações excluídas com sucesso!') + + def get_success_url(self): + return reverse('sapl.materia:excluir_tramitacao_em_lote') + + def form_valid(self, form): + + tramitacao_set = Tramitacao.objects.filter(data_tramitacao=form.cleaned_data['data_tramitacao'], + unidade_tramitacao_local=form.cleaned_data['unidade_tramitacao_local'], + unidade_tramitacao_destino=form.cleaned_data['unidade_tramitacao_destino'], + status=form.cleaned_data['status']) + for tramitacao in tramitacao_set: + materia = tramitacao.materia + if tramitacao == materia.tramitacao_set.last(): + tramitacao.delete() + + return redirect(self.get_success_url()) \ No newline at end of file diff --git a/sapl/templates/materia/em_lote/excluir_tramitacao.html b/sapl/templates/materia/em_lote/excluir_tramitacao.html new file mode 100644 index 000000000..b74faa593 --- /dev/null +++ b/sapl/templates/materia/em_lote/excluir_tramitacao.html @@ -0,0 +1,7 @@ +{% extends "crud/detail.html" %} +{% load i18n crispy_forms_tags %} + +{% block actions %}{% endblock %} +{% block detail_content %} + {% crispy form %} +{% endblock detail_content %} \ No newline at end of file diff --git a/sapl/templates/navbar.yaml b/sapl/templates/navbar.yaml index c997e2e41..b80cb7acd 100644 --- a/sapl/templates/navbar.yaml +++ b/sapl/templates/navbar.yaml @@ -54,6 +54,9 @@ - title: {% trans 'Tramitação em Lote' %} url: sapl.materia:primeira_tramitacao_em_lote check_permission: materia.list_tramitacao {% comment %} FIXME transformar para checagens de menu_[funcionalidade]{% endcomment%} + - title: {% trans 'Excluir Tramitação em Lote' %} + url: sapl.materia:excluir_tramitacao_em_lote + check_permission: materia.list_tramitacao {% comment %} FIXME transformar para checagens de menu_[funcionalidade]{% endcomment%} - title: {% trans 'Normas Jurídicas' %} children: From 7f41407039d9416c8791f7a1ad08f4d3b4aced33 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 18 Jun 2018 13:35:49 -0300 Subject: [PATCH 33/45] Release: 3.1.89 --- docker-compose.yml | 5 ++--- setup.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a607b27df..ead9d3300 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ sapldb: - image: postgres + image: postgres:9.6.8-alpine restart: always environment: POSTGRES_PASSWORD: sapl @@ -11,8 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - # image: interlegis/sapl:3.1.88 - build: . + image: interlegis/sapl:3.1.89 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/setup.py b/setup.py index 61e420d8a..661e71e56 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.88', + version='3.1.89', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', From 429c87921d8669714bd5453aadf9a72542b0f381 Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Mon, 18 Jun 2018 15:57:58 -0300 Subject: [PATCH 34/45] Fix #2027 (#2028) --- sapl/materia/views.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index d5c4884c9..8bf4f7600 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1037,10 +1037,16 @@ class TramitacaoCrud(MasterDetailCrud): '-id').first() if ultima_tramitacao: - context['form'].fields[ - 'unidade_tramitacao_local'].choices = [ - (ultima_tramitacao.unidade_tramitacao_destino.pk, - ultima_tramitacao.unidade_tramitacao_destino)] + if ultima_tramitacao.unidade_tramitacao_destino: + context['form'].fields[ + 'unidade_tramitacao_local'].choices = [ + (ultima_tramitacao.unidade_tramitacao_destino.pk, + ultima_tramitacao.unidade_tramitacao_destino)] + else: + msg = _('Unidade de tramitação destino ' + ' da última tramitação não pode ser vazia!') + messages.add_message(self.request, messages.ERROR, msg) + return context def form_valid(self, form): From 47afb8b73aaa40f93adbecf1ffa20d9349ad0598 Mon Sep 17 00:00:00 2001 From: Edward Date: Mon, 18 Jun 2018 16:01:20 -0300 Subject: [PATCH 35/45] HOT-FIX: revertendo pinagem de PG --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ead9d3300..313c0a963 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ sapldb: - image: postgres:9.6.8-alpine + image: postgres restart: always environment: POSTGRES_PASSWORD: sapl From 6f18ccb12da3922a2afd96e2b0daf6a9fe98223a Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 18 Jun 2018 16:06:31 -0300 Subject: [PATCH 36/45] Release: 3.1.90 --- docker-compose.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 313c0a963..6d6221296 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.89 + image: interlegis/sapl:3.1.90 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/setup.py b/setup.py index 661e71e56..dee2f95fd 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.89', + version='3.1.90', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', From f11795b932b940349d1f69202a3d3ad995e6380e Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Wed, 20 Jun 2018 09:43:32 -0300 Subject: [PATCH 37/45] retira link disponivel para superuser --- sapl/templates/compilacao/textoarticulado_menu_config.html | 1 - 1 file changed, 1 deletion(-) diff --git a/sapl/templates/compilacao/textoarticulado_menu_config.html b/sapl/templates/compilacao/textoarticulado_menu_config.html index 0116ba667..f423d21cd 100644 --- a/sapl/templates/compilacao/textoarticulado_menu_config.html +++ b/sapl/templates/compilacao/textoarticulado_menu_config.html @@ -14,7 +14,6 @@ {% if perms.compilacao.list_tipovide %}
  • {%model_verbose_name_plural 'sapl.compilacao.models.TipoVide'%}
    • {% endif %} {% if user.is_superuser %} -
  • {%model_verbose_name_plural 'sapl.compilacao.models.TipoDispositivo'%}
  • Relacionamento entre Dispositivos
    • {% endif %} From f8e973bca41a3c735d2e57c526467660687f3fea Mon Sep 17 00:00:00 2001 From: cristian-longhi Date: Wed, 20 Jun 2018 13:47:34 -0300 Subject: [PATCH 38/45] =?UTF-8?q?Exibi=C3=A7=C3=A3o=20da=20Mesa=20Diretora?= =?UTF-8?q?=20e=20ajustes=20de=20preenchimento=20em=20mat=C3=A9rias=20e=20?= =?UTF-8?q?protocolo=20(#2029)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Ordenação mesa * Ordenação mesa --- sapl/parlamentares/views.py | 6 ++--- sapl/protocoloadm/forms.py | 3 ++- .../migrations/0022_auto_20180618_1625.py | 25 +++++++++++++++++++ sapl/sessao/models.py | 2 +- sapl/sessao/views.py | 4 +-- 5 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 sapl/sessao/migrations/0022_auto_20180618_1625.py diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index ee67f2733..78678c3fc 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -652,7 +652,7 @@ class MesaDiretoraView(FormView): sessao_atual = sessoes.filter(data_inicio__year__lte=year).exclude( data_inicio__gt=timezone.now()).order_by('-data_inicio').first() - mesa = sessao_atual.composicaomesa_set.all() if sessao_atual else [] + mesa = sessao_atual.composicaomesa_set.all().order_by('cargo_id') if sessao_atual else [] cargos_ocupados = [m.cargo for m in mesa] cargos = CargoMesa.objects.all() @@ -712,7 +712,7 @@ def altera_field_mesa(request): # Atualiza os componentes da view após a mudança composicao_mesa = ComposicaoMesa.objects.filter( - sessao_legislativa=sessao_selecionada) + sessao_legislativa=sessao_selecionada).order_by('cargo_id') cargos_ocupados = [m.cargo for m in composicao_mesa] cargos = CargoMesa.objects.all() @@ -881,7 +881,7 @@ def altera_field_mesa_public_view(request): lista_sessoes = [(s.id, s.__str__()) for s in sessoes] composicao_mesa = ComposicaoMesa.objects.filter( - sessao_legislativa=sessao_selecionada) + sessao_legislativa=sessao_selecionada).order_by('cargo_id') cargos_ocupados = [(m.cargo.id, m.cargo.__str__()) for m in composicao_mesa] diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index 7d68ad9c3..8502bf334 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -291,7 +291,8 @@ class ProtocoloDocumentForm(ModelForm): tipo_protocolo = forms.ChoiceField(required=True, label=_('Tipo de Protocolo'), - choices=TIPOS_PROTOCOLO_CREATE,) + choices=TIPOS_PROTOCOLO_CREATE, + initial=0,) tipo_documento = forms.ModelChoiceField( label=_('Tipo de Documento'), diff --git a/sapl/sessao/migrations/0022_auto_20180618_1625.py b/sapl/sessao/migrations/0022_auto_20180618_1625.py new file mode 100644 index 000000000..4e8fd4323 --- /dev/null +++ b/sapl/sessao/migrations/0022_auto_20180618_1625.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-06-18 19:25 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0021_auto_20180417_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='expedientemateria', + name='tipo_votacao', + field=models.PositiveIntegerField(choices=[(1, 'Simbólica'), (2, 'Nominal'), (3, 'Secreta')], default=1, verbose_name='Tipo de votação'), + ), + migrations.AlterField( + model_name='ordemdia', + name='tipo_votacao', + field=models.PositiveIntegerField(choices=[(1, 'Simbólica'), (2, 'Nominal'), (3, 'Secreta')], default=1, verbose_name='Tipo de votação'), + ), + ] diff --git a/sapl/sessao/models.py b/sapl/sessao/models.py index 4c5e9e187..6af5f490f 100644 --- a/sapl/sessao/models.py +++ b/sapl/sessao/models.py @@ -241,7 +241,7 @@ class AbstractOrdemDia(models.Model): numero_ordem = models.PositiveIntegerField(verbose_name=_('Nº Ordem')) resultado = models.TextField(blank=True, verbose_name=_('Resultado')) tipo_votacao = models.PositiveIntegerField( - verbose_name=_('Tipo de votação'), choices=TIPO_VOTACAO_CHOICES) + verbose_name=_('Tipo de votação'), choices=TIPO_VOTACAO_CHOICES, default=1) votacao_aberta = models.NullBooleanField( blank=True, choices=YES_NO_CHOICES, diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index a0c727ec1..c9e1e0e00 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -992,7 +992,7 @@ class MesaView(FormMixin, DetailView): return self.render_to_response(context) - mesa = sessao.integrantemesa_set.all() if sessao else [] + mesa = sessao.integrantemesa_set.all().order_by('cargo_id') if sessao else [] cargos_ocupados = [m.cargo for m in mesa] cargos = CargoMesa.objects.all() cargos_vagos = list(set(cargos) - set(cargos_ocupados)) @@ -1043,7 +1043,7 @@ def atualizar_mesa(request): # Atualiza os componentes da view após a mudança composicao_mesa = IntegranteMesa.objects.filter( - sessao_plenaria=sessao.id) + sessao_plenaria=sessao.id).order_by('cargo_id') cargos_ocupados = [m.cargo for m in composicao_mesa] cargos = CargoMesa.objects.all() From 3c9f389c722eda9e133246f9b97f5e8494b22b11 Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Wed, 20 Jun 2018 17:46:17 -0300 Subject: [PATCH 39/45] Fix #2035 (#2036) --- sapl/materia/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 8bf4f7600..02484b162 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -96,7 +96,9 @@ def proposicao_texto(request, pk): if proposicao.texto_original: if (not proposicao.data_recebimento and proposicao.autor.user_id != request.user.id): - raise Http404 + messages.error(request, _('Você não tem permissão para acessar o texto original.')) + return redirect(reverse('sapl.materia:proposicao_detail', + kwargs={'pk':pk})) arquivo = proposicao.texto_original From 2a39cbb2b54748f4587a96ee685022df9288f44c Mon Sep 17 00:00:00 2001 From: Talitha Pumar Date: Thu, 21 Jun 2018 12:53:38 -0300 Subject: [PATCH 40/45] HOT FIX (#2037) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arrumada variável no template crud/list.html --- sapl/templates/crud/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/templates/crud/list.html b/sapl/templates/crud/list.html index b1743516d..8e911913c 100644 --- a/sapl/templates/crud/list.html +++ b/sapl/templates/crud/list.html @@ -74,7 +74,7 @@
    {% if href %} {{ value|safe|default:"" }} - {% elif valu != 'core.Cep.None' %} + {% elif value != 'core.Cep.None' %} {% if value|url %} {{ value|safe|default:"" }} {% else %} From 3b3b4acf72ade7640060d5a511e94ce04db8df2f Mon Sep 17 00:00:00 2001 From: Talitha Pumar Date: Thu, 21 Jun 2018 12:55:26 -0300 Subject: [PATCH 41/45] 1934 ordenar protocolo (#2033) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix #1934 ordenaçao na tela de proposiçoes pendentes * Fix #1934 ordenaçao na tela de proposiçoes pendentes * --amend * Update more pythonic * Update prop_pendentes_list.html --- sapl/base/templatetags/common_tags.py | 31 ++++++++++++++++++- .../materia/prop_pendentes_list.html | 31 +++++++++++++++---- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/sapl/base/templatetags/common_tags.py b/sapl/base/templatetags/common_tags.py index 9e095f072..73d71faa8 100644 --- a/sapl/base/templatetags/common_tags.py +++ b/sapl/base/templatetags/common_tags.py @@ -3,7 +3,7 @@ from django import template from django.template.defaultfilters import stringfilter from sapl.base.models import AppConfig -from sapl.materia.models import DocumentoAcessorio, MateriaLegislativa +from sapl.materia.models import DocumentoAcessorio, MateriaLegislativa, Proposicao from sapl.norma.models import NormaJuridica from sapl.parlamentares.models import Filiacao from sapl.utils import filiacao_data @@ -11,6 +11,11 @@ from sapl.utils import filiacao_data register = template.Library() +@register.simple_tag +def define(arg): + return arg + + @register.simple_tag def field_verbose_name(instance, field_name): return instance._meta.get_field(field_name).verbose_name @@ -34,6 +39,30 @@ def model_verbose_name_plural(class_name): return model._meta.verbose_name_plural +@register.filter +def split(value, arg): + return value.split(arg) + + +@register.filter +def sort_by_keys(value, key): + transformed = [] + id_props = [x.id for x in value] + qs = Proposicao.objects.filter(pk__in=id_props) + key_descricao = {'1': 'data_envio', + '-1': '-data_envio', + '2': 'tipo', + '-2': '-tipo', + '3': 'descricao', + '-3': '-descricao', + '4': 'autor', + '-4': '-autor' + } + + transformed = qs.order_by(key_descricao[key]) + return transformed + + @register.filter def lookup(d, key): return d[key] if key in d else [] diff --git a/sapl/templates/materia/prop_pendentes_list.html b/sapl/templates/materia/prop_pendentes_list.html index 092d19a26..518ba7601 100644 --- a/sapl/templates/materia/prop_pendentes_list.html +++ b/sapl/templates/materia/prop_pendentes_list.html @@ -11,24 +11,42 @@ - - - - + {% with 'Data Envio,Tipo,Descrição,Autor' as list %} + {% for name in list|split:"," %} + + {% endfor %} {% if not AppConfig.receber_recibo_proposicao %} {% endif %} + {% endwith %} - {% for prop in object_list %} + {% if 'o' in request.GET %} + {% define object_list|sort_by_keys:request.GET.o as list %} + {% else %} + {% define object_list as list %} + {% endif %} + + {% for prop in list %} - +
    Data de EnvioTipoDescriçãoAutor + + {{ name }} + {% if 'o' in request.GET %} + {% if 'o' not in request.GET and forloop.counter == 1 or 'o' in request.GET and forloop.counter|safe == request.GET.o %} + + {% elif 'o' in request.GET and forloop.counter == request.GET.o|str2intabs %} + + {%endif%} + {%endif%} + + Código do Documento
    {{ prop.data_envio|localtime|date:"d/m/Y H:i:s" }} {{ prop.tipo.descricao }} {{ prop.descricao }}{{prop.autor}}{{ prop.autor }} {% if not AppConfig.receber_recibo_proposicao %} {%if prop.hash_code %} @@ -44,5 +62,6 @@
    {% endif %} + {% include 'paginacao.html'%} {% endblock %} From cc440afd256721ca7cb31717039b5b1122eabf98 Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Fri, 22 Jun 2018 15:25:00 -0300 Subject: [PATCH 42/45] Release: 3.1.91 --- docker-compose.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6d6221296..b67c9c472 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.90 + image: interlegis/sapl:3.1.91 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/setup.py b/setup.py index dee2f95fd..1ce8830db 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.90', + version='3.1.91', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', From 0e54d17c777f160c93fe7ebf67e1dc111c133e7d Mon Sep 17 00:00:00 2001 From: Edward Date: Mon, 25 Jun 2018 09:44:43 -0300 Subject: [PATCH 43/45] Fixes #2038 (#2039) --- sapl/materia/forms.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 20518cfdd..838b8616d 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1818,7 +1818,19 @@ class ConfirmarProposicaoForm(ProposicaoForm): if numeracao == 'A': nm = Protocolo.objects.filter( ano=timezone.now().year).aggregate(Max('numero')) - elif numeracao == 'U': + elif numeracao == 'L': + legislatura = Legislatura.objects.filter( + data_inicio__year__lte=timezone.now().year, + data_fim__year__gte=timezone.now().year).first() + data_inicio = legislatura.data_inicio + data_fim = legislatura.data_fim + nm = MateriaLegislativa.objects.filter( + data_apresentacao__gte=data_inicio, + data_apresentacao__lte=data_fim, + tipo=tipo).aggregate(Max('numero')) + + else: + # numeracao == 'U' ou não informada nm = Protocolo.objects.all().aggregate(Max('numero')) protocolo = Protocolo() From 71c63b26bf89a8b2f83423890e9132957f688eee Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 25 Jun 2018 09:45:56 -0300 Subject: [PATCH 44/45] Release: 3.1.92 --- docker-compose.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b67c9c472..c33273b3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.91 + image: interlegis/sapl:3.1.92 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/setup.py b/setup.py index 1ce8830db..b76d46c98 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.91', + version='3.1.92', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', From 98a22156909ede4597a79019e28672c6fe79b921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Fr=C3=A1?= Date: Mon, 25 Jun 2018 14:20:50 -0300 Subject: [PATCH 45/45] Aumenta retorno da pesquisa de capa de Processo (#2040) --- sapl/materia/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 02484b162..6f0b35ef8 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1948,16 +1948,16 @@ class FichaSelecionaView(PermissionRequiredMixin, FormView): tipo=tipo, data_apresentacao__range=(data_inicial, data_final)) context['quantidade'] = len(materia_list) - materia_list = materia_list[:20] + materia_list = materia_list[:100] context['form'].fields['materia'].choices = [ (m.id, str(m)) for m in materia_list] - if context['quantidade'] > 20: + if context['quantidade'] > 100: messages.info(self.request, _('Sua pesquisa retornou mais do que ' - '20 impressos. Por questões de ' + '100 impressos. Por questões de ' 'performance, foram retornados ' - 'apenas os 20 primeiros. Caso ' + 'apenas os 100 primeiros. Caso ' 'queira outros, tente fazer uma ' 'pesquisa mais específica')) @@ -2004,4 +2004,4 @@ class ExcluirTramitacaoEmLoteView(PermissionRequiredMixin, FormView): if tramitacao == materia.tramitacao_set.last(): tramitacao.delete() - return redirect(self.get_success_url()) \ No newline at end of file + return redirect(self.get_success_url())