From 5b3c5206443c30ae431132e96c4b9de0aa7f9768 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Wed, 28 Feb 2024 12:48:07 -0600 Subject: [PATCH] .. --- B4A/B4XMainPage.bas | 4 +- B4A/C_Cuestionario.bas | 1 + B4A/C_Principal.bas | 220 ++++++++++++++++++++--------------------- B4A/INTMEX.b4a | 2 +- B4A/INTMEX.b4a.meta | 6 +- B4A/Starter.bas | 1 + 6 files changed, 118 insertions(+), 116 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 9ac7236..0843eab 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -263,7 +263,7 @@ Sub B4XPage_Appear LogColor($"////////////////// DeviceID: ${DeviceID} ////////////////// "$, Colors.Blue) DBReqServer = Starter.DBReqServer reqManager.Initialize(Me, Starter.DBReqServer) - Log(Starter.DBReqServer) + Log("|"&Starter.DBReqServer&"|") tgl.Initialize() If Not(Starter.gps.GPSEnabled) Then ToastMessageShow("Es necesario tener el GPS encendido", True) @@ -324,7 +324,7 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub Entrar_Click - Log(Starter.DBReqServer) + Log("|" & Starter.DBReqServer) Dim r As Reflector Dim Api As Int Dim PP As Phone diff --git a/B4A/C_Cuestionario.bas b/B4A/C_Cuestionario.bas index 2fee579..10422ee 100644 --- a/B4A/C_Cuestionario.bas +++ b/B4A/C_Cuestionario.bas @@ -26,6 +26,7 @@ Public Sub Initialize (vCallback As Object, vEventName As String, vRoot As B4XVi db = skmt vPreguntaActual = 0 db.ExecNonQuery("CREATE TABLE IF NOT EXISTS CUESTIONARIO (Q_RUTA TEXT, Q_ALMACEN TEXT, Q_IDCLIENTE TEXT, Q_IDPREGUNTA TEXT, Q_PREGUNTA TEXT, Q_IDRESPUESTA TEXT, Q_RESPUESTA TEXT, Q_FECHA TEXT, Q_ENVIO_OK INTEGER DEFAULT 0)") + agregaColumna("CUESTIONARIO", "Q_ENVIO_OK", "TEXT") agregaColumna("CUESTIONARIO", "Q_RUTA", "TEXT") agregaColumna("CUESTIONARIO", "Q_ALMACEN", "TEXT") Return Me diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 85df317..a9e9b94 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -10,6 +10,7 @@ Sub Class_Globals Private xui As XUI 'ignore ' Dim reqManager As DBRequestManager Dim rd As C_RespaldoDiario + Dim reqManager As DBRequestManager Dim conectado As String Dim ime As IME Dim t1 As Timer @@ -354,7 +355,8 @@ Sub B4XPage_Appear rd.respaldaPaquetes HORAINGRESO ="000000" Btn_Ubicar.Left = (Root.Width/2) - (Btn_Ubicar.Width/2) -' B4XPages.MainPage.reqManager.Initialize(Me, Starter.DBReqServer) + reqManager.Initialize(Me, Starter.DBReqServer) + Log(Starter.DBReqServer) PASO =0 If Not(Starter.gps.GPSEnabled) Then If Starter.marcaCel <> "Sony" Then ToastMessageShow("Es necesario tener el GPS encendido", True) @@ -366,7 +368,7 @@ Sub B4XPage_Appear cmd.Initialize cmd.Name = "select_fecha" Log( Starter.DBReqServer) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "fecha") + reqManager.ExecuteQuery(cmd , 0, "fecha") Msgbox("AJUSTAR FECHA","AVISO") 'ignore B4XPage_Appear Else @@ -572,7 +574,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "UPDATE_INTMEX_ACTUAL2_GPS" cmd.Parameters = Array As Object(L_MONTOD.Text, L_CUANTOST.Text, l_cuantosc.Text,l_porvisitar.TEXT,c.GetString("hglat"),c.GetString("hglon"),batterystatus(0),LPT, STEYIN, STEYOUT,ALMACEN,l_ruta.Text ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "update_gps") + reqManager.ExecuteCommand(cmd , "update_gps") Next End If c.Close @@ -587,7 +589,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_QR_2_INTMEX" cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"),C.GetString("CODIGOB"),C.GetString("LON"),C.GetString("LAT"),ALMACEN,l_ruta.text ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR") + reqManager.ExecuteCommand(cmd , "ins_QR") Next End If c.Close @@ -603,7 +605,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_QR_INTMEX" cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"),C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_LONG"),C.GetString("CAT_CL_LAT"),ALMACEN,l_ruta.text, foto1 ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR") + reqManager.ExecuteCommand(cmd , "ins_QR") Next End If c.Close @@ -616,7 +618,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_encuesta_INTMEX" cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"), c.GetString("HE_TIPO")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -635,7 +637,7 @@ Sub Subir_Click cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) PCNoArts = c.GetString("PC_NOART") PCMonto = c.GetString("PC_MONTO") - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos") + reqManager.ExecuteCommand(cmd , "ins_pedidos") Log(">>>>>> INSERT PEDIDO_CLIENTE") Next End If @@ -654,11 +656,11 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_pedido2_INTMEX" 'CON TOTALES INCLUIDOS cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$) + reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$) ' Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$) ' cmd.Name = "insert_pedido_INTMEX" ' SIN TOTALES INCLUIDOS ' cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO")) -' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido") +' reqManager.ExecuteCommand(cmd , "ins_pedido") Next End If c.Close @@ -676,7 +678,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_noventa_INTMEX" cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, l_ruta.Text) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -693,7 +695,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_geocerca_INTMEX" cmd.Parameters = Array As Object(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -707,7 +709,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_face_like_INTMEX" cmd.Parameters = Array As Object(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -723,7 +725,7 @@ Sub Subir_Click cmd.Initialize cmd.Name ="insert_drop_INTMEX_2" cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",ALMACEN) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") img2.Visible =True PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1)) If Starter.marcaCel <> "Sony" Then ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True) @@ -738,7 +740,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_CUESTIONARIO_INTMEX" cmd.Parameters = Array As Object(c.GetString("Q_IDCLIENTE"), rutaActual, ALMACEN, c.GetString("Q_FECHA"), c.GetString("Q_IDPREGUNTA"), c.GetString("Q_PREGUNTA"), c.GetString("Q_IDRESPUESTA"), C.GetString("Q_RESPUESTA")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_cuestionario") + reqManager.ExecuteCommand(cmd , "ins_cuestionario") Next End If c.Close @@ -845,69 +847,69 @@ Sub cargar_Click cmd.Initialize cmd.Name ="insert_drop_INTMEX_2" cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") cmd.Initialize cmd.Name = "select_cat_gunaprod_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod") + reqManager.ExecuteQuery(cmd , 0, "gunaprod") ' cmd.Initialize ' cmd.Name = "select_resum_apk_INTMEX" ''' va el nombre de archivo de config ' cmd.Parameters = Array As Object(ALMACEN) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done +' reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done cmd.Initialize cmd.Name = "select_cat_paquetes_INTMEX3" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") + reqManager.ExecuteQuery(cmd , 0, "gunaprodp") ' Log("ALMACEN = " & ALMACEN) cmd.Initialize cmd.Name = "select_cat_paquetess_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") + reqManager.ExecuteQuery(cmd , 0, "gunaprodp") cmd.Initialize cmd.Name = "select_cat_detallepa_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "detallepaq") + reqManager.ExecuteQuery(cmd , 0, "detallepaq") cmd.Initialize cmd.Name = "select_cat_clientes_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + reqManager.ExecuteQuery(cmd , 0, "kmt_datos") cmd.Initialize cmd.Name = "select_cat_clientes_todos_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos_todos") + reqManager.ExecuteQuery(cmd , 0, "kmt_datos_todos") cmd.Initialize cmd.Name = "select_hist_datos_INTMEX_2" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos") + reqManager.ExecuteQuery(cmd , 0, "hist_datos") cmd.Initialize cmd.Name = "select_hist_promos_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_promos") cmd.Initialize cmd.Name = "select_clientes_cuestionario_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "clientes_cuestionario") + reqManager.ExecuteQuery(cmd , 0, "clientes_cuestionario") cmd.Initialize cmd.Name = "select_hist_cliente_promos_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") ' cmd.Initialize ' cmd.Name = "select_HIST_MARCAS_CUOTAS_INTMEX" ' cmd.Parameters = Array As Object( ALMACEN, e_ruta.text) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS") +' reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS") If E_RUTA2.text <> "" Then @@ -919,79 +921,79 @@ Sub cargar_Click cmd.Initialize cmd.Name = "select_cat_clientes_INTMEX" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + reqManager.ExecuteQuery(cmd , 0, "kmt_datos") cmd.Initialize cmd.Name = "select_cat_clientes_todos_INTMEX" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos_todos") + reqManager.ExecuteQuery(cmd , 0, "kmt_datos_todos") cmd.Initialize cmd.Name = "select_hist_datos_INTMEX" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos") + reqManager.ExecuteQuery(cmd , 0, "hist_datos") cmd.Initialize cmd.Name = "select_hist_promos_INTMEX" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_promos") cmd.Initialize cmd.Name = "select_hist_cliente_promos_INTMEX" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") End If cmd.Initialize cmd.Name = "select_promo_comp_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos") ' cmd.Initialize ' cmd.Name = "select_verificacion_INTMEX" ' cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "cat_verificacion") +' reqManager.ExecuteQuery(cmd , 0, "cat_verificacion") cmd.Initialize cmd.Name = "select_fecha" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "fecha") + reqManager.ExecuteQuery(cmd , 0, "fecha") cmd.Initialize cmd.Name = "select_folio_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "folio") + reqManager.ExecuteQuery(cmd , 0, "folio") cmd.Initialize cmd.Name = "select_abonosp_INTMEX" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "select_abonosp") + reqManager.ExecuteQuery(cmd , 0, "select_abonosp") cmd.Initialize cmd.Name = "select_marcas_rutas_INTMEX" cmd.Parameters = Array As Object( ALMACEN, e_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "marcas_rutas") + reqManager.ExecuteQuery(cmd , 0, "marcas_rutas") ' cmd.Initialize ' cmd.Name = "select_CUEST_INTMEX" ' cmd.Parameters = Array As Object(ALMACEN) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO") +' reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO") ' cmd.Initialize ' cmd.Name = "select_HIST_CUOTAS_INTMEX" ' cmd.Parameters = Array As Object( ALMACEN,e_ruta.text ) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CUOTAS") +' reqManager.ExecuteQuery(cmd , 0, "CUOTAS") cmd.Initialize cmd.Name = "select_comis_cedex_INTMEX" cmd.Parameters = Array As Object( ALMACEN, e_ruta.text ) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "COMISIONES") + reqManager.ExecuteQuery(cmd , 0, "COMISIONES") cmd.Initialize cmd.Name = "select_hist_avance_INTMEX" 'select * from HIST_AVANCE_MESACTUAL where HIST_AM_RUTA = ? and HIST_AM_IDALMACEN order by HIST_AM_MARCA cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) LogColor($"HIST_AVANCE Ruta=|${e_ruta.text}|, almacen=|${ALMACEN}|"$, Colors.Red) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_avance") + reqManager.ExecuteQuery(cmd , 0, "hist_avance") cargar.Visible = False Subir.Visible = False @@ -1005,29 +1007,25 @@ 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 reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos. + If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then + reqManager.reqsList.RemoveAt(reqManager.reqsList.IndexOf(Job.tag)) + LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue) + End If + LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & 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 + Log("ERROR") +' LogColor("Error: " & reqManager.HandleJob(Job).tag & " : " & Job.ErrorMessage, Colors.red) + Log("ex") + Log(2) +' Job.Release 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 + Log(3) + LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.RGB(0,160,0)) 'Mod por CHV - 211027 'Verificamos que el usuario guardado en BD sea VALIDO. If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "update_gps" Then For Each records() As Object In RESULT.Rows Log("==========================REGISTROS="&RESULT.Rows) @@ -1067,7 +1065,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "kmt_datos" Then 'query tag S_CC.TEXT = "CARGANDO" For Each records() As Object In RESULT.Rows @@ -1106,7 +1104,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "kmt_datos_todos" Then 'query tag S_CC.TEXT = "CARGANDO" For Each records() As Object In RESULT.Rows @@ -1146,7 +1144,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "resum_apk" Then 'query tag For Each records() As Object In RESULT.Rows Dim HIST_RA_OBJMES As String = records(RESULT.Columns.Get("HIST_RA_OBJMES")) @@ -1206,7 +1204,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_promos" Then 'query tag For Each records() As Object In RESULT.Rows Dim HP_CLIENTE As String = records(RESULT.Columns.Get("HP_CLIENTE")) @@ -1227,7 +1225,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_cliente_promos" Then 'query tag For Each records() As Object In RESULT.Rows Dim HCCP_CLIENTE As String = records(RESULT.Columns.Get("HCCP_CLIENTE")) @@ -1240,7 +1238,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "HIST_MARCAS_CUOTAS" Then 'query tag For Each records() As Object In RESULT.Rows Dim HMC_MARCA As String = records(RESULT.Columns.Get("HMC_MARCA")) @@ -1252,7 +1250,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_comp_promos" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_PA_ID As String = records(RESULT.Columns.Get("CAT_PA_ID")) @@ -1274,7 +1272,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "cat_verificacion" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_VE_IDPROD As String = records(RESULT.Columns.Get("CAT_VE_IDPROD")) @@ -1286,7 +1284,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "marcas_rutas" Then 'query tag For Each records() As Object In RESULT.Rows Dim HVD_MARCA As String = records(RESULT.Columns.Get("HVD_MARCA")) @@ -1298,7 +1296,7 @@ Sub JobDone(Job As HttpJob) 'CUOTAS If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "CUOTAS" Then 'query tag For Each records() As Object In RESULT.Rows Dim HC_RUTA As String = records(RESULT.Columns.Get("HC_RUTA")) @@ -1322,7 +1320,7 @@ Sub JobDone(Job As HttpJob) 'COMISIONES If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "COMISIONES" Then 'query tag For Each records() As Object In RESULT.Rows Dim HCM_TOTAL_V As String = records(RESULT.Columns.Get("HCM_TOTAL_V")) @@ -1335,7 +1333,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "gunaprod" Then 'query tag If PB2.Progress < 30 Then S_CP.Text = "CARGANDO" 'Mod por CHV - 20211028 Agregue el "If PB2.Progress < 30 then" For Each records() As Object In RESULT.Rows @@ -1377,7 +1375,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "gunaprodp" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_GP_ID As String = records(RESULT.Columns.Get("CAT_GP_ID")) @@ -1423,7 +1421,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "gunaprodps" Then 'query tag For Each records() As Object In RESULT.Rows @@ -1469,7 +1467,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "detallepaq" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_DP_ALMACEN As String = records(RESULT.Columns.Get("CAT_DP_ALMACEN")) @@ -1509,7 +1507,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_datos" Then 'query tag For Each records() As Object In RESULT.Rows Dim HVD_CLIENTE As String = records(RESULT.Columns.Get("HVD_CLIENTE")) @@ -1538,7 +1536,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "variables" Then 'query tag For Each records() As Object In RESULT.Rows Dim Cat_Va_Descripcion As String = records(RESULT.Columns.Get("CAT_VA_DESCRIPCION")) @@ -1549,7 +1547,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "CUESTIONARIO" Then 'query tag For Each records() As Object In RESULT.Rows Dim Cat_Va_Valor As String = records(RESULT.Columns.Get("CAT_VALOR")) @@ -1560,7 +1558,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "valida_pedido" Then 'query tag For Each records() As Object In RESULT.Rows Dim CUANTOSP As Int = records(RESULT.Columns.Get("CUANTOSP")) @@ -1577,7 +1575,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "valida_pedidoc" Then 'query tag For Each records() As Object In RESULT.Rows Dim CUANTOSC As Int = records(RESULT.Columns.Get("CUANTOSC")) @@ -1592,7 +1590,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "valida_noventa" Then 'query tag For Each records() As Object In RESULT.Rows Dim CUANTOSN As Int = records(RESULT.Columns.Get("CUANTOSN")) @@ -1607,7 +1605,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "ins_pedido" Then 'query tag For Each records() As Object In RESULT.Rows PB2.Progress = PB2.Progress + 5 @@ -1620,7 +1618,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "version" Then 'query tag For Each records() As Object In RESULT.Rows B4XPages.MainPage.skmt.ExecNonQuery("delete from VERSION") @@ -1631,7 +1629,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "count_cli" Then 'query tag For Each records() As Object In RESULT.Rows COUNT_CLIE = records(RESULT.Columns.Get("COUNT_CLIE")) @@ -1640,11 +1638,13 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "ruta" Then 'query tag -' Log("JOBDONE PRINCIPAL RUTA") + Log("JOBDONE PRINCIPAL RUTA") + Log(RESULT.Rows.Size) For Each records() As Object In RESULT.Rows Dim VALIDO As String = records(RESULT.Columns.Get("VALIDO")) + Log("|"&VALIDO) If VALIDO = "OK" Then cargar.Visible = True Subir.Visible = True @@ -1665,7 +1665,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "usuario" Then 'query tag For Each records() As Object In RESULT.Rows Dim name2 As String = records(RESULT.Columns.Get("VALIDO")) @@ -1679,7 +1679,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "fecha" Then 'query tag For Each records() As Object In RESULT.Rows Dim FECHA_HOY As String = records(RESULT.Columns.Get("FECHA")) @@ -1690,7 +1690,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "folio" Then 'query tag For Each records() As Object In RESULT.Rows Dim FOLIO As String = records(RESULT.Columns.Get("FOLIO")) @@ -1701,7 +1701,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_avance" Then 'query tag For Each records() As Object In RESULT.Rows Dim marca As String = records(RESULT.Columns.Get("HIST_AM_MARCA")) @@ -1714,7 +1714,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "select_abonosp" Then 'query tag For Each records() As Object In RESULT.Rows Dim NOTA As String = records(RESULT.Columns.Get("NOTA")) @@ -1727,18 +1727,18 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "ins_cuestionario" Then 'query tag Subs.logJobDoneResultados(RESULT) End If - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = 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) + Dim RESULT As DBResult = 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") @@ -1768,16 +1768,16 @@ End Sub Sub connecta_Click Log( Starter.DBReqServer) - B4XPages.MainPage.reqManager.Initialize(Me, Starter.DBReqServer) + reqManager.Initialize(Me, Starter.DBReqServer) ime.HideKeyboard connecta1 = connecta1 + 1 ' imei = p.GetDeviceId imei = "xxxx" conn = "1" - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "select_version_INTMEX" - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "version") +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "select_version_INTMEX" +' reqManager.ExecuteQuery(cmd , 0, "version") ' Cuando nos conectamos verificamos que el usuario guardado en BD sea VALIDO. ' c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO, PASS from usuarioa") @@ -1789,16 +1789,16 @@ Sub connecta_Click ' cmd.Name = "select_usuario_guna_INTMEX_1" ' Log(usrT & "|" & passT) ' cmd.Parameters = Array As Object(usrT, passT) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "usuarioA") +' reqManager.ExecuteQuery(cmd , 0, "usuarioA") ' End If ' c.Close Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_ruta_INTMEX_7" - cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei) + cmd.Parameters = Array As Object(ALMACEN, e_ruta.text) ' Log($"${ALMACEN},${e_ruta.text},${imei}"$) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") + reqManager.ExecuteQuery(cmd , 0, "ruta") If e_ruta.Text = "KMTS1" Then cargar.Visible = True @@ -1826,7 +1826,7 @@ Sub connecta_Click ' 'SERVER = "http://177.244.63.54:1782" '' Starter.DBReqServer = "http://187.189.244.154:1782" '' SERVER = "http://10.0.0.205:1782" -' B4XPages.MainPage.reqManager.Initialize(Me, Starter.DBReqServer) +' reqManager.Initialize(Me, Starter.DBReqServer) ' End If End Sub @@ -1898,16 +1898,16 @@ Sub inv_Click cmd.Initialize cmd.Name = "select_cat_gunaprod_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod") + reqManager.ExecuteQuery(cmd , 0, "gunaprod") cmd.Initialize cmd.Name = "select_cat_paquetes_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") + reqManager.ExecuteQuery(cmd , 0, "gunaprodp") cmd.Initialize cmd.Name = "select_cat_detallepa_INTMEX" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "detallepaq") + reqManager.ExecuteQuery(cmd , 0, "detallepaq") cargar.Visible = False Subir.Visible = False @@ -1920,17 +1920,17 @@ Sub t1_tick cmd.Initialize cmd.Name = "select_cuantos_pedido_INTMEX" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "valida_pedido") + reqManager.ExecuteQuery(cmd , 0, "valida_pedido") cmd.Initialize cmd.Name = "select_cuantos_noventa_INTMEX" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "valida_noventa") + reqManager.ExecuteQuery(cmd , 0, "valida_noventa") cmd.Initialize cmd.Name = "select_cuantos_pedidoc_INTMEX" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc") + reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc") If PB2.Progress = 0 Then S_CP.Text = "ENVIAR DATOS (K-1)" diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index e9150d8..0874f45 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -162,7 +162,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 4.02.26 + #VersionName: 4.02.27 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 6d0d17b..d11985a 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -61,7 +61,7 @@ ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= ModuleClosedNodes12= -ModuleClosedNodes13=7 +ModuleClosedNodes13= ModuleClosedNodes14=9,11 ModuleClosedNodes15=9,10 ModuleClosedNodes16= @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9=1 -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 +NavigationStack=C_Principal,cargar_Click,995,0,C_Principal,connecta_Click,1791,0,C_Principal,B4XPage_Appear,353,3,B4XMainPage,Entrar_Click,320,2,B4XMainPage,B4XPage_Created,178,0,Starter,ENVIA_ULTIMA_GPS,87,0,Starter,Service_Start,52,5,C_Subs,traeDBReqServerDeBD,435,0,C_Principal,JobDone,1635,6,B4XMainPage,B4XPage_Appear,259,4 SelectedBuild=0 -VisibleModules=2,26,13,16,14,4,27,15,9,6 +VisibleModules=2,26,13,16,14,4,27,15,9,6,17 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 714260f..5b7eb8f 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -58,6 +58,7 @@ Sub Service_Start (StartingIntent As Intent) ' Log(marcaCel) If s.traeDBReqServerDeBD(skmt) <> "N/A" Then DBReqServer = s.traeDBReqServerDeBD(skmt) reqManager.Initialize(Me, DBReqServer) + Log($"Starter - |${DBReqServer}|"$) End Sub Private Sub Timer1_Tick