From 0df4d15701350236b5672226625276021f5037fa Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Fri, 18 Nov 2016 08:04:09 -0200 Subject: [PATCH] 18-11-2016 - GeoSan 7.5.1 - Correção bug relatório de produtividade. --- install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe | Bin 4014080 -> 0 bytes install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss | 2 +- install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe | Bin 0 -> 25303982 bytes trunk/Forms/frmIndicProdutRamaisAgua.frm | 20 ++++++++++---------- trunk/GeoSan.exe | Bin 4014080 -> 0 bytes trunk/GeoSan.vbp | 6 +++--- trunk/GeoSan.vbw | 6 +++--- trunk/Modules/Global.bas | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe index 7395cae..7ba8c80 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 485084b..4a1e014 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 "07.05.00" +#define AppVersionFile "07.05.01" [Setup] AppName=GeoSan diff --git a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe new file mode 100644 index 0000000..3f8e63e Binary files /dev/null and b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe differ diff --git a/trunk/Forms/frmIndicProdutRamaisAgua.frm b/trunk/Forms/frmIndicProdutRamaisAgua.frm index e6cd4de..1769b2f 100644 --- a/trunk/Forms/frmIndicProdutRamaisAgua.frm +++ b/trunk/Forms/frmIndicProdutRamaisAgua.frm @@ -1,5 +1,5 @@ VERSION 5.00 -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "MSCOMCTL.OCX" +Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "MSCOMCTL.OCX" Begin VB.Form frmIndicProdutRamaisAgua Caption = "Indicador de Produtividade - Ligações de Água" ClientHeight = 1440 @@ -178,7 +178,7 @@ d = Left(DATA_LOG, 8) strsql = strsql & " FROM RAMAIS_AGUA RA JOIN RAMAIS_AGUA_LIGACAO RAL ON RAL.OBJECT_ID_ = RA.OBJECT_ID_" strsql = strsql & " Where Len(RA.USUARIO_LOG) > 0 And Len(RA.DATA_LOG) > 0" strsql = strsql & " GROUP BY RA.USUARIO_LOG, LEFT(RA.DATA_LOG,8),LEFT(LEFT(RA.DATA_LOG,8),2), RIGHT(LEFT(RA.DATA_LOG,5),2), RIGHT(LEFT(RA.DATA_LOG,8),2)" - strsql = strsql & " ORDER BY ANO,MES,DIA,USUARIO_LOG" + strsql = strsql & " ORDER BY ANO,MES,DIA,RA.USUARIO_LOG" ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE 'Set rsMeta = Conn.execute("SELECT DISTINCT SUBSTR(DATA_LOG,1,8) AS DATA, SUBSTR(DATA_LOG,1,2) AS DIA,SUBSTR(DATA_LOG,4,2) AS MES,SUBSTR(DATA_LOG,7,2) AS ANO, USUARIO_LOG FROM RAMAIS_AGUA WHERE LENGTH(USUARIO_LOG) > 0 AND LENGTH(DATA_LOG) > 0 ORDER BY ANO,MES,DIA") @@ -253,14 +253,14 @@ a9 = "n" Print #2, "========================================================" If rs.EOF = False Then - dataOld = rs!Data + dataOld = rs!data Do While Not rs.EOF 'IMPRIME O TOTAL DIA DO USUÁRIO - If dataOld = rs!Data Then + If dataOld = rs!data Then SumRamais = SumRamais + rs!Ligacoes - Print #2, Trim(rs!Data); Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) + Print #2, Trim(rs!data); Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) Else ' TROCOU DE DATA @@ -271,10 +271,10 @@ a9 = "n" SumRamais = rs!Ligacoes - Print #2, rs!Data; Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) + Print #2, rs!data; Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) End If - dataOld = rs!Data + dataOld = rs!data rs.MoveNext Loop @@ -520,7 +520,7 @@ g3 = "DIA" Print #2, "" If rsMeta.EOF = False Then - strDataR = rsMeta!Data + strDataR = rsMeta!data strUserR = rsMeta!USUARIO_LOG Print #2, "DATA;USUARIO;LIGAÇÕES" @@ -552,7 +552,7 @@ j = Left(DATA_LOG, 8) rsMeta.MoveNext ProgressBar2.value = ProgressBar2.value + 1 If rsMeta.EOF = False Then - If rsMeta!Data <> strDataR Then + If rsMeta!data <> strDataR Then 'IMPRIME O TOTAL GERAL DIA If frmCanvas.TipoConexao = 1 Then 'SQL @@ -564,7 +564,7 @@ j = Left(DATA_LOG, 8) End If Print #2, strDataR & ";" & "Total Data" & ";" & rs!linhas - strDataR = rsMeta!Data + strDataR = rsMeta!data End If strUserR = rsMeta!USUARIO_LOG Else 'CHEGOU AO FIM DA TABELA diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index 7395cae..7ba8c80 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index f83c2d6..32368fb 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -12,13 +12,13 @@ Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#..\..\..\Windows\SysWo Reference=*\G{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}#1.0#0#..\..\..\Windows\SysWOW64\shell32.dll#Microsoft Shell Controls And Automation Reference=*\G{18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComCanvas.dll#TeComCanvas 4.0.0 Reference=*\G{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComConnection.dll#TeComConnection 1.0 Type Library -Reference=*\G{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0#..\..\..\Program Files\NEXUS\TeCom4.2.0\TeComDatabase.dll#TeComDatabase 4.0.0 +Reference=*\G{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComDatabase.dll#TeComDatabase 4.0.0 Reference=*\G{C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComExport.dll#TeComExport 4.0.0 Reference=*\G{4AFF1793-147E-4E89-825F-D43FDCD3A2FD}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComGeometry.dll#TeComGeometry 1.0 Type Library Reference=*\G{2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComImport.dll#TeComImport 4.0.0 Reference=*\G{E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComNetwork.dll#TeComNetwork 4.0.0 Reference=*\G{F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComPrinter.dll#TeComPrinter 1.0 Type Library -Reference=*\G{EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0#..\..\..\Program Files\NEXUS\TeCom4.2.0\TeComViewDatabase.dll#TeComViewDatabase 1.0 Type Library +Reference=*\G{EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComViewDatabase.dll#TeComViewDatabase 1.0 Type Library Reference=*\G{F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0#..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComViewManager.dll#TeComViewManager 4.0.0 Object={18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0; TeComCanvas.dll Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll @@ -151,7 +151,7 @@ HelpContextID="0" CompatibleMode="0" MajorVer=7 MinorVer=5 -RevisionVer=0 +RevisionVer=1 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/GeoSan.vbw b/trunk/GeoSan.vbw index 86e4a34..f7b27d5 100644 --- a/trunk/GeoSan.vbw +++ b/trunk/GeoSan.vbw @@ -7,7 +7,7 @@ FrmMain = 16, 71, 1246, 591, C, 139, 12, 1258, 744, C FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C FrmCadastroRamal = 63, 13, 1453, 742, C, 45, 39, 1164, 771, C frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C -frmCanvas = 12, 33, 1452, 829, C, 110, 110, 1229, 842, C +frmCanvas = 12, 33, 1452, 829, , 110, 110, 1229, 842, C frmConsumidoresDesabastecidos = 110, 110, 1229, 842, C, 308, 308, 1427, 1040, C frmConsumoLote = 150, 150, 1296, 781, C, 330, 330, 1449, 1062, C frmConsumoLoteGraf = 175, 175, 1321, 806, C, 352, 352, 1471, 1084, C @@ -45,8 +45,8 @@ FrmUser = 0, 0, 0, 0, C, 110, 110, 1229, 842, C frmUserControle = 0, 0, 0, 0, C, 132, 132, 1251, 864, C frmConfSenha = 0, 0, 0, 0, C, 154, 154, 1273, 886, C frmTrocaSenha = 0, 0, 0, 0, C, 176, 176, 1295, 908, C -frmIndicProdutRedesDeAgua = 0, 0, 0, 0, C, 198, 198, 1317, 930, C -frmIndicProdutRamaisAgua = 176, 176, 1295, 908, C, 220, 220, 1339, 952, C +frmIndicProdutRedesDeAgua = 93, 38, 1476, 747, C, 198, 198, 1317, 930, C +frmIndicProdutRamaisAgua = 45, 76, 1464, 808, C, 220, 220, 1339, 952, C frmEncontraTexto = 0, 0, 0, 0, C, 242, 242, 1361, 974, C frmAtualizarSetores = 0, 0, 0, 0, C, 264, 264, 1383, 996, C frmImportarCotas = 0, 0, 0, 0, C, 286, 286, 1405, 1018, C diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index d851290..4618f19 100644 --- a/trunk/Modules/Global.bas +++ b/trunk/Modules/Global.bas @@ -200,7 +200,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.00" + Versao_Geo = "07.05.01" 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