From 305ebe1f90b2d48ae72165cdde5854039739d6b9 Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Sun, 20 Nov 2016 22:33:21 -0200 Subject: [PATCH] 20-11-2016 - GeoSan 7.5.2 - Realizada a adequação do relatório de produtividade de ligações cadastradas, ele considera agora efetivamente somente quem cadastrou as ligações, sem considerar quem cadastrou o ramal. O que ocorria é que quem cadastrava uma nova ligação em um ramal cadastrado por outra pessoa, aumantava a produtividade da outra pessoa e não a dele. --- 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 25303982 -> 0 bytes install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.02.exe | Bin 0 -> 25302260 bytes trunk/Forms/frmIndicProdutRamaisAgua.frm | 569 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- trunk/Forms/frmIndicadorProdutividade.frm | 4 +--- trunk/GeoSan.exe | Bin 4014080 -> 0 bytes trunk/GeoSan.vbp | 3 ++- trunk/GeoSan.vbw | 8 ++++---- trunk/Modules/Global.bas | 2 +- 10 files changed, 149 insertions(+), 439 deletions(-) create mode 100644 install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.02.exe diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe index 7ba8c80..7447172 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 4a1e014..b944753 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.01" +#define AppVersionFile "07.05.02" [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 index 3f8e63e..5b25ffc 100644 Binary files a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe and b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe differ diff --git a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.02.exe b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.02.exe new file mode 100644 index 0000000..f43aa53 Binary files /dev/null and b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.02.exe differ diff --git a/trunk/Forms/frmIndicProdutRamaisAgua.frm b/trunk/Forms/frmIndicProdutRamaisAgua.frm index 1769b2f..4c7c304 100644 --- a/trunk/Forms/frmIndicProdutRamaisAgua.frm +++ b/trunk/Forms/frmIndicProdutRamaisAgua.frm @@ -69,86 +69,45 @@ Attribute VB_GlobalNameSpace = False Attribute VB_Creatable = False Attribute VB_PredeclaredId = True Attribute VB_Exposed = False - +'Gera o relatório de produtividade do cadastro de ramais e ligações de água +' +' Private Sub cmdGerar_Click() -On Error GoTo Trata_Erro -MousePointer = vbHourglass -Dim rs As ADODB.Recordset -Dim rsMeta As ADODB.Recordset -Dim strDataR, strUserR As String -Dim contBar As Long -Dim strsql As String -Dim a As String -Dim b As String -Dim c As String -Dim d As String -Dim e As String -Dim f As String -Dim g As String -Dim h As String -Dim i As String -Dim j As String -Dim k As String -Dim l As String -Dim m As String -Dim n As String -Dim o As String - -a = "RAMAIS_AGUA" -b = "USUARIO_LOG" -c = "DATA_LOG" - - - If frmCanvas.TipoConexao <> 4 Then - Conn.execute ("UPDATE RAMAIS_AGUA SET USUARIO_LOG = 'DESCONHECIDO' WHERE USUARIO_LOG is null") - Conn.execute ("UPDATE RAMAIS_AGUA SET DATA_LOG = '01/01/01 01:01' WHERE DATA_LOG is null") - Else - Conn.execute ("UPDATE " + """" + a + """" + " SET " + """" + b + """" + " = 'DESCONHECIDO' WHERE " + """" + b + """" + "is null") - Conn.execute ("UPDATE " + """" + a + """" + " SET " + """" + c + """" + " = '01/01/01 01:01' WHERE " + """" + c + """" + " is null") - End If + On Error GoTo Trata_Erro + MousePointer = vbHourglass + Dim rs As ADODB.Recordset + Dim rsMeta As ADODB.Recordset + Dim strDataR, strUserR As String + Dim contBar As Long + Dim strsql As String + Dim dataOld As String + Dim TotalLigacoes As Long + Dim TotalLigacoesDoDia As Long + Dim TotalHistoricoLicacoes As Long + + Conn.execute ("UPDATE RAMAIS_AGUA SET USUARIO_LOG = 'DESCONHECIDO' WHERE USUARIO_LOG is null") + Conn.execute ("UPDATE RAMAIS_AGUA SET DATA_LOG = '01/01/01 01:01' WHERE DATA_LOG is null") strDataR = Format(Now, "DD/MM/YY") - + 'IMPRIME O RELATÓRIO DO DIA QUE É DEFINIDO PELA DATA DA MAQUINA ProgressBar1.value = 2 - - If frmCanvas.TipoConexao = 1 Then 'SQL - - strsql = "SELECT COUNT(*) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE LEFT(DATA_LOG,8) = '" & strDataR & "')" - - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE - - - strsql = "SELECT COUNT(*) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO RAL WHERE EXISTS (SELECT OBJECT_ID_ FROM RAMAIS_AGUA RA WHERE SUBSTR(DATA_LOG,1,8) = '" & strDataR & "' AND RA.OBJECT_ID_ = RAL.OBJECT_ID_)" - ElseIf frmCanvas.TipoConexao = 4 Then -a = "RAMAIS_AGUA_LIGACAO" -b = "OBJECT_ID_" -c = "RAMAIS_AGUA" -d = Left(DATA_LOG, 8) - - strsql = "SELECT COUNT(*) AS " + """" + "LINHAS" + """" + " FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE SUBSTR(" + """" + "DATA_LOG" + """" + ",1,8)" + "=" + " '" + strDataR + "')" - - End If - + strsql = "SELECT COUNT(*) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE LEFT(DATA_LOG,8) = '" & strDataR & "')" Set rs = New ADODB.Recordset - rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic - + rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic Open txtCaminho.Text For Output As #2 - Print #2, "****************** SISTEMA GEOSAN **********************" Print #2, "######### RELATÓRIO INDICATIVO DE PRODUTIVIDADE ########" Print #2, "############ CADASTRO DE LIGAÇÕES DE ÁGUA ##############" Print #2, "INÍCIO - *************************** " & Format(Now, "DD/MM/YYYY HH:MM:SS") - Print #2, "" Print #2, "" If rs.EOF = False Then - Print #2, "********************************************************" Print #2, "****************** RESUMO DO DIA *****************INÍCIO" Print #2, "" Print #2, "DATA"; Tab(30); "LIGAÇÕES" Print #2, "========================================================" - Print #2, strDataR; Tab(15); "Total Data"; Tab(30); rs!linhas + Print #2, strDataR; Tab(15); "Total do Dia"; Tab(30); rs!linhas Print #2, "" Print #2, "****************** RESUMO DO DIA ******************* FIM" Print #2, "********************************************************" @@ -158,307 +117,121 @@ d = Left(DATA_LOG, 8) End If Close #2 rs.Close - - - 'MONTAGEM DO RELATÓRIO DIA A DIA - '1 - SELECT DISTINCT LEFT(DATA_LOG,8)as data,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG - '2 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE USUARIO_LOG = 'Adm' and LEFT(DATA_LOG,8) = '01/12/08' - '3 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE LEFT(DATA_LOG,8) = '01/12/08' - - - If frmCanvas.TipoConexao = 1 Then 'SQL - 'Set rsMeta = Conn.execute("SELECT DISTINCT LEFT(DATA_LOG,8) AS DATA,LEFT(LEFT(DATA_LOG,8),2) AS DIA,RIGHT(LEFT(DATA_LOG,5),2) AS MES,RIGHT(LEFT(DATA_LOG,8),2) AS ANO,USUARIO_LOG FROM RAMAIS_AGUA WHERE LEN(USUARIO_LOG) > 0 AND LEN(DATA_LOG) > 0 ORDER BY ANO,MES,DIA") - - strsql = "SELECT RA.USUARIO_LOG," - strsql = strsql & " LEFT(LEFT(RA.DATA_LOG,8),2) AS DIA," - strsql = strsql & " RIGHT(LEFT(RA.DATA_LOG,5),2) AS MES," - strsql = strsql & " RIGHT(LEFT(RA.DATA_LOG,8),2) AS ANO," - strsql = strsql & " LEFT(RA.DATA_LOG,8) AS DATA," - strsql = strsql & " COUNT(RAL.Object_id_) As Ligacoes" - 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,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") - - strsql = "SELECT RA.USUARIO_LOG," - strsql = strsql & " SUBSTR(DATA_LOG,1,2) AS " + """" + "DIA" + """" + "," - strsql = strsql & " SUBSTR(DATA_LOG,4,2) AS " + """" + "MES" + """" + "," - strsql = strsql & " SUBSTR(DATA_LOG,7,2) AS " + """" + "ANO" + """" + "," - strsql = strsql & " SUBSTR(DATA_LOG,1,8) AS " + """" + "DATA" + """" + "," - strsql = strsql & " COUNT(RAL.Object_id_) As " + """" + "Ligacoes" + """" + "" - strsql = strsql & " FROM RAMAIS_AGUA RA JOIN RAMAIS_AGUA_LIGACAO RAL ON RAL.OBJECT_ID_ = RA.OBJECT_ID_" - strsql = strsql & " Where Length(RA.USUARIO_LOG) > 0 And Length(RA.DATA_LOG) > 0" - strsql = strsql & " GROUP BY RA.USUARIO_LOG, SUBSTR(RA.DATA_LOG,1,2), SUBSTR(RA.DATA_LOG,1,8), SUBSTR(RA.DATA_LOG,4,2), SUBSTR(RA.DATA_LOG,4,2), SUBSTR(RA.DATA_LOG,7,2)" - strsql = strsql & " ORDER BY ANO,MES,DIA,USUARIO_LOG" - - - ElseIf frmCanvas.TipoConexao = 4 Then - '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") -Dim a1 As String -Dim a2 As String -Dim a3 As String -Dim a4 As String -Dim a5 As String -Dim a6 As String -Dim a7 As String -Dim a8 As String -Dim a9 As String -Dim a10 As String -a = "USUARIO_LOG" -a10 = "DATA_LOG" -b = """" + "DATA_LOG" + """" - -f = "OBJECT_ID_" -g = "RAMAIS_AGUA" -h = "RAMAIS_AGUA_LIGACAO" -i = "DATA_LOG" - - -a5 = "j" -a6 = "k" -a7 = "l" -a8 = "m" -a9 = "n" - -'"SUBSTR(" + """" + a10 + """" + ",1,2) AS" - strsql = "SELECT " + """" + g + """" + "." + """" + a + """" + "," - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",1,2) AS " + """" + "DIA" + """" + "," - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",4,2) AS " + """" + "MES" + """" + "," - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",7,2) AS " + """" + "ANO" + """" + "," - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",1,8) AS " + """" + "DATA" + """" + "," - strsql = strsql & " COUNT(" + """" + h + """" + "." + """" + f + """" + ") As " + """" + "Ligacoes" + """" + "" - strsql = strsql & " FROM " + """" + g + """" + " JOIN " + """" + h + """" + " ON " + """" + h + """" + "." + """" + f + """" + " = " + """" + g + """" + "." + """" + f + """" + "" - strsql = strsql & " Where length(" + """" + g + """" + "." + """" + a + """" + ") > '0' And length(" + """" + g + """" + "." + """" + a10 + """" + ") > '0'" - strsql = strsql & " GROUP BY " + """" + g + """" + "." + """" + a + """" + "," + "SUBSTR(" + """" + a10 + """" + ",1,2)" + "," + "SUBSTR(" + """" + a10 + """" + ",1,8)" + "," + "SUBSTR(" + """" + a10 + """" + ",4,2)" + "," + "SUBSTR(" + """" + a10 + """" + ",4,2)" + "," + "SUBSTR(" + """" + a10 + """" + ",7,2)" + "" - strsql = strsql & " ORDER BY " + """" + "ANO" + """" + "," + """" + "MES" + """" + "," + """" + "DIA" + """" + "," + """" + a + """" + "" - ' WritePrivateProfileString "A", "A", strsql, App.path & "\DEBUG.INI" - - End If - - Set rs = New ADODB.Recordset - rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic - Dim dataOld As String - Dim SumRamais As Long - - SumRamais = 0 - Open txtCaminho.Text For Append As #2 - Print #2, "********************************************************" - Print #2, "********** HISTÓRICO DIÁRIO DE USUÁRIO ********** INÍCIO" - - Print #2, "========================================================" - Print #2, "DATA"; Tab(15); "USUARIO"; Tab(30); "LIGAÇÕES" - Print #2, "========================================================" - - If rs.EOF = False Then - dataOld = rs!data - Do While Not rs.EOF - 'IMPRIME O TOTAL DIA DO USUÁRIO - 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) - - Else ' TROCOU DE DATA - - Print #2, "========================================================" - Print #2, dataOld; Tab(15); "Total Data"; Tab(30); SumRamais - Print #2, "" - Print #2, "" - - SumRamais = rs!Ligacoes - - Print #2, rs!data; Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) - - End If - dataOld = rs!data - rs.MoveNext - - Loop - Print #2, "========================================================" - Print #2, dataOld; Tab(15); "Total Data"; Tab(30); Trim(SumRamais) - Print #2, "" - - Else - - Print #2, "NÃO HÁ INFORMAÇÕES PARA HISTÓRICO DIÁRIO DE USUÁRIO ****" - Print #2, "" - - End If - - Print #2, "*********** HISTÓRICO DIÁRIO DE USUÁRIO ************ FIM" - Print #2, "********************************************************" - Print #2, "" - Print #2, "" - Print #2, "" - - - -''' If rsMeta.EOF = False Then -''' Do While Not rsMeta.EOF = True -''' rsMeta.MoveNext -''' contBar = contBar +""""+ 1 -''' Loop -''' End If -''' ProgressBar2.value = 0 -''' ProgressBar2.Max = contBar +""""+ 5 -''' rsMeta.Requery -''' ProgressBar1.value = 4 -''' -''' If rsMeta.EOF = False Then -''' -''' strDataR = rsMeta!Data -''' strUserR = rsMeta!usuario_log -''' -''' Do While Not rsMeta.EOF = True -''' DoEvents -''' If frmCanvas.TipoConexao = 1 Then 'SQL -''' Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE USUARIO_LOG = '" & strUserR & "' and LEFT(DATA_LOG,8) = '" & strDataR & "')") -''' ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE -''' Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE USUARIO_LOG = '" & strUserR & "' and SUBSTR(DATA_LOG,1,8) = '" & strDataR & "')") -''' End If -''' -''' If rs.EOF = False Then -''' 'IMPRIME O TOTAL DIA DO USUÁRIO -''' Print #2, strDataR; Tab(15); strUserR; Tab(30); rs!linhas -''' End If -''' rsMeta.MoveNext -''' ProgressBar2.value = ProgressBar2.value +""""+ 1 -''' If rsMeta.EOF = False Then -''' If rsMeta!Data <> strDataR Then -''' 'IMPRIME O TOTAL GERAL DIA -''' -''' If frmCanvas.TipoConexao = 1 Then 'SQL -''' Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE LEFT(DATA_LOG,8) = '" & strDataR & "')") -''' ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE -''' Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE SUBSTR(DATA_LOG,1,8) = '" & strDataR & "')") -''' End If -''' -''' Print #2, "========================================================" -''' Print #2, strDataR; Tab(15); "Total Data"; Tab(30); rs!linhas -''' Print #2, "" -''' Print #2, "" -''' strDataR = rsMeta!Data -''' End If -''' strUserR = rsMeta!usuario_log -''' Else 'CHEGOU AO FIM DA TABELA -''' 'IMPRIME O TOTAL GERAL DO ULTIMO DIA DA TABELA -''' -''' If frmCanvas.TipoConexao = 1 Then 'SQL -''' Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE LEFT(DATA_LOG,8) = '" & strDataR & "')") -''' ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE -''' Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE SUBSTR(DATA_LOG,1,8) = '" & strDataR & "')") -''' End If -''' -''' Print #2, "========================================================" -''' Print #2, strDataR; Tab(15); "Total Data"; Tab(30); rs!linhas -''' Print #2, "" -''' End If -''' Loop -''' Else -''' Print #2, "NÃO HÁ INFORMAÇÕES PARA HISTÓRICO DIÁRIO DE USUÁRIO ****" -''' Print #2, "" -''' End If -''' Print #2, "*********** HISTÓRICO DIÁRIO DE USUÁRIO ************ FIM" -''' Print #2, "********************************************************" -''' Print #2, "" -''' Print #2, "" -''' Print #2, "" - - - + 'MONTAGEM DO RELATÓRIO DIÁRIO DE LIGAÇÕES CADASTRAS - NÃO CONTA RAMAIS, SOMENTE LIGAÇÕES + 'SELECT USUARIO_LOG, LEFT(LEFT(DATA_LOG,8),2) AS DIA, RIGHT(LEFT(DATA_LOG,5),2) AS MES, RIGHT(LEFT(DATA_LOG,10),2) AS ANO, LEFT(DATA_LOG,10) AS DATA, COUNT(Object_id_) As Ligacoes FROM RAMAIS_AGUA_LIGACAO + 'Where Len(USUARIO_LOG) > 0 And Len(DATA_LOG) > 0 + 'GROUP BY USUARIO_LOG, LEFT(DATA_LOG,10), LEFT(LEFT(DATA_LOG,8),2), RIGHT(LEFT(DATA_LOG,5),2), RIGHT(LEFT(DATA_LOG,10),2) + 'ORDER BY ANO,MES,DIA,USUARIO_LOG + strsql = "SELECT USUARIO_LOG, LEFT(LEFT(DATA_LOG,8),2) AS DIA, RIGHT(LEFT(DATA_LOG,5),2) AS MES, RIGHT(LEFT(DATA_LOG,10),2) AS ANO, LEFT(DATA_LOG,10) AS DATA, COUNT(Object_id_) As Ligacoes FROM RAMAIS_AGUA_LIGACAO" + strsql = strsql & " Where Len(USUARIO_LOG) > 0 And Len(DATA_LOG) > 0" + strsql = strsql & " GROUP BY USUARIO_LOG, LEFT(DATA_LOG,10), LEFT(LEFT(DATA_LOG,8),2), RIGHT(LEFT(DATA_LOG,5),2), RIGHT(LEFT(DATA_LOG,10),2)" + strsql = strsql & " ORDER BY ANO,MES,DIA,USUARIO_LOG" + Set rs = New ADODB.Recordset + rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic + TotalLigacoesDoDia = 0 + TotalHistoricoLicacoes = 0 + Open txtCaminho.Text For Append As #2 + Print #2, "********************************************************" + Print #2, "**** HISTÓRICO DIÁRIO DE LIGAÇÕES CADASTRADAS *** INÍCIO" + Print #2, "========================================================" + Print #2, "DATA"; Tab(15); "USUARIO"; Tab(30); "LIGAÇÕES" + Print #2, "========================================================" + If rs.EOF = False Then + dataOld = rs!data + Do While Not rs.EOF + 'IMPRIME O TOTAL DIA DO USUÁRIO + If dataOld = rs!data Then + TotalLigacoesDoDia = TotalLigacoesDoDia + rs!Ligacoes + TotalHistoricoLicacoes = TotalHistoricoLicacoes + rs!Ligacoes + Print #2, Trim(rs!data); Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) + Else ' TROCOU DE DATA + Print #2, "========================================================" + Print #2, dataOld; Tab(15); "Total do Dia"; Tab(30); CStr(TotalLigacoesDoDia) + Print #2, "" + Print #2, "" + TotalLigacoesDoDia = rs!Ligacoes + TotalHistoricoLicacoes = TotalHistoricoLicacoes + rs!Ligacoes + Print #2, rs!data; Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes) + End If + dataOld = rs!data + rs.MoveNext + Loop + Print #2, "========================================================" + Print #2, "" + Print #2, dataOld; Tab(15); "Total geral de ligações cadastradas"; Tab(30); CStr(Trim(TotalHistoricoLicacoes)) + Print #2, "" + Print #2, "Obs: este relatório apresenta apenas as ligações de água" + Print #2, "cadastradas a partir do GeoSan versão 7.5.0" + Print #2, "" + Else + Print #2, "NÃO HÁ INFORMAÇÕES PARA HISTÓRICO DIÁRIO DE USUÁRIO ****" + Print #2, "" + End If + Print #2, "********** HISTÓRICO DIÁRIO POR USUÁRIO ************ FIM" + Print #2, "********************************************************" + Print #2, "" + Print #2, "" + Print #2, "" Close #2 'MONTAGEM DO RELATÓRIO RESUMO CONSOLIDADO (ACUMULADO) DE USUÁRIO '1 - SELECT DISTINCT LEFT(DATA_LOG,8)as data,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG '2 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE USUARIO_LOG = 'Jonathas' '3 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES -a = "USUARIO_LOG" -b = "RAMAIS_AGUA" - - If frmCanvas.TipoConexao = 1 Then 'SQL - Set rsMeta = Conn.execute("SELECT DISTINCT USUARIO_LOG FROM RAMAIS_AGUA WHERE LEN(USUARIO_LOG) > 0 ORDER BY USUARIO_LOG") - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE - Set rsMeta = Conn.execute("SELECT DISTINCT USUARIO_LOG FROM RAMAIS_AGUA WHERE LENGTH(USUARIO_LOG) > 0 ORDER BY USUARIO_LOG") - ElseIf frmCanvas.TipoConexao = 4 Then - Set rsMeta = Conn.execute("SELECT DISTINCT " + """" + "USUARIO_LOG" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE LENgth(" + """" + "USUARIO_LOG" + """" + ") > 0 ORDER BY " + """" + "USUARIO_LOG" + """" + "") - + TotalLigacoes = 0 + Set rsMeta = Conn.execute("SELECT DISTINCT USUARIO_LOG FROM RAMAIS_AGUA WHERE LEN(USUARIO_LOG) > 0 ORDER BY USUARIO_LOG") + contBar = 0 + If rsMeta.EOF = False Then + Do While Not rsMeta.EOF = True + rsMeta.MoveNext + contBar = contBar + 1 + Loop End If - - contBar = 0 - If rsMeta.EOF = False Then - Do While Not rsMeta.EOF = True - rsMeta.MoveNext - contBar = contBar + 1 - Loop - End If - ProgressBar2.value = 0 - ProgressBar2.Max = contBar + 5 - rsMeta.Requery - + ProgressBar2.value = 0 + ProgressBar2.Max = contBar + 5 + rsMeta.Requery ProgressBar1.value = 6 - Open txtCaminho.Text For Append As #2 Print #2, "********************************************************" - Print #2, "********* RESUMO CONSOLIDADO DE USUÁRIO ********* INÍCIO" - + Print #2, "******** RESUMO CONSOLIDADO POR USUÁRIO ********* INÍCIO" If rsMeta.EOF = False Then - strUserR = rsMeta!USUARIO_LOG Print #2, "========================================================" Print #2, ""; Tab(15); "USUARIO"; Tab(30); "LIGAÇÕES" Print #2, "========================================================" Do While Not rsMeta.EOF = True - DoEvents -a = "NRO_LIGACAO" -b = "RAMAIS_AGUA_LIGACAO" -c = "OBJECT_ID_" -d = "RAMAIS_AGUA" -e = "USUARIO_LOG" - - If frmCanvas.TipoConexao <> 4 Then - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE USUARIO_LOG = '" & strUserR & "')") - Else - Set rs = Conn.execute("SELECT COUNT(" + """" + "NRO_LIGACAO" + """" + ") AS LINHAS FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE " + """" + "USUARIO_LOG" + """" + " = '" & strUserR & "')") - End If + DoEvents + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS TotalLigacoesPorUsuario FROM RAMAIS_AGUA_LIGACAO WHERE USUARIO_LOG = '" & strUserR & "'") If rs.EOF = False Then 'IMPRIME O TOTAL DIA DO USUÁRIO - Print #2, ""; Tab(15); strUserR; Tab(30); rs!linhas + Print #2, ""; Tab(15); strUserR; Tab(30); rs!TotalLigacoesPorUsuario + TotalLigacoes = TotalLigacoes + rs!TotalLigacoesPorUsuario End If - rsMeta.MoveNext - ProgressBar2.value = ProgressBar2.value + 1 + rsMeta.MoveNext + ProgressBar2.value = ProgressBar2.value + 1 If rsMeta.EOF = False Then strUserR = rsMeta!USUARIO_LOG Else 'IMPRIME O TOTAL GERAL DA BASE DE DADOS -a = "NRO_LIGACAO" -b = "RAMAIS_AGUA_LIGACAO" -c = "OBJECT_ID_" -d = "RAMAIS_AGUA" -e = "USUARIO_LOG" - - If frmCanvas.TipoConexao <> 4 Then - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA)") - Else - Set rs = Conn.execute("SELECT COUNT(" + """" + "NRO_LIGACAO" + """" + ") AS " + """" + "LINHAS" + """" + " FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + ")") - End If + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS TotalLigacoesGeral FROM RAMAIS_AGUA_LIGACAO") Print #2, "" - Print #2, "*********** RESUMO CONSOLIDADO DE USUÁRIO ********** FIM" + Print #2, "TOTAL CADASTRADO ATÉ " & Format(Now, "DD/MM/YYYY HH:MM:SS"); Tab(30); CStr(TotalLigacoes) + Print #2, "" + Print #2, "********** RESUMO CONSOLIDADO POR USUÁRIO ********** FIM" Print #2, "********************************************************" Print #2, "" + Print #2, "Obs: este relatório apresenta apenas as ligações de água" + Print #2, "cadastradas a partir do GeoSan versão 7.5.0" Print #2, "" Print #2, "" - Print #2, "TOTAL GERAL"; Tab(30); "LIGAÇÕES" + Print #2, "TOTAL GERAL DE LIGAÇÕES E RAMAIS CADASTRADOS"; Tab(30); "LIGAÇÕES" Print #2, "========================================================" - Print #2, "ATÉ " & Format(Now, "DD/MM/YYYY HH:MM:SS"); Tab(30); rs!linhas + Print #2, "ATÉ " & Format(Now, "DD/MM/YYYY HH:MM:SS"); Tab(30); rs!TotalLigacoesGeral + Print #2, "" Print #2, "" Print #2, "" Exit Do - End If Loop Else @@ -466,119 +239,55 @@ e = "USUARIO_LOG" Print #2, "NÃO HÁ INFORMAÇÕES PARA RESUMO CONSOLIDADO DE USUÁRIO **" Print #2, "" End If - - - 'MONTAGEM DO RELATÓRIO DIA A DIA SEPARADO POR PONTO E VIRGULA - '1 - SELECT DISTINCT LEFT(DATA_LOG,8)as data,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG - '2 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE USUARIO_LOG = 'Adm' and LEFT(DATA_LOG,8) = '01/12/08' - '3 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE LEFT(DATA_LOG,8) = '01/12/08' - 'Set rsMeta = Conn.execute("SELECT DISTINCT LEFT(DATA_LOG,8) AS DATA,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG") - -a = Left(DATA_LOG, 8) - -c = Left(Left(DATA_LOG, 8), 2) - -e = Right(Left(DATA_LOG, 5), 2) -g = "USUARIO_LOG" -h = "RAMAIS_AGUA" -i = "DATA_LOG" -j = Right(Left(DATA_LOG, 8), 2) - -Dim g1 As String -Dim g2 As String - -Dim g3 As String -g1 = "ANO" -g2 = "MES" -g3 = "DIA" - - - If frmCanvas.TipoConexao = 1 Then 'SQL - Set rsMeta = Conn.execute("SELECT DISTINCT LEFT(DATA_LOG,8) AS DATA,LEFT(LEFT(DATA_LOG,8),2) AS DIA,RIGHT(LEFT(DATA_LOG,5),2) AS MES,RIGHT(LEFT(DATA_LOG,8),2) AS ANO,USUARIO_LOG FROM RAMAIS_AGUA WHERE LEN(USUARIO_LOG) > 0 AND LEN(DATA_LOG) > 0 ORDER BY ANO,MES,DIA") - 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") - ElseIf frmCanvas.TipoConexao = 4 Then - 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" + """" + "," + """" + g + """" + " FROM " + """" + h + """" + " WHERE LENgth(" + """" + g + """" + ") > '0' AND LENgth(" + """" + i + """" + ") > '0' ORDER BY " + """" + "ANO" + """" + "," + """" + "MES" + """" + "," + """" + "ANO" + """" + "") + 'MONTAGEM DO RELATÓRIO DIA A DIA DOS RAMAIS CADASTRADOS SEPARADO POR PONTO E VIRGULA + 'Para contar quantas ligações estão cadastradas e mostrar o andamento do processamento na barra de progresso + Set rsMeta = Conn.execute("SELECT DISTINCT LEFT(DATA_LOG,10) AS DATA,LEFT(LEFT(DATA_LOG,8),2) AS DIA,RIGHT(LEFT(DATA_LOG,5),2) AS MES,RIGHT(LEFT(DATA_LOG,8),2) AS ANO,USUARIO_LOG FROM RAMAIS_AGUA_LIGACAO WHERE LEN(USUARIO_LOG) > 0 AND LEN(DATA_LOG) > 0 ORDER BY ANO,MES,DIA") + contBar = 0 + If rsMeta.EOF = False Then + Do While Not rsMeta.EOF = True + rsMeta.MoveNext + contBar = contBar + 1 + Loop End If - - contBar = 0 - If rsMeta.EOF = False Then - Do While Not rsMeta.EOF = True - rsMeta.MoveNext - contBar = contBar + 1 - Loop - End If - ProgressBar2.value = 0 - ProgressBar2.Max = contBar - rsMeta.Requery - + ProgressBar2.value = 0 + ProgressBar2.Max = contBar + rsMeta.Requery ProgressBar1.value = 10 - Print #2, "********************************************************" Print #2, "HISTÓRICO DIÁRIO DE USUÁRIO SEPARADO POR ; ****** INÍCIO" + Print #2, "Representa o cadastro total por ramais cadastrados" Print #2, "" If rsMeta.EOF = False Then - strDataR = rsMeta!data strUserR = rsMeta!USUARIO_LOG - Print #2, "DATA;USUARIO;LIGAÇÕES" Do While Not rsMeta.EOF = True DoEvents - -a = NRO_LIGACAO -b = "RAMAIS_AGUA_LIGACAO" -c = "OBJECT_ID_" -d = "RAMAIS_AGUA" -g = "USUARIO_LOG" -h = "RAMAIS_AGUA" -i = "DATA_LOG" -j = Left(DATA_LOG, 8) - - - If frmCanvas.TipoConexao = 1 Then 'SQL - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE USUARIO_LOG = '" & strUserR & "' and LEFT(DATA_LOG,8) = '" & strDataR & "')") - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE USUARIO_LOG = '" & strUserR & "' and SUBSTR(DATA_LOG,1,8) = '" & strDataR & "')") - ElseIf frmCanvas.TipoConexao = 4 Then - Set rs = Conn.execute("SELECT COUNT(" + """" + "NRO_LIGACAO" + """" + ") AS " + """" + "LINHAS" + """" + " FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE " + """" + "USUARIO_LOG" + """" + " = '" & strUserR & "' and " + "SUBSTR(" + """" + "DATA_LOG" + """" + ", 1, 8)" + " = '" & strDataR & "')") - End If - + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE USUARIO_LOG = '" & strUserR & "' and LEFT(DATA_LOG,10) = '" & strDataR & "'") If rs.EOF = False Then 'IMPRIME O TOTAL DIA DO USUÁRIO Print #2, strDataR & ";" & strUserR & ";" & rs!linhas End If - rsMeta.MoveNext - ProgressBar2.value = ProgressBar2.value + 1 + rsMeta.MoveNext + ProgressBar2.value = ProgressBar2.value + 1 If rsMeta.EOF = False Then If rsMeta!data <> strDataR Then 'IMPRIME O TOTAL GERAL DIA - - If frmCanvas.TipoConexao = 1 Then 'SQL - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE LEFT(DATA_LOG,8) = '" & strDataR & "')") - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE SUBSTR(DATA_LOG,1,8) = '" & strDataR & "')") - ElseIf frmCanvas.TipoConexao = 4 Then - Set rs = Conn.execute("SELECT COUNT(" + """" + "NRO_LIGACAO" + """" + ") AS " + """" + "LINHAS" + """" + " FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE " + "SUBSTR(" + """" + "DATA_LOG" + """" + ",1,8)" + " = '" & strDataR & "')") - End If + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE LEFT(DATA_LOG,10) = '" & strDataR & "'") Print #2, strDataR & ";" & "Total Data" & ";" & rs!linhas - strDataR = rsMeta!data End If strUserR = rsMeta!USUARIO_LOG Else 'CHEGOU AO FIM DA TABELA - 'IMPRIME O TOTAL GERAL DO ULTIMO DIA DA TABELA - - If frmCanvas.TipoConexao = 1 Then 'SQL - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE LEFT(DATA_LOG,8) = '" & strDataR & "')") - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA WHERE SUBSTR(DATA_LOG,1,8) = '" & strDataR & "')") - ElseIf frmCanvas.TipoConexao = 4 Then - Set rs = Conn.execute("SELECT COUNT(" + """" + "NRO_LIGACAO" + """" + ") AS " + """" + "LINHAS" + """" + " FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE " + "SUBSTR(" + """" + "DATA_LOG" + """" + ",1,8)" + " = '" & strDataR & "')") - End If - - Print #2, strDataR & ";Total Data;" & rs!linhas + 'IMPRIME O TOTAL GERAL DO ULTIMO DIA DA TABELA + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE LEFT(DATA_LOG,10) = '" & strDataR & "'") + Print #2, strDataR & ";Total do dia;" & rs!linhas + Print #2, "" + Print #2, "Obs. Este relatório não representa necessáriamente o" + Print #2, "número total de ligações, uma vez que contabiliza" + Print #2, "apenas os ramais cadastrados." + Print #2, "Ele considera as ligações adicionais feita a um " Print #2, "" End If Loop @@ -589,28 +298,30 @@ j = Left(DATA_LOG, 8) Print #2, "HISTÓRICO DIÁRIO DE USUÁRIO SEPARADO POR ; ********* FIM" Print #2, "********************************************************" Print #2, "" + Print #2, "Obs: este relatório apresenta apenas as ligações de água" + Print #2, "cadastradas a partir do GeoSan versão 7.5.0" + Print #2, "" + Print #2, "" Print #2, "" Print #2, "****************** SISTEMA GEOSAN **********************" Print #2, "######### RELATÓRIO INDICATIVO DE PRODUTIVIDADE ########" Print #2, "FIM - ****************************** " & Format(Now, "DD/MM/YYYY HH:MM:SS") - Close #2 rsMeta.Close rs.Close MousePointer = Default MsgBox "Arquivo gerado com sucesso!", vbInformation, "Indicador" Unload Me + Exit Sub Trata_Erro: -If Err.Number = 0 Or Err.Number = 20 Or Err.Number = 55 Then - Resume Next -Else - Close #2 - MousePointer = vbDefault - - PrintErro CStr(Me.Name), "cmdGerar.Click ", CStr(Err.Number), CStr(Err.Description), True - -End If + If Err.Number = 0 Or Err.Number = 20 Or Err.Number = 55 Then + Resume Next + Else + Close #2 + MousePointer = vbDefault + PrintErro CStr(Me.Name), "cmdGerar.Click ", CStr(Err.Number), CStr(Err.Description), True + End If End Sub Private Sub Form_Load() diff --git a/trunk/Forms/frmIndicadorProdutividade.frm b/trunk/Forms/frmIndicadorProdutividade.frm index 7e5c3a7..e951813 100644 --- a/trunk/Forms/frmIndicadorProdutividade.frm +++ b/trunk/Forms/frmIndicadorProdutividade.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 frmIndicProdutRedesDeAgua Caption = "Indicador de Produtividade - Redes de Agua" ClientHeight = 1320 @@ -105,5 +105,3 @@ Private Sub cmdGerar_Click() End Sub - - diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index 7ba8c80..7447172 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index 32368fb..9faddd7 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -143,6 +143,7 @@ ResFile32="GeoSan.RES" IconForm="FrmMain" Startup="Sub Main" HelpFile="" +NoControlUpgrade=1 Title="GeoSan" ExeName32="GeoSan.exe" Command32="" @@ -151,7 +152,7 @@ HelpContextID="0" CompatibleMode="0" MajorVer=7 MinorVer=5 -RevisionVer=1 +RevisionVer=2 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/GeoSan.vbw b/trunk/GeoSan.vbw index f7b27d5..313c96d 100644 --- a/trunk/GeoSan.vbw +++ b/trunk/GeoSan.vbw @@ -3,11 +3,11 @@ 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, 1246, 591, C, 139, 12, 1258, 744, C +FrmMain = 16, 71, 1246, 591, , 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, , 110, 110, 1229, 842, C +frmCanvas = 12, 33, 1452, 829, C, 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 @@ -46,7 +46,7 @@ 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 = 93, 38, 1476, 747, C, 198, 198, 1317, 930, C -frmIndicProdutRamaisAgua = 45, 76, 1464, 808, C, 220, 220, 1339, 952, C +frmIndicProdutRamaisAgua = 45, 75, 1464, 808, Z, 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 @@ -60,7 +60,7 @@ frmCalibrarZoom = 0, 0, 0, 0, C, 66, 66, 1185, 798, C frmLoginTema = 0, 0, 0, 0, C, 88, 88, 1207, 820, C mdlRelatoriosProdutividade = 286, 286, 1405, 1018, C frmPageSetup = 0, 0, 0, 0, C, 110, 110, 1229, 842, C -Form1 = 0, 0, 0, 0, C, 132, 132, 1251, 864, C +Form1 = 25, 25, 1151, 758, C, 132, 132, 1251, 864, C frmEncontraConsumidor = 125, 125, 967, 575, C, 154, 154, 1273, 886, C clsTeCanvas = 44, 44, 1163, 776, C frmCadastroRamalAutoLote = 0, 0, 0, 0, C, 176, 176, 1295, 908, C diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index 4618f19..e754520 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.01" + Versao_Geo = "07.05.02" 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