VERSION 6.01.05

- Se cambio el nombre de las imagenes cuando se realiza a primera venta. - Se agrego la fecha de la bitacora en todos lados para que siempre ponga inicioi y fin
2026-04-17 19:36:33 +00:00 · 2026-01-08 20:51:03 -06:00
parent 4ec4846e4e
commit f4fa1e08d1
7 changed files with 36 additions and 36 deletions
--- a/B4A/ADM.b4a
+++ b/B4A/ADM.b4a
@@ -1121,7 +1121,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: ADM
 	#VersionCode: 1
-	#VersionName: 6.01.01
+	#VersionName: 6.01.05
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/B4A/ADM.b4a.meta
+++ b/B4A/ADM.b4a.meta
@@ -88,7 +88,7 @@ ModuleClosedNodes27=
 ModuleClosedNodes28=
 ModuleClosedNodes29=
 ModuleClosedNodes3=
-ModuleClosedNodes30=3,4,5,6,7,8,9,10,11,12,13,14
+ModuleClosedNodes30=2,3,4,5,6,7,8,9,10,11,12,14
 ModuleClosedNodes31=
 ModuleClosedNodes32=15,16,17,18,19
 ModuleClosedNodes4=
@@ -97,6 +97,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,Camera1_Ready,2849,0,CameraExClass,FindCamera,42,0,CameraExClass,SetDisplayOrientation,75,0,Starter,mandaForma,191,0,C_Cliente,Camera1_PictureTaken,2974,5,C_BItacora,Initialize,25,0,C_BItacora,Class_Globals,13,0,C_BItacora,B4XPage_Created,35,0,C_BItacora,mandaBitacora,36,0,C_NoVenta,GUARDA_Click,99,0,Main,Process_Globals,19,0
+NavigationStack=Diseñador Visual,login.bal,-100,1,C_NuevoCliente,Class_Globals,41,0,C_NuevoCliente,Initialize,46,0,C_NuevoCliente,B4XPage_Created,77,0,C_NuevoCliente,p_nuevoCliente_Click,248,0,C_NuevoCliente,GUARDA_Click,218,0,Starter,mandaForma,195,0,C_Cliente,MODS,0,0,C_Cliente,Initialize,181,0,C_Cliente,Class_Globals,178,0,C_Cliente,Camera1_PictureTaken,2928,6
 SelectedBuild=0
-VisibleModules=2,14,30,12,11,5,6,32,31,18,21,4
+VisibleModules=2,14,30,12,11,5,6,32,31,18
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -560,15 +560,18 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 End Sub

 Sub gest_Click
-	
-	c = Starter.skmt.ExecQuery("SELECT * FROM FOTOINICIAL")
-	If c.RowCount = 0 Then
+	Private hayFotoinicial As Boolean = False
+	c = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES where CAT_VA_DESCRIPCION = 'FOTO_INICIAL'")
+	If c.RowCount > 0 Then
+		c.Position = 0
+		If c.GetString("CAT_VA_VALOR") = "ENVIADA" Then hayFotoinicial = True
+	End If
+	If hayFotoinicial = False Then
 		p_camara.Visible = True
 		InitializeCamera
 		Subs.panelVisible(p_camara, 0, 0)
 		b_foto_inci.Text = "Foto tienda"
 	Else
-	
 		If la_cuenta.Text = "0" Then
 			B4XPages.MainPage.tipo_venta = "ABORDO"
 		Else If la_cuenta.Text = "1" Then
@@ -608,6 +611,8 @@ Sub gest_Click
 '	If B4XPages.MainPage.productos.prodsMap.IsInitialized And B4XPages.MainPage.productos.prodsMap.Size > 0 Then Subs.borraPedidoClienteActual
 		B4XPages.ShowPage("productos")
 	End If
+	
+	
 End Sub

 Sub Tels_Click
@@ -2860,9 +2865,10 @@ Sub Camera1_Ready (Success As Boolean)
 End Sub

 Sub Camera1_PictureTaken (Data() As Byte)
+	Private cliente As String = Subs.traeCliente
 	If b_foto_inci.Text = "Foto tienda" Then
 		DateTime.DateFormat="ddMMyyyyHHmmss"
-		fototomada = DateTime.Now & "_tienda.jpg"
+		fototomada = cliente & "_" & DateTime.Now & "_tienda.jpg"
 		Dim filename As String = fototomada
 		Dim dir As String = File.DirInternal
 		camEx.SavePictureToFile(Data, dir, filename)
@@ -2874,7 +2880,7 @@ Sub Camera1_PictureTaken (Data() As Byte)
 		Dim Dir2 As String
 		Try
 			File.MakeDir(Dirp,"/adm")
-			dir = "/amd"
+			dir = "/adm"
 			Log("creado en promotoria " & Dirp & dir)
 		Catch
 			dir = ""
@@ -2908,15 +2914,15 @@ Sub Camera1_PictureTaken (Data() As Byte)
 		LogColor("Mandamos foto tienda: " & fototomada, Colors.red)
 		Log(dir)
 		Log(Dir2)
-		Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${Subs.traeCliente}, ${dir & Dir2 & "/" & fototomada}"$)
-		Starter.mandaForma(Subs.traeAlmacen, Subs.traeRuta, Subs.traeCliente, dir & Dir2 & "/" & fototomada)
+		Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${cliente}, ${dir & Dir2 & "/" & fototomada}"$)
+		Starter.mandaForma(Subs.traeAlmacen, Subs.traeRuta, cliente, dir & Dir2 & "/" & fototomada)

 '		Starter.skmt.ExecNonQuery2("INSERT INTO FOTOINICIAL (RUTAA, ALMACEN, LATITUD, LONGITUD, FECHAHORA, FOTO, USUARIO) VALUES (?,?,?,?,?,?,?)",Array As Object(LA_RUTA, ALMACEN, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, sDate & " " & sTime, File.ReadBytes(File.DirInternal & dir & Dir2, fototomada), Subs.traeUsuarioDeBD))
 		b_foto_inci.Text = "Foto usuario"
 		ChangeCamera_Click
 	Else If b_foto_inci.Text = "Foto usuario" Then
 		DateTime.DateFormat="ddMMyyyyHHmmss"
-		fototomada = DateTime.Now & "_cliente.jpg"
+		fototomada = cliente & "_" & DateTime.Now & "_cliente.jpg"
 		Dim filename As String = fototomada
 		Dim dir As String = File.DirInternal
 		camEx.SavePictureToFile(Data, dir, filename)
@@ -2960,8 +2966,8 @@ Sub Camera1_PictureTaken (Data() As Byte)
 		out.Close
 		
 		LogColor("Mandamos foto usuario: " & fototomada, Colors.red)
-		Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${Subs.traeCliente}, ${dir & Dir2 & "/" & fototomada}"$)
-		Starter.mandaForma(Subs.traeAlmacen, Subs.traeRuta, Subs.traeCliente, dir & Dir2 & "/" & fototomada)
+		Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${cliente}, ${dir & Dir2 & "/" & fototomada}"$)
+		Starter.mandaForma(Subs.traeAlmacen, Subs.traeRuta, cliente, dir & Dir2 & "/" & fototomada)

 '		B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE FOTOINICIAL set FOTO2 = ? where USUARIO = ? and RUTAA = ? and ALMACEN = ? ", Array As Object (File.ReadBytes(File.DirInternal & dir & Dir2, fototomada), Subs.traeUsuarioDeBD,LA_RUTA, ALMACEN ))
 		b_foto_inci.Text = "Foto tienda"
--- a/B4A/C_NuevoCliente.bas
+++ b/B4A/C_NuevoCliente.bas
@@ -7,11 +7,9 @@ Version=11.5
 Sub Class_Globals
 	Private Root As B4XView 'ignore
 	Private xui As XUI 'ignore
-
 	Dim g As GPS
 	Dim ruta As String
 	Dim c As Cursor
-
 	Dim CANCELA As Button
 	Dim GUARDA As Button
 	Dim cuenta As String
@@ -20,7 +18,6 @@ Sub Class_Globals
 	Dim sDate2,sTime2 As String
 	Dim no_cliente As String
 	Dim no_ruta As String
-
 	Dim r_4 As RadioButton
 	Dim E_NOMBRE As EditText
 	Dim tgl As Toggle
@@ -235,7 +232,7 @@ Sub GUARDA_Click
 					' fototomada = "0"
 					B4XPages.ShowPage("Cliente")
 					Log("-- XX")
-					bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Nuevo Cliente", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, "", "", "")
+					bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "Nuevo Cliente", Subs.traeCliente, Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, "", "", "")
 '					CallSubDelayed(Tracker, "StartFLP")
 				Else
 					' Mensaje de advertencia si ET_Atiende.Text está vacío
@@ -252,11 +249,8 @@ Sub GUARDA_Click
 	End If
 End Sub

-
-
-
 Private Sub p_nuevoCliente_Click
-	
+
 End Sub

 'Private Sub b_foto_inci_Click
@@ -264,7 +258,7 @@ End Sub
 '	p_camara.Visible = False
 ''	StopCamera2
 'End Sub
-'
+
 'Private Sub InitializeCamera2
 '	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_CAMERA)
 '	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
@@ -282,7 +276,7 @@ End Sub
 '	Else
 '		ToastMessageShow("Sin permisos de escritura!!!", True)
 '	End If
-'	
+
 '	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_EXTERNAL_STORAGE)
 '	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
 '	If Result Then
@@ -291,7 +285,7 @@ End Sub
 '		ToastMessageShow("Sin permisos de lectura!!!", True)
 '	End If
 'End Sub
-'
+
 'Sub Camera1_Ready (Success As Boolean)
 '	Log("Camara ready")
 '	If Success Then
@@ -305,7 +299,7 @@ End Sub
 '		Log("Cannot open camera")
 '	End If
 'End Sub
-'
+
 'Sub Camera1_PictureTaken (Data()As Byte)
 '	Log("tome foto")
 '	Dim filename As String = fototomada
@@ -320,7 +314,6 @@ End Sub
 '		Dir = ""
 '		Log("creado en raiz")
 '	End Try
-'	
 '	Try
 '		File.MakeDir(Dirp & Dir,"/reduccion")
 '		Dir2 = "/reduccion"
@@ -329,24 +322,21 @@ End Sub
 '		Dir = ""
 '		Log("creado en raiz")
 '	End Try
-'	
 '	camEx2.SavePictureToFile(Data, Dirp&Dir, filename)
 '	camEx2.StartPreview 'restart preview
 '	ToastMessageShow("Picture saved." & CRLF  & "File size: " & File.Size(Dir, filename) & Dir &"," & filename, True)
 '	Log("Picture saved." & CRLF  & "File size: " & File.Size(Dir, filename) & Dir &"," & filename)
 '	p_camara.Visible = False
 '	StopCamera2
-'	
 'End Sub
-'
+
 'Private Sub StopCamera2
 ''	Capturing = False
 '	If camEx2.IsInitialized Then
 '		camEx2.Release
 '	End If
 'End Sub
-'
-'
+
 'Private Sub B_FOTO_Click
 '	DateTime.DateFormat="ddMMyyyyHHmmss"
 '	InitializeCamera2
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -1173,7 +1173,7 @@ Sub JobDone(Job As HttpJob)
 			Dim RESULT As DBResult = reqManager.HandleJob(Job)
 			If RESULT.Tag = "update_gps" Then
 				For Each records() As Object In RESULT.Rows
-					Log("==========================REGISTROS="&RESULT.Rows)
+					Log("==========================REGISTROS="&RESULT.Rows.size)
 					For Each k As String In RESULT.Columns.Keys
 						Log(RESULT.Tag & ": " & k & ": " & records(RESULT.Columns.Get(k)))
 					Next
@@ -2167,6 +2167,7 @@ Sub e_ruta_EnterPressed
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM CLIENTES_NUEVOS")
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENV_MONTO_LIQ")
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_UBICACIONES")
+			Starter.skmt.ExecNonQuery("update CAT_VARIABLES set CAT_VA_VALOR = '' where CAT_VA_DESCRIPCION = 'FOTO_INICIAL'")
 			B4XPage_Appear
 			l_rutasuplencia.Visible = False
 			Label22.Visible = False
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -237,6 +237,9 @@ Sub mandaForma(almacen_ As String, ruta_ As String, cliente_ As String, imagen_
 	If job.Success Then
 		' El servidor respondió correctamente (HTTP 200 OK)
 		Log("Respuesta del servidor: " & job.GetString)
+		skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("FOTO_INICIAL"))
+		skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("FOTO_INICIAL", "ENVIADA"))
+	
 '		MsgboxAsync("¡Imagen subida con éxito!", "Completado")
 	Else
 		' Hubo un error en la conexión o el servidor respondió con un error
--- a/B4A/Tracker.bas
+++ b/B4A/Tracker.bas
@@ -177,7 +177,7 @@ Sub flp_LocationChanged (Location1 As Location)
 	sTime=DateTime.Time(DateTime.Now)
 	If Not(B4XPages.MainPage.skmt.IsInitialized) Then B4XPages.MainPage.skmt.Initialize(Starter.ruta,"kmt.db", True)
 	Try
-		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
+		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
 		B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS")
 	Catch
 		LogColor(LastException, Colors.Red)
@@ -321,4 +321,4 @@ Sub guardaYEnviaUbicacion(lat As String, lon As String)
 	cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, usuario, lat, lon, fecha)
 '	Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${usuario}, ${lat}, ${lon}, ${fecha}"$)
 	Starter.reqManager.ExecuteCommand(cmd, $"guardaHistorialUbicaciones_${id}"$)
-End Sub
+End Sub