1
Download as
Browse Code »

Commit 305ebe1f90b2d48ae72165cdde5854039739d6b9

Authored by José Maria Villac Pinheiro
1 parent 0df4d157
Exists in master

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.
Showing 10 changed files with 149 additions and 439 deletions   Show diff stats
install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe
View file @305ebe1
No preview for this file type
install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss
  Diff comments   View file @305ebe1
1 1 #define SetupBaseName "SetupGeoSan-v."
2   -#define AppVersionFile "07.05.01"
  2 +#define AppVersionFile "07.05.02"
3 3  
4 4 [Setup]
5 5 AppName=GeoSan
... ...
install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.01.exe
View file @305ebe1
No preview for this file type
install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.05.02.exe 0 → 100644
View file @305ebe1
No preview for this file type
trunk/Forms/frmIndicProdutRamaisAgua.frm
  Diff comments   View file @305ebe1
... ... @@ -69,86 +69,45 @@ Attribute VB_GlobalNameSpace = False
69 69 Attribute VB_Creatable = False
70 70 Attribute VB_PredeclaredId = True
71 71 Attribute VB_Exposed = False
72   -
  72 +'Gera o relatório de produtividade do cadastro de ramais e ligações de água
  73 +'
  74 +'
73 75 Private Sub cmdGerar_Click()
74   -On Error GoTo Trata_Erro
75   -MousePointer = vbHourglass
76   -Dim rs As ADODB.Recordset
77   -Dim rsMeta As ADODB.Recordset
78   -Dim strDataR, strUserR As String
79   -Dim contBar As Long
80   -Dim strsql As String
81   -Dim a As String
82   -Dim b As String
83   -Dim c As String
84   -Dim d As String
85   -Dim e As String
86   -Dim f As String
87   -Dim g As String
88   -Dim h As String
89   -Dim i As String
90   -Dim j As String
91   -Dim k As String
92   -Dim l As String
93   -Dim m As String
94   -Dim n As String
95   -Dim o As String
96   -
97   -a = "RAMAIS_AGUA"
98   -b = "USUARIO_LOG"
99   -c = "DATA_LOG"
100   -
101   -
102   - If frmCanvas.TipoConexao <> 4 Then
103   - Conn.execute ("UPDATE RAMAIS_AGUA SET USUARIO_LOG = 'DESCONHECIDO' WHERE USUARIO_LOG is null")
104   - Conn.execute ("UPDATE RAMAIS_AGUA SET DATA_LOG = '01/01/01 01:01' WHERE DATA_LOG is null")
105   - Else
106   - Conn.execute ("UPDATE " + """" + a + """" + " SET " + """" + b + """" + " = 'DESCONHECIDO' WHERE " + """" + b + """" + "is null")
107   - Conn.execute ("UPDATE " + """" + a + """" + " SET " + """" + c + """" + " = '01/01/01 01:01' WHERE " + """" + c + """" + " is null")
108   - End If
  76 + On Error GoTo Trata_Erro
  77 + MousePointer = vbHourglass
  78 + Dim rs As ADODB.Recordset
  79 + Dim rsMeta As ADODB.Recordset
  80 + Dim strDataR, strUserR As String
  81 + Dim contBar As Long
  82 + Dim strsql As String
  83 + Dim dataOld As String
  84 + Dim TotalLigacoes As Long
  85 + Dim TotalLigacoesDoDia As Long
  86 + Dim TotalHistoricoLicacoes As Long
  87 +
  88 + Conn.execute ("UPDATE RAMAIS_AGUA SET USUARIO_LOG = 'DESCONHECIDO' WHERE USUARIO_LOG is null")
  89 + Conn.execute ("UPDATE RAMAIS_AGUA SET DATA_LOG = '01/01/01 01:01' WHERE DATA_LOG is null")
109 90 strDataR = Format(Now, "DD/MM/YY")
110   -
  91 +
111 92 'IMPRIME O RELATÓRIO DO DIA QUE É DEFINIDO PELA DATA DA MAQUINA
112 93 ProgressBar1.value = 2
113   -
114   - If frmCanvas.TipoConexao = 1 Then 'SQL
115   -
116   - 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 & "')"
117   -
118   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
119   -
120   -
121   - 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_)"
122   - ElseIf frmCanvas.TipoConexao = 4 Then
123   -a = "RAMAIS_AGUA_LIGACAO"
124   -b = "OBJECT_ID_"
125   -c = "RAMAIS_AGUA"
126   -d = Left(DATA_LOG, 8)
127   -
128   - 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 + "')"
129   -
130   - End If
131   -
  94 + 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 & "')"
132 95 Set rs = New ADODB.Recordset
133   - rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic
134   -
  96 + rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic
135 97 Open txtCaminho.Text For Output As #2
136   -
137 98 Print #2, "****************** SISTEMA GEOSAN **********************"
138 99 Print #2, "######### RELATÓRIO INDICATIVO DE PRODUTIVIDADE ########"
139 100 Print #2, "############ CADASTRO DE LIGAÇÕES DE ÁGUA ##############"
140 101 Print #2, "INÍCIO - *************************** " & Format(Now, "DD/MM/YYYY HH:MM:SS")
141   -
142 102 Print #2, ""
143 103 Print #2, ""
144 104 If rs.EOF = False Then
145   -
146 105 Print #2, "********************************************************"
147 106 Print #2, "****************** RESUMO DO DIA *****************INÍCIO"
148 107 Print #2, ""
149 108 Print #2, "DATA"; Tab(30); "LIGAÇÕES"
150 109 Print #2, "========================================================"
151   - Print #2, strDataR; Tab(15); "Total Data"; Tab(30); rs!linhas
  110 + Print #2, strDataR; Tab(15); "Total do Dia"; Tab(30); rs!linhas
152 111 Print #2, ""
153 112 Print #2, "****************** RESUMO DO DIA ******************* FIM"
154 113 Print #2, "********************************************************"
... ... @@ -158,307 +117,121 @@ d = Left(DATA_LOG, 8)
158 117 End If
159 118 Close #2
160 119 rs.Close
161   -
162   -
163   - 'MONTAGEM DO RELATÓRIO DIA A DIA
164   - '1 - SELECT DISTINCT LEFT(DATA_LOG,8)as data,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG
165   - '2 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE USUARIO_LOG = 'Adm' and LEFT(DATA_LOG,8) = '01/12/08'
166   - '3 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE LEFT(DATA_LOG,8) = '01/12/08'
167   -
168   -
169   - If frmCanvas.TipoConexao = 1 Then 'SQL
170   - '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")
171   -
172   - strsql = "SELECT RA.USUARIO_LOG,"
173   - strsql = strsql & " LEFT(LEFT(RA.DATA_LOG,8),2) AS DIA,"
174   - strsql = strsql & " RIGHT(LEFT(RA.DATA_LOG,5),2) AS MES,"
175   - strsql = strsql & " RIGHT(LEFT(RA.DATA_LOG,8),2) AS ANO,"
176   - strsql = strsql & " LEFT(RA.DATA_LOG,8) AS DATA,"
177   - strsql = strsql & " COUNT(RAL.Object_id_) As Ligacoes"
178   - strsql = strsql & " FROM RAMAIS_AGUA RA JOIN RAMAIS_AGUA_LIGACAO RAL ON RAL.OBJECT_ID_ = RA.OBJECT_ID_"
179   - strsql = strsql & " Where Len(RA.USUARIO_LOG) > 0 And Len(RA.DATA_LOG) > 0"
180   - 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)"
181   - strsql = strsql & " ORDER BY ANO,MES,DIA,RA.USUARIO_LOG"
182   -
183   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
184   - '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")
185   -
186   - strsql = "SELECT RA.USUARIO_LOG,"
187   - strsql = strsql & " SUBSTR(DATA_LOG,1,2) AS " + """" + "DIA" + """" + ","
188   - strsql = strsql & " SUBSTR(DATA_LOG,4,2) AS " + """" + "MES" + """" + ","
189   - strsql = strsql & " SUBSTR(DATA_LOG,7,2) AS " + """" + "ANO" + """" + ","
190   - strsql = strsql & " SUBSTR(DATA_LOG,1,8) AS " + """" + "DATA" + """" + ","
191   - strsql = strsql & " COUNT(RAL.Object_id_) As " + """" + "Ligacoes" + """" + ""
192   - strsql = strsql & " FROM RAMAIS_AGUA RA JOIN RAMAIS_AGUA_LIGACAO RAL ON RAL.OBJECT_ID_ = RA.OBJECT_ID_"
193   - strsql = strsql & " Where Length(RA.USUARIO_LOG) > 0 And Length(RA.DATA_LOG) > 0"
194   - 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)"
195   - strsql = strsql & " ORDER BY ANO,MES,DIA,USUARIO_LOG"
196   -
197   -
198   - ElseIf frmCanvas.TipoConexao = 4 Then
199   - '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")
200   -Dim a1 As String
201   -Dim a2 As String
202   -Dim a3 As String
203   -Dim a4 As String
204   -Dim a5 As String
205   -Dim a6 As String
206   -Dim a7 As String
207   -Dim a8 As String
208   -Dim a9 As String
209   -Dim a10 As String
210   -a = "USUARIO_LOG"
211   -a10 = "DATA_LOG"
212   -b = """" + "DATA_LOG" + """"
213   -
214   -f = "OBJECT_ID_"
215   -g = "RAMAIS_AGUA"
216   -h = "RAMAIS_AGUA_LIGACAO"
217   -i = "DATA_LOG"
218   -
219   -
220   -a5 = "j"
221   -a6 = "k"
222   -a7 = "l"
223   -a8 = "m"
224   -a9 = "n"
225   -
226   -'"SUBSTR(" + """" + a10 + """" + ",1,2) AS"
227   - strsql = "SELECT " + """" + g + """" + "." + """" + a + """" + ","
228   - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",1,2) AS " + """" + "DIA" + """" + ","
229   - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",4,2) AS " + """" + "MES" + """" + ","
230   - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",7,2) AS " + """" + "ANO" + """" + ","
231   - strsql = strsql + "SUBSTR(" + """" + a10 + """" + ",1,8) AS " + """" + "DATA" + """" + ","
232   - strsql = strsql & " COUNT(" + """" + h + """" + "." + """" + f + """" + ") As " + """" + "Ligacoes" + """" + ""
233   - strsql = strsql & " FROM " + """" + g + """" + " JOIN " + """" + h + """" + " ON " + """" + h + """" + "." + """" + f + """" + " = " + """" + g + """" + "." + """" + f + """" + ""
234   - strsql = strsql & " Where length(" + """" + g + """" + "." + """" + a + """" + ") > '0' And length(" + """" + g + """" + "." + """" + a10 + """" + ") > '0'"
235   - 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)" + ""
236   - strsql = strsql & " ORDER BY " + """" + "ANO" + """" + "," + """" + "MES" + """" + "," + """" + "DIA" + """" + "," + """" + a + """" + ""
237   - ' WritePrivateProfileString "A", "A", strsql, App.path & "\DEBUG.INI"
238   -
239   - End If
240   -
241   - Set rs = New ADODB.Recordset
242   - rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic
243   - Dim dataOld As String
244   - Dim SumRamais As Long
245   -
246   - SumRamais = 0
247   - Open txtCaminho.Text For Append As #2
248   - Print #2, "********************************************************"
249   - Print #2, "********** HISTÓRICO DIÁRIO DE USUÁRIO ********** INÍCIO"
250   -
251   - Print #2, "========================================================"
252   - Print #2, "DATA"; Tab(15); "USUARIO"; Tab(30); "LIGAÇÕES"
253   - Print #2, "========================================================"
254   -
255   - If rs.EOF = False Then
256   - dataOld = rs!data
257   - Do While Not rs.EOF
258   - 'IMPRIME O TOTAL DIA DO USUÁRIO
259   - If dataOld = rs!data Then
260   -
261   - SumRamais = SumRamais + rs!Ligacoes
262   -
263   - Print #2, Trim(rs!data); Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes)
264   -
265   - Else ' TROCOU DE DATA
266   -
267   - Print #2, "========================================================"
268   - Print #2, dataOld; Tab(15); "Total Data"; Tab(30); SumRamais
269   - Print #2, ""
270   - Print #2, ""
271   -
272   - SumRamais = rs!Ligacoes
273   -
274   - Print #2, rs!data; Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes)
275   -
276   - End If
277   - dataOld = rs!data
278   - rs.MoveNext
279   -
280   - Loop
281   - Print #2, "========================================================"
282   - Print #2, dataOld; Tab(15); "Total Data"; Tab(30); Trim(SumRamais)
283   - Print #2, ""
284   -
285   - Else
286   -
287   - Print #2, "NÃO HÁ INFORMAÇÕES PARA HISTÓRICO DIÁRIO DE USUÁRIO ****"
288   - Print #2, ""
289   -
290   - End If
291   -
292   - Print #2, "*********** HISTÓRICO DIÁRIO DE USUÁRIO ************ FIM"
293   - Print #2, "********************************************************"
294   - Print #2, ""
295   - Print #2, ""
296   - Print #2, ""
297   -
298   -
299   -
300   -''' If rsMeta.EOF = False Then
301   -''' Do While Not rsMeta.EOF = True
302   -''' rsMeta.MoveNext
303   -''' contBar = contBar +""""+ 1
304   -''' Loop
305   -''' End If
306   -''' ProgressBar2.value = 0
307   -''' ProgressBar2.Max = contBar +""""+ 5
308   -''' rsMeta.Requery
309   -''' ProgressBar1.value = 4
310   -'''
311   -''' If rsMeta.EOF = False Then
312   -'''
313   -''' strDataR = rsMeta!Data
314   -''' strUserR = rsMeta!usuario_log
315   -'''
316   -''' Do While Not rsMeta.EOF = True
317   -''' DoEvents
318   -''' If frmCanvas.TipoConexao = 1 Then 'SQL
319   -''' 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 & "')")
320   -''' ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
321   -''' 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 & "')")
322   -''' End If
323   -'''
324   -''' If rs.EOF = False Then
325   -''' 'IMPRIME O TOTAL DIA DO USUÁRIO
326   -''' Print #2, strDataR; Tab(15); strUserR; Tab(30); rs!linhas
327   -''' End If
328   -''' rsMeta.MoveNext
329   -''' ProgressBar2.value = ProgressBar2.value +""""+ 1
330   -''' If rsMeta.EOF = False Then
331   -''' If rsMeta!Data <> strDataR Then
332   -''' 'IMPRIME O TOTAL GERAL DIA
333   -'''
334   -''' If frmCanvas.TipoConexao = 1 Then 'SQL
335   -''' 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 & "')")
336   -''' ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
337   -''' 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 & "')")
338   -''' End If
339   -'''
340   -''' Print #2, "========================================================"
341   -''' Print #2, strDataR; Tab(15); "Total Data"; Tab(30); rs!linhas
342   -''' Print #2, ""
343   -''' Print #2, ""
344   -''' strDataR = rsMeta!Data
345   -''' End If
346   -''' strUserR = rsMeta!usuario_log
347   -''' Else 'CHEGOU AO FIM DA TABELA
348   -''' 'IMPRIME O TOTAL GERAL DO ULTIMO DIA DA TABELA
349   -'''
350   -''' If frmCanvas.TipoConexao = 1 Then 'SQL
351   -''' 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 & "')")
352   -''' ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
353   -''' 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 & "')")
354   -''' End If
355   -'''
356   -''' Print #2, "========================================================"
357   -''' Print #2, strDataR; Tab(15); "Total Data"; Tab(30); rs!linhas
358   -''' Print #2, ""
359   -''' End If
360   -''' Loop
361   -''' Else
362   -''' Print #2, "NÃO HÁ INFORMAÇÕES PARA HISTÓRICO DIÁRIO DE USUÁRIO ****"
363   -''' Print #2, ""
364   -''' End If
365   -''' Print #2, "*********** HISTÓRICO DIÁRIO DE USUÁRIO ************ FIM"
366   -''' Print #2, "********************************************************"
367   -''' Print #2, ""
368   -''' Print #2, ""
369   -''' Print #2, ""
370   -
371   -
372   -
373 120  
  121 + 'MONTAGEM DO RELATÓRIO DIÁRIO DE LIGAÇÕES CADASTRAS - NÃO CONTA RAMAIS, SOMENTE LIGAÇÕES
  122 + '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
  123 + 'Where Len(USUARIO_LOG) > 0 And Len(DATA_LOG) > 0
  124 + '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)
  125 + 'ORDER BY ANO,MES,DIA,USUARIO_LOG
  126 + 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"
  127 + strsql = strsql & " Where Len(USUARIO_LOG) > 0 And Len(DATA_LOG) > 0"
  128 + 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)"
  129 + strsql = strsql & " ORDER BY ANO,MES,DIA,USUARIO_LOG"
  130 + Set rs = New ADODB.Recordset
  131 + rs.Open strsql, Conn, adOpenDynamic, adLockOptimistic
  132 + TotalLigacoesDoDia = 0
  133 + TotalHistoricoLicacoes = 0
  134 + Open txtCaminho.Text For Append As #2
  135 + Print #2, "********************************************************"
  136 + Print #2, "**** HISTÓRICO DIÁRIO DE LIGAÇÕES CADASTRADAS *** INÍCIO"
  137 + Print #2, "========================================================"
  138 + Print #2, "DATA"; Tab(15); "USUARIO"; Tab(30); "LIGAÇÕES"
  139 + Print #2, "========================================================"
  140 + If rs.EOF = False Then
  141 + dataOld = rs!data
  142 + Do While Not rs.EOF
  143 + 'IMPRIME O TOTAL DIA DO USUÁRIO
  144 + If dataOld = rs!data Then
  145 + TotalLigacoesDoDia = TotalLigacoesDoDia + rs!Ligacoes
  146 + TotalHistoricoLicacoes = TotalHistoricoLicacoes + rs!Ligacoes
  147 + Print #2, Trim(rs!data); Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes)
  148 + Else ' TROCOU DE DATA
  149 + Print #2, "========================================================"
  150 + Print #2, dataOld; Tab(15); "Total do Dia"; Tab(30); CStr(TotalLigacoesDoDia)
  151 + Print #2, ""
  152 + Print #2, ""
  153 + TotalLigacoesDoDia = rs!Ligacoes
  154 + TotalHistoricoLicacoes = TotalHistoricoLicacoes + rs!Ligacoes
  155 + Print #2, rs!data; Tab(15); Trim(rs!USUARIO_LOG); Tab(30); Trim(rs!Ligacoes)
  156 + End If
  157 + dataOld = rs!data
  158 + rs.MoveNext
  159 + Loop
  160 + Print #2, "========================================================"
  161 + Print #2, ""
  162 + Print #2, dataOld; Tab(15); "Total geral de ligações cadastradas"; Tab(30); CStr(Trim(TotalHistoricoLicacoes))
  163 + Print #2, ""
  164 + Print #2, "Obs: este relatório apresenta apenas as ligações de água"
  165 + Print #2, "cadastradas a partir do GeoSan versão 7.5.0"
  166 + Print #2, ""
  167 + Else
  168 + Print #2, "NÃO HÁ INFORMAÇÕES PARA HISTÓRICO DIÁRIO DE USUÁRIO ****"
  169 + Print #2, ""
  170 + End If
  171 + Print #2, "********** HISTÓRICO DIÁRIO POR USUÁRIO ************ FIM"
  172 + Print #2, "********************************************************"
  173 + Print #2, ""
  174 + Print #2, ""
  175 + Print #2, ""
374 176 Close #2
375 177  
376 178 'MONTAGEM DO RELATÓRIO RESUMO CONSOLIDADO (ACUMULADO) DE USUÁRIO
377 179 '1 - SELECT DISTINCT LEFT(DATA_LOG,8)as data,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG
378 180 '2 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE USUARIO_LOG = 'Jonathas'
379 181 '3 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES
380   -a = "USUARIO_LOG"
381   -b = "RAMAIS_AGUA"
382   -
383   - If frmCanvas.TipoConexao = 1 Then 'SQL
384   - Set rsMeta = Conn.execute("SELECT DISTINCT USUARIO_LOG FROM RAMAIS_AGUA WHERE LEN(USUARIO_LOG) > 0 ORDER BY USUARIO_LOG")
385   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
386   - Set rsMeta = Conn.execute("SELECT DISTINCT USUARIO_LOG FROM RAMAIS_AGUA WHERE LENGTH(USUARIO_LOG) > 0 ORDER BY USUARIO_LOG")
387   - ElseIf frmCanvas.TipoConexao = 4 Then
388   - Set rsMeta = Conn.execute("SELECT DISTINCT " + """" + "USUARIO_LOG" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + " WHERE LENgth(" + """" + "USUARIO_LOG" + """" + ") > 0 ORDER BY " + """" + "USUARIO_LOG" + """" + "")
389   -
  182 + TotalLigacoes = 0
  183 + Set rsMeta = Conn.execute("SELECT DISTINCT USUARIO_LOG FROM RAMAIS_AGUA WHERE LEN(USUARIO_LOG) > 0 ORDER BY USUARIO_LOG")
  184 + contBar = 0
  185 + If rsMeta.EOF = False Then
  186 + Do While Not rsMeta.EOF = True
  187 + rsMeta.MoveNext
  188 + contBar = contBar + 1
  189 + Loop
390 190 End If
391   -
392   - contBar = 0
393   - If rsMeta.EOF = False Then
394   - Do While Not rsMeta.EOF = True
395   - rsMeta.MoveNext
396   - contBar = contBar + 1
397   - Loop
398   - End If
399   - ProgressBar2.value = 0
400   - ProgressBar2.Max = contBar + 5
401   - rsMeta.Requery
402   -
  191 + ProgressBar2.value = 0
  192 + ProgressBar2.Max = contBar + 5
  193 + rsMeta.Requery
403 194 ProgressBar1.value = 6
404   -
405 195 Open txtCaminho.Text For Append As #2
406 196 Print #2, "********************************************************"
407   - Print #2, "********* RESUMO CONSOLIDADO DE USUÁRIO ********* INÍCIO"
408   -
  197 + Print #2, "******** RESUMO CONSOLIDADO POR USUÁRIO ********* INÍCIO"
409 198 If rsMeta.EOF = False Then
410   -
411 199 strUserR = rsMeta!USUARIO_LOG
412 200 Print #2, "========================================================"
413 201 Print #2, ""; Tab(15); "USUARIO"; Tab(30); "LIGAÇÕES"
414 202 Print #2, "========================================================"
415 203 Do While Not rsMeta.EOF = True
416   - DoEvents
417   -a = "NRO_LIGACAO"
418   -b = "RAMAIS_AGUA_LIGACAO"
419   -c = "OBJECT_ID_"
420   -d = "RAMAIS_AGUA"
421   -e = "USUARIO_LOG"
422   -
423   - If frmCanvas.TipoConexao <> 4 Then
424   - 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 & "')")
425   - Else
426   - 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 & "')")
427   - End If
  204 + DoEvents
  205 + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS TotalLigacoesPorUsuario FROM RAMAIS_AGUA_LIGACAO WHERE USUARIO_LOG = '" & strUserR & "'")
428 206 If rs.EOF = False Then
429 207 'IMPRIME O TOTAL DIA DO USUÁRIO
430   - Print #2, ""; Tab(15); strUserR; Tab(30); rs!linhas
  208 + Print #2, ""; Tab(15); strUserR; Tab(30); rs!TotalLigacoesPorUsuario
  209 + TotalLigacoes = TotalLigacoes + rs!TotalLigacoesPorUsuario
431 210 End If
432   - rsMeta.MoveNext
433   - ProgressBar2.value = ProgressBar2.value + 1
  211 + rsMeta.MoveNext
  212 + ProgressBar2.value = ProgressBar2.value + 1
434 213 If rsMeta.EOF = False Then
435 214 strUserR = rsMeta!USUARIO_LOG
436 215 Else
437 216 'IMPRIME O TOTAL GERAL DA BASE DE DADOS
438   -a = "NRO_LIGACAO"
439   -b = "RAMAIS_AGUA_LIGACAO"
440   -c = "OBJECT_ID_"
441   -d = "RAMAIS_AGUA"
442   -e = "USUARIO_LOG"
443   -
444   - If frmCanvas.TipoConexao <> 4 Then
445   - Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS " + """" + "LINHAS" + """" + " FROM RAMAIS_AGUA_LIGACAO WHERE OBJECT_ID_ IN (SELECT OBJECT_ID_ FROM RAMAIS_AGUA)")
446   - Else
447   - Set rs = Conn.execute("SELECT COUNT(" + """" + "NRO_LIGACAO" + """" + ") AS " + """" + "LINHAS" + """" + " FROM " + """" + "RAMAIS_AGUA_LIGACAO" + """" + " WHERE " + """" + "OBJECT_ID_" + """" + " IN (SELECT " + """" + "OBJECT_ID_" + """" + " FROM " + """" + "RAMAIS_AGUA" + """" + ")")
448   - End If
  217 + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS TotalLigacoesGeral FROM RAMAIS_AGUA_LIGACAO")
449 218 Print #2, ""
450   - Print #2, "*********** RESUMO CONSOLIDADO DE USUÁRIO ********** FIM"
  219 + Print #2, "TOTAL CADASTRADO ATÉ " & Format(Now, "DD/MM/YYYY HH:MM:SS"); Tab(30); CStr(TotalLigacoes)
  220 + Print #2, ""
  221 + Print #2, "********** RESUMO CONSOLIDADO POR USUÁRIO ********** FIM"
451 222 Print #2, "********************************************************"
452 223 Print #2, ""
  224 + Print #2, "Obs: este relatório apresenta apenas as ligações de água"
  225 + Print #2, "cadastradas a partir do GeoSan versão 7.5.0"
453 226 Print #2, ""
454 227 Print #2, ""
455   - Print #2, "TOTAL GERAL"; Tab(30); "LIGAÇÕES"
  228 + Print #2, "TOTAL GERAL DE LIGAÇÕES E RAMAIS CADASTRADOS"; Tab(30); "LIGAÇÕES"
456 229 Print #2, "========================================================"
457   - Print #2, "ATÉ " & Format(Now, "DD/MM/YYYY HH:MM:SS"); Tab(30); rs!linhas
  230 + Print #2, "ATÉ " & Format(Now, "DD/MM/YYYY HH:MM:SS"); Tab(30); rs!TotalLigacoesGeral
  231 + Print #2, ""
458 232 Print #2, ""
459 233 Print #2, ""
460 234 Exit Do
461   -
462 235 End If
463 236 Loop
464 237 Else
... ... @@ -466,119 +239,55 @@ e = &quot;USUARIO_LOG&quot;
466 239 Print #2, "NÃO HÁ INFORMAÇÕES PARA RESUMO CONSOLIDADO DE USUÁRIO **"
467 240 Print #2, ""
468 241 End If
469   -
470   -
471   - 'MONTAGEM DO RELATÓRIO DIA A DIA SEPARADO POR PONTO E VIRGULA
472   - '1 - SELECT DISTINCT LEFT(DATA_LOG,8)as data,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG
473   - '2 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE USUARIO_LOG = 'Adm' and LEFT(DATA_LOG,8) = '01/12/08'
474   - '3 - SELECT COUNT(*) AS LINHAS,SUM(LENGTHCALCULATED) AS COMPRIMENTO FROM WATERLINES WHERE LEFT(DATA_LOG,8) = '01/12/08'
475   - 'Set rsMeta = Conn.execute("SELECT DISTINCT LEFT(DATA_LOG,8) AS DATA,USUARIO_LOG FROM WATERLINES ORDER BY DATA,USUARIO_LOG")
476   -
477   -a = Left(DATA_LOG, 8)
478   -
479   -c = Left(Left(DATA_LOG, 8), 2)
480   -
481   -e = Right(Left(DATA_LOG, 5), 2)
482 242  
483   -g = "USUARIO_LOG"
484   -h = "RAMAIS_AGUA"
485   -i = "DATA_LOG"
486   -j = Right(Left(DATA_LOG, 8), 2)
487   -
488   -Dim g1 As String
489   -Dim g2 As String
490   -
491   -Dim g3 As String
492   -g1 = "ANO"
493   -g2 = "MES"
494   -g3 = "DIA"
495   -
496   -
497   - If frmCanvas.TipoConexao = 1 Then 'SQL
498   - 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")
499   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
500   - 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")
501   - ElseIf frmCanvas.TipoConexao = 4 Then
502   - 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" + """" + "")
  243 + 'MONTAGEM DO RELATÓRIO DIA A DIA DOS RAMAIS CADASTRADOS SEPARADO POR PONTO E VIRGULA
  244 + 'Para contar quantas ligações estão cadastradas e mostrar o andamento do processamento na barra de progresso
  245 + 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")
  246 + contBar = 0
  247 + If rsMeta.EOF = False Then
  248 + Do While Not rsMeta.EOF = True
  249 + rsMeta.MoveNext
  250 + contBar = contBar + 1
  251 + Loop
503 252 End If
504   -
505   - contBar = 0
506   - If rsMeta.EOF = False Then
507   - Do While Not rsMeta.EOF = True
508   - rsMeta.MoveNext
509   - contBar = contBar + 1
510   - Loop
511   - End If
512   - ProgressBar2.value = 0
513   - ProgressBar2.Max = contBar
514   - rsMeta.Requery
515   -
  253 + ProgressBar2.value = 0
  254 + ProgressBar2.Max = contBar
  255 + rsMeta.Requery
516 256 ProgressBar1.value = 10
517   -
518 257 Print #2, "********************************************************"
519 258 Print #2, "HISTÓRICO DIÁRIO DE USUÁRIO SEPARADO POR ; ****** INÍCIO"
  259 + Print #2, "Representa o cadastro total por ramais cadastrados"
520 260 Print #2, ""
521 261 If rsMeta.EOF = False Then
522   -
523 262 strDataR = rsMeta!data
524 263 strUserR = rsMeta!USUARIO_LOG
525   -
526 264 Print #2, "DATA;USUARIO;LIGAÇÕES"
527 265 Do While Not rsMeta.EOF = True
528 266 DoEvents
529   -
530   -a = NRO_LIGACAO
531   -b = "RAMAIS_AGUA_LIGACAO"
532   -c = "OBJECT_ID_"
533   -d = "RAMAIS_AGUA"
534   -g = "USUARIO_LOG"
535   -h = "RAMAIS_AGUA"
536   -i = "DATA_LOG"
537   -j = Left(DATA_LOG, 8)
538   -
539   -
540   - If frmCanvas.TipoConexao = 1 Then 'SQL
541   - 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 & "')")
542   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
543   - 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 & "')")
544   - ElseIf frmCanvas.TipoConexao = 4 Then
545   - 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 & "')")
546   - End If
547   -
  267 + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE USUARIO_LOG = '" & strUserR & "' and LEFT(DATA_LOG,10) = '" & strDataR & "'")
548 268 If rs.EOF = False Then
549 269 'IMPRIME O TOTAL DIA DO USUÁRIO
550 270 Print #2, strDataR & ";" & strUserR & ";" & rs!linhas
551 271 End If
552   - rsMeta.MoveNext
553   - ProgressBar2.value = ProgressBar2.value + 1
  272 + rsMeta.MoveNext
  273 + ProgressBar2.value = ProgressBar2.value + 1
554 274 If rsMeta.EOF = False Then
555 275 If rsMeta!data <> strDataR Then
556 276 'IMPRIME O TOTAL GERAL DIA
557   -
558   - If frmCanvas.TipoConexao = 1 Then 'SQL
559   - 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 & "')")
560   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
561   - 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 & "')")
562   - ElseIf frmCanvas.TipoConexao = 4 Then
563   - 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 & "')")
564   - End If
  277 + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE LEFT(DATA_LOG,10) = '" & strDataR & "'")
565 278 Print #2, strDataR & ";" & "Total Data" & ";" & rs!linhas
566   -
567 279 strDataR = rsMeta!data
568 280 End If
569 281 strUserR = rsMeta!USUARIO_LOG
570 282 Else 'CHEGOU AO FIM DA TABELA
571   - 'IMPRIME O TOTAL GERAL DO ULTIMO DIA DA TABELA
572   -
573   - If frmCanvas.TipoConexao = 1 Then 'SQL
574   - 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 & "')")
575   - ElseIf frmCanvas.TipoConexao = 2 Then 'ORACLE
576   - 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 & "')")
577   - ElseIf frmCanvas.TipoConexao = 4 Then
578   - 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 & "')")
579   - End If
580   -
581   - Print #2, strDataR & ";Total Data;" & rs!linhas
  283 + 'IMPRIME O TOTAL GERAL DO ULTIMO DIA DA TABELA
  284 + Set rs = Conn.execute("SELECT COUNT(NRO_LIGACAO) AS LINHAS FROM RAMAIS_AGUA_LIGACAO WHERE LEFT(DATA_LOG,10) = '" & strDataR & "'")
  285 + Print #2, strDataR & ";Total do dia;" & rs!linhas
  286 + Print #2, ""
  287 + Print #2, "Obs. Este relatório não representa necessáriamente o"
  288 + Print #2, "número total de ligações, uma vez que contabiliza"
  289 + Print #2, "apenas os ramais cadastrados."
  290 + Print #2, "Ele considera as ligações adicionais feita a um "
582 291 Print #2, ""
583 292 End If
584 293 Loop
... ... @@ -589,28 +298,30 @@ j = Left(DATA_LOG, 8)
589 298 Print #2, "HISTÓRICO DIÁRIO DE USUÁRIO SEPARADO POR ; ********* FIM"
590 299 Print #2, "********************************************************"
591 300 Print #2, ""
  301 + Print #2, "Obs: este relatório apresenta apenas as ligações de água"
  302 + Print #2, "cadastradas a partir do GeoSan versão 7.5.0"
  303 + Print #2, ""
  304 + Print #2, ""
592 305 Print #2, ""
593 306 Print #2, "****************** SISTEMA GEOSAN **********************"
594 307 Print #2, "######### RELATÓRIO INDICATIVO DE PRODUTIVIDADE ########"
595 308 Print #2, "FIM - ****************************** " & Format(Now, "DD/MM/YYYY HH:MM:SS")
596   -
597 309 Close #2
598 310 rsMeta.Close
599 311 rs.Close
600 312 MousePointer = Default
601 313 MsgBox "Arquivo gerado com sucesso!", vbInformation, "Indicador"
602 314 Unload Me
  315 + Exit Sub
603 316  
604 317 Trata_Erro:
605   -If Err.Number = 0 Or Err.Number = 20 Or Err.Number = 55 Then
606   - Resume Next
607   -Else
608   - Close #2
609   - MousePointer = vbDefault
610   -
611   - PrintErro CStr(Me.Name), "cmdGerar.Click ", CStr(Err.Number), CStr(Err.Description), True
612   -
613   -End If
  318 + If Err.Number = 0 Or Err.Number = 20 Or Err.Number = 55 Then
  319 + Resume Next
  320 + Else
  321 + Close #2
  322 + MousePointer = vbDefault
  323 + PrintErro CStr(Me.Name), "cmdGerar.Click ", CStr(Err.Number), CStr(Err.Description), True
  324 + End If
614 325 End Sub
615 326  
616 327 Private Sub Form_Load()
... ...
trunk/Forms/frmIndicadorProdutividade.frm
  Diff comments   View file @305ebe1
1 1 VERSION 5.00
2   -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "MSCOMCTL.OCX"
  2 +Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "MSCOMCTL.OCX"
3 3 Begin VB.Form frmIndicProdutRedesDeAgua
4 4 Caption = "Indicador de Produtividade - Redes de Agua"
5 5 ClientHeight = 1320
... ... @@ -105,5 +105,3 @@ Private Sub cmdGerar_Click()
105 105  
106 106 End Sub
107 107  
108   -
109   -
... ...
trunk/GeoSan.exe
View file @305ebe1
No preview for this file type
trunk/GeoSan.vbp
  Diff comments   View file @305ebe1
... ... @@ -143,6 +143,7 @@ ResFile32=&quot;GeoSan.RES&quot;
143 143 IconForm="FrmMain"
144 144 Startup="Sub Main"
145 145 HelpFile=""
  146 +NoControlUpgrade=1
146 147 Title="GeoSan"
147 148 ExeName32="GeoSan.exe"
148 149 Command32=""
... ... @@ -151,7 +152,7 @@ HelpContextID=&quot;0&quot;
151 152 CompatibleMode="0"
152 153 MajorVer=7
153 154 MinorVer=5
154   -RevisionVer=1
  155 +RevisionVer=2
155 156 AutoIncrementVer=0
156 157 ServerSupportFiles=0
157 158 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
... ...
trunk/GeoSan.vbw
  Diff comments   View file @305ebe1
... ... @@ -3,11 +3,11 @@ 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   -FrmMain = 16, 71, 1246, 591, C, 139, 12, 1258, 744, C
  6 +FrmMain = 16, 71, 1246, 591, , 139, 12, 1258, 744, C
7 7 FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C
8 8 FrmCadastroRamal = 63, 13, 1453, 742, 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, , 110, 110, 1229, 842, C
  10 +frmCanvas = 12, 33, 1452, 829, 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
... ... @@ -46,7 +46,7 @@ frmUserControle = 0, 0, 0, 0, C, 132, 132, 1251, 864, C
46 46 frmConfSenha = 0, 0, 0, 0, C, 154, 154, 1273, 886, C
47 47 frmTrocaSenha = 0, 0, 0, 0, C, 176, 176, 1295, 908, C
48 48 frmIndicProdutRedesDeAgua = 93, 38, 1476, 747, C, 198, 198, 1317, 930, C
49   -frmIndicProdutRamaisAgua = 45, 76, 1464, 808, C, 220, 220, 1339, 952, C
  49 +frmIndicProdutRamaisAgua = 45, 75, 1464, 808, Z, 220, 220, 1339, 952, C
50 50 frmEncontraTexto = 0, 0, 0, 0, C, 242, 242, 1361, 974, C
51 51 frmAtualizarSetores = 0, 0, 0, 0, C, 264, 264, 1383, 996, C
52 52 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
60 60 frmLoginTema = 0, 0, 0, 0, C, 88, 88, 1207, 820, C
61 61 mdlRelatoriosProdutividade = 286, 286, 1405, 1018, C
62 62 frmPageSetup = 0, 0, 0, 0, C, 110, 110, 1229, 842, C
63   -Form1 = 0, 0, 0, 0, C, 132, 132, 1251, 864, C
  63 +Form1 = 25, 25, 1151, 758, C, 132, 132, 1251, 864, C
64 64 frmEncontraConsumidor = 125, 125, 967, 575, C, 154, 154, 1273, 886, C
65 65 clsTeCanvas = 44, 44, 1163, 776, C
66 66 frmCadastroRamalAutoLote = 0, 0, 0, 0, C, 176, 176, 1295, 908, C
... ...
trunk/Modules/Global.bas
  Diff comments   View file @305ebe1
... ... @@ -200,7 +200,7 @@ Public Sub Main()
200 200 End If
201 201 'Configura a versão atual do GeoSan
202 202 Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision
203   - Versao_Geo = "07.05.01"
  203 + Versao_Geo = "07.05.02"
204 204 glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe
205 205 SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações
206 206 connn = ""
... ...