diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 6ebddb6..91f72c4 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -917,7 +917,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 5.12.14 + #VersionName: 5.12.15 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index aee66e4..05523f5 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -100,6 +100,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,JobDone,2227,0,DiseƱador Visual,cliente.bal,-100,2,C_Cliente,Guardar_Click,1083,0,C_Cliente,mandaPendientes,1089,1,C_Principal,enviaPedidoBatch,3521,6,Main,Globals,34,0,Main,Process_Globals,28,0,C_Cliente,Class_Globals,0,0,C_Cliente,B4XPage_Created,399,6,C_Cliente,B4XPage_Appear,850,0 +NavigationStack=C_Cliente,B4XPage_Appear,841,0,B4XMainPage,Class_Globals,118,0,B4XMainPage,Initialize,126,0,C_Principal,cargar_Click,1031,0,Subs,modTrendSpending,2210,3,C_TrendSpending,modTrendSpending,112,2,C_Productos,B4XPage_Appear,236,0,C_TrendSpending,traeDescXSku,59,0,C_TrendSpending,traeInfoTrendSpending,73,2,C_Principal,JobDone,2240,0 SelectedBuild=0 -VisibleModules=31,1,12,3,32,13,14,20,19,33 +VisibleModules=31,1,12,3,32,13,14,20,19,33,16 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 33f2acc..d4b41e0 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -2214,7 +2214,7 @@ Sub modTrendSpending(accion As String, tipo As String, monto As String) acumulado = d.GetString("ACUMULADO") End If Log("acumulado: " & acumulado & " | monto: " & monto) - Private c As Cursor = Starter.skmt.ExecQuery($"select HIST_TSS_TIPO, ${HIST_TSS_SEMANA} as disponible, ${HIST_TSS_SEMANA_ACUM} as acumulado from HIST_TREND_SPENDING_SEMANAL where HIST_TSS_TIPO = '${tipo.ToUpperCase}'"$) + Private c As Cursor = Starter.skmt.ExecQuery($"select HIST_TSS_TIPO, ifnull(${HIST_TSS_SEMANA},0) as disponible, ifnull(${HIST_TSS_SEMANA_ACUM},0) as acumulado from HIST_TREND_SPENDING_SEMANAL where HIST_TSS_TIPO = '${tipo.ToUpperCase}'"$) If accion.ToUpperCase = "RESTA" Then If c.RowCount > 0 Then c.Position = 0 diff --git a/C_TrendSpending.bas b/C_TrendSpending.bas index ab1e719..1d78e71 100644 --- a/C_TrendSpending.bas +++ b/C_TrendSpending.bas @@ -82,11 +82,12 @@ Sub traeInfoTrendSpending As Map End If If semana > 0 Then c = tsdb.ExecQuery($"select HIST_TSS_TIPO, HIST_TSS_SEMANA${semana}, ifnull(HIST_TSS_SEMANA${semana}_ACUM,0) as HIST_TSS_SEMANA${semana}_ACUM from HIST_TREND_SPENDING_SEMANAL"$) -' Log($"select HIST_TSS_TIPO, HIST_TSS_SEMANA${semana}, ifnull(HIST_TSS_SEMANA${semana}_ACUM,0) as HIST_TSS_SEMANA${semana}_ACUM from HIST_TREND_SPENDING_SEMANAL"$) + Log($"select HIST_TSS_TIPO, HIST_TSS_SEMANA${semana}, ifnull(HIST_TSS_SEMANA${semana}_ACUM,0) as HIST_TSS_SEMANA${semana}_ACUM from HIST_TREND_SPENDING_SEMANAL"$) If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 c.Position = i HIST_TSS_SEMANA = c.GetString($"HIST_TSS_SEMANA${semana}"$) + If Not(IsNumber(HIST_TSS_SEMANA)) Then HIST_TSS_SEMANA = 0 Private xx As String = c.GetString($"HIST_TSS_SEMANA${semana}_ACUM"$) If xx = "null" Then xx = 0 HIST_TSS_SEMANA_ACUM = xx @@ -124,7 +125,7 @@ Sub modTrendSpending(accion As String, tipo As String, monto As String) acumulado = d.GetString("ACUMULADO") End If Log("acumulado:" & acumulado & " | monto: " & monto) - Private c As Cursor = tsdb.ExecQuery($"select HIST_TSS_TIPO, ${HIST_TSS_SEMANA} as disponible, ${HIST_TSS_SEMANA_ACUM} as acumulado from HIST_TREND_SPENDING_SEMANAL where HIST_TSS_TIPO = '${tipo.ToUpperCase}'"$) + Private c As Cursor = tsdb.ExecQuery($"select HIST_TSS_TIPO, ifnull(${HIST_TSS_SEMANA},0) as disponible, ifnull(${HIST_TSS_SEMANA_ACUM},0) as acumulado from HIST_TREND_SPENDING_SEMANAL where HIST_TSS_TIPO = '${tipo.ToUpperCase}'"$) ' Log(($"select HIST_TSS_TIPO, ${HIST_TSS_SEMANA} as disponible, ${HIST_TSS_SEMANA_ACUM} as acumulado from HIST_TREND_SPENDING_SEMANAL where HIST_TSS_TIPO = '${tipo.ToUpperCase}'"$)) Log("---- " & c.RowCount) If accion.ToUpperCase = "RESTA" Then