From 54442317a3a9beb02ed949fa9f2120ba54195320 Mon Sep 17 00:00:00 2001 From: Eric Menezes Noronha Date: Wed, 30 Jul 2014 13:45:22 -0300 Subject: [PATCH] Alteração do formulário --- Mapa/Mapa.dfm | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- Mapa/Mapa.pas | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- 2 files changed, 215 insertions(+), 127 deletions(-) diff --git a/Mapa/Mapa.dfm b/Mapa/Mapa.dfm index 58d1d64..fce55d5 100644 --- a/Mapa/Mapa.dfm +++ b/Mapa/Mapa.dfm @@ -141,11 +141,10 @@ object frmMapaCacic: TfrmMapaCacic Font.Style = [fsBold] ParentFont = False TabOrder = 0 - ExplicitTop = 420 end object gbInformacoesSobreComputador: TGroupBox Left = 1 - Top = 62 + Top = 59 Width = 780 Height = 374 Anchors = [] @@ -162,9 +161,9 @@ object frmMapaCacic: TfrmMapaCacic DesignSize = ( 780 374) - object lbEtiqueta3: TLabel - Left = 107 - Top = 82 + object lbEtiqueta2: TLabel + Left = 277 + Top = 33 Width = 250 Height = 13 Hint = 'Insira o n'#250'mero do patrim'#244'nio do monitor, se o tiver.' @@ -180,9 +179,9 @@ object frmMapaCacic: TfrmMapaCacic ShowHint = True Visible = False end - object lbEtiqueta4: TLabel - Left = 420 - Top = 82 + object lbEtiqueta3: TLabel + Left = 511 + Top = 33 Width = 250 Height = 13 Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.' @@ -198,9 +197,9 @@ object frmMapaCacic: TfrmMapaCacic ShowHint = True Visible = False end - object lbEtiqueta2: TLabel - Left = 420 - Top = 33 + object lbEtiqueta4: TLabel + Left = 43 + Top = 80 Width = 250 Height = 13 Hint = 'Este '#233' o usu'#225'rio logado atualmente' @@ -216,8 +215,8 @@ object frmMapaCacic: TfrmMapaCacic ShowHint = True Visible = False end - object lbEtiqueta8: TLabel - Left = 107 + object lbEtiqueta9: TLabel + Left = 43 Top = 182 Width = 250 Height = 13 @@ -232,7 +231,7 @@ object frmMapaCacic: TfrmMapaCacic ParentFont = False Visible = False end - object lbEtiqueta9: TLabel + object lbEtiqueta10: TLabel Left = 420 Top = 182 Width = 250 @@ -248,7 +247,7 @@ object frmMapaCacic: TfrmMapaCacic Visible = False end object lbEtiqueta1: TLabel - Left = 107 + Left = 43 Top = 33 Width = 250 Height = 13 @@ -269,8 +268,8 @@ object frmMapaCacic: TfrmMapaCacic Visible = False end object lbEtiqueta5: TLabel - Left = 107 - Top = 129 + Left = 420 + Top = 82 Width = 250 Height = 13 Hint = 'Nome do usu'#225'rio logado.' @@ -284,7 +283,7 @@ object frmMapaCacic: TfrmMapaCacic ParentFont = False Visible = False end - object lbEtiqueta6: TLabel + object lbEtiqueta7: TLabel Left = 420 Top = 129 Width = 69 @@ -302,8 +301,8 @@ object frmMapaCacic: TfrmMapaCacic ShowHint = True Visible = False end - object lbEtiqueta7: TLabel - Left = 495 + object lbEtiqueta6: TLabel + Left = 43 Top = 129 Width = 175 Height = 13 @@ -322,40 +321,77 @@ object frmMapaCacic: TfrmMapaCacic ShowHint = True Visible = False end - object edTeInfoPatrimonio3: TEdit - Left = 107 - Top = 101 - Width = 250 - Height = 24 + object lbEtiquetaTel: TLabel + Left = 514 + Top = 129 + Width = 69 + Height = 13 + Hint = 'Digite o telefone do seu local de trabalho.' + AutoSize = False + Caption = 'Telefone' Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText - Font.Height = -13 + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + ParentFont = False + ParentShowHint = False + ShowHint = True + Visible = False + end + object lbEtiqueta8: TLabel + Left = 632 + Top = 129 + Width = 69 + Height = 13 + Hint = 'Digite o ramal do seu local de trabalho.' + AutoSize = False + Caption = 'Ramal' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 ParentFont = False ParentShowHint = False ShowHint = True - TabOrder = 2 Visible = False end object edTeInfoPatrimonio4: TEdit - Left = 420 + Left = 43 Top = 99 - Width = 250 + Width = 310 Height = 24 + Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 43 ParentFont = False ParentShowHint = False ShowHint = True TabOrder = 3 Visible = False end + object edTeInfoPatrimonio3: TEdit + Left = 509 + Top = 52 + Width = 221 + Height = 24 + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'MS Sans Serif' + Font.Style = [] + MaxLength = 34 + ParentFont = False + ParentShowHint = False + ShowHint = True + TabOrder = 2 + Visible = False + end object btCombosUpdate: TButton Left = 684 Top = 10 @@ -363,21 +399,20 @@ object frmMapaCacic: TfrmMapaCacic Height = 20 Caption = 'Recarregar' Enabled = False - TabOrder = 11 + TabOrder = 13 OnClick = btCombosUpdateClick end object edTeInfoPatrimonio2: TEdit - Left = 420 + Left = 277 Top = 52 - Width = 250 + Width = 221 Height = 24 - Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 34 ParentFont = False ParentShowHint = False ShowHint = True @@ -385,27 +420,26 @@ object frmMapaCacic: TfrmMapaCacic Visible = False end object edTeInfoPatrimonio8: TEdit - Left = 107 - Top = 201 - Width = 250 + Left = 632 + Top = 148 + Width = 98 Height = 24 - Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 10 ParentFont = False ParentShowHint = False ShowHint = True - TabOrder = 7 + TabOrder = 8 Visible = False end object edTeInfoPatrimonio9: TEdit - Left = 420 + Left = 43 Top = 201 - Width = 250 + Width = 310 Height = 24 Enabled = False Font.Charset = DEFAULT_CHARSET @@ -413,24 +447,24 @@ object frmMapaCacic: TfrmMapaCacic Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 43 ParentFont = False ParentShowHint = False ShowHint = True - TabOrder = 8 + TabOrder = 9 Visible = False end object edTeInfoPatrimonio1: TEdit - Left = 107 + Left = 43 Top = 52 - Width = 250 + Width = 221 Height = 24 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 34 ParentFont = False ParentShowHint = False ShowHint = True @@ -438,9 +472,9 @@ object frmMapaCacic: TfrmMapaCacic Visible = False end object edTeInfoPatrimonio5: TEdit - Left = 107 - Top = 148 - Width = 250 + Left = 420 + Top = 99 + Width = 310 Height = 24 Enabled = False Font.Charset = DEFAULT_CHARSET @@ -448,7 +482,7 @@ object frmMapaCacic: TfrmMapaCacic Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 34 + MaxLength = 43 ParentFont = False ParentShowHint = False ShowHint = True @@ -461,19 +495,18 @@ object frmMapaCacic: TfrmMapaCacic Width = 774 Height = 83 Caption = 'Termo de Responsabilidade' - TabOrder = 9 + TabOrder = 11 object rdConcordaTermos: TRadioButton - Left = 16 - Top = 16 - Width = 737 + Left = 3 + Top = 23 + Width = 742 Height = 57 BiDiMode = bdLeftToRight Caption = - 'Declaro minha responsabilidade pelas informa'#231#245'es prestadas, pelo' + - '(s) equipamento(s) cadastrado(s), e que tenho pleno conhecimento' + - ' das orienta'#231#245'es contidas no memorando Circular n'#186' 999/2014/CGA' + - ', que traz orienta'#231#245'es sobre o armazenamento seguro de dados no ' + - 'ambiente computacional da PGFN.' + 'Declaro minha responsabilidade pelas informa'#231#245'es prestadas e que' + + ' tenho pleno conhecimento das orienta'#231#245'es contidas no Memorando-' + + 'Circular N'#186' 116/2014/PGFN/DGC/CGA-CTI, sobre o armazenamento seg' + + 'uro de dados no ambiente computacional da PGFN.' ParentBiDiMode = False TabOrder = 0 WordWrap = True @@ -494,22 +527,21 @@ object frmMapaCacic: TfrmMapaCacic Font.Name = 'Arial' Font.Style = [fsBold] ParentFont = False - TabOrder = 10 + TabOrder = 12 Visible = False OnClick = AtualizaPatrimonio - ExplicitTop = 308 end object edTeInfoPatrimonio6: TEdit - Left = 420 + Left = 43 Top = 148 - Width = 69 + Width = 310 Height = 24 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 9 ParentFont = False ParentShowHint = False ShowHint = True @@ -517,22 +549,56 @@ object frmMapaCacic: TfrmMapaCacic Visible = False end object edTeInfoPatrimonio7: TEdit - Left = 495 + Left = 420 Top = 148 - Width = 175 + Width = 67 Height = 24 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 Font.Name = 'MS Sans Serif' Font.Style = [] - MaxLength = 20 + MaxLength = 9 ParentFont = False ParentShowHint = False ShowHint = True TabOrder = 6 Visible = False end + object edTeInfoPatrimonio10: TEdit + Left = 422 + Top = 201 + Width = 310 + Height = 24 + Enabled = False + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'MS Sans Serif' + Font.Style = [] + MaxLength = 43 + ParentFont = False + ParentShowHint = False + ShowHint = True + TabOrder = 10 + Visible = False + end + object edTeInfoPatrimonioTel: TMaskEdit + Left = 514 + Top = 148 + Width = 89 + Height = 24 + EditMask = '!\(999\)99999-9999;0;_' + Font.Charset = DEFAULT_CHARSET + Font.Color = clBlack + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + MaxLength = 15 + ParentFont = False + TabOrder = 7 + Visible = False + end end object gbLeiaComAtencao: TGroupBox Left = 0 @@ -550,7 +616,6 @@ object frmMapaCacic: TfrmMapaCacic ParentColor = False ParentFont = False TabOrder = 2 - ExplicitTop = 2 DesignSize = ( 780 53) diff --git a/Mapa/Mapa.pas b/Mapa/Mapa.pas index 3d1fd16..52246bb 100644 --- a/Mapa/Mapa.pas +++ b/Mapa/Mapa.pas @@ -74,15 +74,15 @@ type gbLeiaComAtencao: TGroupBox; lbLeiaComAtencao: TLabel; gbInformacoesSobreComputador: TGroupBox; + lbEtiqueta2: TLabel; lbEtiqueta3: TLabel; lbEtiqueta4: TLabel; - lbEtiqueta2: TLabel; - lbEtiqueta8: TLabel; lbEtiqueta9: TLabel; + lbEtiqueta10: TLabel; lbEtiqueta1: TLabel; lbEtiqueta5: TLabel; - edTeInfoPatrimonio3: TEdit; edTeInfoPatrimonio4: TEdit; + edTeInfoPatrimonio3: TEdit; btCombosUpdate: TButton; edTeInfoPatrimonio2: TEdit; edTeInfoPatrimonio8: TEdit; @@ -92,11 +92,15 @@ type bgTermoResponsabilidade: TGroupBox; rdConcordaTermos: TRadioButton; btGravarInformacoes: TButton; - lbEtiqueta6: TLabel; - edTeInfoPatrimonio6: TEdit; lbEtiqueta7: TLabel; + edTeInfoPatrimonio6: TEdit; + lbEtiqueta6: TLabel; edTeInfoPatrimonio7: TEdit; btKonamiCode: TPanel; + edTeInfoPatrimonioTel: TMaskEdit; + lbEtiquetaTel: TLabel; + lbEtiqueta8: TLabel; + edTeInfoPatrimonio10: TEdit; procedure FormCreate(Sender: TObject); procedure AtualizaPatrimonio(Sender: TObject); @@ -128,7 +132,9 @@ type strTeInfoPatrimonio6, strTeInfoPatrimonio7, strTeInfoPatrimonio8, - strTeInfoPatrimonio9 : String; + strTeInfoPatrimonio9, + strTeInfoPatrimonio10, + strTeInfoPatrimonioTel : String; psswd : String; foco : boolean; @@ -342,28 +348,34 @@ begin strTeInfoPatrimonio1 := objCacic.getValueFromTags('IDPatrimonio', strCollectsPatrimonioLast); if (strTeInfoPatrimonio2='') then - strTeInfoPatrimonio2 := objCacic.getValueFromTags('UserLogado', + strTeInfoPatrimonio2 := objCacic.getValueFromTags('PatrimonioMonitor1', strCollectsPatrimonioLast); if (strTeInfoPatrimonio3='') then - strTeInfoPatrimonio3 := objCacic.getValueFromTags('PatrimonioMonitor1', + strTeInfoPatrimonio3 := objCacic.getValueFromTags('PatrimonioMonitor2', strCollectsPatrimonioLast); if (strTeInfoPatrimonio4='') then - strTeInfoPatrimonio4 := objCacic.getValueFromTags('PatrimonioMonitor2', + strTeInfoPatrimonio4 := objCacic.getValueFromTags('UserLogado', strCollectsPatrimonioLast); if (strTeInfoPatrimonio5='') then strTeInfoPatrimonio5 := objCacic.getValueFromTags('UserName', strCollectsPatrimonioLast); if (strTeInfoPatrimonio6='') then - strTeInfoPatrimonio6 := objCacic.getValueFromTags('Sala', + strTeInfoPatrimonio6 := objCacic.getValueFromTags('Coordenacao_Setor', strCollectsPatrimonioLast); if (strTeInfoPatrimonio7='') then - strTeInfoPatrimonio7 := objCacic.getValueFromTags('Coordenacao_Setor', + strTeInfoPatrimonio7 := objCacic.getValueFromTags('Sala', + strCollectsPatrimonioLast); + if (strTeInfoPatrimonioTel='') then + strTeInfoPatrimonioTel := objCacic.getValueFromTags('Tel', strCollectsPatrimonioLast); if (strTeInfoPatrimonio8='') then - strTeInfoPatrimonio8 := objCacic.getValueFromTags('ComputerName', + strTeInfoPatrimonio8 := objCacic.getValueFromTags('Ramal', strCollectsPatrimonioLast); if (strTeInfoPatrimonio9='') then - strTeInfoPatrimonio9 := objCacic.getValueFromTags('IPComputer', + strTeInfoPatrimonio9 := objCacic.getValueFromTags('ComputerName', + strCollectsPatrimonioLast); + if (strTeInfoPatrimonio10='') then + strTeInfoPatrimonio10 := objCacic.getValueFromTags('IPComputer', strCollectsPatrimonioLast); End; btCombosUpdate.Enabled := true; @@ -383,14 +395,16 @@ if edTeInfoPatrimonio5.text <> '' then strFieldsAndValuesToRequest := 'CollectType=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt('col_patr')) ; strColetaAtual := StringReplace('[IDPatrimonio]' + edTeInfoPatrimonio1.Text + '[/IDPatrimonio]' + - '[UserLogado]' + edTeInfoPatrimonio2.Text + '[/UserLogado]' + - '[PatrimonioMonitor1]' + edTeInfoPatrimonio3.Text + '[/PatrimonioMonitor1]' + - '[PatrimonioMonitor2]' + edTeInfoPatrimonio4.Text + '[/PatrimonioMonitor2]' + + '[PatrimonioMonitor1]' + edTeInfoPatrimonio2.Text + '[/PatrimonioMonitor1]' + + '[PatrimonioMonitor2]' + edTeInfoPatrimonio3.Text + '[/PatrimonioMonitor2]' + + '[UserLogado]' + edTeInfoPatrimonio4.Text + '[/UserLogado]' + '[UserName]' + edTeInfoPatrimonio5.Text + '[/UserName]' + - '[Sala]' + edTeInfoPatrimonio6.Text + '[/Sala]' + - '[Coordenacao_Setor]' + edTeInfoPatrimonio7.Text + '[/Coordenacao_Setor]' + - '[ComputerName]' + edTeInfoPatrimonio8.text + '[/ComputerName]' + - '[IPComputer]' + edTeInfoPatrimonio9.text + '[/IPComputer]' + '[Coordenacao_Setor]' + edTeInfoPatrimonio6.Text + '[/Coordenacao_Setor]' + + '[Sala]' + edTeInfoPatrimonio7.Text + '[/Sala]' + + '[Tel]' + edTeInfoPatrimonioTel.text + '[/Tel]' + + '[Ramal]' + edTeInfoPatrimonio8.text + '[/Ramal]' + + '[ComputerName]' + edTeInfoPatrimonio9.text + '[/ComputerName]' + + '[IPComputer]' + edTeInfoPatrimonio10.text + '[/IPComputer]' , ',','[[COMMA]]',[rfReplaceAll]); strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Patrimonio=' + @@ -449,24 +463,17 @@ Begin edTeInfoPatrimonio1.Visible := true; lbEtiqueta1.Visible := true; -//-----------------------------USUARIO LOGADO----------------------------------- - -// edTeInfoUserLogado.Text := getUserLogon; - strTeInfoPatrimonio2 := ''; - while(strTeInfoPatrimonio2 = '') and (count < 600) do - begin - strTeInfoPatrimonio2 := objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName')); - strTeInfoPatrimonio2 := copy(strTeInfoPatrimonio2, pos('\', strTeInfoPatrimonio2)+1, length(strTeInfoPatrimonio2)); - edTeInfoPatrimonio2.Text:= strTeInfoPatrimonio2; - sleep(1000); - count := count + 1; - end; +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta2 -> "' + +// objCacic.getValueFromTags('in_exibir_etiqueta2', +// strConfigsPatrimonioInterface)+'"'); - if edTeInfoPatrimonio2.Text <> '' then - begin +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta2', strConfigsPatrimonioInterface)) = 'S') then +// begin + //lbEtiqueta3.Caption := objCacic.getValueFromTags('te_etiqueta2', strConfigsPatrimonioInterface); lbEtiqueta2.Visible := true; - edTeInfoPatrimonio2.Visible := true; - end; + edTeInfoPatrimonio2.Text := strTeInfoPatrimonio2; + edTeInfoPatrimonio2.visible := True; +// end; // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta3 -> "' + // objCacic.getValueFromTags('in_exibir_etiqueta3', @@ -476,23 +483,28 @@ Begin // begin //lbEtiqueta3.Caption := objCacic.getValueFromTags('te_etiqueta3', strConfigsPatrimonioInterface); lbEtiqueta3.Visible := true; - edTeInfoPatrimonio3.Hint := objCacic.getValueFromTags('te_help_etiqueta3', strConfigsPatrimonioInterface); edTeInfoPatrimonio3.Text := strTeInfoPatrimonio3; edTeInfoPatrimonio3.visible := True; // end; -// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta4 -> "' + -// objCacic.getValueFromTags('in_exibir_etiqueta4', -// strConfigsPatrimonioInterface)+'"'); +//-----------------------------USUARIO LOGADO----------------------------------- -// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta4', strConfigsPatrimonioInterface)) = 'S') then -// begin - //lbEtiqueta4.Caption := objCacic.getValueFromTags('te_etiqueta4', strConfigsPatrimonioInterface); - lbEtiqueta4.Visible := true; - edTeInfoPatrimonio4.Hint := objCacic.getValueFromTags('te_help_etiqueta4', strConfigsPatrimonioInterface); - edTeInfoPatrimonio4.Text := strTeInfoPatrimonio4; - edTeInfoPatrimonio4.visible := True; -// end; +// edTeInfoUserLogado.Text := getUserLogon; + strTeInfoPatrimonio4 := ''; + while(strTeInfoPatrimonio4 = '') and (count < 600) do + begin + strTeInfoPatrimonio4 := objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName')); + strTeInfoPatrimonio4 := copy(strTeInfoPatrimonio4, pos('\', strTeInfoPatrimonio4)+1, length(strTeInfoPatrimonio4)); + edTeInfoPatrimonio4.Text:= strTeInfoPatrimonio4; + sleep(1000); + count := count + 1; + end; + + if edTeInfoPatrimonio4.Text <> '' then + begin + lbEtiqueta4.Visible := true; + edTeInfoPatrimonio4.Visible := true; + end; //-------------------------------NOME USUARIO----------------------------------- strNomeLDAP := getLastValue(LDAPName, 'Attribute:', 'cn'+#$D#$A); @@ -515,8 +527,6 @@ Begin lbEtiqueta5.hint := 'Digite seu nome, não foi possível recuperá-lo.'; end; -//---------------------------------PATRIMONIO MONITORES------------------------------ - // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' + // objCacic.getValueFromTags('in_exibir_etiqueta6', // strConfigsPatrimonioInterface)+'"'); @@ -543,8 +553,12 @@ Begin edTeInfoPatrimonio7.visible := True; // end; -//-----------------------NOME DO COMPUTADOR PARA O EDTEXT----------------------- - edTeInfoPatrimonio8.Text := NomeComputador; + lbEtiquetaTel.Visible := true; + edTeInfoPatrimonioTel.Hint := objCacic.getValueFromTags('te_help_etiqueta_tel', strConfigsPatrimonioInterface); + edTeInfoPatrimonioTel.Text := strTeInfoPatrimonioTel; + edTeInfoPatrimonioTel.visible := True; + + edTeInfoPatrimonio8.Text := strTeInfoPatrimonio8; if edTeInfoPatrimonio8.Text <> '' then begin lbEtiqueta8.Visible := true; @@ -552,15 +566,24 @@ Begin end; lbEtiqueta8.Visible := true; edTeInfoPatrimonio8.Visible := true; - -//-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT------------------------------------- - strTeInfoPatrimonio9 := fetchWMIvalues('Win32_NetworkAdapterConfiguration', objCACIC.getLocalFolderName); - edTeInfoPatrimonio9.Text := objCACIC.getValueFromTags('IPAddress',strTeInfoPatrimonio9); +//-----------------------NOME DO COMPUTADOR PARA O EDTEXT----------------------- + edTeInfoPatrimonio9.Text := NomeComputador; if edTeInfoPatrimonio9.Text <> '' then begin lbEtiqueta9.Visible := true; edTeInfoPatrimonio9.Visible := true; end; + lbEtiqueta9.Visible := true; + edTeInfoPatrimonio9.Visible := true; + +//-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT------------------------------------- + strTeInfoPatrimonio10 := fetchWMIvalues('Win32_NetworkAdapterConfiguration', objCACIC.getLocalFolderName); + edTeInfoPatrimonio10.Text := objCACIC.getValueFromTags('IPAddress',strTeInfoPatrimonio10); + if edTeInfoPatrimonio10.Text <> '' then + begin + lbEtiqueta10.Visible := true; + edTeInfoPatrimonio10.Visible := true; + end; btGravarInformacoes.Visible := true; btCombosUpdate.Enabled := true; -- libgit2 0.21.2