Download as
Browse Code »

Commit cbdbe0cef180a12917de355be2e8e3c0fd405692

Authored by José Maria Villac Pinheiro
1 parent 00f1d915
Exists in master

Colocado o número e complemento do endereço para quando pesquisa pelo número da ligação

Showing 11 changed files with 20 additions and 12 deletions   Show diff stats
install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe
View file @cbdbe0c
No preview for this file type
install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss
  Diff comments   View file @cbdbe0c
1 1 #define SetupBaseName "SetupGeoSan-v."
2   -#define AppVersionFile "08.00.01"
  2 +#define AppVersionFile "08.01.00"
3 3  
4 4 [Setup]
5 5 AppName=GeoSan
... ...
install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.06.exe
View file @00f1d91
No preview for this file type
install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.00.01.exe
View file @00f1d91
No preview for this file type
install/GeraSetupGeoSan/Output/SetupGeoSan-v.08.01.00.exe 0 → 100644
View file @cbdbe0c
No preview for this file type
trunk/Controles/GEOSAN.INI
  Diff comments   View file @cbdbe0c
... ... @@ -9,9 +9,9 @@ SENHA=2413133221223131231422314124432231413444223131344323424234244141424131
9 9 [RAMAIS]
10 10 CONSULTAR_LIGAÇÕES=NÃO
11 11 [RAMAISFILTRO]
12   -PESQUISA=INSCRIÇÃO
  12 +PESQUISA=ENDEREÇO
13 13 ATIVADO=SIM
14   -VALOR=12269
  14 +VALOR=bianchin
15 15 [EMAIL]
16 16 EMAILDESTINATARIO=tec@nexusbr.com
17 17 EMAILREMETENTE=NEXUS <tec@nexusbr.com>
... ...
trunk/Forms/frmCadastroRamal.frm
  Diff comments   View file @cbdbe0c
... ... @@ -837,6 +837,10 @@ Private Function Carrega_PreFiltro(ByVal ComLotes As Boolean)
837 837 Dim TIPO_R As String
838 838 Dim TB_Ligacao As String
839 839 Dim strLigacoes As String
  840 + Dim enderecoCompleto As String
  841 + Dim enderecoStr As String
  842 + Dim numeroImovel As String
  843 + Dim complementoImovel As String
840 844 'HIDROMETRADAS E FICTÍCIAS
841 845 Dim RS_NRO_LIGACAO As New ADODB.Recordset
842 846 Dim ma As String
... ... @@ -861,18 +865,18 @@ Private Function Carrega_PreFiltro(ByVal ComLotes As Boolean)
861 865 mf = "HIDROMETRADO"
862 866 mg = "NXGS_V_LIG_COMERCIAL"
863 867 mh = "NXGS_V_LIG_COMERCIAL_E"
864   - mj = "RAMAIS_ESGOTO_LIGACAO"
865 868 Set rs = New ADODB.Recordset
866 869 If tcs.getCurrentLayer = "RAMAIS_AGUA" Then
867 870 'SELECIONA A TABELA OU VIEW QUE POSSUI DADOS DOS CONSUMIDORES DE AGUA
868 871 TIPO_R = "AGUA"
869 872 TB_Ligacoes = "RAMAIS_AGUA_LIGACAO"
870   - 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"
  873 + mj = "RAMAIS_ESGOTO_LIGACAO"
  874 + 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"
871 875 Else
872 876 'SELECIONA A TABELA OU VIEW QUE POSSUI DADOS DOS CONSUMIDORES DE ESGOTO
873 877 TIPO_R = "ESGOTO"
874 878 TB_Ligacoes = "RAMAIS_ESGOTO_LIGACAO"
875   - strIni = "SELECT NRO_LIGACAO, CLASSIFICACAO_FISCAL, ENDERECO, CONSUMIDOR, COD_LOGRADOURO as " + """" + "CODLOGRAD" + """" + ", TIPO, ECONOMIAS, HIDROMETRADO FROM NXGS_V_LIG_COMERCIAL_E"
  879 + 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"
876 880 End If
877 881 str = "" 'LIMPA A STRING DE COMANDO
878 882 If Me.optNumLigacao.value = True And Trim(Me.txtNumLigacao) <> "" Then
... ... @@ -917,8 +921,12 @@ Private Function Carrega_PreFiltro(ByVal ComLotes As Boolean)
917 921 DoEvents
918 922 'Set itmx = lvLigacoes.ListItems.Add(, , rs.Fields("NRO_LIGACAO").value)
919 923 Set itmx = lvLigacoes.ListItems.Add(, , rs.Fields("CLASSIFICACAO_FISCAL").value)
  924 + numeroImovel = IIf(IsNull(rs.Fields("NUM_CASA").value), "", rs.Fields("NUM_CASA").value)
  925 + complementoImovel = IIf(IsNull(rs.Fields("COMPL_LOGRADOURO").value), "", rs.Fields("COMPL_LOGRADOURO").value)
  926 + enderecoStr = IIf(IsNull(rs.Fields("ENDERECO").value), "", rs.Fields("ENDERECO").value)
  927 + enderecoCompleto = enderecoStr + ", " + numeroImovel + " - " + complementoImovel
920 928 itmx.SubItems(1) = IIf(IsNull(rs.Fields("NRO_LIGACAO").value), "", rs.Fields("NRO_LIGACAO").value)
921   - itmx.SubItems(2) = IIf(IsNull(rs.Fields("ENDERECO").value), "", rs.Fields("ENDERECO").value)
  929 + itmx.SubItems(2) = enderecoCompleto
922 930 itmx.SubItems(3) = IIf(IsNull(rs.Fields("CONSUMIDOR").value), "", rs.Fields("CONSUMIDOR").value)
923 931 'incluído para mostrar o tipo da ligação
924 932 itmx.SubItems(4) = IIf(IsNull(rs.Fields("TIPO").value), "", rs.Fields("TIPO").value)
... ...
trunk/GeoSan.exe
View file @cbdbe0c
No preview for this file type
trunk/GeoSan.vbp
  Diff comments   View file @cbdbe0c
... ... @@ -151,8 +151,8 @@ Name=&quot;GeoSan&quot;
151 151 HelpContextID="0"
152 152 CompatibleMode="0"
153 153 MajorVer=8
154   -MinorVer=0
155   -RevisionVer=1
  154 +MinorVer=1
  155 +RevisionVer=0
156 156 AutoIncrementVer=0
157 157 ServerSupportFiles=0
158 158 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
... ...
trunk/GeoSan.vbw
  Diff comments   View file @cbdbe0c
1   -Global = 78, 7, 1036, 696, C
  1 +Global = 78, 7, 1036, 696,
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
5 5 FrmTypes = 0, 0, 0, 0, C, 176, 176, 1295, 908, C
6 6 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   -FrmCadastroRamal = 63, 13, 1453, 868, C, 45, 39, 1164, 771, C
  8 +FrmCadastroRamal = 63, 13, 1453, 868, , 45, 39, 1164, 771, C
9 9 frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C
10 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
... ...
trunk/Modules/Global.bas
  Diff comments   View file @cbdbe0c
... ... @@ -201,7 +201,7 @@ Public Sub Main()
201 201 End If
202 202 'Configura a versão atual do GeoSan
203 203 Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision
204   - Versao_Geo = "07.05.06"
  204 + Versao_Geo = "08.01.00"
205 205 glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe
206 206 SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações
207 207 connn = ""
... ...