Download as
Browse Code »

Commit 5432b3bad64d7361e9b6af4f15768c381108d5a0

Authored by Eric Menezes Noronha
1 parent 8e821bdc
Exists in master

Adaptação para força mapa.

Showing 6 changed files with 27 additions and 18 deletions   Show diff stats
MapaTesteProj/MapaCACIC.dproj
  Diff comments   View file @5432b3b
... ... @@ -24,8 +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">5</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.5</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>
28   -</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">5</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.5</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>
29 28 </ProjectExtensions>
30 29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
31 30 <ItemGroup>
... ...
MapaTesteProj/MapaCACIC.identcache
View file @5432b3b
No preview for this file type
MapaTesteProj/MapaTeste.dcu
View file @5432b3b
No preview for this file type
MapaTesteProj/MapaTeste.dfm
  Diff comments   View file @5432b3b
... ... @@ -218,6 +218,7 @@ object frmMapaCacic: TfrmMapaCacic
218 218 Top = 182
219 219 Width = 250
220 220 Height = 13
  221 + Hint = 'Nome do computador, constando o patrim'#244'nio.'
221 222 AutoSize = False
222 223 Caption = 'Computador'
223 224 Font.Charset = DEFAULT_CHARSET
... ... @@ -249,8 +250,8 @@ object frmMapaCacic: TfrmMapaCacic
249 250 Width = 250
250 251 Height = 13
251 252 Hint =
252   - 'Patrim'#244'nio do Computador. Gentileza procure o n'#250'mero que se enco' +
253   - 'ntra no mesmo.'
  253 + 'N'#250'mero do Patrim'#244'nio do Computador. Gentileza procure o n'#250'mero q' +
  254 + 'ue se encontra em uma etiqueta colada no mesmo.'
254 255 HelpContext = 1
255 256 AutoSize = False
256 257 Caption = 'Patrim'#244'nio'
... ... @@ -269,6 +270,7 @@ object frmMapaCacic: TfrmMapaCacic
269 270 Top = 129
270 271 Width = 250
271 272 Height = 13
  273 + Hint = 'Nome do usu'#225'rio logado.'
272 274 AutoSize = False
273 275 Caption = 'Nome'
274 276 Font.Charset = DEFAULT_CHARSET
... ... @@ -550,7 +552,7 @@ object frmMapaCacic: TfrmMapaCacic
550 552 AutoSize = False
551 553 Caption =
552 554 'O preenchimento correto dos campos abaixo define a exatid'#227'o do c' +
553   - 'ontrole de patrim'#244'nio e localiza'#231#227'o f'#237'sica do equipamento. '
  555 + 'ontrole de patrim'#244'nio e localiza'#231#227'o f'#237'sica do equipamento. '
554 556 Font.Charset = DEFAULT_CHARSET
555 557 Font.Color = clBlack
556 558 Font.Height = -13
... ...
MapaTesteProj/MapaTeste.pas
  Diff comments   View file @5432b3b
... ... @@ -304,6 +304,7 @@ Begin
304 304  
305 305 if (Result <> '0') then
306 306 Begin
  307 + objCacic.setValueToFile('Configs' ,'modulo_patr' , objCacic.getValueFromTags('modPatrimonio' , Result, '<>'), strGerColsInfFileName);
307 308 objCacic.setValueToFile('Configs' ,'servidor_autenticacao', objCacic.getValueFromTags('dados_ldap' , Result), strGerColsInfFileName);
308 309 objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName);
309 310 objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName);
... ... @@ -403,7 +404,11 @@ if edTeInfoPatrimonio5.text &lt;&gt; &#39;&#39; then
403 404 btGravarInformacoes.Caption := 'Informações enviadas com sucesso...';
404 405 objCacic.setValueToFile('Collects','col_patr_last' ,
405 406 objCacic.enCrypt(strColetaAtual), strGerColsInfFileName);
406   - objCacic.setValueToFile('Configs','col_patr_exe', 's', strGerColsInfFileName);
  407 + if objCacic.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'N' then
  408 + objCacic.setValueToFile('Configs','col_patr_exe', 'n', strGerColsInfFileName)
  409 + else
  410 + objCacic.setValueToFile('Configs','col_patr_exe', 's', strGerColsInfFileName);
  411 +
407 412  
408 413 End;
409 414 objCacic.writeDebugLog(#13#10 + 'AtualizaPatrimonio: Dados Enviados ao Servidor!');
... ...
main.pas
  Diff comments   View file @5432b3b
... ... @@ -1211,7 +1211,7 @@ begin
1211 1211  
1212 1212 timerNuExecApos.Enabled := False;
1213 1213 objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"');
1214   - if (p_acao = 'getTest') then //se for getTest, esperar a aplicação finalizar.
  1214 + if ((p_acao = 'getTest') or (p_acao = 'getConfigs')) then //se for getTest, esperar a aplicação finalizar.
1215 1215 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)
1216 1216 else
1217 1217 objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,false,SW_HIDE);
... ... @@ -1228,7 +1228,7 @@ begin
1228 1228 if (ActualActivity<>4) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then
1229 1229 Invoca_MapaCacic
1230 1230 else
1231   - MessageDlg(#13#13+'Módulo desabilitado!',mtError, [mbOK], 0);
  1231 + MessageDlg(#13#13+'Módulo desabilitado!',mtInformation, [mbOK], 0);
1232 1232 end;
1233 1233  
1234 1234 ////////////////////////////////////////////////////////////////////////////////
... ... @@ -1293,15 +1293,7 @@ begin
1293 1293 (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') or
1294 1294 (trim(objCACIC.getValueFromFile('Configs','forca_coleta', strGerColsInfFileName))='S') Then
1295 1295 Begin
1296   - ////////////////////////////////////////////////////////////////////////////////
1297   - // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
1298   - ////////////////////////////////////////////////////////////////////////////////
1299   - if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s')
1300   - and (ActualActivity<>4)
1301   - and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then begin
1302   - objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
1303   - Invoca_MapaCacic;
1304   - end;
  1296 +
1305 1297 timerCheckNoMinuto.Enabled := false;
1306 1298 objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...');
1307 1299  
... ... @@ -1327,9 +1319,20 @@ begin
1327 1319  
1328 1320 objCACIC.writeDebugLog('ExecutaCACIC: Primeira chamada ao Gerente de Coletas...');
1329 1321 Invoca_GerCols('getConfigs');
1330   -
  1322 +
  1323 + ////////////////////////////////////////////////////////////////////////////////
  1324 + // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
  1325 + ////////////////////////////////////////////////////////////////////////////////
  1326 + if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s')
  1327 + and (ActualActivity<>4)
  1328 + and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then begin
  1329 + objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
  1330 + Invoca_MapaCacic;
  1331 + end;
  1332 +
1331 1333 sleep(3000); // Pausa para início do Gerente de Coletas e criação do arquivo temp\aguarde_GER.txt
1332 1334  
  1335 +
1333 1336 Application.ProcessMessages;
1334 1337 InicializaTray;
1335 1338  
... ...