diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index b86b69e..85df317 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -861,7 +861,7 @@ Sub cargar_Click cmd.Name = "select_cat_paquetes_INTMEX3" cmd.Parameters = Array As Object(ALMACEN) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") - Log("ALMACEN = " & ALMACEN) +' Log("ALMACEN = " & ALMACEN) cmd.Initialize cmd.Name = "select_cat_paquetess_INTMEX" @@ -894,9 +894,8 @@ Sub cargar_Click B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_promos") cmd.Initialize - cmd.Name = "select_clientes_cuestionario" + cmd.Name = "select_clientes_cuestionario_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - Log($"${e_ruta.text}, ${ALMACEN}"$) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "clientes_cuestionario") cmd.Initialize @@ -1006,24 +1005,24 @@ End Sub Sub JobDone(Job As HttpJob) Log("JOBDONE PRINCIPAL") - If B4XPages.MainPage.reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos. - If B4XPages.MainPage.reqManager.reqsList.IndexOf(Job.tag) <> -1 Then - B4XPages.MainPage.reqManager.reqsList.RemoveAt(B4XPages.MainPage.reqManager.reqsList.IndexOf(Job.tag)) - LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue) - End If - LogColor(">>>>>> " & B4XPages.MainPage.reqManager.reqsList.Size & " - " & B4XPages.MainPage.reqManager.reqsList, Colors.Blue) - End If +' If B4XPages.MainPage.reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos. +' If B4XPages.MainPage.reqManager.reqsList.IndexOf(Job.tag) <> -1 Then +' B4XPages.MainPage.reqManager.reqsList.RemoveAt(B4XPages.MainPage.reqManager.reqsList.IndexOf(Job.tag)) +' LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue) +' End If +' LogColor(">>>>>> " & B4XPages.MainPage.reqManager.reqsList.Size & " - " & B4XPages.MainPage.reqManager.reqsList, Colors.Blue) +' End If If Job.Success = False Then - LogColor("Error: " & B4XPages.MainPage.reqManager.HandleJob(Job).tag & " : " & Job.ErrorMessage, Colors.red) - If Job.ErrorMessage = "STREAM" Then - If CARGA = "SUBIR" Then - PB2.Progress = PB2.Progress + PORCENTAJE - S_CP.Text = "SUBIENDO" - If PB2.Progress > 99 Then - S_CP.Text = "VALIDANDO" - End If - End If - End If +' LogColor("Error: " & B4XPages.MainPage.reqManager.HandleJob(Job).tag & " : " & Job.ErrorMessage, Colors.red) +' If Job.ErrorMessage = "STREAM" Then +' If CARGA = "SUBIR" Then +' PB2.Progress = PB2.Progress + PORCENTAJE +' S_CP.Text = "SUBIENDO" +' If PB2.Progress > 99 Then +' S_CP.Text = "VALIDANDO" +' End If +' End If +' End If Else 'If Job Success then ... LogColor("JobDone: '" & B4XPages.MainPage.reqManager.HandleJob(Job).tag & "' - Registros: " & B4XPages.MainPage.reqManager.HandleJob(Job).Rows.Size, Colors.RGB(0,160,0)) 'Mod por CHV - 211027 'Verificamos que el usuario guardado en BD sea VALIDO. @@ -1643,7 +1642,7 @@ Sub JobDone(Job As HttpJob) If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) If RESULT.Tag = "ruta" Then 'query tag - Log("JOBDONE PRINCIPAL RUTA") +' Log("JOBDONE PRINCIPAL RUTA") For Each records() As Object In RESULT.Rows Dim VALIDO As String = records(RESULT.Columns.Get("VALIDO")) If VALIDO = "OK" Then @@ -1733,15 +1732,18 @@ Sub JobDone(Job As HttpJob) Subs.logJobDoneResultados(RESULT) End If + Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) If RESULT.Tag = "test" Then 'query tag Log(">>>>>>>>>>>>> TEST") Subs.logJobDoneResultados(RESULT) End If + Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) If RESULT.Tag = "clientes_cuestionario" Then + Log("Entramos a clientes_cuestionario - Regs:" & RESULT.Rows.Size) Starter.skmt.ExecNonQuery("delete from HIST_CUESTIONARIO") For Each records() As Object In RESULT.Rows - Dim idCliente As String = records(RESULT.Columns.Get("NOTA")) + Dim idCliente As String = records(RESULT.Columns.Get("HC_CLIENTE")) Starter.skmt.ExecNonQuery2("INSERT INTO HIST_CUESTIONARIO(HC_CLIENTE) VALUES (?)", Array As Object (idCliente)) Next End If @@ -1795,7 +1797,7 @@ Sub connecta_Click cmd.Initialize cmd.Name = "select_ruta_INTMEX_7" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei) - Log($"${ALMACEN},${e_ruta.text},${imei}"$) +' Log($"${ALMACEN},${e_ruta.text},${imei}"$) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") If e_ruta.Text = "KMTS1" Then diff --git a/B4A/INTMEX_LL.b4a b/B4A/INTMEX.b4a similarity index 99% rename from B4A/INTMEX_LL.b4a rename to B4A/INTMEX.b4a index 01bab73..e9150d8 100644 --- a/B4A/INTMEX_LL.b4a +++ b/B4A/INTMEX.b4a @@ -157,12 +157,12 @@ Module9=C_Nota NumberOfFiles=46 NumberOfLibraries=33 NumberOfModules=28 -Version=12.8 +Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 4.02.14 + #VersionName: 4.02.26 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX_LL.b4a.meta b/B4A/INTMEX.b4a.meta similarity index 84% rename from B4A/INTMEX_LL.b4a.meta rename to B4A/INTMEX.b4a.meta index 8cd2534..6d0d17b 100644 --- a/B4A/INTMEX_LL.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9=1 -NavigationStack=C_Cliente,CreateListItem,1119,0,C_Principal,Class_Globals,0,0,C_Principal,connecta_Click,1790,0,C_Principal,cargar_Click,866,6,C_Principal,JobDone,1738,0,C_Cliente,B4XPage_Created,159,0,C_Cliente,Class_Globals,145,0,C_Cliente,cuest_preguntaContestada,1135,2,C_Cliente,ListView1_ItemLongClick,408,0,C_Cliente,gest_Click,411,6 +NavigationStack=C_Principal,Class_Globals,0,0,C_Cliente,B4XPage_Created,159,0,C_Cliente,Class_Globals,145,0,C_Cliente,cuest_preguntaContestada,1135,2,C_Cliente,GPS_LocationChanged,404,0,C_Cliente,ListView1_ItemLongClick,408,0,C_Cliente,gest_Click,417,6,C_Principal,connecta_Click,1791,0,C_Principal,cargar_Click,899,6,C_Principal,JobDone,1721,6 SelectedBuild=0 VisibleModules=2,26,13,16,14,4,27,15,9,6