From cbdbe0cef180a12917de355be2e8e3c0fd405692 Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Mon, 26 Apr 2021 21:49:07 -0300 Subject: [PATCH] Colocado o número e complemento do endereço para quando pesquisa pelo número da ligação --- install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe | Bin 3985408 -> 0 bytes install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss | 2 +- install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.06.exe | Bin 25308843 -> 0 bytes install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe | Bin 25308552 -> 0 bytes install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.01.00.exe | Bin 0 -> 25311756 bytes trunk/Controles/GEOSAN.INI | 4 ++-- trunk/Forms/frmCadastroRamal.frm | 16 ++++++++++++---- trunk/GeoSan.exe | Bin 3985408 -> 0 bytes trunk/GeoSan.vbp | 4 ++-- trunk/GeoSan.vbw | 4 ++-- trunk/Modules/Global.bas | 2 +- 11 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.06.exe delete mode 100644 install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe create mode 100644 install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.01.00.exe diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe index b8db4ce..a98d75b 100644 Binary files a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe and b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe differ diff --git a/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss b/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss index f7fc3d5..eed0e9c 100644 --- a/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss +++ b/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss @@ -1,5 +1,5 @@ #define SetupBaseName "SetupGeoSan-v." -#define AppVersionFile "08.00.01" +#define AppVersionFile "08.01.00" [Setup] AppName=GeoSan diff --git a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.06.exe b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.06.exe deleted file mode 100644 index ca48278..0000000 Binary files a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.06.exe and /dev/null differ diff --git a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe deleted file mode 100644 index 2845516..0000000 Binary files a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe and /dev/null differ diff --git a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.01.00.exe b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.01.00.exe new file mode 100644 index 0000000..8636b8e Binary files /dev/null and b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.01.00.exe differ diff --git a/trunk/Controles/GEOSAN.INI b/trunk/Controles/GEOSAN.INI index 03af4a3..4b7e0e9 100644 --- a/trunk/Controles/GEOSAN.INI +++ b/trunk/Controles/GEOSAN.INI @@ -9,9 +9,9 @@ SENHA=2413133221223131231422314124432231413444223131344323424234244141424131 [RAMAIS] CONSULTAR_LIGAÇÕES=NÃO [RAMAISFILTRO] -PESQUISA=INSCRIÇÃO +PESQUISA=ENDEREÇO ATIVADO=SIM -VALOR=12269 +VALOR=bianchin [EMAIL] EMAILDESTINATARIO=tec@nexusbr.com EMAILREMETENTE=NEXUS diff --git a/trunk/Forms/frmCadastroRamal.frm b/trunk/Forms/frmCadastroRamal.frm index c307ff0..ea9a80a 100644 --- a/trunk/Forms/frmCadastroRamal.frm +++ b/trunk/Forms/frmCadastroRamal.frm @@ -837,6 +837,10 @@ Private Function Carrega_PreFiltro(ByVal ComLotes As Boolean) Dim TIPO_R As String Dim TB_Ligacao As String Dim strLigacoes As String + Dim enderecoCompleto As String + Dim enderecoStr As String + Dim numeroImovel As String + Dim complementoImovel As String 'HIDROMETRADAS E FICTÍCIAS Dim RS_NRO_LIGACAO As New ADODB.Recordset Dim ma As String @@ -861,18 +865,18 @@ Private Function Carrega_PreFiltro(ByVal ComLotes As Boolean) mf = "HIDROMETRADO" mg = "NXGS_V_LIG_COMERCIAL" mh = "NXGS_V_LIG_COMERCIAL_E" - mj = "RAMAIS_ESGOTO_LIGACAO" Set rs = New ADODB.Recordset If tcs.getCurrentLayer = "RAMAIS_AGUA" Then 'SELECIONA A TABELA OU VIEW QUE POSSUI DADOS DOS CONSUMIDORES DE AGUA TIPO_R = "AGUA" TB_Ligacoes = "RAMAIS_AGUA_LIGACAO" - strIni = "SELECT CONVERT(nvarchar(50), NRO_LIGACAO) as NRO_LIGACAO, CLASSIFICACAO_FISCAL, ENDERECO, CONSUMIDOR, COD_LOGRADOURO as " + """" + "CODLOGRAD" + """" + ", TIPO, ECONOMIAS, HIDROMETRADO FROM NXGS_V_LIG_COMERCIAL" + mj = "RAMAIS_ESGOTO_LIGACAO" + strIni = "SELECT CONVERT(nvarchar(50), NRO_LIGACAO) as NRO_LIGACAO, CLASSIFICACAO_FISCAL, ENDERECO, NUM_CASA, COMPL_LOGRADOURO, CONSUMIDOR, COD_LOGRADOURO as " + """" + "CODLOGRAD" + """" + ", TIPO, ECONOMIAS, HIDROMETRADO FROM NXGS_V_LIG_COMERCIAL" Else 'SELECIONA A TABELA OU VIEW QUE POSSUI DADOS DOS CONSUMIDORES DE ESGOTO TIPO_R = "ESGOTO" TB_Ligacoes = "RAMAIS_ESGOTO_LIGACAO" - strIni = "SELECT NRO_LIGACAO, CLASSIFICACAO_FISCAL, ENDERECO, CONSUMIDOR, COD_LOGRADOURO as " + """" + "CODLOGRAD" + """" + ", TIPO, ECONOMIAS, HIDROMETRADO FROM NXGS_V_LIG_COMERCIAL_E" + strIni = "SELECT NRO_LIGACAO, CLASSIFICACAO_FISCAL, ENDERECO, NUM_CASA, COMPL_LOGRADOURO, CONSUMIDOR, COD_LOGRADOURO as " + """" + "CODLOGRAD" + """" + ", TIPO, ECONOMIAS, HIDROMETRADO FROM NXGS_V_LIG_COMERCIAL_E" End If str = "" 'LIMPA A STRING DE COMANDO If Me.optNumLigacao.value = True And Trim(Me.txtNumLigacao) <> "" Then @@ -917,8 +921,12 @@ Private Function Carrega_PreFiltro(ByVal ComLotes As Boolean) DoEvents 'Set itmx = lvLigacoes.ListItems.Add(, , rs.Fields("NRO_LIGACAO").value) Set itmx = lvLigacoes.ListItems.Add(, , rs.Fields("CLASSIFICACAO_FISCAL").value) + numeroImovel = IIf(IsNull(rs.Fields("NUM_CASA").value), "", rs.Fields("NUM_CASA").value) + complementoImovel = IIf(IsNull(rs.Fields("COMPL_LOGRADOURO").value), "", rs.Fields("COMPL_LOGRADOURO").value) + enderecoStr = IIf(IsNull(rs.Fields("ENDERECO").value), "", rs.Fields("ENDERECO").value) + enderecoCompleto = enderecoStr + ", " + numeroImovel + " - " + complementoImovel itmx.SubItems(1) = IIf(IsNull(rs.Fields("NRO_LIGACAO").value), "", rs.Fields("NRO_LIGACAO").value) - itmx.SubItems(2) = IIf(IsNull(rs.Fields("ENDERECO").value), "", rs.Fields("ENDERECO").value) + itmx.SubItems(2) = enderecoCompleto itmx.SubItems(3) = IIf(IsNull(rs.Fields("CONSUMIDOR").value), "", rs.Fields("CONSUMIDOR").value) 'incluído para mostrar o tipo da ligação itmx.SubItems(4) = IIf(IsNull(rs.Fields("TIPO").value), "", rs.Fields("TIPO").value) diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index b8db4ce..a98d75b 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index c01579c..7e4d41b 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -151,8 +151,8 @@ Name="GeoSan" HelpContextID="0" CompatibleMode="0" MajorVer=8 -MinorVer=0 -RevisionVer=1 +MinorVer=1 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/GeoSan.vbw b/trunk/GeoSan.vbw index 3f0f194..ef4e7b2 100644 --- a/trunk/GeoSan.vbw +++ b/trunk/GeoSan.vbw @@ -1,11 +1,11 @@ -Global = 78, 7, 1036, 696, C +Global = 78, 7, 1036, 696, calcDetecta = 0, 0, 0, 0, C FrmCreatTextForLayer = 0, 0, 0, 0, C, 132, 132, 1251, 864, C frmAbout = 0, 0, 0, 0, C, 154, 154, 1273, 886, C FrmTypes = 0, 0, 0, 0, C, 176, 176, 1295, 908, C FrmMain = 16, 71, 1497, 969, C, 139, 12, 1258, 744, C FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C -FrmCadastroRamal = 63, 13, 1453, 868, C, 45, 39, 1164, 771, C +FrmCadastroRamal = 63, 13, 1453, 868, , 45, 39, 1164, 771, C frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C frmCanvas = 12, 33, 1492, 898, C, 110, 110, 1229, 842, C frmConsumidoresDesabastecidos = 110, 110, 1229, 842, C, 308, 308, 1427, 1040, C diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index 78e8d62..cdef6e6 100644 --- a/trunk/Modules/Global.bas +++ b/trunk/Modules/Global.bas @@ -201,7 +201,7 @@ Public Sub Main() End If 'Configura a versão atual do GeoSan Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision - Versao_Geo = "07.05.06" + Versao_Geo = "08.01.00" glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações connn = "" -- libgit2 0.21.2