From d49ef2d100437612409c2cabc14c52a0e838618c Mon Sep 17 00:00:00 2001 From: IsR0d Date: Mon, 28 Oct 2024 17:49:47 -0600 Subject: [PATCH] =?UTF-8?q?Version:=204.10.27=20Se=20agrego=20una=20column?= =?UTF-8?q?a=20a=20BITACORAGPS=20para=20saber=20si=20usaron=20la=20contras?= =?UTF-8?q?e=C3=B1a=20de=20la=20geocerca,=200=20es=20inactivo=20y=201=20es?= =?UTF-8?q?=20activo,=20tambien=20se=20manda=20la=20version=20a=20TMP=5FDR?= =?UTF-8?q?OP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 1 + B4A/C_Cliente.bas | 43 +++++++++------- B4A/C_NoVenta.bas | 2 +- B4A/C_Principal.bas | 96 ++++++++++++++++++----------------- B4A/Guna Vistas V3.1.b4a | 2 +- B4A/Guna Vistas V3.1.b4a.meta | 6 +-- B4A/Subs.bas | 6 +-- 7 files changed, 82 insertions(+), 74 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 4a43787..8e1acba 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -184,6 +184,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("PEDIDO", "PE_RECALCULO", "TEXT") Subs.agregaColumna("PEDIDO", "PE_RECALCULOTOT", "TEXT") Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "TEXT") + Subs.agregaColumna("BITACORAGPS", "BAN_GEOB", "TEXT") Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna "P10" en la tabla c=skmt.ExecQuery("SELECT COUNT(*) AS fCol FROM pragma_table_info('ENCUESTA_MODULO3') WHERE name='P10'") c.Position = 0 diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index a841c08..f7c3a94 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -426,6 +426,8 @@ Sub Class_Globals Private geoCont As Int = 0 Private l_version As Label Private p_transparenteInicioFin As Panel + + Dim b_geo As String End Sub 'You can add more parameters here. @@ -944,9 +946,11 @@ Sub GPS_LocationChanged (Location1 As Location) gest.Visible = True Tels.Visible = True iniciofin + b_geo = "0" Else If geo = "1" Then gest.Visible = False Tels.Visible = False + p_transparenteInicioFin.Visible = False b_Inicio_Fin_venta.Visible = False End If End If @@ -957,6 +961,7 @@ Sub GPS_LocationChanged (Location1 As Location) gest.Visible = True iniciofin precision = "1" + b_geo = "0" ToastMessageShow("DENTRO de rango GPS", False) Else If habi = "1" Then c = skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD")) @@ -981,17 +986,20 @@ Sub GPS_LocationChanged (Location1 As Location) LA_GEO.TextColor = Colors.Blue Tels.Visible = True gest.Visible = True + b_geo = "1" iniciofin ToastMessageShow("DENTRO de rango GPS", False) Else If distancealm > 50 Then Tels.Visible = False gest.Visible = False + p_transparenteInicioFin.Visible = False b_Inicio_Fin_venta.Visible = False c = skmt.ExecQuery("SELECT PC_CLIENTE FROM PEDIDO_CLIENTE WHERE PC_CLIENTE IN (Select CUENTA from cuentaa)") If c.RowCount > 0 Then precision = "0" Tels.Visible = True gest.Visible = True + b_geo = "0" iniciofin Else If c.RowCount = 0 Then c = skmt.ExecQuery("SELECT NV_CLIENTE FROM NOVENTA CLIENTE WHERE NV_CLIENTE IN (Select CUENTA from cuentaa)") @@ -999,15 +1007,18 @@ Sub GPS_LocationChanged (Location1 As Location) Tels.Visible = True gest.Visible = True precision = "0" + b_geo = "0" iniciofin Else If c.RowCount = 0 Then Tels.Visible = False gest.Visible = False + p_transparenteInicioFin.Visible = False b_Inicio_Fin_venta.Visible = False LA_GEO.TextColor = Colors.Red If ALMACEN = "1" Then Tels.Visible = False gest.Visible = True + b_geo = "0" iniciofin End If End If @@ -1016,6 +1027,7 @@ Sub GPS_LocationChanged (Location1 As Location) If ALMACEN = "1" Then Tels.Visible = False gest.Visible = True + b_geo = "0" iniciofin End If End If @@ -1024,24 +1036,29 @@ Sub GPS_LocationChanged (Location1 As Location) If c.RowCount > 0 Then Tels.Visible = True gest.Visible = True + b_geo = "0" iniciofin Else If c.RowCount = 0 Then Tels.Visible = False gest.Visible = False + p_transparenteInicioFin.Visible = False b_Inicio_Fin_venta.Visible = False c = skmt.ExecQuery("SELECT NV_CLIENTE FROM NOVENTA CLIENTE WHERE NV_CLIENTE IN (Select CUENTA from cuentaa)") If c.RowCount > 0 Then Tels.Visible = True gest.Visible = True + b_geo = "0" iniciofin Else If c.RowCount = 0 Then Tels.Visible = False gest.Visible = False + p_transparenteInicioFin.Visible = False b_Inicio_Fin_venta.Visible = False LA_GEO.TextColor = Colors.Red If ALMACEN = "1" Then Tels.Visible = False gest.Visible = True + b_geo = "0" iniciofin End If End If @@ -1049,17 +1066,20 @@ Sub GPS_LocationChanged (Location1 As Location) If ALMACEN = "1" Then Tels.Visible = False gest.Visible = True + b_geo = "0" iniciofin End If End If Else Tels.Visible = False gest.Visible = False + p_transparenteInicioFin.Visible = False b_Inicio_Fin_venta.Visible = False LA_GEO.TextColor = Colors.Red If ALMACEN = "1" Then Tels.Visible = False gest.Visible = True + b_geo = "0" iniciofin End If End If @@ -1131,7 +1151,7 @@ End Sub Sub JobDone(Job As HttpJob) If Job.Success = False Then ' ToastMessageShow("Error: " & Job.ErrorMessage, True) - LogColor("Error: " & Job.tag & " : " & subs.parseHTTPError(Job.ErrorMessage), Colors.red) + LogColor("Error: " & Job.tag & " : " & Subs.parseHTTPError(Job.ErrorMessage), Colors.red) ' LogColor("Error: " & Job.ErrorMessage, Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211110 @@ -2018,21 +2038,6 @@ Sub guardadoventa End Try DateTime.TimeFormat = "HH:mm:ss" B4XPages.ShowPage("Principal") - - - - If la_cuenta.Text <> "0" Then 'Si es ABORDO, no mostramos el boton b_Inicio_Fin_venta y regresamos a Principal. - b_Inicio_Fin_venta.Visible = True - Log("Hacemos visible el boton de Inicio Venta3") - Else - b_Inicio_Fin_venta.Visible = False - Starter.enVenta = False - LogColor(">>>>>> ABORDO: " & Starter.enVenta, Colors.red) - Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutasSup, "Venta Abordo", "0", Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, "", "") - LogColor(">>>>>> Ruta: <<<<<<<<<<<<" & Subs.traeRutasSup, Colors.Blue) - Subs.iniciaActividad("principal") - B4XPages.ShowPageAndRemovePreviousPages("Principal") - End If End Sub Sub NUEVO_Click @@ -4753,7 +4758,7 @@ Private Sub b_Inicio_Fin_venta_Click motivoNoVisita = "" p_transparenteInicioFin.Visible = False If b_Inicio_Fin_venta.Text = "TERMINAR VENTA" Then - Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Termina Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, motivoNoVenta, motivoNoVisita) + Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Termina Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, motivoNoVenta, motivoNoVisita,b_geo) Starter.enVenta = False ' LogColor($">>>>>> TERMINA VENTA: ${Starter.enVenta} - ${Subs.traeCliente}"$, Colors.red) B4XPages.ShowPageAndRemovePreviousPages("Principal") @@ -4764,12 +4769,12 @@ Private Sub b_Inicio_Fin_venta_Click contadorIniciarVenta = contadorIniciarVenta + 1 If contadorIniciarVenta = 1 And IniVenNO = False And motivoNoVenta <> "NO VENTA" Then IniVenNO = True - Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, "", "") + Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, "", "",b_geo) Starter.enVenta = True ' LogColor($">>>>>> INICIA VENTA: ${Starter.enVenta} - ${Subs.traeCliente}"$, Colors.red) Else If contadorIniciarVenta = 1 And IniVenNO = False And motivoNoVenta = "NO VENTA" Then IniVenNO = True - Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, motivoNoVenta, "") + Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Inicia Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, motivoNoVenta, "",b_geo) Starter.enVenta = True Else If contadorIniciarVenta > 1 Then b_Inicio_Fin_venta.Visible = False diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index f562550..d427d76 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -130,6 +130,6 @@ Sub GUARDA_Click B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ? where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss)) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ? ", Array As Object(sTime)) DateTime.TimeFormat = "HH:mm:ss" - Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, r_1.Checked) + Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, r_1.Checked, B4XPages.MainPage.cliente.b_geo) B4XPages.ShowPage("Principal") End Sub \ No newline at end of file diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 1af78e2..20bac32 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -629,7 +629,7 @@ Sub Subir_Click ' If eventob = "Suplencia" Then nombreCliente = VarXRu ' Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${nombreCliente}','${ iniciob}', '${finb}','${ latitudb}','${ longitudb}', '${precision}', '${motivonoventa}', '${motivonovisita}', '${fechab}'"$) ' TMP_ALMACEN, TMP_USUARIO, TMP_RUTA, TMP_EVENTO, TMP_ID_CLIENTE, TMP_NOMBRE_CLIENTE, TMP_INICIO, TMP_FINAL, TMP_LATITUD, TMP_LONGITUD, TMP_PRESICION, TMP_MOTIVO_NO_VENTA, TMP_MOTIVO_NO_VISITA, TMP_FECHA_SINC, TMP_FECHA_MOVIL - cmd.Parameters = Array As Object(h.GetString("almacenb"), h.GetString("usuariob"), h.GetString("rutab"), eventob, clienteb, nombreCliente, h.GetString("iniciob"), finb, h.GetString("latitudb"), h.GetString("longitudb"), h.GetString("precision"), h.GetString("motivonoventa"), h.GetString("motivonovisita"), h.GetString("fechab")) + cmd.Parameters = Array As Object(h.GetString("almacenb"), h.GetString("usuariob"), h.GetString("rutab"), eventob, clienteb, nombreCliente, h.GetString("iniciob"), finb, h.GetString("latitudb"), h.GetString("longitudb"), h.GetString("precision"), h.GetString("motivonoventa"), h.GetString("motivonovisita"), h.GetString("fechab"),h.GetString("BAN_GEOB")) B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "mandaBitacora") Loop Log("MANDAMOS BITACORA") @@ -766,8 +766,8 @@ Sub Subir_Click sTime=DateTime.Time(DateTime.Now) Dim cmd As DBCommand cmd.Initialize - cmd.Name ="insert_drop_GV2_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) + cmd.Name ="insert_drop_GV2_3" + 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,Application.VersionName) B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop") img2.Visible =True PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1)) @@ -928,8 +928,8 @@ Sub cargar_Click Dim P As PhoneId imei = "" cmd.Initialize - cmd.Name ="insert_drop_GV2_2" - cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN) + cmd.Name ="insert_drop_GV2_3" + cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN,Application.VersionName) B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop") cmd.Initialize @@ -2070,61 +2070,62 @@ Sub b_mapa_Click End Sub Sub t2_tick - e_ruta.Text = "" - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente") - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido") - B4XPages.MainPage.skmt.ExecNonQuery("delete from noventa") - B4XPages.MainPage.skmt.ExecNonQuery("delete from clie_act") - B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2") - B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod") - B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ") - B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VENTAS") - B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VERIFICACION") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA2") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_STAY_OUT") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_FACE") - B4XPages.MainPage.skmt.ExecNonQuery("INSERT INTO HIST_STAY_OUT(HSO_INI, HSO_FIN) VALUES (0,0)") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_CODIGO_BARRAS") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO1") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO2") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO3") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO4") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO5") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS") - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA") - B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("CARGA_DIA")) - B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword")) - B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD")) - B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD")) + e_ruta.Text = "" + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente") + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido") + B4XPages.MainPage.skmt.ExecNonQuery("delete from noventa") + B4XPages.MainPage.skmt.ExecNonQuery("delete from clie_act") + B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2") + B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod") + B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ") + B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VENTAS") + B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VERIFICACION") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA2") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_STAY_OUT") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_FACE") + B4XPages.MainPage.skmt.ExecNonQuery("INSERT INTO HIST_STAY_OUT(HSO_INI, HSO_FIN) VALUES (0,0)") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_CODIGO_BARRAS") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO1") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO2") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO3") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO4") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO5") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA") + B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("CARGA_DIA")) + B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword")) + B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD")) + B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD")) ' B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("FORZAR_ACTUALIZACION")) ' B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("VERSION_NUEVA")) - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0)) + B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0)) ' B4XPage_Appear - E_RUTA2.Visible = False - E_RUTA2.Text = "" - cargar.Visible = False - Subir.Visible = False - connecta.Visible = True + E_RUTA2.Visible = False + E_RUTA2.Text = "" + cargar.Visible = False + Subir.Visible = False + connecta.Visible = True ' B4XPages.ShowPage("Login") ' If PB2.Progress = 0 Then ' S_CP.Text = "ENVIAR DATOS (K-1)" ' End If ' img2.Visible=False - t2.Enabled = False + t2.Enabled = False + B4XPage_Appear End Sub Sub e_ruta_EnterPressed If e_ruta.Text = "FIN DIA" Then - RES = Msgbox2("Seguro que desa hacer el cierre todos los datos se borraran?","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore + RES = Msgbox2("Seguro que desea hacer el cierre? Todos los datos se borrarán.", "Cierre", "Si", "", "No", LoadBitmap(File.DirAssets, "alert2.png")) 'ignore If RES = DialogResponse.POSITIVE Then - Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Fin Día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") - t2.Initialize("T2", 1000) ' 1000 = 1 second - t2.Enabled = True + Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRuta, "Fin Día", "", Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, "2", "", "", "") Label22.Visible = False l_rutasuplencia.Visible = False - l_rutasuplencia.Text = "" + l_rutasuplencia.Text = "" + t2.Initialize("t2", 1000) ' 1000 ms = 1 segundo + t2.Enabled = True End If End If @@ -2136,6 +2137,7 @@ Sub e_ruta_EnterPressed img3.Visible =True Resumen.Visible= False End If + If e_ruta.Text = "SUPLENCIA" Then e_ruta.Text = "" E_RUTA2.Visible = True @@ -2246,9 +2248,9 @@ Sub B_OK_PAS_Click B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("CARGA_DIA",1)) If E_RUTA2.Visible = True Then - Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Carga día suplencia", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") + Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Carga día suplencia", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","", "") Else - Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Carga día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") + Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Carga día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","", "") End If Else if CARGA = "CARGAR" And (S_CP.Text <> "LISTO" Or S_CC.Text <> "LISTO" Or S_CH.Text <> "LISTO") Then diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index 2cae0ea..de295f4 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -251,7 +251,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 4.10.23 + #VersionName: 4.10.27 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 89b32fd..d058117 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -66,7 +66,7 @@ ModuleClosedNodes2= ModuleClosedNodes20= ModuleClosedNodes21= ModuleClosedNodes22=3,4 -ModuleClosedNodes23=1,3,4,5,6,7,8,9 +ModuleClosedNodes23=3,4,5,6,7,8,9 ModuleClosedNodes24= ModuleClosedNodes25= ModuleClosedNodes3= @@ -76,6 +76,6 @@ ModuleClosedNodes6=8,9,10,11 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,GPS_LocationChanged,1008,0,C_Cliente,iniciofin,1081,0,C_Cliente,B_guardaencuesta_Click,1895,0,C_Cliente,Tels_Click,1899,0,C_Cliente,B4XPage_CloseRequest,1907,0,C_Principal,e_ruta_EnterPressed,2112,0,C_Principal,t2_tick,2092,0,C_Principal,e_ruta_Click,2722,4,C_Principal,AddTitle,2705,0,C_Principal,B_OK_PANEL5_Click,2719,0,C_Principal,connecta_Click,1972,5 +NavigationStack=C_Clientes,Class_Globals,1,0,C_Principal,cargar_Click,924,0,C_Principal,JobDone,1143,0,Subs,bitacora,1309,0,C_Principal,Subir_Click,622,6,C_Cliente,Guardar_Click,1962,6,C_Cliente,p_pideGeoPass_Click,1095,0,C_Cliente,Class_Globals,423,0,C_Cliente,B4XPage_Appear,903,0,C_Cliente,GPS_LocationChanged,991,0 SelectedBuild=0 -VisibleModules=23,2,24,13,14,4,25,9,19,10 +VisibleModules=23,24,4,5,13,14,25,9,19,10,2 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 54eeb04..347375d 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1276,7 +1276,7 @@ End Sub 'En geocerca si mete la contraseña poner 0 en precision gps y si esta dentro de los 50 mts poner 1 y 2 para eventos que no lo ocupen 'Mandar fecha de sync(sysdate) -Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As String, eventob As String, clienteb As String, iniciob As String, finb As String, latitudb As String, longitudb As String, precision As String, motivonoventa As String, motivonovisita As String ) +Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As String, eventob As String, clienteb As String, iniciob As String, finb As String, latitudb As String, longitudb As String, precision As String, motivonoventa As String, motivonovisita As String, BAN_GEOB As String) Log(motivonovisita) ' Log("bitacora") Private cmd As DBCommand @@ -1294,7 +1294,7 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As If eventob = "Carga día" Then nombreCliente = "CARGA DIA" If eventob = "Carga día suplencia" Then nombreCliente = traeRutasSup If eventob <> "Termina Venta" And eventob <> "No Venta" Then - B4XPages.MainPage.skmt.ExecNonQuery($"INSERT INTO BITACORAGPS (fechab, usuariob , almacenb , rutab , eventob , clienteb , iniciob , finb , latitudb, longitudb , precision , motivonoventa , motivonovisita) VALUES ('${fechab}' ,'${usuariob}' , '${almacenb}' , '${rutab}' , '${eventob}' , '${clienteb}' , '${iniciob}' , '${finb}' , '${latitudb}' , '${longitudb}' , '${precision}' , '${motivonoventa}' , '${motivonovisita}')"$) + B4XPages.MainPage.skmt.ExecNonQuery($"INSERT INTO BITACORAGPS (fechab, usuariob , almacenb , rutab , eventob , clienteb , iniciob , finb , latitudb, longitudb , precision , motivonoventa , motivonovisita, BAN_GEOB) VALUES ('${fechab}' ,'${usuariob}' , '${almacenb}' , '${rutab}' , '${eventob}' , '${clienteb}' , '${iniciob}' , '${finb}' , '${latitudb}' , '${longitudb}' , '${precision}' , '${motivonoventa}' , '${motivonovisita}', '${BAN_GEOB}')"$) Else Private e As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select fechab from BITACORAGPS where usuariob = '${usuariob}' and almacenb = '${almacenb}' and rutab = '${rutab}' and clienteb = '${clienteb}' and eventob = 'Inicia Venta' order by fechab desc"$) If e.RowCount > 0 Then @@ -1313,7 +1313,7 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select * from BITACORAGPS where usuariob = '${usuariob}' and almacenb = '${almacenb}' and rutab = '${rutab}' and clienteb = '${clienteb}' order by fechab desc"$) If c.RowCount > 0 Then c.Position = 0 - cmd.Parameters = Array As Object(c.GetString("almacenb"), c.GetString("usuariob"), c.GetString("rutab"), c.GetString("eventob"), c.GetString("clienteb"), nombreCliente, c.GetString("iniciob"), c.GetString("finb"), c.GetString("latitudb"), c.GetString("longitudb"), c.GetString("precision"), c.GetString("motivonoventa"), c.GetString("motivonovisita"), c.GetString("fechab")) + cmd.Parameters = Array As Object(c.GetString("almacenb"), c.GetString("usuariob"), c.GetString("rutab"), c.GetString("eventob"), c.GetString("clienteb"), nombreCliente, c.GetString("iniciob"), c.GetString("finb"), c.GetString("latitudb"), c.GetString("longitudb"), c.GetString("precision"), c.GetString("motivonoventa"), c.GetString("motivonovisita"), c.GetString("fechab"), c.GetString("BAN_GEOB")) Starter.reqManager.ExecuteCommand(cmd , "mandaBitacora") End If End If