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