Download as
Browse Code »

Commit 86dc1bf08cfaf31a23db9de03333ba9884f3bacb

Authored by Eric Menezes Noronha
1 parent ed7f3d97
Exists in master

Debug do mapa; 

Modificado texto de "acordo" do mapa;
Melhoria ao chamar o mapa pelo cacic280.
Showing 6 changed files with 47 additions and 28 deletions   Show diff stats
Mapa/Mapa.dfm
  Diff comments   View file @86dc1bf
... ... @@ -2,7 +2,7 @@ object frmMapaCacic: TfrmMapaCacic
2 2 Left = 274
3 3 Top = 200
4 4 Caption = 'Mapa Cacic'
5   - ClientHeight = 448
  5 + ClientHeight = 461
6 6 ClientWidth = 789
7 7 Color = clBtnFace
8 8 TransparentColorValue = clBtnFace
... ... @@ -92,12 +92,12 @@ object frmMapaCacic: TfrmMapaCacic
92 92 OnKeyDown = FormKeyDown
93 93 DesignSize = (
94 94 789
95   - 448)
  95 + 461)
96 96 PixelsPerInch = 96
97 97 TextHeight = 13
98 98 object edWebManagerAddress: TLabel
99 99 Left = 155
100   - Top = 426
  100 + Top = 439
101 101 Width = 500
102 102 Height = 14
103 103 Anchors = [akBottom]
... ... @@ -108,10 +108,11 @@ object frmMapaCacic: TfrmMapaCacic
108 108 Font.Name = 'Arial'
109 109 Font.Style = [fsBold]
110 110 ParentFont = False
  111 + ExplicitTop = 426
111 112 end
112 113 object lbWebManagerAddress: TLabel
113 114 Left = 3
114   - Top = 429
  115 + Top = 442
115 116 Width = 153
116 117 Height = 13
117 118 Anchors = [akLeft, akBottom]
... ... @@ -123,10 +124,11 @@ object frmMapaCacic: TfrmMapaCacic
123 124 Font.Name = 'Arial'
124 125 Font.Style = []
125 126 ParentFont = False
  127 + ExplicitTop = 429
126 128 end
127 129 object pnVersao: TPanel
128 130 Left = 683
129   - Top = 420
  131 + Top = 433
130 132 Width = 105
131 133 Height = 20
132 134 Anchors = [akRight, akBottom]
... ... @@ -139,12 +141,13 @@ object frmMapaCacic: TfrmMapaCacic
139 141 Font.Style = [fsBold]
140 142 ParentFont = False
141 143 TabOrder = 0
  144 + ExplicitTop = 420
142 145 end
143 146 object gbInformacoesSobreComputador: TGroupBox
144 147 Left = 1
145   - Top = 58
  148 + Top = 62
146 149 Width = 780
147   - Height = 361
  150 + Height = 374
148 151 Anchors = []
149 152 Caption =
150 153 ' Informa'#231#245'es sobre localiza'#231#227'o f'#237'sica e patrimonial deste comput' +
... ... @@ -158,7 +161,7 @@ object frmMapaCacic: TfrmMapaCacic
158 161 TabOrder = 1
159 162 DesignSize = (
160 163 780
161   - 361)
  164 + 374)
162 165 object lbEtiqueta3: TLabel
163 166 Left = 107
164 167 Top = 82
... ... @@ -166,7 +169,7 @@ object frmMapaCacic: TfrmMapaCacic
166 169 Height = 13
167 170 Hint = 'Insira o n'#250'mero do patrim'#244'nio do monitor, se o tiver.'
168 171 AutoSize = False
169   - Caption = 'Monitor 1'
  172 + Caption = 'Patrim'#244'nio do Monitor Principal'
170 173 Font.Charset = DEFAULT_CHARSET
171 174 Font.Color = clWindowText
172 175 Font.Height = -11
... ... @@ -184,7 +187,7 @@ object frmMapaCacic: TfrmMapaCacic
184 187 Height = 13
185 188 Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.'
186 189 AutoSize = False
187   - Caption = 'Monitor 2'
  190 + Caption = 'Patrim'#244'nio do Monitor Secund'#225'rio'
188 191 Font.Charset = DEFAULT_CHARSET
189 192 Font.Color = clWindowText
190 193 Font.Height = -11
... ... @@ -456,24 +459,30 @@ object frmMapaCacic: TfrmMapaCacic
456 459 Left = 3
457 460 Top = 231
458 461 Width = 774
459   - Height = 58
  462 + Height = 83
460 463 Caption = 'Termo de Responsabilidade'
461 464 TabOrder = 9
462 465 object rdConcordaTermos: TRadioButton
463   - Left = 24
464   - Top = 24
465   - Width = 553
466   - Height = 17
  466 + Left = 16
  467 + Top = 16
  468 + Width = 737
  469 + Height = 57
  470 + BiDiMode = bdLeftToRight
467 471 Caption =
468   - 'Declaro minha responsabilidade pelas informa'#231#245'es e pelo(s) equip' +
469   - 'amento(s) cadastrado(s).'
  472 + 'Declaro minha responsabilidade pelas informa'#231#245'es prestadas, pelo' +
  473 + '(s) equipamento(s) cadastrado(s), e que tenho pleno conhecimento' +
  474 + ' das orienta'#231#245'es contidas no memorando Circular n'#186' 999/2014/CGA' +
  475 + ', que traz orienta'#231#245'es sobre o armazenamento seguro de dados no ' +
  476 + 'ambiente computacional da PGFN.'
  477 + ParentBiDiMode = False
470 478 TabOrder = 0
  479 + WordWrap = True
471 480 OnClick = rdConcordaTermosClick
472 481 end
473 482 end
474 483 object btGravarInformacoes: TButton
475 484 Left = 186
476   - Top = 308
  485 + Top = 320
477 486 Width = 401
478 487 Height = 37
479 488 Anchors = []
... ... @@ -488,6 +497,7 @@ object frmMapaCacic: TfrmMapaCacic
488 497 TabOrder = 10
489 498 Visible = False
490 499 OnClick = AtualizaPatrimonio
  500 + ExplicitTop = 308
491 501 end
492 502 object edTeInfoPatrimonio6: TEdit
493 503 Left = 420
... ... @@ -526,7 +536,7 @@ object frmMapaCacic: TfrmMapaCacic
526 536 end
527 537 object gbLeiaComAtencao: TGroupBox
528 538 Left = 0
529   - Top = 2
  539 + Top = 3
530 540 Width = 780
531 541 Height = 53
532 542 Anchors = []
... ... @@ -540,6 +550,7 @@ object frmMapaCacic: TfrmMapaCacic
540 550 ParentColor = False
541 551 ParentFont = False
542 552 TabOrder = 2
  553 + ExplicitTop = 2
543 554 DesignSize = (
544 555 780
545 556 53)
... ...
Mapa/Mapa.pas
  Diff comments   View file @86dc1bf
... ... @@ -164,8 +164,7 @@ End;
164 164 procedure TfrmMapaCacic.Finalizar;
165 165 Begin
166 166 Visible := false;
167   -
168   - reset(textFileAguarde);
  167 +
169 168 if FileExists(objCACIC.getLocalFolderName + '\temp\aguarde_MAPACACIC.txt') then
170 169 objCACIC.deleteFileOrFolder(objCacic.getLocalFolderName +
171 170 '\temp\aguarde_MAPACACIC.txt');
... ... @@ -453,6 +452,7 @@ Begin
453 452 //-----------------------------USUARIO LOGADO-----------------------------------
454 453  
455 454 // edTeInfoUserLogado.Text := getUserLogon;
  455 + strTeInfoPatrimonio2 := '';
456 456 while(strTeInfoPatrimonio2 = '') and (count < 600) do
457 457 begin
458 458 strTeInfoPatrimonio2 := objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName'));
... ...
Mapa/Source/synsock.pas
  Diff comments   View file @86dc1bf
... ... @@ -53,7 +53,7 @@ unit synsock;
53 53 {$ENDIF}
54 54  
55 55 {$IFDEF WIN32}
56   - {$I sswin32.inc}
  56 + {$I sswin32q.inc}
57 57 {$ELSE}
58 58 {$IFDEF FPC}
59 59 {$I ssfpc.pas}
... ...
Mapa/mapacacic.dproj
  Diff comments   View file @86dc1bf
... ... @@ -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">9</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.9</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">11</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.11</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
View file @86dc1bf
No preview for this file type
main.pas
  Diff comments   View file @86dc1bf
... ... @@ -1313,8 +1313,17 @@ end;
1313 1313  
1314 1314 procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject);
1315 1315 begin
1316   - if (ActualActivity<>4) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then
  1316 + if (ActualActivity=0) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then
1317 1317 Invoca_MapaCacic
  1318 + else if(ActualActivity <> 0) then
  1319 + begin
  1320 + if ActualActivity = 1 then
  1321 + MessageDlg(#13#13+'Coleta em execução!',mtInformation, [mbOK], 0);
  1322 + if ActualActivity = 3 then
  1323 + MessageDlg(#13#13+'Cacic sendo executado em suporte remoto!',mtInformation, [mbOK], 0);
  1324 + if ActualActivity = 4 then
  1325 + MessageDlg(#13#13+'Mapa já está em execução!',mtInformation, [mbOK], 0);
  1326 + end
1318 1327 else
1319 1328 MessageDlg(#13#13+'Módulo desabilitado!',mtInformation, [mbOK], 0);
1320 1329 end;
... ... @@ -1334,16 +1343,15 @@ begin
1334 1343 Begin
1335 1344 objCacic.writeDailyLog('Invoca_MapaCacic: Criando processo mapa.');
1336 1345 objCACIC.writeDebugLog('Invoca_MapaCacic: Criando Processo Mapa => "'+objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe');
1337   - sleep(10000); //Pausa para dar tempo de realizar o login na máquina, senão o usuário fica em branco.
1338 1346 if (objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',false,SW_SHOW)) then
1339 1347 objCacic.writeDailyLog('Invoca_MapaCacic: Processo criado.')
1340 1348 else
1341 1349 objCacic.writeDailyLog('Invoca_MapaCacic: Falha ao criar processo.');
1342 1350 End
1343   - else
1344   - objCACIC.writeDailyLog('Não foi possível invocar o Mapa Cacic!');
1345   - End;
  1351 + else
  1352 + objCACIC.writeDailyLog('Não foi possível invocar o Mapa Cacic!');
1346 1353 End;
  1354 + End;
1347 1355 end;
1348 1356  
1349 1357 function TFormularioGeral.FindWindowByTitle(WindowTitle: string): Hwnd;
... ...