From d510458135be9afc04e1e58962ee7738b7564559 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Wed, 18 Oct 2023 03:51:59 -0600 Subject: [PATCH] =?UTF-8?q?18/10/23=20-=20Se=20quit=C3=B3=20de=20los=20Job?= =?UTF-8?q?Done=20el=20toast=20de=20error.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 1 + B4A/C_Cliente.bas | 2 +- B4A/C_NuevoCliente.bas | 11 +++++++---- B4A/C_Principal.bas | 1 + B4A/Mariana Censos.b4a | 2 +- B4A/Mariana Censos.b4a.meta | 8 ++++---- B4A/Starter.bas | 3 ++- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 22d1c0c..0b419b4 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -357,6 +357,7 @@ Sub JobDone(Job As HttpJob) Log(Job.Success) If Job.Success = False Then ToastMessageShow("Error: " & Job.ErrorMessage, True) +' LogColor("Error: " & Job.ErrorMessage, Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 If Job.JobName = "DBRequest" Then diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 9beb937..2a7e251 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -386,7 +386,7 @@ End Sub Sub JobDone(Job As HttpJob) Log(Job.Success) If Job.Success = False Then - ToastMessageShow("Error: " & Job.ErrorMessage, True) +' ToastMessageShow("Error: " & Job.ErrorMessage, True) LogColor("Error: " & Job.ErrorMessage, Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index 62757a4..fed6e77 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -50,7 +50,7 @@ Sub Class_Globals Private B_FOTO As Button Dim elOtroCliente As String = "" Dim camposModificados As List - dim mandarTodo as Boolean = False + Dim mandarTodo As Boolean = False End Sub 'You can add more parameters here. @@ -160,6 +160,7 @@ Sub b_guardar_Click ToastMessageShow("Es necesario cargar una ruta.", False) Else Log("entramos a b_guardar") + Log($"CargarCliente: ${cargarCliente}"$) DateTime.DateFormat = "dd/MM/yyyy" DateTime.Timeformat = "HHmmss" sDate=DateTime.Date(DateTime.Now) @@ -183,9 +184,11 @@ Sub b_guardar_Click Private DateNC As String = DateTime.Date(DateTime.Now) If cargarCliente Then camposModificados = Subs.RemoveDuplicates(camposModificados) - B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE kmt_info set CAT_CL_CODIGO = '${no_cliente}', CAT_CL_CEDIS = '${Subs.traeAlmacen}', CAT_CL_LAT = '${B4XPages.MainPage.lat_gps}', CAT_CL_LONG = '${B4XPages.MainPage.lon_gps}', CAT_CL_GIRO = '${cb_giro.SelectedItem}', CAT_CL_NOMBRE = '${Subs.escapeSQLString(et_nombre.Text)}', CAT_CL_CALLE1 = '${Subs.escapeSQLString(et_direccion.text)}', CAT_CL_ENVIO_PENDIENTE = 1, LAT_CENSADOR = '${B4XPages.MainPage.lat_gps}', LON_CENSADOR = '${B4XPages.MainPage.lon_gps}', CAMPOS_MODIFICADOS = '${Subs.list2string(camposModificados)}' where CAT_CL_CODIGO In (select cuenta from cuentaa)"$) + B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE kmt_info set CAT_CL_CODIGO = '${no_cliente}', CAT_CL_CEDIS = '${Subs.traeAlmacen}', + CAT_CL_LAT = '${B4XPages.MainPage.lat_gps}', CAT_CL_LONG = '${B4XPages.MainPage.lon_gps}', CAT_CL_GIRO = '${cb_giro.SelectedItem}', CAT_CL_NOMBRE = '${Subs.escapeSQLString(et_nombre.Text)}', CAT_CL_CALLE1 = '${Subs.escapeSQLString(et_direccion.text)}', CAT_CL_ENVIO_PENDIENTE = 1, + LAT_CENSADOR = '${B4XPages.MainPage.lat_gps}', LON_CENSADOR = '${B4XPages.MainPage.lon_gps}', CAMPOS_MODIFICADOS = '${Subs.list2string(camposModificados)}' where CAT_CL_CODIGO In (select cuenta from cuentaa)"$) Else - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_CALLE1, CAT_CL_LAT, CAT_CL_LONG, CAT_CL_FECHA_CAPTURA, CAT_CL_DIAS_VISITA, CAT_CL_ENVIO_PENDIENTE) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1) ", Array As Object (no_cliente, no_ruta, et_nombre.Text, et_direccion.Text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, DateNC, Starter.dia_semana)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_CALLE1, CAT_CL_LAT, CAT_CL_LONG, CAT_CL_FECHA_CAPTURA, CAT_CL_DIAS_VISITA, LAT_CENSADOR, LON_CENSADOR, CAT_CL_ENVIO_PENDIENTE) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1) ", Array As Object (no_cliente, no_ruta, et_nombre.Text, et_direccion.Text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, DateNC, Starter.dia_semana, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) End If B4XPages.MainPage.skmt.ExecNonQuery("delete from CUENTAA") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(no_cliente)) @@ -394,8 +397,8 @@ Sub mandaPendientesNuevosClientes ' TMP_ALMACENID, TMP_RUTA, TMP_USUARIO, TMP_ID_CLIENTE, TMP_NOMBRE, TMP_DOMICILIO, TMP_FECHA_CAPTURA_MOVIL, TMP_FECHA_SINCRONIZACION, TMP_LATITUD, TMP_LONGITUD cmd.Parameters = Array As Object(Subs.traeAlmacen, c.GetString("CAT_CL_RUTA"), Subs.traeUsuarioDeBD, c.GetString("CAT_CL_CODIGO"), c.GetString("CAT_CL_NOMBRE"), c.GetString("CAT_CL_CALLE1"), c.GetString("CAT_CL_FECHA_CAPTURA"), sDateP, c.GetString("CAT_CL_LAT"), c.GetString("CAT_CL_LONG"), fotox, elGiro, Starter.dia_semana) ' Log($"${c.GetString("CAT_CL_CODIGO")}, ${Subs.traeAlmacen}, ${c.GetString("CAT_CL_LAT")}, ${c.GetString("CAT_CL_LONG")}, ${c.GetString("CAT_CL_SECUENCIA")}, ${c.GetString("CAT_CL_RUTA")}, ${c.GetString("CAT_CL_DIASEMANA")}, ${c.GetString("CAT_CL_GIRO")}, ${c.GetString("CAT_CL_NOMBRE")}, ${c.GetString("CAT_CL_ATIENDE1")}, ${c.GetString("CAT_CL_CALLE")}, ${c.GetString("CAT_CL_NOINT")}, ${c.GetString("CAT_CL_NOEXT")}, ${c.GetString("CAT_CL_CALLE1")}, ${c.GetString("CAT_CL_CRUCE1")}, ${c.GetString("CAT_CL_CALLE2")}, ${c.GetString("CAT_CL_CP")}, ${c.GetString("CAT_CL_COLONIA")}, ${c.GetString("CAT_CL_MUNI")}, ${c.GetString("CAT_CL_EDO")}, ${c.GetString("CAT_CL_ESTATUS")}, ${c.GetString("CAT_CL_FECHA_CAPTURA")}, ${sDate}, ${Subs.traeUsuarioDeBD}"$) - reqManager.ExecuteCommand(cmd , $"guardaClienteNuevo_${c.GetString("CAT_CL_CODIGO")}"$) + cmd.Initialize cmd.Name = "guardaClientesNuevosMods_MARDS" cmd.Parameters = Array As Object(Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeAlmacen, c.GetString("CAT_CL_RUTA"), Subs.traeCliente, c.GetString("CAMPOS_MODIFICADOS")) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index a362b25..7d51359 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -542,6 +542,7 @@ Sub JobDone(Job As HttpJob) Log("JobDone Principal") If Job.Success = False Then 'ToastMessageShow("Error: " & Job.ErrorMessage, True) + LogColor("Error: " & Job.ErrorMessage, Colors.red) If Job.ErrorMessage = "STREAM" Then If CARGA = "SUBIR" Then PB2.Progress = PB2.Progress + PORCENTAJE diff --git a/B4A/Mariana Censos.b4a b/B4A/Mariana Censos.b4a index 820fa28..e73c1bb 100644 --- a/B4A/Mariana Censos.b4a +++ b/B4A/Mariana Censos.b4a @@ -748,7 +748,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Mariana Censos #VersionCode: 1 - #VersionName: 3.09.26 + #VersionName: 3.10.10 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Mariana Censos.b4a.meta b/B4A/Mariana Censos.b4a.meta index 78d4ef3..f21abcc 100644 --- a/B4A/Mariana Censos.b4a.meta +++ b/B4A/Mariana Censos.b4a.meta @@ -38,14 +38,14 @@ ModuleClosedNodes12=5 ModuleClosedNodes13= ModuleClosedNodes14=63,64,65,67,68 ModuleClosedNodes15=9,10,11,13,17,18,19 -ModuleClosedNodes2=2,3,7,8,9,10,11,12,13,14,15,16,17,18,21,22 +ModuleClosedNodes2=2,3,8,9,10,11,12,13,14,15,16,17,18,21,22 ModuleClosedNodes3= ModuleClosedNodes4=8,10,11,14,16,17,18,19,20,21,22,23,24,25,26,27,28 ModuleClosedNodes5=4,8,10,11,12,13 ModuleClosedNodes6= -ModuleClosedNodes7=5,6,9,11,12,13,14,16,17,18 +ModuleClosedNodes7=6,9,11,12,13,14,16,17,18 ModuleClosedNodes8=3 ModuleClosedNodes9= -NavigationStack=C_Clientes,B4XPage_Appear,97,6,C_Clientes,clv_clientes_ItemClick,140,5,C_Clientes,BUSCA_TextChanged,219,2,Visual Designer,clientesItem.bal,-100,6,Visual Designer,clientes.bal,-100,6,C_Clientes,Class_Globals,18,0,Starter,Service_Create,44,0,Starter,JobDone,115,0,C_Principal,B4XPage_Appear,394,0,Starter,ENVIA_ULTIMA_GPS,81,2 +NavigationStack=C_Cliente,b_guardaCambios_Click,328,0,C_Cliente,mandaPendientes,369,0,C_NuevoCliente,Class_Globals,0,0,Visual Designer,nuevocliente.bal,-100,1,C_NuevoCliente,mandaPendientesNuevosClientes,398,0,C_NuevoCliente,b_guardar_Click,178,5,C_NuevoCliente,B4XPage_Appear,111,0,B4XMainPage,JobDone,353,0,Starter,JobDone,113,3,C_Principal,JobDone,538,0,C_Cliente,JobDone,382,0 SelectedBuild=0 -VisibleModules=2,13,8,4,5,14,7,11,6,10 +VisibleModules=2,13,8,4,5,14,7,11,15 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 8c1a53b..82d269d 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -120,7 +120,8 @@ End Sub Sub JobDone(Job As HttpJob) ' Log(Job.Success) If Job.Success = False Then - ToastMessageShow("Error: " & Job.ErrorMessage, True) +' ToastMessageShow("Error: " & Job.ErrorMessage, True) + LogColor("Error: " & Job.ErrorMessage, Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 If Job.JobName = "DBRequest" Then