Commit 1fd3c042c559525817ee55dd5e44086890a0e210
1 parent
e07f513c
Exists in
master
Modificações para execução do mapa ser de total controle do gerente.
Showing
15 changed files
with
66 additions
and
25 deletions
Show diff stats
Mapa/Mapa.pas
| ... | ... | @@ -311,7 +311,6 @@ Begin |
| 311 | 311 | if (Result <> '0') then |
| 312 | 312 | Begin |
| 313 | 313 | objCACIC.writeDailyLog('getConfigs: Comunicação realizada com sucesso!'); |
| 314 | - objCacic.setValueToFile('Configs' ,'modulo_patr' , objCacic.getValueFromTags('modPatrimonio' , Result, '<>'), strGerColsInfFileName); | |
| 315 | 314 | objCacic.setValueToFile('Configs' ,'servidor_autenticacao', objCacic.getValueFromTags('dados_ldap' , Result), strGerColsInfFileName); |
| 316 | 315 | objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName); |
| 317 | 316 | objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName); |
| ... | ... | @@ -421,12 +420,9 @@ if edTeInfoPatrimonio5.text <> '' then |
| 421 | 420 | btGravarInformacoes.Caption := 'Informações enviadas com sucesso...'; |
| 422 | 421 | objCacic.setValueToFile('Collects','col_patr_last' , |
| 423 | 422 | objCacic.enCrypt(strColetaAtual), strGerColsInfFileName); |
| 424 | - objCacic.setValueToFile('Configs','col_patr_exe', 's', strGerColsInfFileName); | |
| 425 | - | |
| 426 | 423 | End; |
| 427 | 424 | objCacic.writeDebugLog(#13#10 + 'AtualizaPatrimonio: Dados Enviados ao Servidor!'); |
| 428 | 425 | Application.ProcessMessages; |
| 429 | - | |
| 430 | 426 | Finalizar; |
| 431 | 427 | end |
| 432 | 428 | else |
| ... | ... | @@ -436,6 +432,7 @@ end; |
| 436 | 432 | |
| 437 | 433 | procedure TfrmMapaCacic.MontaInterface; |
| 438 | 434 | var strConfigsPatrimonioInterface, |
| 435 | + termosPatrimonio, | |
| 439 | 436 | strNomeLDAP : String; |
| 440 | 437 | count : integer; |
| 441 | 438 | Begin |
| ... | ... | @@ -445,6 +442,7 @@ Begin |
| 445 | 442 | strConfigsPatrimonioInterface := objCacic.deCrypt(objCacic.getValueFromFile |
| 446 | 443 | ('Configs','Patrimonio_Interface', |
| 447 | 444 | strGerColsInfFileName)); |
| 445 | + termosPatrimonio := objCacic.getValueFromFile('Configs', 'termos_patrimonio', strGercolsInfFileName); | |
| 448 | 446 | |
| 449 | 447 | //-------------------------PATRIMONIO DA MAQUINA-------------------------------- |
| 450 | 448 | { edTePatrimonioPc.Text := SetPatrimonioPc; |
| ... | ... | @@ -566,6 +564,9 @@ Begin |
| 566 | 564 | edTeInfoPatrimonio10.Visible := true; |
| 567 | 565 | end; |
| 568 | 566 | |
| 567 | + if termosPatrimonio <> '' then | |
| 568 | + rdConcordaTermos.Caption := termosPatrimonio; | |
| 569 | + | |
| 569 | 570 | btGravarInformacoes.Visible := true; |
| 570 | 571 | btCombosUpdate.Enabled := true; |
| 571 | 572 | Application.ProcessMessages; |
| ... | ... | @@ -676,8 +677,8 @@ begin |
| 676 | 677 | if getConfigs <> '0' then |
| 677 | 678 | begin |
| 678 | 679 | if (objCACIC.getValueFromFile('Configs', |
| 679 | - 'modulo_patr', | |
| 680 | - strGerColsInfFileName) = 'S') then | |
| 680 | + 'Patrimonio', | |
| 681 | + strGerColsInfFileName) = 'true') then | |
| 681 | 682 | begin |
| 682 | 683 | objCACIC.writeDailyLog('Iniciando formulário.'); |
| 683 | 684 | mapa; | ... | ... |
Mapa/mapacacic.dproj
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 25 | 25 | <Borland.ProjectType /> |
| 26 | 26 | <BorlandProject> |
| 27 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">16</VersionInfo><VersionInfo Name="Debug">True</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.16</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">mapacacic.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> | |
| 27 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">17</VersionInfo><VersionInfo Name="Debug">True</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">mapacacic.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> | |
| 28 | 28 | </ProjectExtensions> |
| 29 | 29 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 30 | 30 | <ItemGroup> | ... | ... |
Mapa/mapacacic.res
No preview for this file type
cacic280.dproj
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 41 | 41 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 42 | 42 | <BorlandProject> |
| 43 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">16</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.16</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 43 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">17</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 44 | 44 | </ProjectExtensions> |
| 45 | 45 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 46 | 46 | <ItemGroup> | ... | ... |
cacic280.res
No preview for this file type
cacicservice/cacicservice.dproj
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 38 | 38 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 39 | 39 | <BorlandProject> |
| 40 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">16</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Sustentação do Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.16</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacicservice.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 40 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">17</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Sustentação do Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacicservice.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 41 | 41 | </ProjectExtensions> |
| 42 | 42 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 43 | 43 | <ItemGroup> | ... | ... |
cacicservice/cacicservice.res
No preview for this file type
chksis/chksis.dproj
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 30 | 30 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 31 | 31 | <BorlandProject> |
| 32 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\Arquivos de programas\Borland\Delphi7\Mitec\D7</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Arquivos de programas\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">16</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Verificador de Integridade</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.16</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">ChkSIS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">chksis.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 32 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\Arquivos de programas\Borland\Delphi7\Mitec\D7</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Arquivos de programas\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">17</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev.Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Verificador de Integridade</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">ChkSIS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">chksis.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 33 | 33 | </ProjectExtensions> |
| 34 | 34 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 35 | 35 | <ItemGroup> | ... | ... |
chksis/chksis.res
No preview for this file type
gercols/gercols.dpr
| ... | ... | @@ -343,7 +343,6 @@ Begin |
| 343 | 343 | ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
| 344 | 344 | //Gravação no DatFileName dos valores de REDE, COMPUTADOR e EXECUÇÃO obtidos, para consulta pelos outros módulos... |
| 345 | 345 | ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
| 346 | - objCacic.setValueToFile('Configs' ,'modulo_patr' ,objCacic.getValueFromTags('modPatrimonio' , strRetorno, '<>'), strGerColsInfFileName); | |
| 347 | 346 | objCacic.setValueToFile('Configs' ,'CollectsDefinitions' ,objCacic.getValueFromTags('CollectsDefinitions' , strRetorno, '<>'), strGerColsInfFileName); |
| 348 | 347 | objCacic.setValueToFile('Configs' ,'TeServUpdates' ,objCacic.getValueFromTags('te_serv_updates' , strRetorno, '<>'), strChkSisInfFileName); |
| 349 | 348 | objCacic.setValueToFile('Configs' ,'NuPortaServUpdates' ,objCacic.getValueFromTags('nu_porta_serv_updates' , strRetorno, '<>'), strChkSisInfFileName); |
| ... | ... | @@ -378,6 +377,45 @@ Begin |
| 378 | 377 | End; |
| 379 | 378 | end; |
| 380 | 379 | |
| 380 | +procedure getMapa(); | |
| 381 | +var strRetorno: string; | |
| 382 | +Begin | |
| 383 | + Try | |
| 384 | + strAcaoGerCols := 'Preparando teste de comunicação com Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'; | |
| 385 | + | |
| 386 | + objCacic.writeDebugLog('getMapa: Recebendo informações do módulo de patrimônio.'); | |
| 387 | + | |
| 388 | + Try | |
| 389 | + strRetorno := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/mapa', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, 'Pegando informações do módulo de patrimônio. ('+objCacic.getWebManagerAddress+').'); | |
| 390 | + | |
| 391 | + if (strRetorno <> '0') Then | |
| 392 | + Begin | |
| 393 | + objCacic.setBoolCipher(not objCacic.isInDebugMode); | |
| 394 | + if (objCacic.getValueFromTags('Comm_Status', strRetorno,'<>') = 'OK') then | |
| 395 | + Begin | |
| 396 | + objCacic.setValueToFile('Configs','Patrimonio', | |
| 397 | + objCacic.getValueFromTags('Patrimonio', strRetorno, '<>'), | |
| 398 | + strGerColsInfFileName); | |
| 399 | + objCacic.setValueToFile('Configs','termos_patrimonio' ,objCacic.getValueFromTags('Mensagem' , strRetorno,'<>'), strGerColsInfFileName); | |
| 400 | + End; | |
| 401 | + End; | |
| 402 | + except | |
| 403 | + on E : Exception do | |
| 404 | + Begin | |
| 405 | + objCacic.writeDebugLog('getTest: Lançando Exceção #2'); | |
| 406 | + objCacic.writeExceptionLog(E.Message,E.ClassName,'Exceção #2 - Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); | |
| 407 | + objCacic.writeDailyLog('Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); | |
| 408 | + End; | |
| 409 | + End; | |
| 410 | + Except | |
| 411 | + on E : Exception do | |
| 412 | + Begin | |
| 413 | + objCacic.writeDebugLog('getMapa: Lançando Exceção #5'); | |
| 414 | + objCacic.writeExceptionLog(E.Message,E.ClassName,'getMapa: Exceção #5'); | |
| 415 | + End; | |
| 416 | + End; | |
| 417 | +end; | |
| 418 | + | |
| 381 | 419 | procedure getTest(); |
| 382 | 420 | var strRetorno: string; |
| 383 | 421 | Begin |
| ... | ... | @@ -1762,8 +1800,13 @@ begin |
| 1762 | 1800 | Finalizar(true); |
| 1763 | 1801 | halt(0); |
| 1764 | 1802 | end |
| 1765 | - else | |
| 1766 | - Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, strAcaoGerCols); | |
| 1803 | + else if FindCmdLineSwitch ('getMapa', True) then | |
| 1804 | + begin | |
| 1805 | + getConfigs(true); | |
| 1806 | + getMapa(); | |
| 1807 | + Finalizar(true); | |
| 1808 | + halt(0); | |
| 1809 | + end; | |
| 1767 | 1810 | |
| 1768 | 1811 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 1769 | 1812 | ... | ... |
gercols/gercols.dproj
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 39 | 39 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 40 | 40 | <BorlandProject> |
| 41 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">16</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.16</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 41 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">17</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 42 | 42 | </ProjectExtensions> |
| 43 | 43 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 44 | 44 | <ItemGroup> | ... | ... |
gercols/gercols.res
No preview for this file type
installcacic/installcacic.dproj
| ... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 33 | 33 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 34 | 34 | <BorlandProject> |
| 35 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">16</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.16</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">installcacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 35 | +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">17</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">installcacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> | |
| 36 | 36 | </ProjectExtensions> |
| 37 | 37 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 38 | 38 | <ItemGroup> | ... | ... |
installcacic/installcacic.res
No preview for this file type
main.pas
| ... | ... | @@ -819,9 +819,8 @@ Begin |
| 819 | 819 | |
| 820 | 820 | objCACIC.writeDailyLog('Acionando Recuperador de Mapa Cacic.'); |
| 821 | 821 | objCACIC.writeDebugLog('ChecaMAPACACIC: Acionando Recuperador de M�dulo Gerente de Coletas: '+objCACIC.getWinDir + 'chksis.exe'); |
| 822 | - objCACIC.createOneProcess(objCACIC.getWinDir + 'chksis.exe',false,SW_HIDE); | |
| 822 | + objCACIC.createOneProcess(objCACIC.getWinDir + 'chksis.exe',true,SW_HIDE); | |
| 823 | 823 | |
| 824 | - sleep(30000); // 30 segundos de espera para download do gercols.exe | |
| 825 | 824 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 826 | 825 | strFileSize := objCACIC.getFileSize(objCACIC.getLocalFolderName + '\Modules\mapacacic.exe',true); |
| 827 | 826 | if not(strFileSize = '0') and not(strFileSize = '-1') then |
| ... | ... | @@ -1124,6 +1123,7 @@ begin |
| 1124 | 1123 | objCACIC.writeDebugLog('FormCreate: Op��o /execute recebida...'); |
| 1125 | 1124 | objCACIC.writeDailyLog('Op��o para execu��o imediata encontrada...'); |
| 1126 | 1125 | end; |
| 1126 | + Invoca_GerCols('getMapa'); | |
| 1127 | 1127 | ExecutaCACIC(nil); |
| 1128 | 1128 | end; |
| 1129 | 1129 | |
| ... | ... | @@ -1299,10 +1299,9 @@ begin |
| 1299 | 1299 | |
| 1300 | 1300 | timerNuExecApos.Enabled := False; |
| 1301 | 1301 | objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"'); |
| 1302 | - if ((p_acao = 'getTest') or (p_acao = 'getConfigs')) then //se for getTest, esperar a aplica��o finalizar. | |
| 1303 | - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,true,SW_HIDE) | |
| 1304 | - else | |
| 1305 | - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,true,SW_HIDE); | |
| 1302 | + | |
| 1303 | + objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,true,SW_HIDE); | |
| 1304 | + | |
| 1306 | 1305 | g_intStatus := 1; |
| 1307 | 1306 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 1308 | 1307 | End |
| ... | ... | @@ -1428,11 +1427,9 @@ begin |
| 1428 | 1427 | //////////////////////////////////////////////////////////////////////////////// |
| 1429 | 1428 | // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // |
| 1430 | 1429 | //////////////////////////////////////////////////////////////////////////////// |
| 1431 | - if not FindCmdLineSwitch('atualizacao', True) and | |
| 1432 | - (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s') | |
| 1430 | + if not FindCmdLineSwitch('atualizacao', True) | |
| 1433 | 1431 | and not (FileExists(objCacic.getLocalFolderName + 'Temp\aguarde_MAPACACIC.txt')) |
| 1434 | - and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') | |
| 1435 | - and bl_primeira_execucao then | |
| 1432 | + and (objCACIC.getValueFromFile('Configs', 'Patrimonio', strGerColsInfFileName) = 'true') then | |
| 1436 | 1433 | begin |
| 1437 | 1434 | objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...'); |
| 1438 | 1435 | Invoca_MapaCacic; | ... | ... |