From 280d3ae273d77a1dbd4a06d02be2ec946fd4ac6e Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Wed, 1 May 2024 17:36:00 -0600 Subject: [PATCH] - Modificacion de la subrutina horaentrada para el ingreso al abordo --- B4A/C_Principal.bas | 81 +++++++++++++++++++---------------------- B4A/KelloggsV4.b4a.meta | 2 +- B4A/Subs.bas | 12 +++++- 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 8d03ac3..87f262d 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -2520,12 +2520,9 @@ Sub Resumen_Click End Sub Sub B_PROXIMA_Click - b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido where pe_cliente = 0 and pe_tipo = 'ABORDO' " ) b.Position = 0 - If b.GetString("CUANTOS") > 0 Then - If horaentrada Then Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) @@ -2534,18 +2531,13 @@ Sub B_PROXIMA_Click Else End If - Else If b.GetString("CUANTOS") = 0 Then - e = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO_SUGERIDO") If e.RowCount > 0 Then - Msgbox2Async("Tienes un pedido sugerido, ¿Deseas aceptarlo?","Atención", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png"),False) Wait For Msgbox_Result (result As Int) If result = DialogResponse.POSITIVE Then - If horaentrada Then - For i = 0 To e.RowCount - 1 e.Position = i c = Starter.skmt.ExecQuery2("SELECT * FROM CAT_GUNAPROD WHERE CAT_GP_ID = ?",Array As String(e.GetString("ID_PRODUCTO"))) @@ -2553,19 +2545,15 @@ Sub B_PROXIMA_Click c.Position = 0 Subs.actualizaProducto(e.GetString("ALMACEN"), c.GetString("CAT_GP_PRECIO"),e.GetString("PROMEDIO"), c.GetString("CAT_GP_NOMBRE"), e.GetString("ID_PRODUCTO"),"0",Subs.traeFecha,usuario,e.GetString("RUTA"),c.GetString("CAT_GP_PRECIO"),"ABORDO") End If - Next Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) Starter.tipov = "ABORDO" B4XPages.ShowPage("Productos") - Else - - End If - - Else If result = DialogResponse.NEGATIVE Then + End If + Else If result = DialogResponse.NEGATIVE Then If horaentrada Then Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) @@ -2574,53 +2562,58 @@ Sub B_PROXIMA_Click Else End If - End If - Else If c.RowCount = 0 Then - If horaentrada Then Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) Starter.tipov = "ABORDO" B4XPages.ShowPage("Productos") Else - + End If - End If e.Close - End If b.Close - End Sub Sub horaentrada As Boolean - Dim periodo As Period - periodo.Hours = 0 - periodo.Minutes = 0 - Dim newDate As Long = DateUtils.AddPeriod(DateTime.Now, periodo) - Log(newDate) - Log(DateUtils.TicksToString(newDate)) - Dim p2 As Period - p2.Hours = 0 - p2.Minutes = 0 - DateTime.DateFormat = "MM/dd/yyyy HH:mm" - Dim fecha2 As String = DateTime.Date(DateTime.Now) - Dim pr2() As String = Regex.Split(" ",fecha2) - LogColor(pr2(0),Colors.red) - Dim pr3 As String = pr2(0) &" "&"12:00" - LogColor(pr3,Colors.Red) - Dim ticks2 As Long = DateTime.DateParse(pr3) - LogColor(ticks2,Colors.red) - LogColor(DateTime.Date(ticks2),Colors.red) - Dim timeToCheck2 As Long = DateUtils.AddPeriod(ticks2, p2) - LogColor(DateUtils.TicksToString(timeToCheck2),Colors.red) - If timeToCheck2 <= newDate Then - Return True - Else +' Dim periodo As Period +' periodo.Hours = 0 +' periodo.Minutes = 0 +' Dim newDate As Long = DateUtils.AddPeriod(DateTime.Now, periodo) +'' Log(newDate) +' Log(DateUtils.TicksToString(newDate)) +' Dim p2 As Period +' p2.Hours = 0 +' p2.Minutes = 0 +' DateTime.DateFormat = "MM/dd/yyyy HH:mm" +' Dim fecha2 As String = DateTime.Date(DateTime.Now) +' Log("FECHA2: " & DateUtils.TicksToString(DateTime.Now)) +' Dim pr2() As String = Regex.Split(" ",fecha2) +' LogColor(pr2(0),Colors.red) +' Dim pr3 As String = pr2(0) &" "&"12:00" +' LogColor(pr3,Colors.Red) +' Dim ticks2 As Long = DateTime.DateParse(pr3) +' LogColor(ticks2,Colors.red) +' LogColor(DateTime.Date(ticks2),Colors.red) +' Dim timeToCheck2 As Long = DateUtils.AddPeriod(ticks2, p2) +' LogColor(DateUtils.TicksToString(timeToCheck2),Colors.red) +' If timeToCheck2 <= newDate Then +' Return True +' Else +' Return False +' End If + DateTime.TimeFormat = "HH:mm:ss" + Private lasDoce As Long = DateTime.TimeParse("12:00:00") +' Private lasDoce As Long = DateTime.TimeParse("17:41:00") + Log("lasDoce: " & DateUtils.TicksToString(lasDoce)) + If DateTime.Now < lasDoce Then + ToastMessageShow($"No puedes entrar al ABORDO antes de las ${Subs.horaNormal(lasDoce)}"$, True) Return False + Else + Return True End If End Sub diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 4310f8a..b322570 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,LlenaProdsLL,1270,2,C_Productos,Busca_TextChanged,1205,0,C_Principal,Class_Globals,0,0,C_Principal,Resumen_Click,2359,0,C_Principal,horaentrada,2601,0,C_Principal,B_PROXIMA_Click,2590,0,C_Cliente,B_IMP2_Click,1088,6,C_Principal,B4XPage_CloseRequest,1963,0,C_Principal,B_OK_RES_Click,2341,0,B4XMainPage,Class_Globals,23,0 +NavigationStack=C_Cliente,B_IMP2_Click,1088,6,C_Principal,B4XPage_CloseRequest,1963,0,C_Principal,B_OK_RES_Click,2341,0,B4XMainPage,Class_Globals,23,0,Visual Designer,principal.bal,-100,1,C_Principal,Class_Globals,0,0,C_Principal,B_PROXIMA_Click,2533,6,C_Principal,horaentrada,2603,6,Subs,fechanormal,1661,0,Subs,horaNormal,1662,2 SelectedBuild=0 VisibleModules=1,27,11,3,12,4,28,17,23,29 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 59f12b9..0f6eda1 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1659,13 +1659,23 @@ End Sub Sub fechanormal(fecha As String) As String 'ignore ' Log(fecha) Dim OrigFormat As String = DateTime.DateFormat 'save orig date format - DateTime.DateFormat = "yyyy/MM/dd HH:mm:ss" + DateTime.DateFormat = "HH:mm:ss" Dim nuevaFecha As String=DateTime.Date(fecha) DateTime.DateFormat = OrigFormat 'return to orig date format ' Log(nuevaFecha) Return nuevaFecha End Sub +Sub horaNormal(fecha As String) As String 'ignore +' Log(fecha) + Dim OrigFormat As String = DateTime.DateFormat 'save orig date format + DateTime.TimeFormat = "HH:mm" + Dim nuevaFecha As String=DateTime.time(fecha) + DateTime.DateFormat = OrigFormat 'return to orig date format +' Log(nuevaFecha) + Return nuevaFecha +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 )