21/9/23 - Modificacion al mandapendientes y tmp_drop

- Se modifico el mandaPendientes y mandaPendientesNuevosClientes para que cuando se llamen desde Principal se manden TODOS, y cuando se llamen al guardar un cliente solo se manden los pendientes.
- Se egrego que cuando se mande información al final del día, se mande tambien información al TMP_DROP

B4A/C_Cliente.bas

@@ -151,6 +151,7 @@ Sub Class_Globals
 	Dim turnoColor As Int = 1
 	Dim cd As ColorDrawable
 	Dim camposModificados As List
+	dim mandarTodo as Boolean = False
 End Sub
 
 'You can add more parameters here.
@@ -346,6 +347,7 @@ End Sub
 Sub mandaPendientes
 	'Enviamos Pendientes
 	c = B4XPages.MainPage.skmt.ExecQuery("SELECT * from kmt_info where CAT_CL_ENVIO_PENDIENTE = '1'")
+	If mandarTodo Then c = B4XPages.MainPage.skmt.ExecQuery("SELECT * from kmt_info")
 	Log($"Cliente PENDIENTE: ${c.RowCount}"$)
 	If c.RowCount > 0 Then
 		For i = 0 To c.RowCount - 1
@@ -354,8 +356,6 @@ Sub mandaPendientes
 			Dim fechaCaptura As String = c.GetString("CAT_CL_FECHA_CAPTURA")
 			Log(fechaCaptura)
 			Dim cmd As DBCommand
-			cmd.Initialize
-			cmd.Name = "guardaClienteGeocerca_MARDS"
 			Dim motivo As String = "VERIFICACION DE DATOS"
 			Dim comentario As String = c.GetString("ESTATUS_ORIGINAL")
 			If c.GetString("CAT_CL_CODIGO").As(String).SubString2(0,1) = "N" Then motivo = "VERIFICACION CLIENTE NUEVO PREVENTA"
@@ -363,6 +363,8 @@ Sub mandaPendientes
 			If c.GetString("CAT_CL_CODIGO").As(String).SubString2(0,1) = "N" Then comentario = ""
 			If c.GetString("CAT_CL_CODIGO").As(String).SubString2(0,2) = "NC" Then comentario = c.GetString("CAT_CL_CALLE1")
 
+			cmd.Initialize
+			cmd.Name = "guardaClienteGeocerca_MARDS"
 			cmd.Parameters = Array As Object(c.GetString("CAT_CL_CODIGO"), fechaCaptura, Subs.traeUsuarioDeBD, c.GetString("CAT_CL_LAT"), c.GetString("CAT_CL_LONG"), l_ruta.text, Subs.traeAlmacen, c.GetString("LAT_CENSADOR"), c.GetString("LON_CENSADOR"), motivo, comentario)
 			reqManager.ExecuteCommand(cmd, "guaradClienteGeocerca")
 

B4A/C_NuevoCliente.bas

@@ -50,6 +50,7 @@ Sub Class_Globals
 	Private B_FOTO As Button
 	Dim elOtroCliente As String = ""
 	Dim camposModificados As List
+	dim mandarTodo as Boolean = False
 End Sub
 
 'You can add more parameters here.
@@ -370,6 +371,7 @@ Sub mandaPendientesNuevosClientes
 	Private sDateP As String = DateTime.Date(DateTime.Now)
 '	c = B4XPages.MainPage.skmt.ExecQuery("SELECT * from kmt_info where CAT_CL_CODIGO like 'NC%' and CAT_CL_ENVIO_PENDIENTE = '1'")
 	c = B4XPages.MainPage.skmt.ExecQuery("Select kmt_info.*, nom_foto from kmt_info left join HIST_FOTO_CLIENTE on cat_cl_codigo = codigo where CAT_CL_CODIGO like 'NC%' and CAT_CL_ENVIO_PENDIENTE = '1'")
+	If mandarTodo Then c = B4XPages.MainPage.skmt.ExecQuery("Select kmt_info.*, nom_foto from kmt_info left join HIST_FOTO_CLIENTE on cat_cl_codigo = codigo where CAT_CL_CODIGO like 'NC%'")
 	Log($"Cliente Nuevo PENDIENTE: ${c.RowCount}"$)
 	Dim fotox() As Byte
 	Dim cmd As DBCommand

B4A/C_Principal.bas

@@ -423,18 +423,38 @@ Sub b_subir_Click
 				c.Position = i
 				Log(File.Exists(Dirp&Dir&Dir2,c.GetString("NOM_FOTO")))
 				Log($"${Dirp&Dir&Dir2},${c.GetString("NOM_FOTO")}"$)
+				Try
 					fotox = Bit.InputStreamToBytes(File.OpenInput(Dirp&Dir&Dir2,c.GetString("NOM_FOTO")))
 					cmd.Initialize
 					cmd.Name = "insert_fotos_cliente_nuevo_MARIANA"
 					cmd.Parameters = Array As Object(c.GetString("CODIGO"),c.GetString("ALMACEN"),c.GetString("RUTA"), fotox)
 					Log($"${c.GetString("CODIGO")}, ${c.GetString("ALMACEN")}, ${c.GetString("RUTA")}"$)
 					B4XPages.MainPage.reqManager.ExecuteCommand(cmd, $"insert_clientes_${c.GetString("CODIGO")}"$)
+				Catch
+					Log(LastException)
+				End Try
 			Next
 			c.Close
 		End If
 
+		B4XPages.MainPage.cliente.mandarTodo = True
+		B4XPages.MainPage.nuevoCliente.mandarTodo = True
 		B4XPages.MainPage.cliente.mandaPendientes
 		B4XPages.MainPage.nuevoCliente.mandaPendientesNuevosClientes
+		B4XPages.MainPage.cliente.mandarTodo = False
+		B4XPages.MainPage.nuevoCliente.mandarTodo = False
+		
+		Dim sDate, sTime As String
+		DateTime.DateFormat = "MM/dd/yyyy"
+		sDate=DateTime.Date(DateTime.Now)
+		sTime=DateTime.Time(DateTime.Now)
+		
+		cmd.Initialize
+		cmd.Name ="insert_drop_MARDS_2"
+		cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,"CENSOS",sTime,"","","","","ENVIO",ALMACEN)
+		B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_drop")
+		mapTiempos.Put($"ins_drop"$, DateTime.now)
+		
 		ProgressDialogHide
 		ToastMessageShow("Información enviada", True)
 	End If

B4A/Mariana Censos.b4a

@@ -741,12 +741,12 @@ Module9=C_UpdateAvailable
 NumberOfFiles=346
 NumberOfLibraries=30
 NumberOfModules=15
-Version=11.5
+Version=12.5
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Mariana Censos
 	#VersionCode: 1
-	#VersionName: 3.09.14
+	#VersionName: 3.09.20
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Mariana Censos.b4a.meta

@@ -43,9 +43,9 @@ ModuleClosedNodes3=
 ModuleClosedNodes4=8,10,11,14,16,17,18,19,20,21,22,23,24,25,26,27,28
 ModuleClosedNodes5=2,4,5,8
 ModuleClosedNodes6=
-ModuleClosedNodes7=1,5,6,9,11,12,13,14,16,17,18
+ModuleClosedNodes7=5,6,9,11,12,13,14,16,17,18
 ModuleClosedNodes8=3
 ModuleClosedNodes9=
-NavigationStack=Tracker,flp_LocationChanged,175,0,C_NuevoCliente,b_guardar_Click,155,2,Subs,traeFecha,692,0,C_Cliente,b_guardaCambios_Click,318,6,C_Cliente,GPS_LocationChanged,308,2,C_Cliente,B4XPage_Appear,270,0,C_Principal,cargar_Click,476,5,Visual Designer,cliente.bal,-100,2,C_NuevoCliente,mandaPendientesNuevosClientes,397,0,B4XMainPage,B4XPage_Appear,232,0,Visual Designer,nota.bal,-100,1
+NavigationStack=Visual Designer,cliente.bal,-100,2,B4XMainPage,B4XPage_Appear,232,0,Visual Designer,nota.bal,-100,1,C_Cliente,MODS,0,0,C_Cliente,Class_Globals,147,5,C_Cliente,mandaPendientes,343,0,C_NuevoCliente,Class_Globals,46,4,C_NuevoCliente,mandaPendientesNuevosClientes,367,3,C_Principal,cargar_Click,478,5,C_Principal,b_subir_Click,427,6
 SelectedBuild=0
 VisibleModules=2,13,8,4,5,14,15,7,11,6