Commit 004bee6787712035f842e32c741d9c4a81a4de20
1 parent
37c2c41c
Exists in
master
Realizada alterações dos campos solicitadas pela PGFN.
Bug de minimizar o formulário concertado. Retirada a barra de tarefas, caso o formulário esteja focado. git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@1586 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing
3 changed files
with
371 additions
and
395 deletions
Show diff stats
MapaTesteProj/MapaTeste.dcu
No preview for this file type
MapaTesteProj/MapaTeste.dfm
| ... | ... | @@ -2,7 +2,7 @@ object frmMapaCacic: TfrmMapaCacic |
| 2 | 2 | Left = 0 |
| 3 | 3 | Top = -55 |
| 4 | 4 | Caption = 'frmMapaCacic' |
| 5 | - ClientHeight = 634 | |
| 5 | + ClientHeight = 448 | |
| 6 | 6 | ClientWidth = 789 |
| 7 | 7 | Color = clBtnFace |
| 8 | 8 | Font.Charset = DEFAULT_CHARSET |
| ... | ... | @@ -10,19 +10,89 @@ object frmMapaCacic: TfrmMapaCacic |
| 10 | 10 | Font.Height = -11 |
| 11 | 11 | Font.Name = 'Tahoma' |
| 12 | 12 | Font.Style = [] |
| 13 | + Icon.Data = { | |
| 14 | + 0000010001002020000001000800A80800001600000028000000200000004000 | |
| 15 | + 0000010008000000000000000000000000000000000000000000000000000000 | |
| 16 | + 000000020B00060B1100080D14000B111C00132517001A3116001E3D15001C3E | |
| 17 | + 1D000B12230011192B00131D320016223A0029551E00366D1E001C4026002348 | |
| 18 | + 20002B542500366D21003F7F2700336530003C773900000D460001114F000011 | |
| 19 | + 5A00192641001A2844001D2C4A00243A4C002232550023365D00071D6200081E | |
| 20 | + 6D00001A7F000B2766000B28640008216B000B2A6D00112167000D2675000C30 | |
| 21 | + 7000263A6100283D62002B5E48002B455500375E5B0030604200377A47002C6A | |
| 22 | + 58003C6B53003B655B003E6B5C002F4C63002A416A002E51680034576000385F | |
| 23 | + 6300304879003E6C60002F726600377E650030756E00347B6B002B6D7300457E | |
| 24 | + 520040735A0040716600406F71004A7C7F004285250054AA2B005EBD2F0060C3 | |
| 25 | + 310065C831003C854C003A855D003C8874003A867B004D9F4000408758004795 | |
| 26 | + 52004D9C54004F915D004B9858004EA44D004FA857004DA15A0056AB54005CB3 | |
| 27 | + 5A004E8B6300408E6800449466004A9E61005AAE63000017810000188400011A | |
| 28 | + 8800001D90000F3191000E319B0010349900163C9B000021AD00072AA8000023 | |
| 29 | + B0000025BB000026BC00184B83001B518A001C449700334E8200355085003956 | |
| 30 | + 90003B5893003B5995003E5D9C00256582003E6194001F51BA003F65A5003B7F | |
| 31 | + BB00457694004060A0004263A5004264A5004365A9004568AD00476AB100486D | |
| 32 | + B4004A6FB9004971B4004B71BC00042CC3000028C800012AD300042ED000002B | |
| 33 | + D700002CDD00002CE200002EEE00083EE1000030F3000131F4000031F8000032 | |
| 34 | + FD000C42CA001344C2001445CA001951C6000A40DE001643D100194FD0001B4D | |
| 35 | + DC00245DCB00204FD4002B61DC002F6BDD00316DD6003374DC001B4CE1001D54 | |
| 36 | + E5002153E200225DE2002763EF002C68E8003D7EE7003A7AEB002A66F0003979 | |
| 37 | + F1004F77C600537CCC00537DD000368884003D9A94005996990041A29F004C84 | |
| 38 | + A1005E9EA00042A4A00061A1A40062A4A50067A9A70066A8A90067ACB70069B4 | |
| 39 | + B4006CB5B60072CB8C0074CF920072C5980077D194007AD7900075CBA6007AD5 | |
| 40 | + A4007BD9A1007BD7A90076CBB80079CFB8007AD1B3007FDEB30079D1BB003E89 | |
| 41 | + CB003E94D400349DD2003E98D7003F99D9003DA0DF003EA4E3003BA9E5003DAB | |
| 42 | + E90034B1E60034B4EA005680D0005884D6005682D9005883D8005C89DB004394 | |
| 43 | + D8004994DE006BB6C00066B1C90065B0D5005A87E1005C8AE3005E8DEA00459C | |
| 44 | + E2004A9AE5005690E6005793E9005A93ED005D95F0006090E6006191EE006194 | |
| 45 | + F4006298F7006396F8006699FD00689CFE0078CEC70074C3CB007AD2C0007BD6 | |
| 46 | + D2007CD8D40081DFAA0082DCBF0085E9AB0081D0CE0081CFD10081D7D60086DC | |
| 47 | + DC008BE2E30094F2F20095F4F3009DF2F30099FCFB00A2FBFA00FFFFFF000000 | |
| 48 | + 0000000000000000000000000000000000000000000000000000000000000000 | |
| 49 | + 616A000000000000000000000000000000000000000000000000852100000018 | |
| 50 | + 8E906A0000000000000000000000000000000000000000000086908A00000066 | |
| 51 | + 9090890000000000000000000000000000000000000000000088909068000064 | |
| 52 | + 8D8E8400000000000000000000000000000000000000000000878F8B620000DA | |
| 53 | + 6563B00000000000000000000000000000000000000000000079676DB70044FB | |
| 54 | + F7B9FCB30000000000000000727C7C830000000000000000AEFEB4F8F90000F9 | |
| 55 | + FDFDFBB40000000083D3E6E8EBECECEAE7DEAB7E00000000B1FDFDFDF6000041 | |
| 56 | + F9FDF52D0000AAEBECEBEBECE6D6D7E7ECECECECE77C000038F8FDF83100000E | |
| 57 | + 59B6400583E6ECECEBEBECAA7C7D7D7DD4ECEBECEBEBDE000659B5520E000007 | |
| 58 | + 48461375E0E1EBEBECEBD37BE8EBECE77AD3EBECECEAE0D92C45464700000000 | |
| 59 | + 45492EC8CBD1E1EAECEBD5DEEBECEBECDEABECEBE8E1D2D87814491200000000 | |
| 60 | + 1C1177E0D1CCD1CEE9EBEBECEBECEBECEBEBEBE5D0D1C9D2E07511340000006F | |
| 61 | + DF82EAE9CDD2CBCAE4EBEBECEBECEBECEBECEBE3CACBD2CDE9E782D6000071DF | |
| 62 | + EBECEBEBE9E0CEE5EBECEBECEBECEBECEBECEBEBE2CFE1E9EBECEBECAB0039EB | |
| 63 | + EBECEBECEBEAE5EBEBEBEBEBEBECEBECEBEBEBECEBE5EBEBEBECEBEBEB716EEA | |
| 64 | + EBECEBECEBECEAE8E7DFDEDFEBECEBECEADFDEDFE7E8EBEBECECEBECE86F0083 | |
| 65 | + ECECEBEBEBEBAA7D7E8080D5ECEBEBECEAA9807F7E7DDFECECEBECE973000001 | |
| 66 | + 81DFE8EBEBECECECEBECEBEBEBECEBEBEBECEBECECECEBEBE9E8D62A00000000 | |
| 67 | + 04193573ABDDDFDFE7E7E8EAEBEBEBEBEAE8E7DFDFDED5836E1E0B0200000000 | |
| 68 | + 00000000000002040A0C1B1D297A7A291B190B09030100000000000000000000 | |
| 69 | + 000000000000000000000000000C1A0000000000000000000000000000000000 | |
| 70 | + 0101010101010101010101010101090101010101010101010101010100000000 | |
| 71 | + 175F5F5F5F5F605F605F5F5F5F60605F5F605F5F605F605F5F5F5E1600000000 | |
| 72 | + 00286C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6B230000000000 | |
| 73 | + 0000ADAFB2AFB2B2AFB2B2B2AFB2B2AFB2AFB2B2AFB2B2B2B2AC000000000000 | |
| 74 | + 0000001536241132250843200D421F1137271033220F3A262B00000000000000 | |
| 75 | + 00009157DB9651BF972FED984AC57650B89A4FBC9930BF9B3DC0000000000000 | |
| 76 | + 00008C56F1A15CF4A24BC7A73EC69E5AC49C4DBEA53FBDA874BAEE0000000000 | |
| 77 | + 00009555F0A156F2A24BEFA33CC69D5BC49B4CBEA63FC1A874BB000000000000 | |
| 78 | + 00009158DC935DC3944AF0A04EF39254EE9F53C5993BC5A44BC2000000000000 | |
| 79 | + 000000000000000000000000000000000000000000000000000000000000FFFF | |
| 80 | + FFFFCFFFFFF387FFFFE387FFFFE187FFFFE187FFFFE103FC3FC183C003C18300 | |
| 81 | + 00C18000004180000003C0000003C00000038000000300000001000000000000 | |
| 82 | + 00008000000180000003800000018000000180000003C0000003C0000003E000 | |
| 83 | + 0007F000000FF800001FF000000FF0000007F000000FF000000FFFFFFFFF} | |
| 13 | 84 | OldCreateOrder = False |
| 14 | - Position = poDesigned | |
| 15 | 85 | OnActivate = FormActivate |
| 16 | 86 | OnClose = FormClose |
| 17 | 87 | OnCreate = FormCreate |
| 18 | 88 | DesignSize = ( |
| 19 | 89 | 789 |
| 20 | - 634) | |
| 90 | + 448) | |
| 21 | 91 | PixelsPerInch = 96 |
| 22 | 92 | TextHeight = 13 |
| 23 | 93 | object edWebManagerAddress: TLabel |
| 24 | 94 | Left = 155 |
| 25 | - Top = 682 | |
| 95 | + Top = 426 | |
| 26 | 96 | Width = 500 |
| 27 | 97 | Height = 14 |
| 28 | 98 | Anchors = [akBottom] |
| ... | ... | @@ -33,12 +103,10 @@ object frmMapaCacic: TfrmMapaCacic |
| 33 | 103 | Font.Name = 'Arial' |
| 34 | 104 | Font.Style = [fsBold] |
| 35 | 105 | ParentFont = False |
| 36 | - ExplicitLeft = 159 | |
| 37 | - ExplicitTop = 537 | |
| 38 | 106 | end |
| 39 | 107 | object lbWebManagerAddress: TLabel |
| 40 | - Left = 0 | |
| 41 | - Top = 683 | |
| 108 | + Left = 3 | |
| 109 | + Top = 429 | |
| 42 | 110 | Width = 153 |
| 43 | 111 | Height = 13 |
| 44 | 112 | Anchors = [akLeft, akBottom] |
| ... | ... | @@ -50,31 +118,65 @@ object frmMapaCacic: TfrmMapaCacic |
| 50 | 118 | Font.Name = 'Arial' |
| 51 | 119 | Font.Style = [] |
| 52 | 120 | ParentFont = False |
| 53 | - ExplicitTop = 538 | |
| 54 | 121 | end |
| 55 | - object btGravarInformacoes: TButton | |
| 56 | - Left = 188 | |
| 57 | - Top = 580 | |
| 58 | - Width = 401 | |
| 59 | - Height = 35 | |
| 60 | - Anchors = [] | |
| 61 | - Caption = 'Grava e Envia Informa'#231#245'es Patrimoniais ao Gerente WEB' | |
| 62 | - Enabled = False | |
| 122 | + object pnVersao: TPanel | |
| 123 | + Left = 683 | |
| 124 | + Top = 420 | |
| 125 | + Width = 105 | |
| 126 | + Height = 20 | |
| 127 | + Anchors = [akRight, akBottom] | |
| 128 | + BevelInner = bvLowered | |
| 129 | + Caption = 'Vers'#227'o' | |
| 63 | 130 | Font.Charset = DEFAULT_CHARSET |
| 64 | 131 | Font.Color = clWindowText |
| 65 | - Font.Height = -13 | |
| 66 | - Font.Name = 'Arial' | |
| 132 | + Font.Height = -11 | |
| 133 | + Font.Name = 'MS Sans Serif' | |
| 67 | 134 | Font.Style = [fsBold] |
| 68 | 135 | ParentFont = False |
| 69 | 136 | TabOrder = 0 |
| 137 | + end | |
| 138 | + object pnMessageBox: TPanel | |
| 139 | + Left = 1 | |
| 140 | + Top = 243 | |
| 141 | + Width = 780 | |
| 142 | + Height = 45 | |
| 143 | + BevelInner = bvLowered | |
| 144 | + Color = clInactiveBorder | |
| 145 | + Font.Charset = DEFAULT_CHARSET | |
| 146 | + Font.Color = clMenuHighlight | |
| 147 | + Font.Height = -13 | |
| 148 | + Font.Name = 'Arial' | |
| 149 | + Font.Style = [] | |
| 150 | + ParentBackground = False | |
| 151 | + ParentFont = False | |
| 152 | + TabOrder = 1 | |
| 70 | 153 | Visible = False |
| 71 | - OnClick = AtualizaPatrimonio | |
| 154 | + object lbMensagens: TLabel | |
| 155 | + Left = 2 | |
| 156 | + Top = 2 | |
| 157 | + Width = 776 | |
| 158 | + Height = 41 | |
| 159 | + Align = alClient | |
| 160 | + Alignment = taCenter | |
| 161 | + AutoSize = False | |
| 162 | + Color = clGrayText | |
| 163 | + Font.Charset = DEFAULT_CHARSET | |
| 164 | + Font.Color = clWindowText | |
| 165 | + Font.Height = -13 | |
| 166 | + Font.Name = 'MS Sans Serif' | |
| 167 | + Font.Style = [] | |
| 168 | + ParentColor = False | |
| 169 | + ParentFont = False | |
| 170 | + Layout = tlCenter | |
| 171 | + ExplicitLeft = 6 | |
| 172 | + ExplicitTop = 0 | |
| 173 | + end | |
| 72 | 174 | end |
| 73 | 175 | object gbInformacoesSobreComputador: TGroupBox |
| 74 | 176 | Left = 1 |
| 75 | - Top = 64 | |
| 177 | + Top = 58 | |
| 76 | 178 | Width = 780 |
| 77 | - Height = 497 | |
| 179 | + Height = 361 | |
| 78 | 180 | Anchors = [] |
| 79 | 181 | Caption = |
| 80 | 182 | ' Informa'#231#245'es sobre localiza'#231#227'o f'#237'sica e patrimonial deste comput' + |
| ... | ... | @@ -85,73 +187,17 @@ object frmMapaCacic: TfrmMapaCacic |
| 85 | 187 | Font.Name = 'MS Sans Serif' |
| 86 | 188 | Font.Style = [fsBold] |
| 87 | 189 | ParentFont = False |
| 88 | - TabOrder = 1 | |
| 89 | - object lbEtiqueta1: TLabel | |
| 90 | - Left = 6 | |
| 91 | - Top = 226 | |
| 92 | - Width = 45 | |
| 93 | - Height = 13 | |
| 94 | - Caption = 'Etiqueta1' | |
| 95 | - Font.Charset = DEFAULT_CHARSET | |
| 96 | - Font.Color = clWindowText | |
| 97 | - Font.Height = -11 | |
| 98 | - Font.Name = 'MS Sans Serif' | |
| 99 | - Font.Style = [] | |
| 100 | - ParentFont = False | |
| 101 | - Visible = False | |
| 102 | - end | |
| 103 | - object lbEtiqueta2: TLabel | |
| 104 | - Left = 266 | |
| 105 | - Top = 226 | |
| 106 | - Width = 250 | |
| 107 | - Height = 13 | |
| 108 | - AutoSize = False | |
| 109 | - Caption = 'Etiqueta2' | |
| 110 | - Font.Charset = DEFAULT_CHARSET | |
| 111 | - Font.Color = clWindowText | |
| 112 | - Font.Height = -11 | |
| 113 | - Font.Name = 'MS Sans Serif' | |
| 114 | - Font.Style = [] | |
| 115 | - ParentFont = False | |
| 116 | - Visible = False | |
| 117 | - end | |
| 118 | - object lbEtiqueta3: TLabel | |
| 119 | - Left = 530 | |
| 120 | - Top = 226 | |
| 121 | - Width = 250 | |
| 122 | - Height = 13 | |
| 123 | - AutoSize = False | |
| 124 | - Caption = 'Etiqueta3' | |
| 125 | - Font.Charset = DEFAULT_CHARSET | |
| 126 | - Font.Color = clWindowText | |
| 127 | - Font.Height = -11 | |
| 128 | - Font.Name = 'MS Sans Serif' | |
| 129 | - Font.Style = [] | |
| 130 | - ParentFont = False | |
| 131 | - Visible = False | |
| 132 | - end | |
| 133 | - object lbEtiqueta4: TLabel | |
| 134 | - Left = 3 | |
| 135 | - Top = 275 | |
| 136 | - Width = 250 | |
| 137 | - Height = 13 | |
| 138 | - AutoSize = False | |
| 139 | - Caption = 'Etiqueta4' | |
| 140 | - Font.Charset = DEFAULT_CHARSET | |
| 141 | - Font.Color = clWindowText | |
| 142 | - Font.Height = -11 | |
| 143 | - Font.Name = 'MS Sans Serif' | |
| 144 | - Font.Style = [] | |
| 145 | - ParentFont = False | |
| 146 | - Visible = False | |
| 147 | - end | |
| 190 | + TabOrder = 2 | |
| 191 | + DesignSize = ( | |
| 192 | + 780 | |
| 193 | + 361) | |
| 148 | 194 | object lbEtiqueta5: TLabel |
| 149 | - Left = 266 | |
| 150 | - Top = 275 | |
| 195 | + Left = 107 | |
| 196 | + Top = 82 | |
| 151 | 197 | Width = 250 |
| 152 | 198 | Height = 13 |
| 153 | 199 | AutoSize = False |
| 154 | - Caption = 'Etiqueta5' | |
| 200 | + Caption = 'Monitor 1' | |
| 155 | 201 | Font.Charset = DEFAULT_CHARSET |
| 156 | 202 | Font.Color = clWindowText |
| 157 | 203 | Font.Height = -11 |
| ... | ... | @@ -161,12 +207,12 @@ object frmMapaCacic: TfrmMapaCacic |
| 161 | 207 | Visible = False |
| 162 | 208 | end |
| 163 | 209 | object lbEtiqueta6: TLabel |
| 164 | - Left = 530 | |
| 165 | - Top = 275 | |
| 210 | + Left = 420 | |
| 211 | + Top = 82 | |
| 166 | 212 | Width = 250 |
| 167 | 213 | Height = 13 |
| 168 | 214 | AutoSize = False |
| 169 | - Caption = 'Etiqueta6' | |
| 215 | + Caption = 'Monitor 2' | |
| 170 | 216 | Font.Charset = DEFAULT_CHARSET |
| 171 | 217 | Font.Color = clWindowText |
| 172 | 218 | Font.Height = -11 |
| ... | ... | @@ -192,7 +238,7 @@ object frmMapaCacic: TfrmMapaCacic |
| 192 | 238 | end |
| 193 | 239 | object lbEtiquetaNomeComputador: TLabel |
| 194 | 240 | Left = 107 |
| 195 | - Top = 146 | |
| 241 | + Top = 182 | |
| 196 | 242 | Width = 250 |
| 197 | 243 | Height = 13 |
| 198 | 244 | AutoSize = False |
| ... | ... | @@ -205,24 +251,9 @@ object frmMapaCacic: TfrmMapaCacic |
| 205 | 251 | ParentFont = False |
| 206 | 252 | Visible = False |
| 207 | 253 | end |
| 208 | - object lbEtiquetaCpfUser: TLabel | |
| 209 | - Left = 420 | |
| 210 | - Top = 89 | |
| 211 | - Width = 250 | |
| 212 | - Height = 13 | |
| 213 | - AutoSize = False | |
| 214 | - Caption = 'CPF' | |
| 215 | - Font.Charset = DEFAULT_CHARSET | |
| 216 | - Font.Color = clWindowText | |
| 217 | - Font.Height = -11 | |
| 218 | - Font.Name = 'MS Sans Serif' | |
| 219 | - Font.Style = [] | |
| 220 | - ParentFont = False | |
| 221 | - Visible = False | |
| 222 | - end | |
| 223 | 254 | object lbEtiquetaIpComputador: TLabel |
| 224 | 255 | Left = 420 |
| 225 | - Top = 146 | |
| 256 | + Top = 129 | |
| 226 | 257 | Width = 250 |
| 227 | 258 | Height = 13 |
| 228 | 259 | AutoSize = False |
| ... | ... | @@ -252,7 +283,7 @@ object frmMapaCacic: TfrmMapaCacic |
| 252 | 283 | end |
| 253 | 284 | object lbEtiquetaNome: TLabel |
| 254 | 285 | Left = 107 |
| 255 | - Top = 89 | |
| 286 | + Top = 129 | |
| 256 | 287 | Width = 250 |
| 257 | 288 | Height = 13 |
| 258 | 289 | AutoSize = False |
| ... | ... | @@ -265,77 +296,9 @@ object frmMapaCacic: TfrmMapaCacic |
| 265 | 296 | ParentFont = False |
| 266 | 297 | Visible = False |
| 267 | 298 | end |
| 268 | - object edTeInfoPatrimonio1: TEdit | |
| 269 | - Left = 5 | |
| 270 | - Top = 245 | |
| 271 | - Width = 251 | |
| 272 | - Height = 24 | |
| 273 | - Font.Charset = DEFAULT_CHARSET | |
| 274 | - Font.Color = clWindowText | |
| 275 | - Font.Height = -13 | |
| 276 | - Font.Name = 'Arial' | |
| 277 | - Font.Style = [] | |
| 278 | - MaxLength = 100 | |
| 279 | - ParentFont = False | |
| 280 | - ParentShowHint = False | |
| 281 | - ShowHint = True | |
| 282 | - TabOrder = 0 | |
| 283 | - Visible = False | |
| 284 | - end | |
| 285 | - object edTeInfoPatrimonio4: TEdit | |
| 286 | - Left = 6 | |
| 287 | - Top = 294 | |
| 288 | - Width = 250 | |
| 289 | - Height = 24 | |
| 290 | - Font.Charset = DEFAULT_CHARSET | |
| 291 | - Font.Color = clWindowText | |
| 292 | - Font.Height = -13 | |
| 293 | - Font.Name = 'MS Sans Serif' | |
| 294 | - Font.Style = [] | |
| 295 | - MaxLength = 20 | |
| 296 | - ParentFont = False | |
| 297 | - ParentShowHint = False | |
| 298 | - ShowHint = True | |
| 299 | - TabOrder = 3 | |
| 300 | - Visible = False | |
| 301 | - end | |
| 302 | - object edTeInfoPatrimonio2: TEdit | |
| 303 | - Left = 262 | |
| 304 | - Top = 245 | |
| 305 | - Width = 250 | |
| 306 | - Height = 24 | |
| 307 | - Font.Charset = DEFAULT_CHARSET | |
| 308 | - Font.Color = clWindowText | |
| 309 | - Font.Height = -13 | |
| 310 | - Font.Name = 'MS Sans Serif' | |
| 311 | - Font.Style = [] | |
| 312 | - MaxLength = 20 | |
| 313 | - ParentFont = False | |
| 314 | - ParentShowHint = False | |
| 315 | - ShowHint = True | |
| 316 | - TabOrder = 1 | |
| 317 | - Visible = False | |
| 318 | - end | |
| 319 | - object edTeInfoPatrimonio3: TEdit | |
| 320 | - Left = 530 | |
| 321 | - Top = 245 | |
| 322 | - Width = 250 | |
| 323 | - Height = 24 | |
| 324 | - Font.Charset = DEFAULT_CHARSET | |
| 325 | - Font.Color = clWindowText | |
| 326 | - Font.Height = -13 | |
| 327 | - Font.Name = 'MS Sans Serif' | |
| 328 | - Font.Style = [] | |
| 329 | - MaxLength = 20 | |
| 330 | - ParentFont = False | |
| 331 | - ParentShowHint = False | |
| 332 | - ShowHint = True | |
| 333 | - TabOrder = 2 | |
| 334 | - Visible = False | |
| 335 | - end | |
| 336 | 299 | object edTeInfoPatrimonio5: TEdit |
| 337 | - Left = 266 | |
| 338 | - Top = 294 | |
| 300 | + Left = 107 | |
| 301 | + Top = 99 | |
| 339 | 302 | Width = 250 |
| 340 | 303 | Height = 24 |
| 341 | 304 | Font.Charset = DEFAULT_CHARSET |
| ... | ... | @@ -347,12 +310,12 @@ object frmMapaCacic: TfrmMapaCacic |
| 347 | 310 | ParentFont = False |
| 348 | 311 | ParentShowHint = False |
| 349 | 312 | ShowHint = True |
| 350 | - TabOrder = 4 | |
| 313 | + TabOrder = 0 | |
| 351 | 314 | Visible = False |
| 352 | 315 | end |
| 353 | 316 | object edTeInfoPatrimonio6: TEdit |
| 354 | - Left = 530 | |
| 355 | - Top = 294 | |
| 317 | + Left = 420 | |
| 318 | + Top = 99 | |
| 356 | 319 | Width = 250 |
| 357 | 320 | Height = 24 |
| 358 | 321 | Font.Charset = DEFAULT_CHARSET |
| ... | ... | @@ -364,16 +327,9 @@ object frmMapaCacic: TfrmMapaCacic |
| 364 | 327 | ParentFont = False |
| 365 | 328 | ParentShowHint = False |
| 366 | 329 | ShowHint = True |
| 367 | - TabOrder = 5 | |
| 330 | + TabOrder = 1 | |
| 368 | 331 | Visible = False |
| 369 | 332 | end |
| 370 | - object pnDivisoria01: TPanel | |
| 371 | - Left = 3 | |
| 372 | - Top = 211 | |
| 373 | - Width = 772 | |
| 374 | - Height = 3 | |
| 375 | - TabOrder = 6 | |
| 376 | - end | |
| 377 | 333 | object btCombosUpdate: TButton |
| 378 | 334 | Left = 684 |
| 379 | 335 | Top = 10 |
| ... | ... | @@ -381,7 +337,7 @@ object frmMapaCacic: TfrmMapaCacic |
| 381 | 337 | Height = 20 |
| 382 | 338 | Caption = 'Recarregar' |
| 383 | 339 | Enabled = False |
| 384 | - TabOrder = 7 | |
| 340 | + TabOrder = 2 | |
| 385 | 341 | OnClick = btCombosUpdateClick |
| 386 | 342 | end |
| 387 | 343 | object edTeInfoUserLogado: TEdit |
| ... | ... | @@ -399,30 +355,12 @@ object frmMapaCacic: TfrmMapaCacic |
| 399 | 355 | ParentFont = False |
| 400 | 356 | ParentShowHint = False |
| 401 | 357 | ShowHint = True |
| 402 | - TabOrder = 8 | |
| 358 | + TabOrder = 3 | |
| 403 | 359 | Visible = False |
| 404 | 360 | end |
| 405 | 361 | object edTeInfoNomeComputador: TEdit |
| 406 | 362 | Left = 107 |
| 407 | - Top = 165 | |
| 408 | - Width = 250 | |
| 409 | - Height = 24 | |
| 410 | - Enabled = False | |
| 411 | - Font.Charset = DEFAULT_CHARSET | |
| 412 | - Font.Color = clWindowText | |
| 413 | - Font.Height = -13 | |
| 414 | - Font.Name = 'MS Sans Serif' | |
| 415 | - Font.Style = [] | |
| 416 | - MaxLength = 20 | |
| 417 | - ParentFont = False | |
| 418 | - ParentShowHint = False | |
| 419 | - ShowHint = True | |
| 420 | - TabOrder = 9 | |
| 421 | - Visible = False | |
| 422 | - end | |
| 423 | - object edTeInfoCpfUser: TEdit | |
| 424 | - Left = 420 | |
| 425 | - Top = 108 | |
| 363 | + Top = 201 | |
| 426 | 364 | Width = 250 |
| 427 | 365 | Height = 24 |
| 428 | 366 | Enabled = False |
| ... | ... | @@ -435,12 +373,12 @@ object frmMapaCacic: TfrmMapaCacic |
| 435 | 373 | ParentFont = False |
| 436 | 374 | ParentShowHint = False |
| 437 | 375 | ShowHint = True |
| 438 | - TabOrder = 10 | |
| 376 | + TabOrder = 4 | |
| 439 | 377 | Visible = False |
| 440 | 378 | end |
| 441 | 379 | object edTeInfoIpComputador: TEdit |
| 442 | 380 | Left = 420 |
| 443 | - Top = 165 | |
| 381 | + Top = 148 | |
| 444 | 382 | Width = 250 |
| 445 | 383 | Height = 24 |
| 446 | 384 | Enabled = False |
| ... | ... | @@ -453,7 +391,7 @@ object frmMapaCacic: TfrmMapaCacic |
| 453 | 391 | ParentFont = False |
| 454 | 392 | ParentShowHint = False |
| 455 | 393 | ShowHint = True |
| 456 | - TabOrder = 11 | |
| 394 | + TabOrder = 5 | |
| 457 | 395 | Visible = False |
| 458 | 396 | end |
| 459 | 397 | object edTePatrimonioPc: TEdit |
| ... | ... | @@ -461,7 +399,6 @@ object frmMapaCacic: TfrmMapaCacic |
| 461 | 399 | Top = 52 |
| 462 | 400 | Width = 250 |
| 463 | 401 | Height = 24 |
| 464 | - Enabled = False | |
| 465 | 402 | Font.Charset = DEFAULT_CHARSET |
| 466 | 403 | Font.Color = clWindowText |
| 467 | 404 | Font.Height = -13 |
| ... | ... | @@ -471,12 +408,12 @@ object frmMapaCacic: TfrmMapaCacic |
| 471 | 408 | ParentFont = False |
| 472 | 409 | ParentShowHint = False |
| 473 | 410 | ShowHint = True |
| 474 | - TabOrder = 12 | |
| 411 | + TabOrder = 6 | |
| 475 | 412 | Visible = False |
| 476 | 413 | end |
| 477 | 414 | object edTeInfoNome: TEdit |
| 478 | 415 | Left = 107 |
| 479 | - Top = 108 | |
| 416 | + Top = 148 | |
| 480 | 417 | Width = 250 |
| 481 | 418 | Height = 24 |
| 482 | 419 | Enabled = False |
| ... | ... | @@ -489,42 +426,50 @@ object frmMapaCacic: TfrmMapaCacic |
| 489 | 426 | ParentFont = False |
| 490 | 427 | ParentShowHint = False |
| 491 | 428 | ShowHint = True |
| 492 | - TabOrder = 13 | |
| 429 | + TabOrder = 7 | |
| 493 | 430 | Visible = False |
| 494 | 431 | end |
| 495 | 432 | object bgTermoResponsabilidade: TGroupBox |
| 496 | - Left = 8 | |
| 497 | - Top = 328 | |
| 498 | - Width = 761 | |
| 499 | - Height = 161 | |
| 433 | + Left = 10 | |
| 434 | + Top = 231 | |
| 435 | + Width = 767 | |
| 436 | + Height = 58 | |
| 500 | 437 | Caption = 'Termo de Responsabilidade' |
| 501 | - TabOrder = 14 | |
| 502 | - object mmTermoResponsabilidade: TMemo | |
| 503 | - Left = 8 | |
| 504 | - Top = 21 | |
| 505 | - Width = 745 | |
| 506 | - Height = 108 | |
| 507 | - Enabled = False | |
| 508 | - Lines.Strings = ( | |
| 509 | - 'mmTermoResponsabilidade') | |
| 510 | - ReadOnly = True | |
| 511 | - ScrollBars = ssVertical | |
| 512 | - TabOrder = 0 | |
| 513 | - end | |
| 438 | + TabOrder = 8 | |
| 514 | 439 | object rdConcordaTermos: TRadioButton |
| 515 | 440 | Left = 24 |
| 516 | - Top = 135 | |
| 517 | - Width = 337 | |
| 441 | + Top = 24 | |
| 442 | + Width = 553 | |
| 518 | 443 | Height = 17 |
| 519 | - Caption = 'Eu aceito os termos e condi'#231#245'es etc...' | |
| 520 | - TabOrder = 1 | |
| 444 | + Caption = | |
| 445 | + 'Declaro minha responsabilidade pelas informa'#231#245'es e pelo(s) equip' + | |
| 446 | + 'amento(s) cadastrado(s).' | |
| 447 | + TabOrder = 0 | |
| 521 | 448 | OnClick = rdConcordaTermosClick |
| 522 | 449 | end |
| 523 | 450 | end |
| 451 | + object btGravarInformacoes: TButton | |
| 452 | + Left = 186 | |
| 453 | + Top = 308 | |
| 454 | + Width = 401 | |
| 455 | + Height = 37 | |
| 456 | + Anchors = [] | |
| 457 | + Caption = 'Grava e Envia Informa'#231#245'es Patrimoniais' | |
| 458 | + Enabled = False | |
| 459 | + Font.Charset = DEFAULT_CHARSET | |
| 460 | + Font.Color = clWindowText | |
| 461 | + Font.Height = -13 | |
| 462 | + Font.Name = 'Arial' | |
| 463 | + Font.Style = [fsBold] | |
| 464 | + ParentFont = False | |
| 465 | + TabOrder = 9 | |
| 466 | + Visible = False | |
| 467 | + OnClick = AtualizaPatrimonio | |
| 468 | + end | |
| 524 | 469 | end |
| 525 | 470 | object gbLeiaComAtencao: TGroupBox |
| 526 | - Left = 1 | |
| 527 | - Top = 11 | |
| 471 | + Left = 0 | |
| 472 | + Top = 2 | |
| 528 | 473 | Width = 780 |
| 529 | 474 | Height = 53 |
| 530 | 475 | Anchors = [] |
| ... | ... | @@ -537,15 +482,15 @@ object frmMapaCacic: TfrmMapaCacic |
| 537 | 482 | Font.Style = [fsBold] |
| 538 | 483 | ParentColor = False |
| 539 | 484 | ParentFont = False |
| 540 | - TabOrder = 2 | |
| 485 | + TabOrder = 3 | |
| 541 | 486 | DesignSize = ( |
| 542 | 487 | 780 |
| 543 | 488 | 53) |
| 544 | 489 | object lbLeiaComAtencao: TLabel |
| 545 | - Left = 14 | |
| 546 | - Top = 18 | |
| 490 | + Left = 11 | |
| 491 | + Top = 21 | |
| 547 | 492 | Width = 769 |
| 548 | - Height = 32 | |
| 493 | + Height = 29 | |
| 549 | 494 | Anchors = [] |
| 550 | 495 | AutoSize = False |
| 551 | 496 | Caption = |
| ... | ... | @@ -560,83 +505,30 @@ object frmMapaCacic: TfrmMapaCacic |
| 560 | 505 | WordWrap = True |
| 561 | 506 | end |
| 562 | 507 | end |
| 563 | - object pnVersao: TPanel | |
| 564 | - Left = 676 | |
| 565 | - Top = 676 | |
| 566 | - Width = 105 | |
| 567 | - Height = 20 | |
| 568 | - Anchors = [akRight, akBottom] | |
| 569 | - BevelInner = bvLowered | |
| 570 | - Caption = 'Vers'#227'o' | |
| 571 | - Font.Charset = DEFAULT_CHARSET | |
| 572 | - Font.Color = clWindowText | |
| 573 | - Font.Height = -11 | |
| 574 | - Font.Name = 'MS Sans Serif' | |
| 575 | - Font.Style = [fsBold] | |
| 576 | - ParentFont = False | |
| 577 | - TabOrder = 3 | |
| 578 | - end | |
| 579 | - object pnMessageBox: TPanel | |
| 580 | - Left = 1 | |
| 581 | - Top = 246 | |
| 582 | - Width = 780 | |
| 583 | - Height = 45 | |
| 584 | - BevelInner = bvLowered | |
| 585 | - Color = clInactiveBorder | |
| 586 | - Font.Charset = DEFAULT_CHARSET | |
| 587 | - Font.Color = clMenuHighlight | |
| 588 | - Font.Height = -13 | |
| 589 | - Font.Name = 'Arial' | |
| 590 | - Font.Style = [] | |
| 591 | - ParentBackground = False | |
| 592 | - ParentFont = False | |
| 593 | - TabOrder = 4 | |
| 594 | - Visible = False | |
| 595 | - object lbMensagens: TLabel | |
| 596 | - Left = 2 | |
| 597 | - Top = 2 | |
| 598 | - Width = 776 | |
| 599 | - Height = 41 | |
| 600 | - Align = alClient | |
| 601 | - Alignment = taCenter | |
| 602 | - AutoSize = False | |
| 603 | - Color = clGrayText | |
| 604 | - Font.Charset = DEFAULT_CHARSET | |
| 605 | - Font.Color = clWindowText | |
| 606 | - Font.Height = -13 | |
| 607 | - Font.Name = 'MS Sans Serif' | |
| 608 | - Font.Style = [] | |
| 609 | - ParentColor = False | |
| 610 | - ParentFont = False | |
| 611 | - Layout = tlCenter | |
| 612 | - ExplicitLeft = -38 | |
| 613 | - ExplicitTop = 4 | |
| 614 | - end | |
| 615 | - end | |
| 616 | 508 | object timerMessageBoxShowOrHide: TTimer |
| 617 | 509 | Enabled = False |
| 618 | 510 | Interval = 500 |
| 619 | - Left = 34 | |
| 620 | - Top = 569 | |
| 511 | + Left = 50 | |
| 512 | + Top = 377 | |
| 621 | 513 | end |
| 622 | 514 | object timerMessageShowTime: TTimer |
| 623 | 515 | Enabled = False |
| 624 | 516 | Interval = 0 |
| 625 | 517 | OnTimer = timerMessageShowTimeTimer |
| 626 | - Left = 2 | |
| 627 | - Top = 569 | |
| 518 | + Left = 18 | |
| 519 | + Top = 377 | |
| 628 | 520 | end |
| 629 | 521 | object timerProcessos: TTimer |
| 630 | 522 | Enabled = False |
| 631 | 523 | Interval = 1 |
| 632 | 524 | OnTimer = timerProcessosTimer |
| 633 | - Left = 66 | |
| 634 | - Top = 569 | |
| 525 | + Left = 82 | |
| 526 | + Top = 377 | |
| 635 | 527 | end |
| 636 | 528 | object IdIPWatch1: TIdIPWatch |
| 637 | 529 | Active = False |
| 638 | 530 | HistoryFilename = 'iphist.dat' |
| 639 | - Left = 96 | |
| 640 | - Top = 568 | |
| 531 | + Left = 112 | |
| 532 | + Top = 376 | |
| 641 | 533 | end |
| 642 | 534 | end | ... | ... |
MapaTesteProj/MapaTeste.pas
| ... | ... | @@ -39,7 +39,11 @@ uses |
| 39 | 39 | Types, |
| 40 | 40 | IdIPWatch, |
| 41 | 41 | Registry, |
| 42 | - Math, IdBaseComponent, IdComponent; | |
| 42 | + Math, | |
| 43 | + IdBaseComponent, | |
| 44 | + IdComponent, | |
| 45 | + Mask, | |
| 46 | + ComObj; | |
| 43 | 47 | |
| 44 | 48 | function IsUserAnAdmin() : boolean; external shell32; |
| 45 | 49 | |
| ... | ... | @@ -58,48 +62,36 @@ var strCollectsPatrimonioLast, |
| 58 | 62 | |
| 59 | 63 | type |
| 60 | 64 | TfrmMapaCacic = class(TForm) |
| 61 | - btGravarInformacoes: TButton; | |
| 62 | 65 | edWebManagerAddress: TLabel; |
| 63 | - gbInformacoesSobreComputador: TGroupBox; | |
| 64 | - lbEtiqueta1: TLabel; | |
| 65 | - lbEtiqueta2: TLabel; | |
| 66 | - lbEtiqueta3: TLabel; | |
| 67 | - lbEtiqueta4: TLabel; | |
| 68 | - lbEtiqueta5: TLabel; | |
| 69 | - lbEtiqueta6: TLabel; | |
| 70 | - edTeInfoPatrimonio1: TEdit; | |
| 71 | - edTeInfoPatrimonio4: TEdit; | |
| 72 | - edTeInfoPatrimonio2: TEdit; | |
| 73 | - edTeInfoPatrimonio3: TEdit; | |
| 74 | - edTeInfoPatrimonio5: TEdit; | |
| 75 | - edTeInfoPatrimonio6: TEdit; | |
| 76 | - pnDivisoria01: TPanel; | |
| 77 | - btCombosUpdate: TButton; | |
| 78 | - gbLeiaComAtencao: TGroupBox; | |
| 79 | - lbLeiaComAtencao: TLabel; | |
| 80 | 66 | lbWebManagerAddress: TLabel; |
| 81 | 67 | pnVersao: TPanel; |
| 82 | 68 | timerMessageBoxShowOrHide: TTimer; |
| 83 | 69 | timerMessageShowTime: TTimer; |
| 84 | 70 | timerProcessos: TTimer; |
| 85 | - edTeInfoUserLogado: TEdit; | |
| 86 | - edTeInfoNomeComputador: TEdit; | |
| 87 | - edTeInfoCpfUser: TEdit; | |
| 88 | - edTeInfoIpComputador: TEdit; | |
| 71 | + IdIPWatch1: TIdIPWatch; | |
| 72 | + pnMessageBox: TPanel; | |
| 73 | + lbMensagens: TLabel; | |
| 74 | + gbLeiaComAtencao: TGroupBox; | |
| 75 | + lbLeiaComAtencao: TLabel; | |
| 76 | + gbInformacoesSobreComputador: TGroupBox; | |
| 77 | + lbEtiqueta5: TLabel; | |
| 78 | + lbEtiqueta6: TLabel; | |
| 89 | 79 | lbEtiquetaUserLogado: TLabel; |
| 90 | 80 | lbEtiquetaNomeComputador: TLabel; |
| 91 | - lbEtiquetaCpfUser: TLabel; | |
| 92 | 81 | lbEtiquetaIpComputador: TLabel; |
| 93 | - IdIPWatch1: TIdIPWatch; | |
| 94 | 82 | lbEtiquetaPatrimonioPc: TLabel; |
| 83 | + lbEtiquetaNome: TLabel; | |
| 84 | + edTeInfoPatrimonio5: TEdit; | |
| 85 | + edTeInfoPatrimonio6: TEdit; | |
| 86 | + btCombosUpdate: TButton; | |
| 87 | + edTeInfoUserLogado: TEdit; | |
| 88 | + edTeInfoNomeComputador: TEdit; | |
| 89 | + edTeInfoIpComputador: TEdit; | |
| 95 | 90 | edTePatrimonioPc: TEdit; |
| 96 | 91 | edTeInfoNome: TEdit; |
| 97 | - lbEtiquetaNome: TLabel; | |
| 98 | 92 | bgTermoResponsabilidade: TGroupBox; |
| 99 | - mmTermoResponsabilidade: TMemo; | |
| 100 | 93 | rdConcordaTermos: TRadioButton; |
| 101 | - pnMessageBox: TPanel; | |
| 102 | - lbMensagens: TLabel; | |
| 94 | + btGravarInformacoes: TButton; | |
| 103 | 95 | |
| 104 | 96 | procedure FormCreate(Sender: TObject); |
| 105 | 97 | procedure AtualizaPatrimonio(Sender: TObject); |
| ... | ... | @@ -109,13 +101,15 @@ type |
| 109 | 101 | procedure btCombosUpdateClick(Sender: TObject); |
| 110 | 102 | procedure timerMessageShowTimeTimer(Sender: TObject); |
| 111 | 103 | procedure timerProcessosTimer(Sender: TObject); |
| 104 | + procedure rdConcordaTermosClick(Sender: TObject); | |
| 105 | + procedure EstadoBarraTarefa(EstadoBarra: Boolean); | |
| 106 | + | |
| 112 | 107 | function NomeComputador : String; |
| 113 | 108 | function UserName : String; |
| 114 | 109 | function getConfigs : String; |
| 115 | 110 | function SetCpfUser : String; |
| 116 | 111 | function SetPatrimonioPC : String; |
| 117 | 112 | function FormatarCpf(strCpfUser : String) : String; |
| 118 | - procedure rdConcordaTermosClick(Sender: TObject); | |
| 119 | 113 | |
| 120 | 114 | |
| 121 | 115 | private |
| ... | ... | @@ -124,9 +118,10 @@ type |
| 124 | 118 | strTeInfoPatrimonio3, |
| 125 | 119 | strTeInfoPatrimonio4, |
| 126 | 120 | strTeInfoPatrimonio5, |
| 127 | - strTeInfoPatrimonio6 : String; | |
| 121 | + strTeInfoPatrimonio6, | |
| 122 | + strTeInfoPatrimonio7 : String; | |
| 128 | 123 | |
| 129 | - procedure SetFocus; | |
| 124 | + procedure FormSetFocus; | |
| 130 | 125 | procedure MontaInterface; |
| 131 | 126 | procedure RecuperaValoresAnteriores; |
| 132 | 127 | procedure Sair; |
| ... | ... | @@ -287,10 +282,12 @@ begin |
| 287 | 282 | end; |
| 288 | 283 | |
| 289 | 284 | function TfrmMapaCacic.getConfigs : String; |
| 285 | + | |
| 290 | 286 | Begin |
| 291 | 287 | btCombosUpdate.Enabled := false; |
| 292 | 288 | |
| 293 | 289 | Result := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/config', strFieldsAndValuesToRequest,objCacic.getLocalFolderName); |
| 290 | + | |
| 294 | 291 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 295 | 292 | |
| 296 | 293 | objCacic.writeDebugLog('FormActivate: Retorno de getConfigs: "'+Result+'"'); |
| ... | ... | @@ -300,14 +297,18 @@ Begin |
| 300 | 297 | Mensagem('Comunicação Efetuada com Sucesso! Salvando as Configurações Obtidas...',false,1); |
| 301 | 298 | objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName); |
| 302 | 299 | objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName); |
| 303 | - objCacic.setValueToFile('Collects','Patrimonio_Last' , objCacic.getValueFromTags('Collects_Patrimonio_Last' , Result), strGerColsInfFileName); | |
| 304 | - End; | |
| 300 | +//Linha comentada, pois gerente não está mandando as configurações adequadas. | |
| 301 | + //objCacic.setValueToFile('Collects','Patrimonio_Last' , objCacic.getValueFromTags('Collects_Patrimonio_Last' , Result), strGerColsInfFileName); | |
| 302 | + End | |
| 303 | + else | |
| 304 | + begin | |
| 305 | + MessageDlg(#13#13+'Não foi possível realizar a conexão!',mtError, [mbOK], 0); | |
| 306 | + end; | |
| 305 | 307 | btCombosUpdate.Enabled := true; |
| 306 | 308 | End; |
| 307 | 309 | |
| 308 | 310 | procedure TfrmMapaCacic.RecuperaValoresAnteriores; |
| 309 | -var strCollectsPatrimonioLast, | |
| 310 | - strConfigsPatrimonioInterface : String; | |
| 311 | +var strCollectsPatrimonioLast : String; | |
| 311 | 312 | begin |
| 312 | 313 | btCombosUpdate.Enabled := false; |
| 313 | 314 | |
| ... | ... | @@ -319,12 +320,6 @@ begin |
| 319 | 320 | |
| 320 | 321 | if (strCollectsPatrimonioLast <> '') then |
| 321 | 322 | Begin |
| 322 | - strConfigsPatrimonioInterface := objCacic.deCrypt( objCacic.GetValueFromFile | |
| 323 | - ('Configs','Patrimonio_Interface', | |
| 324 | - strGerColsInfFileName)); | |
| 325 | - | |
| 326 | - lbEtiqueta1.Caption := objCacic.getValueFromTags('te_etiqueta1', | |
| 327 | - strConfigsPatrimonioInterface); | |
| 328 | 323 | |
| 329 | 324 | if (strTeInfoPatrimonio1='') then |
| 330 | 325 | strTeInfoPatrimonio1 := objCacic.getValueFromTags('TeInfoPatrimonio1', |
| ... | ... | @@ -344,6 +339,9 @@ begin |
| 344 | 339 | if (strTeInfoPatrimonio6='') then |
| 345 | 340 | strTeInfoPatrimonio6 := objCacic.getValueFromTags('TeInfoPatrimonio6', |
| 346 | 341 | strCollectsPatrimonioLast); |
| 342 | + if (strTeInfoPatrimonio7='') then | |
| 343 | + strTeInfoPatrimonio7 := objCacic.getValueFromTags('TeInfoPatrimonio7', | |
| 344 | + strCollectsPatrimonioLast); | |
| 347 | 345 | End; |
| 348 | 346 | btCombosUpdate.Enabled := true; |
| 349 | 347 | Application.ProcessMessages; |
| ... | ... | @@ -358,16 +356,13 @@ begin |
| 358 | 356 | |
| 359 | 357 | strFieldsAndValuesToRequest := 'CollectType=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt('col_patr')) ; |
| 360 | 358 | |
| 361 | - strColetaAtual := StringReplace('[TeInfoPatrimonio]' + edTePatrimonioPc.Text + '[/TeInfoPatrimonio]' + | |
| 362 | - '[TeInfoUser]' + edTeInfoUserLogado.Text + '[/TeInfoUser]' + | |
| 363 | - '[TeInfoNome]' + edTeInfoNome.Text + '[/TeInfoNome]' + | |
| 364 | - '[TeInfoCpfUser]' + edTeInfoCpfUser.Text + '[/TeInfoCpfUser]' + | |
| 365 | - '[TeInfoPatrimonio1]' + edTeInfoPatrimonio1.Text + '[/TeInfoPatrimonio1]' + | |
| 366 | - '[TeInfoPatrimonio2]' + edTeInfoPatrimonio2.Text + '[/TeInfoPatrimonio2]' + | |
| 367 | - '[TeInfoPatrimonio3]' + edTeInfoPatrimonio3.Text + '[/TeInfoPatrimonio3]' + | |
| 368 | - '[TeInfoPatrimonio4]' + edTeInfoPatrimonio4.Text + '[/TeInfoPatrimonio4]' + | |
| 369 | - '[TeInfoPatrimonio5]' + edTeInfoPatrimonio5.Text + '[/TeInfoPatrimonio5]' + | |
| 370 | - '[TeInfoPatrimonio6]' + edTeInfoPatrimonio6.Text + '[/TeInfoPatrimonio6]',',','[[COMMA]]',[rfReplaceAll]); | |
| 359 | + strColetaAtual := StringReplace('[TeInfoPatrimonio1]' + edTePatrimonioPc.Text + '[/TeInfoPatrimonio1]' + | |
| 360 | + '[TeInfoPatrimonio2]' + edTeInfoUserLogado.Text + '[/TeInfoPatrimonio2]' + | |
| 361 | + '[TeInfoPatrimonio3]' + edTeInfoNome.Text + '[/TeInfoPatrimonio3]' + | |
| 362 | + '[TeInfoPatrimonio4]' + edTeInfoIpComputador.Text + '[/TeInfoPatrimonio4]' + | |
| 363 | + '[TeInfoPatrimonio5]' + edTeInfoNomeComputador.Text+ '[/TeInfoPatrimonio5]' + | |
| 364 | + '[TeInfoPatrimonio6]' + edTeInfoPatrimonio5.Text + '[/TeInfoPatrimonio6]' + | |
| 365 | + '[TeInfoPatrimonio7]' + edTeInfoPatrimonio6.Text + '[/TeInfoPatrimonio7]',',','[[COMMA]]',[rfReplaceAll]); | |
| 371 | 366 | |
| 372 | 367 | strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',col_patr=' + |
| 373 | 368 | objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(strColetaAtual)); |
| ... | ... | @@ -389,6 +384,7 @@ begin |
| 389 | 384 | objCacic.writeDebugLog(#13#10 + 'AtualizaPatrimonio: Dados Enviados ao Servidor!'); |
| 390 | 385 | Application.ProcessMessages; |
| 391 | 386 | |
| 387 | + EstadoBarraTarefa(TRUE); | |
| 392 | 388 | Finalizar(true); |
| 393 | 389 | |
| 394 | 390 | end; |
| ... | ... | @@ -401,13 +397,6 @@ Begin |
| 401 | 397 | |
| 402 | 398 | Mensagem('Montando Interface para Coleta de Informações...',false,1); |
| 403 | 399 | |
| 404 | -//-------------------------PATRIMONIO DA MAQUINA-------------------------------- | |
| 405 | - edTePatrimonioPc.Text := SetPatrimonioPc; | |
| 406 | - if edTePatrimonioPc.Text <> '' then | |
| 407 | - Begin | |
| 408 | - lbEtiquetaPatrimonioPc.Visible := true; | |
| 409 | - edTePatrimonioPc.Visible := true; | |
| 410 | - end; | |
| 411 | 400 | |
| 412 | 401 | //-------------------------------NOME USUARIO----------------------------------- |
| 413 | 402 | edTeInfoNome.Text := 'Nome'; |
| ... | ... | @@ -424,6 +413,8 @@ Begin |
| 424 | 413 | lbEtiquetaNomeComputador.Visible := true; |
| 425 | 414 | edTeInfoNomeComputador.Visible := true; |
| 426 | 415 | end; |
| 416 | + lbEtiquetaNomeComputador.Visible := true; | |
| 417 | + edTeInfonomeComputador.Visible := true; | |
| 427 | 418 | |
| 428 | 419 | //-----------------------------USUARIO LOGADO----------------------------------- |
| 429 | 420 | |
| ... | ... | @@ -436,12 +427,12 @@ Begin |
| 436 | 427 | |
| 437 | 428 | //-------------------------------CPF USUARIO------------------------------------ |
| 438 | 429 | |
| 439 | - edTeInfoCpfUser.Text := FormatarCpf(SetCpfUser); | |
| 430 | +{ edTeInfoCpfUser.Text := FormatarCpf(SetCpfUser); | |
| 440 | 431 | if edTeInfoCpfUser.Text <> '' then |
| 441 | 432 | begin |
| 442 | 433 | lbEtiquetaCpfUser.Visible := true; |
| 443 | 434 | edTeInfoCpfUser.Visible := true; |
| 444 | - end; | |
| 435 | + end;} | |
| 445 | 436 | |
| 446 | 437 | //-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT------------------------------------- |
| 447 | 438 | edTeInfoIpComputador.Text := idipwatch1.LocalIP; |
| ... | ... | @@ -451,11 +442,22 @@ Begin |
| 451 | 442 | edTeInfoIpComputador.Visible := true; |
| 452 | 443 | end; |
| 453 | 444 | |
| 445 | +//-------------------------PATRIMONIO DA MAQUINA-------------------------------- | |
| 446 | +{ edTePatrimonioPc.Text := SetPatrimonioPc; | |
| 447 | + if edTePatrimonioPc.Text <> '' then | |
| 448 | + Begin | |
| 449 | + lbEtiquetaPatrimonioPc.Visible := true; | |
| 450 | + edTePatrimonioPc.Visible := true; | |
| 451 | + end;} | |
| 452 | + edTePatrimonioPc.Text := strTeInfoPatrimonio1; | |
| 453 | + edTePatrimonioPc.Visible := true; | |
| 454 | + lbEtiquetaPatrimonioPc.Visible := true; | |
| 455 | + | |
| 454 | 456 | |
| 455 | 457 | //----------VALOR DE strGerColsInfFileName ALTERADO PARA ARQUIVO TESTE----------------------------- |
| 456 | - strConfigsPatrimonioInterface := objCacic.deCrypt( objCacic.getValueFromFile('Configs','Patrimonio_Interface',strGerColsInfFileName)); | |
| 458 | + strConfigsPatrimonioInterface := objCacic.deCrypt(objCacic.getValueFromFile('Configs','Patrimonio_Interface',strGerColsInfFileName)); | |
| 457 | 459 | |
| 458 | - objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta1 -> "' + | |
| 460 | + { objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueobjCacic.enCta1 -> "' + | |
| 459 | 461 | objCacic.getValueFromTags('in_exibir_etiqueta1', |
| 460 | 462 | strConfigsPatrimonioInterface)+'"'); |
| 461 | 463 | |
| ... | ... | @@ -470,7 +472,7 @@ Begin |
| 470 | 472 | |
| 471 | 473 | objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta2 -> "' + |
| 472 | 474 | objCacic.getValueFromTags('in_exibir_etiqueta2', |
| 473 | - strConfigsPatrimonioInterface)+'"'); | |
| 475 | + strConfigsPatrimonioInterface)+'"'); | |
| 474 | 476 | |
| 475 | 477 | if (trim(objCacic.getValueFromTags('in_exibir_etiqueta2', strConfigsPatrimonioInterface)) = 'S') then |
| 476 | 478 | begin |
| ... | ... | @@ -505,33 +507,33 @@ Begin |
| 505 | 507 | edTeInfoPatrimonio4.Hint := objCacic.getValueFromTags('te_help_etiqueta4', strConfigsPatrimonioInterface); |
| 506 | 508 | edTeInfoPatrimonio4.Text := strTeInfoPatrimonio4; |
| 507 | 509 | edTeInfoPatrimonio4.visible := True; |
| 508 | - end; | |
| 510 | + end; } | |
| 509 | 511 | |
| 510 | - objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta5 -> "' + | |
| 511 | - objCacic.getValueFromTags('in_exibir_etiqueta5', | |
| 512 | - strConfigsPatrimonioInterface)+'"'); | |
| 512 | +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta5 -> "' + | |
| 513 | +// objCacic.getValueFromTags('in_exibir_etiqueta5', | |
| 514 | +// strConfigsPatrimonioInterface)+'"'); | |
| 513 | 515 | |
| 514 | - if (trim(objCacic.getValueFromTags('in_exibir_etiqueta5', strConfigsPatrimonioInterface)) = 'S') then | |
| 515 | - begin | |
| 516 | - lbEtiqueta5.Caption := objCacic.getValueFromTags('te_etiqueta5', strConfigsPatrimonioInterface); | |
| 516 | +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta5', strConfigsPatrimonioInterface)) = 'S') then | |
| 517 | +// begin | |
| 518 | + //lbEtiqueta5.Caption := objCacic.getValueFromTags('te_etiqueta5', strConfigsPatrimonioInterface); | |
| 517 | 519 | lbEtiqueta5.Visible := true; |
| 518 | 520 | edTeInfoPatrimonio5.Hint := objCacic.getValueFromTags('te_help_etiqueta5', strConfigsPatrimonioInterface); |
| 519 | - edTeInfoPatrimonio5.Text := strTeInfoPatrimonio5; | |
| 521 | + edTeInfoPatrimonio5.Text := strTeInfoPatrimonio6; | |
| 520 | 522 | edTeInfoPatrimonio5.visible := True; |
| 521 | - end; | |
| 523 | +// end; | |
| 522 | 524 | |
| 523 | - objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' + | |
| 524 | - objCacic.getValueFromTags('in_exibir_etiqueta6', | |
| 525 | - strConfigsPatrimonioInterface)+'"'); | |
| 525 | +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' + | |
| 526 | +// objCacic.getValueFromTags('in_exibir_etiqueta6', | |
| 527 | +// strConfigsPatrimonioInterface)+'"'); | |
| 526 | 528 | |
| 527 | - if (trim(objCacic.getValueFromTags('in_exibir_etiqueta6', strConfigsPatrimonioInterface)) = 'S') then | |
| 528 | - begin | |
| 529 | - lbEtiqueta6.Caption := objCacic.getValueFromTags('te_etiqueta6', strConfigsPatrimonioInterface); | |
| 529 | +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta6', strConfigsPatrimonioInterface)) = 'S') then | |
| 530 | +// begin | |
| 531 | + //lbEtiqueta6.Caption := objCacic.getValueFromTags('te_etiqueta6', strConfigsPatrimonioInterface); | |
| 530 | 532 | lbEtiqueta6.Visible := true; |
| 531 | 533 | edTeInfoPatrimonio6.Hint := objCacic.getValueFromTags('te_help_etiqueta6', strConfigsPatrimonioInterface); |
| 532 | - edTeInfoPatrimonio6.Text := strTeInfoPatrimonio6; | |
| 534 | + edTeInfoPatrimonio6.Text := strTeInfoPatrimonio7; | |
| 533 | 535 | edTeInfoPatrimonio6.visible := True; |
| 534 | - end; | |
| 536 | +// end; | |
| 535 | 537 | |
| 536 | 538 | Mensagem('',false,1); |
| 537 | 539 | btGravarInformacoes.Visible := true; |
| ... | ... | @@ -584,8 +586,11 @@ begin |
| 584 | 586 | |
| 585 | 587 | //Se foco for verdadeiro, executar procedimento SetFocus, o qual modifica |
| 586 | 588 | //propriedades do form e starta o timer para esconder o processo no gerenciador. |
| 587 | - if foco then | |
| 588 | - SetFocus; | |
| 589 | + if foco then | |
| 590 | + begin | |
| 591 | + //TfrmMapaCacic.OnChange := FormSetFocus; | |
| 592 | + FormSetFocus; | |
| 593 | + end; | |
| 589 | 594 | |
| 590 | 595 | if IsUserAnAdmin then |
| 591 | 596 | Begin |
| ... | ... | @@ -620,8 +625,8 @@ begin |
| 620 | 625 | //agente instalado estava excluíndo sempre que o mesmo era criado, dando conflito |
| 621 | 626 | //com o Mapa. |
| 622 | 627 | |
| 623 | - //AssignFile(textFileAguarde,objCacic.getLocalFolderName + | |
| 624 | - // '\temp\aguarde_MAPACACIC.txt'); //Associa o arquivo a uma variável do tipo TextFile | |
| 628 | + AssignFile(textFileAguarde,objCacic.getLocalFolderName + | |
| 629 | + '\temp\aguarde_MAPACACIC.txt'); //Associa o arquivo a uma variável do tipo TextFile | |
| 625 | 630 | |
| 626 | 631 | AssignFile(textFileAguarde, 'C:\Documents and Settings\adriano\Desktop\TesteLerArquivo\aguarde_MAPACACIC.txt'); |
| 627 | 632 | |
| ... | ... | @@ -669,7 +674,7 @@ begin |
| 669 | 674 | MessageDLG(#13#10+'ATENÇÃO! Essa aplicação requer execução com nível administrativo.',mtError,[mbOK],0); |
| 670 | 675 | objCacic.writeDailyLog('SEM PRIVILÉGIOS: Necessário ser administrador "local" ou de Domínio!'); |
| 671 | 676 | Sair; |
| 672 | - End | |
| 677 | + End | |
| 673 | 678 | Finally |
| 674 | 679 | End; |
| 675 | 680 | end; |
| ... | ... | @@ -701,17 +706,45 @@ end; |
| 701 | 706 | //------------------------------------------------------------------------------ |
| 702 | 707 | //PROCEDURE CRIADO PARA DEIXAR O FORM FULLSCREEN E FOCADO, SEM QUE SEJA POSSÍVEL |
| 703 | 708 | //FECHAR OU ALTERNAR ENTRE OUTRAS JANELAS ATÉ QUE ATUALIZE O PATRIMONIO. |
| 704 | -procedure TfrmMapaCacic.SetFocus; | |
| 709 | +procedure TfrmMapaCacic.FormSetFocus; | |
| 705 | 710 | var |
| 706 | 711 | r : TRect; |
| 707 | 712 | begin |
| 708 | - Fechar := False; | |
| 709 | - BorderIcons := BorderIcons - [biSystemMenu] - [biMinimize] - [biMaximize]; | |
| 710 | - BorderStyle := bsNone; | |
| 711 | - FormStyle := fsStayOnTop; | |
| 713 | + Fechar := False; | |
| 714 | + BorderIcons := BorderIcons - [biSystemMenu] - [biMinimize] - [biMaximize]; | |
| 715 | + BorderStyle := bsNone; | |
| 716 | + FormStyle := fsStayOnTop; | |
| 717 | + timerProcessos.Enabled := True; | |
| 712 | 718 | SystemParametersInfo(SPI_GETWORKAREA, 0, @r,0); |
| 713 | 719 | SetBounds(r.Left, r.Top, r.Right-r.Left, r.Bottom-r.Top); |
| 714 | - timerProcessos.Enabled := True; | |
| 720 | + Top := 0; | |
| 721 | + Left := 0; | |
| 722 | + Width := Screen.Width; | |
| 723 | + Height := Screen.Height; | |
| 724 | + EstadoBarraTarefa(FALSE); | |
| 725 | + | |
| 726 | +end; | |
| 727 | + | |
| 728 | +//------------------------------------------------------------------------------ | |
| 729 | +//----------------ESCONDE BARRA DE TAREFAS-------------------------------------- | |
| 730 | +//------------------------------------------------------------------------------ | |
| 731 | + | |
| 732 | +procedure TfrmMapaCacic.EstadoBarraTarefa(EstadoBarra: Boolean); | |
| 733 | + | |
| 734 | +var wndHandle : THandle; | |
| 735 | + wndClass : array[0..50] of Char; | |
| 736 | + | |
| 737 | +begin | |
| 738 | + | |
| 739 | + StrPCopy(@wndClass[0],'Shell_TrayWnd'); | |
| 740 | + wndHandle := FindWindow(@wndClass[0], nil); | |
| 741 | + | |
| 742 | + If EstadoBarra=True Then | |
| 743 | + ShowWindow(wndHandle, SW_RESTORE) {Mostra a barra de tarefas} | |
| 744 | + | |
| 745 | + Else | |
| 746 | + ShowWindow(wndHandle, SW_HIDE); {Esconde a barra de tarefas} | |
| 747 | + | |
| 715 | 748 | end; |
| 716 | 749 | |
| 717 | 750 | //------------------------------------------------------------------------------ |
| ... | ... | @@ -782,4 +815,55 @@ begin |
| 782 | 815 | end; |
| 783 | 816 | end; |
| 784 | 817 | |
| 818 | +{raiz ldap | |
| 819 | +ou=bsa,ou=regbsa,ou=pgfn,dc=mf,dc=gov,dc=br | |
| 820 | + | |
| 821 | +usuário: ldap | |
| 822 | +senha: nova4275 | |
| 823 | + | |
| 824 | +host: 10.72.160.21 | |
| 825 | +host: 10.72.160.20 | |
| 826 | + | |
| 827 | +-- | |
| 828 | + } | |
| 829 | +{ | |
| 830 | +function connectLDAP(sADForestName, sADUserName, sADGroupName: string); | |
| 831 | +var ADOConnection, ADOCmd, Res: Variant; | |
| 832 | + sBase, | |
| 833 | + sFilter, | |
| 834 | + sAttributes, | |
| 835 | + user: string; | |
| 836 | + | |
| 837 | +Begin | |
| 838 | + ADOConnection := CreateOleObject('ADODB.Connection'); | |
| 839 | + ADOCmd := CreateOleObject('ADODB.Command'); | |
| 840 | + try | |
| 841 | + ADOConnection.Provider := 'ADsDSOObject'; | |
| 842 | + ADOConnection.Open('Active Directory Provider'); | |
| 843 | + ADOCmd.ActiveConnection := ADOConnection; | |
| 844 | + ADOCmd.Properties('Page Size') := 100; | |
| 845 | + ADOCmd.Properties('Timeout') := 30; | |
| 846 | + ADOCmd.Properties('Cache Results') := False; | |
| 847 | +//'SELECT Name, whenCreated FROM \'''LDAP://' + raiz + '''' WHERE objectClass='''user'''' | |
| 848 | + sBase := '<GC://' + sADForestName+ '>'; | |
| 849 | + sFilter := '(&(objectCategory=person)(objectClass=user)' + | |
| 850 | + '(distinguishedName=' + sADUserName + ')' + | |
| 851 | + '(memberOf:1.2.840.113556.1.4.1941:=' + sADGroupName + '))'; | |
| 852 | + sAttributes := 'sAMAccountName'; | |
| 853 | + | |
| 854 | + //ADOCmd.CommandText := sBase + ';' + sFilter + ';' + sAttributes + ';subtree'; | |
| 855 | + ADOCmd.CommandText := 'SELECT Name, whenCreated FROM \''''LDAP://' + raiz + '''' WHERE objectClass='''user'''; | |
| 856 | + Res := AdoCmd.Execute; | |
| 857 | + | |
| 858 | + if Res.EOF then | |
| 859 | + User := '' | |
| 860 | + else | |
| 861 | + User := Res.Fields[0].Value; | |
| 862 | + finally | |
| 863 | + ADOCmd := Nil; | |
| 864 | + ADOConnection.Close; | |
| 865 | + ADOConnection := Nil; | |
| 866 | + end; | |
| 867 | +end; | |
| 868 | + } | |
| 785 | 869 | end. | ... | ... |