From 8e821bdce0fa4df7cf075bfc4c6f0c09bfe912e0 Mon Sep 17 00:00:00 2001 From: Eric Menezes Noronha Date: Tue, 27 May 2014 18:28:36 -0300 Subject: [PATCH] Correção chamada mapacacic --- MapaTesteProj/MapaCACIC.identcache | Bin 1327 -> 0 bytes main.pas | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MapaTesteProj/MapaCACIC.identcache b/MapaTesteProj/MapaCACIC.identcache index 7c0e401..9131734 100644 Binary files a/MapaTesteProj/MapaCACIC.identcache and b/MapaTesteProj/MapaCACIC.identcache differ diff --git a/main.pas b/main.pas index e26e789..ee90a03 100755 --- a/main.pas +++ b/main.pas @@ -1225,14 +1225,14 @@ end; procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject); begin - if (ActualActivity<>4) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) <> 'N') then + if (ActualActivity<>4) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then Invoca_MapaCacic else MessageDlg(#13#13+'Módulo desabilitado!',mtError, [mbOK], 0); end; //////////////////////////////////////////////////////////////////////////////// -// CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // +// CRIADO PARA A CHAMADA DO MAPA CACIC // //////////////////////////////////////////////////////////////////////////////// procedure TFormularioGeral.Invoca_MapaCacic; @@ -1296,13 +1296,12 @@ begin //////////////////////////////////////////////////////////////////////////////// // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // //////////////////////////////////////////////////////////////////////////////// - if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s') + if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s') and (ActualActivity<>4) - and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) <> 'N') then begin + and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then begin objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...'); Invoca_MapaCacic; - end; - + end; timerCheckNoMinuto.Enabled := false; objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...'); @@ -1424,6 +1423,7 @@ begin Invoca_GerCols('collect'); End; End; + timerCheckNoMinuto.Enabled := true; End; -- libgit2 0.21.2