From 510d0041d95b890146e81bc71f3bbd3c7b456bef Mon Sep 17 00:00:00 2001
From: cheveguerra <cheveguerra@gmail.com>
Date: Tue, 19 Sep 2023 09:57:28 -0600
Subject: [PATCH] 19/9/23 - Pruebas

---
 B4A/B4XMainPage.bas      | 10 ----------
 B4A/C_Principal.bas      | 11 ++++++++---
 B4A/C_Subs.bas           | 23 +++++++++++++++++------
 B4A/DBRequestManager.bas |  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index da6c338..84b09e0 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -36,16 +36,6 @@ Sub Class_Globals
 	Public promos As C_Promos
 	Public historico As C_Historico
 
-	'nuevocliente -> NuevoCliente
-	'buscar -> ticketsDia
-	'colonia -> clientes
-	'nopago -> noVenta
-	'tarjeta -> Nota
-	'fila -> Cliente
-	'colonia2 -> Productos
-	
-	'xxxxxxxxxxxxxxxxxxxxxxxxx
-
 	Dim reqManager As DBRequestManager
 	Dim s As C_Subs
 	Dim v As String = Application.VersionName
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 3699558..baa51ef 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -1761,7 +1761,12 @@ Sub tickets_dia_LongClick
 End Sub
 
 Sub Subs_envioOk(succes As Boolean)
-	Log("######################   " & succes)
+	Log("###################### ENVIO OK - " & succes)
+	If Not(succes) Then
+		ToastMessageShow($"El envio no se completo con exito, por favor vuelva a enviar."$, True)
+	Else
+		ToastMessageShow($"¡El envio exitoso!."$, True)
+	End If
 	ProgressDialogHide
 End Sub
 '################################    Termina codigo de prueba   #############################
@@ -1913,12 +1918,12 @@ Sub t1_tick
 	cmd.Name = "select_cuantos_pedido_MARDS"
 	cmd.Parameters = Array As Object(ALMACEN,l_ruta.text)
 	reqManager.ExecuteQuery(cmd , 0, "valida_pedido")
-	
+
 	cmd.Initialize
 	cmd.Name = "select_cuantos_noventa_MARDS"
 	cmd.Parameters = Array As Object(ALMACEN,l_ruta.text)
 	reqManager.ExecuteQuery(cmd , 0, "valida_noventa")
-	
+
 	cmd.Initialize
 	cmd.Name = "select_cuantos_pedidoc_MARDS"
 	cmd.Parameters = Array As Object(ALMACEN,l_ruta.text)
diff --git a/B4A/C_Subs.bas b/B4A/C_Subs.bas
index 8200cf3..c8b0150 100644
--- a/B4A/C_Subs.bas
+++ b/B4A/C_Subs.bas
@@ -17,6 +17,7 @@ Sub Class_Globals
 	Dim db, kmt, errorLog As SQL 'Requiere la libreria "SQL" 'ignore
 	Dim ssid As String  'ignore
 	Dim reqsList As List
+	Dim reqError As Boolean = False
 	Private subsLogs As Boolean = False
 End Sub
 
@@ -65,7 +66,8 @@ Sub envioTest
 	Private cmd As DBCommand
 	cmd.Initialize
 	cmd.Name = "select_fecha"
-	For i = 0 To 20 
+	For i = 0 To 50
+'		Sleep(200)
 		reqManager.ExecuteQuery(cmd, 0, $"select_fecha_${i}"$)
 		reqsList.Add($"select_fecha_${i}"$)
 	Next
@@ -82,7 +84,10 @@ End Sub
 Sub JobDone(Job As HttpJob)
 	LogColor("C_SUBS JOBDONE - " & Job.Success, Colors.Red)
 	If Job.Success = False Then
+		Log($"Error en el request ${Job.Tag}"$)
 		LogColor("** " & Job.Tag & " Error: " & Job.ErrorMessage, Colors.Red)
+		If reqsList.IndexOf(Job.Tag) > -1 Then reqsList.RemoveAt(reqsList.IndexOf(Job.Tag))
+		reqError = True
 	Else
 		If Job.JobName = "DBRequest" Then
 			Dim resultado As DBResult = reqManager.HandleJob(Job)
@@ -94,13 +99,19 @@ Sub JobDone(Job As HttpJob)
 					Next
 				Next
 			End If
-			Log(reqsList.Size)
-			If reqsList.Size = 0 Then 'Ya no hay DBReqs pendientes.
-				envioOk(True)
-				Log("-= FIN =-")
-			End If
 		End If
 	End If
+	Log(reqsList.Size)
+	If reqsList.Size = 0 Then 'Ya no hay DBReqs pendientes.
+		Log(reqError)
+		If Not(reqError) Then
+			envioOk(True)
+		Else
+			envioOk(False)
+		End If
+		reqError = False
+		Log("-= FIN =-")
+	End If
 	Job.Release
 End Sub
 
diff --git a/B4A/DBRequestManager.bas b/B4A/DBRequestManager.bas
index b8bd9ef..34c7f79 100644
--- a/B4A/DBRequestManager.bas
+++ b/B4A/DBRequestManager.bas
@@ -41,7 +41,7 @@ Public Sub ExecuteQuery(Command As DBCommand, Limit As Int, Tag As Object)
 	WriteList(Command.Parameters, out2)
 	out2.Close
 	j.PostBytes(link & "?method=query", ms.ToBytesArray)
-	j.GetRequest.Timeout = 20000 'timeout del request (20 segs)
+	j.GetRequest.Timeout = 30000 'timeout del request (30 segs)
 End Sub
 
 'Executes a batch of (non-select) commands.