Download as
Browse Code »

Commit 54442317a3a9beb02ed949fa9f2120ba54195320

Authored by Eric Menezes Noronha
1 parent 86dc1bf0
Exists in master

Alteração do formulário

Showing 2 changed files with 215 additions and 127 deletions   Show diff stats
Mapa/Mapa.dfm
  Diff comments   View file @5444231
... ... @@ -141,11 +141,10 @@ object frmMapaCacic: TfrmMapaCacic
141 141 Font.Style = [fsBold]
142 142 ParentFont = False
143 143 TabOrder = 0
144   - ExplicitTop = 420
145 144 end
146 145 object gbInformacoesSobreComputador: TGroupBox
147 146 Left = 1
148   - Top = 62
  147 + Top = 59
149 148 Width = 780
150 149 Height = 374
151 150 Anchors = []
... ... @@ -162,9 +161,9 @@ object frmMapaCacic: TfrmMapaCacic
162 161 DesignSize = (
163 162 780
164 163 374)
165   - object lbEtiqueta3: TLabel
166   - Left = 107
167   - Top = 82
  164 + object lbEtiqueta2: TLabel
  165 + Left = 277
  166 + Top = 33
168 167 Width = 250
169 168 Height = 13
170 169 Hint = 'Insira o n'#250'mero do patrim'#244'nio do monitor, se o tiver.'
... ... @@ -180,9 +179,9 @@ object frmMapaCacic: TfrmMapaCacic
180 179 ShowHint = True
181 180 Visible = False
182 181 end
183   - object lbEtiqueta4: TLabel
184   - Left = 420
185   - Top = 82
  182 + object lbEtiqueta3: TLabel
  183 + Left = 511
  184 + Top = 33
186 185 Width = 250
187 186 Height = 13
188 187 Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.'
... ... @@ -198,9 +197,9 @@ object frmMapaCacic: TfrmMapaCacic
198 197 ShowHint = True
199 198 Visible = False
200 199 end
201   - object lbEtiqueta2: TLabel
202   - Left = 420
203   - Top = 33
  200 + object lbEtiqueta4: TLabel
  201 + Left = 43
  202 + Top = 80
204 203 Width = 250
205 204 Height = 13
206 205 Hint = 'Este '#233' o usu'#225'rio logado atualmente'
... ... @@ -216,8 +215,8 @@ object frmMapaCacic: TfrmMapaCacic
216 215 ShowHint = True
217 216 Visible = False
218 217 end
219   - object lbEtiqueta8: TLabel
220   - Left = 107
  218 + object lbEtiqueta9: TLabel
  219 + Left = 43
221 220 Top = 182
222 221 Width = 250
223 222 Height = 13
... ... @@ -232,7 +231,7 @@ object frmMapaCacic: TfrmMapaCacic
232 231 ParentFont = False
233 232 Visible = False
234 233 end
235   - object lbEtiqueta9: TLabel
  234 + object lbEtiqueta10: TLabel
236 235 Left = 420
237 236 Top = 182
238 237 Width = 250
... ... @@ -248,7 +247,7 @@ object frmMapaCacic: TfrmMapaCacic
248 247 Visible = False
249 248 end
250 249 object lbEtiqueta1: TLabel
251   - Left = 107
  250 + Left = 43
252 251 Top = 33
253 252 Width = 250
254 253 Height = 13
... ... @@ -269,8 +268,8 @@ object frmMapaCacic: TfrmMapaCacic
269 268 Visible = False
270 269 end
271 270 object lbEtiqueta5: TLabel
272   - Left = 107
273   - Top = 129
  271 + Left = 420
  272 + Top = 82
274 273 Width = 250
275 274 Height = 13
276 275 Hint = 'Nome do usu'#225'rio logado.'
... ... @@ -284,7 +283,7 @@ object frmMapaCacic: TfrmMapaCacic
284 283 ParentFont = False
285 284 Visible = False
286 285 end
287   - object lbEtiqueta6: TLabel
  286 + object lbEtiqueta7: TLabel
288 287 Left = 420
289 288 Top = 129
290 289 Width = 69
... ... @@ -302,8 +301,8 @@ object frmMapaCacic: TfrmMapaCacic
302 301 ShowHint = True
303 302 Visible = False
304 303 end
305   - object lbEtiqueta7: TLabel
306   - Left = 495
  304 + object lbEtiqueta6: TLabel
  305 + Left = 43
307 306 Top = 129
308 307 Width = 175
309 308 Height = 13
... ... @@ -322,40 +321,77 @@ object frmMapaCacic: TfrmMapaCacic
322 321 ShowHint = True
323 322 Visible = False
324 323 end
325   - object edTeInfoPatrimonio3: TEdit
326   - Left = 107
327   - Top = 101
328   - Width = 250
329   - Height = 24
  324 + object lbEtiquetaTel: TLabel
  325 + Left = 514
  326 + Top = 129
  327 + Width = 69
  328 + Height = 13
  329 + Hint = 'Digite o telefone do seu local de trabalho.'
  330 + AutoSize = False
  331 + Caption = 'Telefone'
330 332 Font.Charset = DEFAULT_CHARSET
331 333 Font.Color = clWindowText
332   - Font.Height = -13
  334 + Font.Height = -11
  335 + Font.Name = 'MS Sans Serif'
  336 + Font.Style = []
  337 + ParentFont = False
  338 + ParentShowHint = False
  339 + ShowHint = True
  340 + Visible = False
  341 + end
  342 + object lbEtiqueta8: TLabel
  343 + Left = 632
  344 + Top = 129
  345 + Width = 69
  346 + Height = 13
  347 + Hint = 'Digite o ramal do seu local de trabalho.'
  348 + AutoSize = False
  349 + Caption = 'Ramal'
  350 + Font.Charset = DEFAULT_CHARSET
  351 + Font.Color = clWindowText
  352 + Font.Height = -11
333 353 Font.Name = 'MS Sans Serif'
334 354 Font.Style = []
335   - MaxLength = 20
336 355 ParentFont = False
337 356 ParentShowHint = False
338 357 ShowHint = True
339   - TabOrder = 2
340 358 Visible = False
341 359 end
342 360 object edTeInfoPatrimonio4: TEdit
343   - Left = 420
  361 + Left = 43
344 362 Top = 99
345   - Width = 250
  363 + Width = 310
346 364 Height = 24
  365 + Enabled = False
347 366 Font.Charset = DEFAULT_CHARSET
348 367 Font.Color = clWindowText
349 368 Font.Height = -13
350 369 Font.Name = 'MS Sans Serif'
351 370 Font.Style = []
352   - MaxLength = 20
  371 + MaxLength = 43
353 372 ParentFont = False
354 373 ParentShowHint = False
355 374 ShowHint = True
356 375 TabOrder = 3
357 376 Visible = False
358 377 end
  378 + object edTeInfoPatrimonio3: TEdit
  379 + Left = 509
  380 + Top = 52
  381 + Width = 221
  382 + Height = 24
  383 + Font.Charset = DEFAULT_CHARSET
  384 + Font.Color = clWindowText
  385 + Font.Height = -13
  386 + Font.Name = 'MS Sans Serif'
  387 + Font.Style = []
  388 + MaxLength = 34
  389 + ParentFont = False
  390 + ParentShowHint = False
  391 + ShowHint = True
  392 + TabOrder = 2
  393 + Visible = False
  394 + end
359 395 object btCombosUpdate: TButton
360 396 Left = 684
361 397 Top = 10
... ... @@ -363,21 +399,20 @@ object frmMapaCacic: TfrmMapaCacic
363 399 Height = 20
364 400 Caption = 'Recarregar'
365 401 Enabled = False
366   - TabOrder = 11
  402 + TabOrder = 13
367 403 OnClick = btCombosUpdateClick
368 404 end
369 405 object edTeInfoPatrimonio2: TEdit
370   - Left = 420
  406 + Left = 277
371 407 Top = 52
372   - Width = 250
  408 + Width = 221
373 409 Height = 24
374   - Enabled = False
375 410 Font.Charset = DEFAULT_CHARSET
376 411 Font.Color = clWindowText
377 412 Font.Height = -13
378 413 Font.Name = 'MS Sans Serif'
379 414 Font.Style = []
380   - MaxLength = 20
  415 + MaxLength = 34
381 416 ParentFont = False
382 417 ParentShowHint = False
383 418 ShowHint = True
... ... @@ -385,27 +420,26 @@ object frmMapaCacic: TfrmMapaCacic
385 420 Visible = False
386 421 end
387 422 object edTeInfoPatrimonio8: TEdit
388   - Left = 107
389   - Top = 201
390   - Width = 250
  423 + Left = 632
  424 + Top = 148
  425 + Width = 98
391 426 Height = 24
392   - Enabled = False
393 427 Font.Charset = DEFAULT_CHARSET
394 428 Font.Color = clWindowText
395 429 Font.Height = -13
396 430 Font.Name = 'MS Sans Serif'
397 431 Font.Style = []
398   - MaxLength = 20
  432 + MaxLength = 10
399 433 ParentFont = False
400 434 ParentShowHint = False
401 435 ShowHint = True
402   - TabOrder = 7
  436 + TabOrder = 8
403 437 Visible = False
404 438 end
405 439 object edTeInfoPatrimonio9: TEdit
406   - Left = 420
  440 + Left = 43
407 441 Top = 201
408   - Width = 250
  442 + Width = 310
409 443 Height = 24
410 444 Enabled = False
411 445 Font.Charset = DEFAULT_CHARSET
... ... @@ -413,24 +447,24 @@ object frmMapaCacic: TfrmMapaCacic
413 447 Font.Height = -13
414 448 Font.Name = 'MS Sans Serif'
415 449 Font.Style = []
416   - MaxLength = 20
  450 + MaxLength = 43
417 451 ParentFont = False
418 452 ParentShowHint = False
419 453 ShowHint = True
420   - TabOrder = 8
  454 + TabOrder = 9
421 455 Visible = False
422 456 end
423 457 object edTeInfoPatrimonio1: TEdit
424   - Left = 107
  458 + Left = 43
425 459 Top = 52
426   - Width = 250
  460 + Width = 221
427 461 Height = 24
428 462 Font.Charset = DEFAULT_CHARSET
429 463 Font.Color = clWindowText
430 464 Font.Height = -13
431 465 Font.Name = 'MS Sans Serif'
432 466 Font.Style = []
433   - MaxLength = 20
  467 + MaxLength = 34
434 468 ParentFont = False
435 469 ParentShowHint = False
436 470 ShowHint = True
... ... @@ -438,9 +472,9 @@ object frmMapaCacic: TfrmMapaCacic
438 472 Visible = False
439 473 end
440 474 object edTeInfoPatrimonio5: TEdit
441   - Left = 107
442   - Top = 148
443   - Width = 250
  475 + Left = 420
  476 + Top = 99
  477 + Width = 310
444 478 Height = 24
445 479 Enabled = False
446 480 Font.Charset = DEFAULT_CHARSET
... ... @@ -448,7 +482,7 @@ object frmMapaCacic: TfrmMapaCacic
448 482 Font.Height = -13
449 483 Font.Name = 'MS Sans Serif'
450 484 Font.Style = []
451   - MaxLength = 34
  485 + MaxLength = 43
452 486 ParentFont = False
453 487 ParentShowHint = False
454 488 ShowHint = True
... ... @@ -461,19 +495,18 @@ object frmMapaCacic: TfrmMapaCacic
461 495 Width = 774
462 496 Height = 83
463 497 Caption = 'Termo de Responsabilidade'
464   - TabOrder = 9
  498 + TabOrder = 11
465 499 object rdConcordaTermos: TRadioButton
466   - Left = 16
467   - Top = 16
468   - Width = 737
  500 + Left = 3
  501 + Top = 23
  502 + Width = 742
469 503 Height = 57
470 504 BiDiMode = bdLeftToRight
471 505 Caption =
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.'
  506 + 'Declaro minha responsabilidade pelas informa'#231#245'es prestadas e que' +
  507 + ' tenho pleno conhecimento das orienta'#231#245'es contidas no Memorando-' +
  508 + 'Circular N'#186' 116/2014/PGFN/DGC/CGA-CTI, sobre o armazenamento seg' +
  509 + 'uro de dados no ambiente computacional da PGFN.'
477 510 ParentBiDiMode = False
478 511 TabOrder = 0
479 512 WordWrap = True
... ... @@ -494,22 +527,21 @@ object frmMapaCacic: TfrmMapaCacic
494 527 Font.Name = 'Arial'
495 528 Font.Style = [fsBold]
496 529 ParentFont = False
497   - TabOrder = 10
  530 + TabOrder = 12
498 531 Visible = False
499 532 OnClick = AtualizaPatrimonio
500   - ExplicitTop = 308
501 533 end
502 534 object edTeInfoPatrimonio6: TEdit
503   - Left = 420
  535 + Left = 43
504 536 Top = 148
505   - Width = 69
  537 + Width = 310
506 538 Height = 24
507 539 Font.Charset = DEFAULT_CHARSET
508 540 Font.Color = clWindowText
509 541 Font.Height = -13
510 542 Font.Name = 'MS Sans Serif'
511 543 Font.Style = []
512   - MaxLength = 20
  544 + MaxLength = 9
513 545 ParentFont = False
514 546 ParentShowHint = False
515 547 ShowHint = True
... ... @@ -517,22 +549,56 @@ object frmMapaCacic: TfrmMapaCacic
517 549 Visible = False
518 550 end
519 551 object edTeInfoPatrimonio7: TEdit
520   - Left = 495
  552 + Left = 420
521 553 Top = 148
522   - Width = 175
  554 + Width = 67
523 555 Height = 24
524 556 Font.Charset = DEFAULT_CHARSET
525 557 Font.Color = clWindowText
526 558 Font.Height = -13
527 559 Font.Name = 'MS Sans Serif'
528 560 Font.Style = []
529   - MaxLength = 20
  561 + MaxLength = 9
530 562 ParentFont = False
531 563 ParentShowHint = False
532 564 ShowHint = True
533 565 TabOrder = 6
534 566 Visible = False
535 567 end
  568 + object edTeInfoPatrimonio10: TEdit
  569 + Left = 422
  570 + Top = 201
  571 + Width = 310
  572 + Height = 24
  573 + Enabled = False
  574 + Font.Charset = DEFAULT_CHARSET
  575 + Font.Color = clWindowText
  576 + Font.Height = -13
  577 + Font.Name = 'MS Sans Serif'
  578 + Font.Style = []
  579 + MaxLength = 43
  580 + ParentFont = False
  581 + ParentShowHint = False
  582 + ShowHint = True
  583 + TabOrder = 10
  584 + Visible = False
  585 + end
  586 + object edTeInfoPatrimonioTel: TMaskEdit
  587 + Left = 514
  588 + Top = 148
  589 + Width = 89
  590 + Height = 24
  591 + EditMask = '!\(999\)99999-9999;0;_'
  592 + Font.Charset = DEFAULT_CHARSET
  593 + Font.Color = clBlack
  594 + Font.Height = -11
  595 + Font.Name = 'MS Sans Serif'
  596 + Font.Style = []
  597 + MaxLength = 15
  598 + ParentFont = False
  599 + TabOrder = 7
  600 + Visible = False
  601 + end
536 602 end
537 603 object gbLeiaComAtencao: TGroupBox
538 604 Left = 0
... ... @@ -550,7 +616,6 @@ object frmMapaCacic: TfrmMapaCacic
550 616 ParentColor = False
551 617 ParentFont = False
552 618 TabOrder = 2
553   - ExplicitTop = 2
554 619 DesignSize = (
555 620 780
556 621 53)
... ...
Mapa/Mapa.pas
  Diff comments   View file @5444231
... ... @@ -74,15 +74,15 @@ type
74 74 gbLeiaComAtencao: TGroupBox;
75 75 lbLeiaComAtencao: TLabel;
76 76 gbInformacoesSobreComputador: TGroupBox;
  77 + lbEtiqueta2: TLabel;
77 78 lbEtiqueta3: TLabel;
78 79 lbEtiqueta4: TLabel;
79   - lbEtiqueta2: TLabel;
80   - lbEtiqueta8: TLabel;
81 80 lbEtiqueta9: TLabel;
  81 + lbEtiqueta10: TLabel;
82 82 lbEtiqueta1: TLabel;
83 83 lbEtiqueta5: TLabel;
84   - edTeInfoPatrimonio3: TEdit;
85 84 edTeInfoPatrimonio4: TEdit;
  85 + edTeInfoPatrimonio3: TEdit;
86 86 btCombosUpdate: TButton;
87 87 edTeInfoPatrimonio2: TEdit;
88 88 edTeInfoPatrimonio8: TEdit;
... ... @@ -92,11 +92,15 @@ type
92 92 bgTermoResponsabilidade: TGroupBox;
93 93 rdConcordaTermos: TRadioButton;
94 94 btGravarInformacoes: TButton;
95   - lbEtiqueta6: TLabel;
96   - edTeInfoPatrimonio6: TEdit;
97 95 lbEtiqueta7: TLabel;
  96 + edTeInfoPatrimonio6: TEdit;
  97 + lbEtiqueta6: TLabel;
98 98 edTeInfoPatrimonio7: TEdit;
99 99 btKonamiCode: TPanel;
  100 + edTeInfoPatrimonioTel: TMaskEdit;
  101 + lbEtiquetaTel: TLabel;
  102 + lbEtiqueta8: TLabel;
  103 + edTeInfoPatrimonio10: TEdit;
100 104  
101 105 procedure FormCreate(Sender: TObject);
102 106 procedure AtualizaPatrimonio(Sender: TObject);
... ... @@ -128,7 +132,9 @@ type
128 132 strTeInfoPatrimonio6,
129 133 strTeInfoPatrimonio7,
130 134 strTeInfoPatrimonio8,
131   - strTeInfoPatrimonio9 : String;
  135 + strTeInfoPatrimonio9,
  136 + strTeInfoPatrimonio10,
  137 + strTeInfoPatrimonioTel : String;
132 138 psswd : String;
133 139 foco : boolean;
134 140  
... ... @@ -342,28 +348,34 @@ begin
342 348 strTeInfoPatrimonio1 := objCacic.getValueFromTags('IDPatrimonio',
343 349 strCollectsPatrimonioLast);
344 350 if (strTeInfoPatrimonio2='') then
345   - strTeInfoPatrimonio2 := objCacic.getValueFromTags('UserLogado',
  351 + strTeInfoPatrimonio2 := objCacic.getValueFromTags('PatrimonioMonitor1',
346 352 strCollectsPatrimonioLast);
347 353 if (strTeInfoPatrimonio3='') then
348   - strTeInfoPatrimonio3 := objCacic.getValueFromTags('PatrimonioMonitor1',
  354 + strTeInfoPatrimonio3 := objCacic.getValueFromTags('PatrimonioMonitor2',
349 355 strCollectsPatrimonioLast);
350 356 if (strTeInfoPatrimonio4='') then
351   - strTeInfoPatrimonio4 := objCacic.getValueFromTags('PatrimonioMonitor2',
  357 + strTeInfoPatrimonio4 := objCacic.getValueFromTags('UserLogado',
352 358 strCollectsPatrimonioLast);
353 359 if (strTeInfoPatrimonio5='') then
354 360 strTeInfoPatrimonio5 := objCacic.getValueFromTags('UserName',
355 361 strCollectsPatrimonioLast);
356 362 if (strTeInfoPatrimonio6='') then
357   - strTeInfoPatrimonio6 := objCacic.getValueFromTags('Sala',
  363 + strTeInfoPatrimonio6 := objCacic.getValueFromTags('Coordenacao_Setor',
358 364 strCollectsPatrimonioLast);
359 365 if (strTeInfoPatrimonio7='') then
360   - strTeInfoPatrimonio7 := objCacic.getValueFromTags('Coordenacao_Setor',
  366 + strTeInfoPatrimonio7 := objCacic.getValueFromTags('Sala',
  367 + strCollectsPatrimonioLast);
  368 + if (strTeInfoPatrimonioTel='') then
  369 + strTeInfoPatrimonioTel := objCacic.getValueFromTags('Tel',
361 370 strCollectsPatrimonioLast);
362 371 if (strTeInfoPatrimonio8='') then
363   - strTeInfoPatrimonio8 := objCacic.getValueFromTags('ComputerName',
  372 + strTeInfoPatrimonio8 := objCacic.getValueFromTags('Ramal',
364 373 strCollectsPatrimonioLast);
365 374 if (strTeInfoPatrimonio9='') then
366   - strTeInfoPatrimonio9 := objCacic.getValueFromTags('IPComputer',
  375 + strTeInfoPatrimonio9 := objCacic.getValueFromTags('ComputerName',
  376 + strCollectsPatrimonioLast);
  377 + if (strTeInfoPatrimonio10='') then
  378 + strTeInfoPatrimonio10 := objCacic.getValueFromTags('IPComputer',
367 379 strCollectsPatrimonioLast);
368 380 End;
369 381 btCombosUpdate.Enabled := true;
... ... @@ -383,14 +395,16 @@ if edTeInfoPatrimonio5.text <> '' then
383 395 strFieldsAndValuesToRequest := 'CollectType=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt('col_patr')) ;
384 396  
385 397 strColetaAtual := StringReplace('[IDPatrimonio]' + edTeInfoPatrimonio1.Text + '[/IDPatrimonio]' +
386   - '[UserLogado]' + edTeInfoPatrimonio2.Text + '[/UserLogado]' +
387   - '[PatrimonioMonitor1]' + edTeInfoPatrimonio3.Text + '[/PatrimonioMonitor1]' +
388   - '[PatrimonioMonitor2]' + edTeInfoPatrimonio4.Text + '[/PatrimonioMonitor2]' +
  398 + '[PatrimonioMonitor1]' + edTeInfoPatrimonio2.Text + '[/PatrimonioMonitor1]' +
  399 + '[PatrimonioMonitor2]' + edTeInfoPatrimonio3.Text + '[/PatrimonioMonitor2]' +
  400 + '[UserLogado]' + edTeInfoPatrimonio4.Text + '[/UserLogado]' +
389 401 '[UserName]' + edTeInfoPatrimonio5.Text + '[/UserName]' +
390   - '[Sala]' + edTeInfoPatrimonio6.Text + '[/Sala]' +
391   - '[Coordenacao_Setor]' + edTeInfoPatrimonio7.Text + '[/Coordenacao_Setor]' +
392   - '[ComputerName]' + edTeInfoPatrimonio8.text + '[/ComputerName]' +
393   - '[IPComputer]' + edTeInfoPatrimonio9.text + '[/IPComputer]'
  402 + '[Coordenacao_Setor]' + edTeInfoPatrimonio6.Text + '[/Coordenacao_Setor]' +
  403 + '[Sala]' + edTeInfoPatrimonio7.Text + '[/Sala]' +
  404 + '[Tel]' + edTeInfoPatrimonioTel.text + '[/Tel]' +
  405 + '[Ramal]' + edTeInfoPatrimonio8.text + '[/Ramal]' +
  406 + '[ComputerName]' + edTeInfoPatrimonio9.text + '[/ComputerName]' +
  407 + '[IPComputer]' + edTeInfoPatrimonio10.text + '[/IPComputer]'
394 408 , ',','[[COMMA]]',[rfReplaceAll]);
395 409  
396 410 strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Patrimonio=' +
... ... @@ -449,24 +463,17 @@ Begin
449 463 edTeInfoPatrimonio1.Visible := true;
450 464 lbEtiqueta1.Visible := true;
451 465  
452   -//-----------------------------USUARIO LOGADO-----------------------------------
453   -
454   -// edTeInfoUserLogado.Text := getUserLogon;
455   - strTeInfoPatrimonio2 := '';
456   - while(strTeInfoPatrimonio2 = '') and (count < 600) do
457   - begin
458   - strTeInfoPatrimonio2 := objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName'));
459   - strTeInfoPatrimonio2 := copy(strTeInfoPatrimonio2, pos('\', strTeInfoPatrimonio2)+1, length(strTeInfoPatrimonio2));
460   - edTeInfoPatrimonio2.Text:= strTeInfoPatrimonio2;
461   - sleep(1000);
462   - count := count + 1;
463   - end;
  466 +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta2 -> "' +
  467 +// objCacic.getValueFromTags('in_exibir_etiqueta2',
  468 +// strConfigsPatrimonioInterface)+'"');
464 469  
465   - if edTeInfoPatrimonio2.Text <> '' then
466   - begin
  470 +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta2', strConfigsPatrimonioInterface)) = 'S') then
  471 +// begin
  472 + //lbEtiqueta3.Caption := objCacic.getValueFromTags('te_etiqueta2', strConfigsPatrimonioInterface);
467 473 lbEtiqueta2.Visible := true;
468   - edTeInfoPatrimonio2.Visible := true;
469   - end;
  474 + edTeInfoPatrimonio2.Text := strTeInfoPatrimonio2;
  475 + edTeInfoPatrimonio2.visible := True;
  476 +// end;
470 477  
471 478 // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta3 -> "' +
472 479 // objCacic.getValueFromTags('in_exibir_etiqueta3',
... ... @@ -476,23 +483,28 @@ Begin
476 483 // begin
477 484 //lbEtiqueta3.Caption := objCacic.getValueFromTags('te_etiqueta3', strConfigsPatrimonioInterface);
478 485 lbEtiqueta3.Visible := true;
479   - edTeInfoPatrimonio3.Hint := objCacic.getValueFromTags('te_help_etiqueta3', strConfigsPatrimonioInterface);
480 486 edTeInfoPatrimonio3.Text := strTeInfoPatrimonio3;
481 487 edTeInfoPatrimonio3.visible := True;
482 488 // end;
483 489  
484   -// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta4 -> "' +
485   -// objCacic.getValueFromTags('in_exibir_etiqueta4',
486   -// strConfigsPatrimonioInterface)+'"');
  490 +//-----------------------------USUARIO LOGADO-----------------------------------
487 491  
488   -// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta4', strConfigsPatrimonioInterface)) = 'S') then
489   -// begin
490   - //lbEtiqueta4.Caption := objCacic.getValueFromTags('te_etiqueta4', strConfigsPatrimonioInterface);
491   - lbEtiqueta4.Visible := true;
492   - edTeInfoPatrimonio4.Hint := objCacic.getValueFromTags('te_help_etiqueta4', strConfigsPatrimonioInterface);
493   - edTeInfoPatrimonio4.Text := strTeInfoPatrimonio4;
494   - edTeInfoPatrimonio4.visible := True;
495   -// end;
  492 +// edTeInfoUserLogado.Text := getUserLogon;
  493 + strTeInfoPatrimonio4 := '';
  494 + while(strTeInfoPatrimonio4 = '') and (count < 600) do
  495 + begin
  496 + strTeInfoPatrimonio4 := objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName'));
  497 + strTeInfoPatrimonio4 := copy(strTeInfoPatrimonio4, pos('\', strTeInfoPatrimonio4)+1, length(strTeInfoPatrimonio4));
  498 + edTeInfoPatrimonio4.Text:= strTeInfoPatrimonio4;
  499 + sleep(1000);
  500 + count := count + 1;
  501 + end;
  502 +
  503 + if edTeInfoPatrimonio4.Text <> '' then
  504 + begin
  505 + lbEtiqueta4.Visible := true;
  506 + edTeInfoPatrimonio4.Visible := true;
  507 + end;
496 508  
497 509 //-------------------------------NOME USUARIO-----------------------------------
498 510 strNomeLDAP := getLastValue(LDAPName, 'Attribute:', 'cn'+#$D#$A);
... ... @@ -515,8 +527,6 @@ Begin
515 527 lbEtiqueta5.hint := 'Digite seu nome, não foi possível recuperá-lo.';
516 528 end;
517 529  
518   -//---------------------------------PATRIMONIO MONITORES------------------------------
519   -
520 530 // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' +
521 531 // objCacic.getValueFromTags('in_exibir_etiqueta6',
522 532 // strConfigsPatrimonioInterface)+'"');
... ... @@ -543,8 +553,12 @@ Begin
543 553 edTeInfoPatrimonio7.visible := True;
544 554 // end;
545 555  
546   -//-----------------------NOME DO COMPUTADOR PARA O EDTEXT-----------------------
547   - edTeInfoPatrimonio8.Text := NomeComputador;
  556 + lbEtiquetaTel.Visible := true;
  557 + edTeInfoPatrimonioTel.Hint := objCacic.getValueFromTags('te_help_etiqueta_tel', strConfigsPatrimonioInterface);
  558 + edTeInfoPatrimonioTel.Text := strTeInfoPatrimonioTel;
  559 + edTeInfoPatrimonioTel.visible := True;
  560 +
  561 + edTeInfoPatrimonio8.Text := strTeInfoPatrimonio8;
548 562 if edTeInfoPatrimonio8.Text <> '' then
549 563 begin
550 564 lbEtiqueta8.Visible := true;
... ... @@ -552,15 +566,24 @@ Begin
552 566 end;
553 567 lbEtiqueta8.Visible := true;
554 568 edTeInfoPatrimonio8.Visible := true;
555   -
556   -//-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT-------------------------------------
557   - strTeInfoPatrimonio9 := fetchWMIvalues('Win32_NetworkAdapterConfiguration', objCACIC.getLocalFolderName);
558   - edTeInfoPatrimonio9.Text := objCACIC.getValueFromTags('IPAddress',strTeInfoPatrimonio9);
  569 +//-----------------------NOME DO COMPUTADOR PARA O EDTEXT-----------------------
  570 + edTeInfoPatrimonio9.Text := NomeComputador;
559 571 if edTeInfoPatrimonio9.Text <> '' then
560 572 begin
561 573 lbEtiqueta9.Visible := true;
562 574 edTeInfoPatrimonio9.Visible := true;
563 575 end;
  576 + lbEtiqueta9.Visible := true;
  577 + edTeInfoPatrimonio9.Visible := true;
  578 +
  579 +//-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT-------------------------------------
  580 + strTeInfoPatrimonio10 := fetchWMIvalues('Win32_NetworkAdapterConfiguration', objCACIC.getLocalFolderName);
  581 + edTeInfoPatrimonio10.Text := objCACIC.getValueFromTags('IPAddress',strTeInfoPatrimonio10);
  582 + if edTeInfoPatrimonio10.Text <> '' then
  583 + begin
  584 + lbEtiqueta10.Visible := true;
  585 + edTeInfoPatrimonio10.Visible := true;
  586 + end;
564 587  
565 588 btGravarInformacoes.Visible := true;
566 589 btCombosUpdate.Enabled := true;
... ...