VERSION 6.03.03

- Se amplio el tamaño del listview en el historico y se agrego el numbre del vendedor.

B4A/B4XMainPage.bas

@@ -26,8 +26,6 @@ Version=9.85
 	'###########################################################################################################
 #End Region
 
-'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\
-
 Sub Class_Globals
 	Private Root As B4XView
 	Private xui As XUI
@@ -203,6 +201,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("CAT_GUNAPROD", "CAT_GP_PRECIO10", "TEXT DEFAULT '0'")
 	Subs.agregaColumna("PEDIDO_CLIENTE", "PC_GUARDADO", "TEXT DEFAULT '0'")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_GP_VARREQ3", "TEXT DEFAULT '0'")
+	Subs.agregaColumna("HIST_VENTAS", "HVD_USUARIO", "TEXT")
 	
 	Subs.agregaColumna("CAT_GUNAPROD2", "MARCA", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD", "MARCA", "TEXT")

B4A/C_Cliente.bas

@@ -1757,6 +1757,7 @@ End Sub
 
 Private Sub la_nombre_Click
 	Log("Clicked")
+	If Not(Subs.geocercaActiva) Then
 		Log("Enviando coords")
 		DateTime.DateFormat = "MM/dd/yyyy"
 		sDate=DateTime.Date(DateTime.Now)
@@ -1770,5 +1771,9 @@ Private Sub la_nombre_Click
 '		cmd.Parameters = Array As Object("1", "1", "5", "6", "CLN13478")
 		Log($"${Subs.traeAlmacen}, ${Subs.traeRuta},${la_cuenta.text},${B4XPages.MainPage.lat_gps},${B4XPages.MainPage.lon_gps}"$)
 		reqManager.ExecuteCommand(cmd , "insCoordsNuevas")
+		ToastMessageShow("Coordenadas actualizadas", False)
 		B4XPage_Appear
+	Else
+		ToastMessageShow("Geocerca activada", False)
+	End If
 End Sub

B4A/C_Historico.bas

@@ -55,6 +55,7 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
+	ListView1.Height = Root.Height * 0.8
 	If Not(Starter.gps.GPSEnabled) Then
 		ToastMessageShow("Es necesario tener el GPS encendido", True)
 		StartActivity(Starter.gps.LocationSettingsIntent)
@@ -65,8 +66,9 @@ Sub B4XPage_Appear
 	C.Position=0
 	Existe = C.GetString("EXISTE")
 	C.Close
-	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_PRONOMBRE asc")
+	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_USUARIO from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_PRONOMBRE asc")
 	ListView1.Clear
+	ListView1.TwoLinesLayout.ItemHeight = 70dip
 	If c.RowCount>0 Then
 		For i=0 To c.RowCount -1
 			c.Position=i
@@ -78,7 +80,7 @@ Sub B4XPage_Appear
 			label2 = ListView1.TwoLinesLayout.SecondLabel
 			label2.TextSize = 10
 			label2.TextColor = Colors.Blue
-			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT"))
+			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT") & CRLF & "Usuario: " & c.GetString("HVD_USUARIO"))
 		Next
 	End If
 	If Existe <> 0 Then

B4A/C_Nota.bas

@@ -57,6 +57,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '		L_CANT.Text = c.GetString("PC_NOART")
 '		L_TOTAL.Text = c.GetString("PC_MONTO")
 '	End If
+	p_nota.Height = Root.Height : p_nota.Width = Root.Width
 End Sub
 
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

B4A/C_Principal.bas

@@ -998,6 +998,7 @@ Sub cargar_Click
 		cmd.Initialize
 		cmd.Name = "select_hist_datos_INTMEX_2"
 		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		Log($"===> ${e_ruta.text}, ${ALMACEN}"$)
 		reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 
 		cmd.Initialize
@@ -1814,7 +1815,9 @@ Sub JobDone(Job As HttpJob)
 					Dim HVD_PRONOMBRE As String = records(RESULT.Columns.Get("HVD_PRONOMBRE"))
 					Dim HVD_CANT As String = records(RESULT.Columns.Get("HVD_CANT"))
 					Dim HVD_COSTO_TOT As String = records(RESULT.Columns.Get("HVD_COSTO_TOT"))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT) VALUES (?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT))
+					Dim HVD_USUARIO As String = records(RESULT.Columns.Get("USUARIO"))
+					Log(HVD_USUARIO)
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_USUARIO) VALUES (?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_USUARIO))
 				Next
 				Listo3 =1
 				If PB1.Progress = 0 Then

B4A/INTMEX.b4a

@@ -164,7 +164,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Intmex
 	#VersionCode: 1
-	#VersionName: 6.02.21
+	#VersionName: 6.03.03
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/INTMEX.b4a.meta

@@ -91,6 +91,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,B4XPage_disappear,440,0,C_Principal,JobDone,2068,0,C_Principal,cargar_Click,1030,0,C_Principal,Subir_Click,819,0,C_Principal,B4XPage_Appear,550,0,C_Principal,GPS_LocationChanged,2619,0,C_Cliente,GPS_LocationChanged,481,0,C_Cliente,B_GUARDA_C_Click,1055,0,C_Cliente,B4XPage_Appear,354,0,C_Cliente,la_nombre_Click,1769,0,C_Cliente,JobDone,1448,6
+NavigationStack=C_Nota,Initialize,39,0,C_Nota,p_nota_Click,312,0,C_Nota,B4XPage_Created,57,6,C_Historico,GPS_LocationChanged,86,0,C_Nota,B4XPage_Appear,58,2,C_Historico,B4XPage_Created,49,0,Diseñador Visual,nota.bal,-100,6,C_Principal,JobDone,1804,2,C_Principal,cargar_Click,980,4,C_Historico,B4XPage_Appear,66,6,B4XMainPage,B4XPage_Created,197,0
 SelectedBuild=0
-VisibleModules=28,2,13,20,14,29,15,4,11,21
+VisibleModules=28,2,13,14,29,15,4,11,21,7,9