Download as
Browse Code »

Commit 00f1d9155bd56fc272cd7abc07ff49d22ffe1ae2

Authored by José Maria Villac Pinheiro
1 parent 609e20c2
Exists in master and in 2 other branches main, textosRedesEsgoto

Alterada coluna do objectid. Necessário revisar esta parte do código para não ne… 

…cessitar esta alteração futuramente.
Showing 15 changed files with 43 additions and 39 deletions   Show diff stats
install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe
View file @00f1d91
No preview for this file type
install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss
  Diff comments   View file @00f1d91
1 1 #define SetupBaseName "SetupGeoSan-v."
2   -#define AppVersionFile "07.05.06"
  2 +#define AppVersionFile "08.00.01"
3 3  
4 4 [Setup]
5 5 AppName=GeoSan
... ...
install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe 0 → 100644
View file @00f1d91
No preview for this file type
trunk/Controles/variaveisGlobais.txt
View file @00f1d91
No preview for this file type
trunk/Forms/frmCanvas.frm
  Diff comments   View file @00f1d91
1 1 VERSION 5.00
2 2 Object = "{18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0"; "TeComCanvas.dll"
3   -Object = "{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0"; "TeComConnection.dll"
4 3 Object = "{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0"; "TeComDatabase.dll"
  4 +Object = "{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0"; "TeComConnection.dll"
5 5 Object = "{EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0"; "TeComViewDatabase.dll"
6 6 Begin VB.Form frmCanvas
7 7 Caption = "Mapa"
8   - ClientHeight = 5955
  8 + ClientHeight = 5952
9 9 ClientLeft = 60
10   - ClientTop = 450
  10 + ClientTop = 456
11 11 ClientWidth = 7680
12 12 Icon = "frmCanvas.frx":0000
13 13 KeyPreview = -1 'True
14 14 LinkTopic = "Form1"
15 15 MDIChild = -1 'True
16   - ScaleHeight = 5955
  16 + ScaleHeight = 5952
17 17 ScaleWidth = 7680
18 18 WindowState = 2 'Maximized
19 19 Begin TECOMCANVASLibCtl.TeCanvas TCanvas
... ... @@ -33,7 +33,7 @@ Begin VB.Form frmCanvas
33 33 Caption = "Ajustar Escala"
34 34 BeginProperty Font
35 35 Name = "MS Sans Serif"
36   - Size = 8.25
  36 + Size = 7.8
37 37 Charset = 0
38 38 Weight = 700
39 39 Underline = 0 'False
... ... @@ -67,7 +67,7 @@ Begin VB.Form frmCanvas
67 67 Caption = "Tamanho das Redes"
68 68 BeginProperty Font
69 69 Name = "MS Sans Serif"
70   - Size = 8.25
  70 + Size = 7.8
71 71 Charset = 0
72 72 Weight = 700
73 73 Underline = 0 'False
... ... @@ -233,7 +233,7 @@ Private Sub InsereLigacaoNoRamalSelecionado(object_id_ramalSelecionado As Long,
233 233 Conn.BeginTrans
234 234 debugCodigoErro = "0"
235 235 Set rsInsereRamaisAguaLigacao = New ADODB.Recordset
236   - strAbreConexaoInsereRamaisAguaLigacao = "SELECT NRO_LIGACA, VOL_FATURA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidoreSelecionado)
  236 + strAbreConexaoInsereRamaisAguaLigacao = "SELECT NRO_LIGACA, VOL_FATURA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_272 = " + CStr(object_id_consumidoreSelecionado)
237 237 debugCodigoErro = "1 - Select: " & strAbreConexaoInsereRamaisAguaLigacao
238 238 rsInsereRamaisAguaLigacao.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText
239 239  
... ... @@ -251,12 +251,12 @@ Private Sub InsereLigacaoNoRamalSelecionado(object_id_ramalSelecionado As Long,
251 251 '3 - Apaga NX GPS
252 252 debugCodigoErro = "2"
253 253 Set rsApagaLigacaoGpsCadastrada = New ADODB.Recordset
254   - strApagaLigacaoGpsCadastrada = "SELECT NRO_LIGACA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado)
  254 + strApagaLigacaoGpsCadastrada = "SELECT NRO_LIGACA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_272 = " + CStr(object_id_consumidorSelecionado)
255 255 rsApagaLigacaoGpsCadastrada.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText
256   - strApagaLigacaoGpsCadastrada = "DELETE FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado)
  256 + strApagaLigacaoGpsCadastrada = "DELETE FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_272 = " + CStr(object_id_consumidorSelecionado)
257 257 Conn.execute (strApagaLigacaoGpsCadastrada)
258 258 debugCodigoErro = "3"
259   - strApagaGeometriaDaLigacaoGpsCadastrada = "DELETE FROM POINTS331 WHERE object_id = " + CStr(object_id_consumidoreSelecionado)
  259 + strApagaGeometriaDaLigacaoGpsCadastrada = "DELETE FROM POINTS272 WHERE object_id = " + CStr(object_id_consumidoreSelecionado)
260 260 Conn.execute (strApagaGeometriaDaLigacaoGpsCadastrada)
261 261 rsApagaLigacaoGpsCadastrada.Close
262 262 Conn.CommitTrans
... ... @@ -399,7 +399,7 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A
399 399 debugCodigoErro = "4"
400 400 dataCadastroLigacao = Now
401 401 Set rsInsereRamaisAguaLigacao = New ADODB.Recordset
402   - strAbreConexaoInsereRamaisAguaLigacao = "SELECT NRO_LIGACA, VOL_FATURA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado)
  402 + strAbreConexaoInsereRamaisAguaLigacao = "SELECT NRO_LIGACA, VOL_FATURA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_272 = " + CStr(object_id_consumidorSelecionado)
403 403 debugCodigoErro = "5 - Select: " & strAbreConexaoInsereRamaisAguaLigacao
404 404 rsInsereRamaisAguaLigacao.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText
405 405 'Inicia a atualização de RAMAIS_AGUA com todos os dados
... ... @@ -415,12 +415,12 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A
415 415 '6 - Apaga NX GPS
416 416 debugCodigoErro = "6"
417 417 Set rsApagaLigacaoGpsCadastrada = New ADODB.Recordset
418   - strApagaLigacaoGpsCadastrada = "SELECT NRO_LIGACA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado)
  418 + strApagaLigacaoGpsCadastrada = "SELECT NRO_LIGACA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_272 = " + CStr(object_id_consumidorSelecionado)
419 419 rsApagaLigacaoGpsCadastrada.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText
420   - strApagaLigacaoGpsCadastrada = "DELETE FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado)
  420 + strApagaLigacaoGpsCadastrada = "DELETE FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_272 = " + CStr(object_id_consumidorSelecionado)
421 421 Conn.execute (strApagaLigacaoGpsCadastrada)
422 422 debugCodigoErro = "7"
423   - strApagaGeometriaDaLigacaoGpsCadastrada = "DELETE FROM POINTS331 WHERE object_id = " + CStr(object_id_consumidorSelecionado)
  423 + strApagaGeometriaDaLigacaoGpsCadastrada = "DELETE FROM POINTS272 WHERE object_id = " + CStr(object_id_consumidorSelecionado)
424 424 Conn.execute (strApagaGeometriaDaLigacaoGpsCadastrada)
425 425 rsApagaLigacaoGpsCadastrada.Close
426 426 Conn.CommitTrans
... ...
trunk/GeoSan.exe
View file @00f1d91
No preview for this file type
trunk/GeoSan.vbp
  Diff comments   View file @00f1d91
... ... @@ -19,9 +19,14 @@ Reference=*\G{2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0#C:\Arquivos de Program
19 19 Reference=*\G{E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComNetwork.dll#TeComNetwork 4.0.0
20 20 Reference=*\G{F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComPrinter.dll#TeComPrinter 1.0 Type Library
21 21 Reference=*\G{EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComViewDatabase.dll#TeComViewDatabase 1.0 Type Library
22   -Reference=*\G{F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComViewManager.dll#TeComViewManager 4.0.0
23 22 Object={18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0; TeComCanvas.dll
24 23 Object={87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0; TeComDatabase.dll
  24 +Object={F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0; TeComPrinter.dll
  25 +Object={E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0; TeComNetwork.dll
  26 +Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll
  27 +Object={EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0; TeComViewDatabase.dll
  28 +Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll
  29 +Object={C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0; TeComExport.dll
25 30 Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
26 31 Object={5E9E78A0-531B-11CF-91F6-C2863C385E30}#1.0#0; MSFLXGRD.OCX
27 32 Object={65E121D4-0C60-11D2-A9FC-0000F8754DA1}#2.0#0; MSCHRT20.OCX
... ... @@ -133,13 +138,7 @@ Class=clsRamalModel; classes\clsRamalModel.cls
133 138 Class=clsRamalController; classes\clsRamalController.cls
134 139 Class=clsConsumidorModel; classes\clsConsumidorModel.cls
135 140 Class=clsConsumidorControler; classes\clsConsumidorControler.cls
136   -Object={F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0; TeComPrinter.dll
137   -Object={E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0; TeComNetwork.dll
138   -Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll
139 141 Object={F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0; TeComViewManager.dll
140   -Object={EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0; TeComViewDatabase.dll
141   -Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll
142   -Object={C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0; TeComExport.dll
143 142 ResFile32="GeoSan.RES"
144 143 IconForm="FrmMain"
145 144 Startup="Sub Main"
... ... @@ -151,9 +150,9 @@ Command32=""
151 150 Name="GeoSan"
152 151 HelpContextID="0"
153 152 CompatibleMode="0"
154   -MajorVer=7
155   -MinorVer=5
156   -RevisionVer=6
  153 +MajorVer=8
  154 +MinorVer=0
  155 +RevisionVer=1
157 156 AutoIncrementVer=0
158 157 ServerSupportFiles=0
159 158 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
... ...
trunk/GeoSan.vbw
  Diff comments   View file @00f1d91
1   -Global = 78, 7, 1036, 696,
  1 +Global = 78, 7, 1036, 696, C
2 2 calcDetecta = 0, 0, 0, 0, C
3 3 FrmCreatTextForLayer = 0, 0, 0, 0, C, 132, 132, 1251, 864, C
4 4 frmAbout = 0, 0, 0, 0, C, 154, 154, 1273, 886, C
... ... @@ -7,7 +7,7 @@ FrmMain = 16, 71, 1497, 969, C, 139, 12, 1258, 744, C
7 7 FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C
8 8 FrmCadastroRamal = 63, 13, 1453, 868, C, 45, 39, 1164, 771, C
9 9 frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C
10   -frmCanvas = 12, 33, 1452, 829, C, 110, 110, 1229, 842, C
  10 +frmCanvas = 12, 33, 1492, 898, C, 110, 110, 1229, 842, C
11 11 frmConsumidoresDesabastecidos = 110, 110, 1229, 842, C, 308, 308, 1427, 1040, C
12 12 frmConsumoLote = 150, 150, 1296, 781, C, 330, 330, 1449, 1062, C
13 13 frmConsumoLoteGraf = 175, 175, 1321, 806, C, 352, 352, 1471, 1084, C
... ... @@ -75,7 +75,7 @@ CDistanciaEquivalente = 0, 0, 0, 0, C
75 75 CDuasLinhas = 0, 0, 0, 0, C
76 76 CLine2D = 0, 0, 0, 0, C
77 77 CLocalizaTrechos = 0, 0, 0, 0, C
78   -CObtemObjIDsRamais = 0, 0, 0, 0, C
  78 +CObtemObjIDsRamais = 90, 90, 1288, 733, C
79 79 CPoint2D = 0, 0, 0, 0, C
80 80 CVariaveis = 110, 110, 1229, 842, C
81 81 CGeoDatabase = 50, 50, 1176, 783, C
... ... @@ -90,7 +90,7 @@ CObtemZdoNo = 0, 0, 0, 0, C
90 90 CAcertaZsDosNos = 0, 0, 0, 0, C
91 91 CDatabaseNexus = 0, 0, 0, 0, C
92 92 frmExportaConsumos = 100, 100, 1320, 769, C, 220, 220, 1339, 952, C
93   -CConsumo = 0, 0, 0, 0, C
  93 +CConsumo = 60, 60, 1258, 703, C
94 94 CObtemObjIdsNos = 0, 0, 0, 0, C
95 95 CEncontraDiretorio = 0, 0, 0, 0, C
96 96 CAtualiza = 0, 0, 0, 0, C
... ...
trunk/Projeto_NxViewmanager/NxViewManager.vbp
  Diff comments   View file @00f1d91
1 1 Type=Control
2   -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\Windows\SysWOW64\stdole2.tlb#OLE Automation
3   -Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\..\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library
  2 +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation
  3 +Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#C:\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library
4 4 Object={18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0; TeComCanvas.dll
5   -Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\Windows\SysWow64\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6)
6   -Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#..\..\..\..\Program Files (x86)\Common Files\Microsoft Shared\DAO\dao360.dll#Microsoft DAO 3.6 Object Library
  5 +Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#C:\Windows\SysWow64\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6)
  6 +Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#C:\Program Files (x86)\Common Files\Microsoft Shared\DAO\dao360.dll#Microsoft DAO 3.6 Object Library
7 7 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll
8   -Reference=*\G{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0#..\..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComConnection.dll#TeComConnection 1.0 Type Library
9   -Reference=*\G{18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0#..\..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComCanvas.dll#TeComCanvas 4.0.0
  8 +Reference=*\G{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComConnection.dll#TeComConnection 1.0 Type Library
  9 +Reference=*\G{18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComCanvas.dll#TeComCanvas 4.0.0
10 10 Object={F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0; TeComViewManager.dll
11 11 Object={EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0; TeComViewDatabase.dll
12 12 Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX
... ...
trunk/Projeto_NxViewmanager/NxViewManager.vbw
  Diff comments   View file @00f1d91
1   -Geral = 0, 0, 0, 0, C
  1 +Geral = 210, 210, 1378, 871, C
2 2 FrmLayerTheme = 0, 0, 0, 0, C, 22, 22, 1146, 754, C
3   -frmViews = 0, 0, 0, 0, C, 44, 44, 1168, 776, C
  3 +frmViews = 224, 99, 1392, 760, , 44, 44, 1168, 776, C
4 4 ViewManager = 0, 0, 0, 0, C, 66, 66, 1190, 798, C
5   -frmTheme = 175, 175, 1301, 908, , 88, 88, 1212, 820, C
6   -Header = 0, 0, 0, 0, C
  5 +frmTheme = 175, 175, 1301, 908, C, 88, 88, 1212, 820, C
  6 +Header = 240, 240, 1408, 901, C
... ...
trunk/Projeto_NxViewmanager/NxViewManager2.exp
View file @00f1d91
No preview for this file type
trunk/Projeto_NxViewmanager/NxViewManager2.lib
View file @00f1d91
No preview for this file type
trunk/Projeto_NxViewmanager/NxViewManager2.oca 0 → 100644
View file @00f1d91
No preview for this file type
trunk/Projeto_NxViewmanager/NxViewManager2.ocx
View file @00f1d91
No preview for this file type
trunk/Projeto_NxViewmanagerGeoSanLog.txt 0 → 100644
  Diff comments   View file @00f1d91
... ... @@ -0,0 +1,5 @@
  1 +11/03/2019 05:01:38 - ViewManager.ctl - Public Function Init - 76 - Path not found
  2 +17/09/2020 12:11:01 - ViewManager.ctl - Public Function Init - 76 - Path not found
  3 +17/09/2020 12:18:51 - ViewManager.ctl - Public Function Init - 76 - Path not found
  4 +17/09/2020 12:24:37 - ViewManager.ctl - Public Function Init - 76 - Path not found
  5 +17/09/2020 16:43:19 - ViewManager.ctl - Public Function Init - 76 - Path not found
... ...