diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 9e74f38..59975b6 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -141,8 +141,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) ruta = Starter.ruta Provider.Initialize - Subs.borraArribaDe100Errores ' Para Websockets - Subs.borraArribaDe600RenglonesBitacora ' Para Websockets +' Subs.borraArribaDe100Errores ' Para Websockets +' Subs.borraArribaDe600RenglonesBitacora ' Para Websockets If File.Exists(ruta, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If @@ -238,7 +238,7 @@ Sub B4XPage_Appear LogColor($"////////////////// DeviceID: ${DeviceID} ////////////////// "$, Colors.Blue) LogColor("Revisa permisos Phone_State", Colors.Green) Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_PHONE_STATE) - Wait For Activity_PermissionResult (Permission As String, Result As Boolean) + Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) If Result Then IMEN.Text = Phn.GetDeviceId IMEI = Phn.GetDeviceId @@ -246,7 +246,7 @@ Sub B4XPage_Appear IMEI="" 'Pruebas End If Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION) - Wait For Activity_PermissionResult (Permission As String, Result As Boolean) + Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) If Result Then StartService(Tracker) Log("Start Tracker") @@ -298,6 +298,7 @@ Sub Entrar_Click Dim r As Reflector Dim Api As Int Dim PP As Phone + user.Text = user.Text.trim Api = r.GetStaticField("android.os.Build$VERSION", "SDK_INT") If Api < 9 Then 'Old device @@ -594,7 +595,7 @@ End Sub Sub copiaDB Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) - Wait For Activity_PermissionResult (Permission As String, Result As Boolean) + Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) Dim theDir As String = "" If Result Then Dim theDir As String diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index a6d1ad5..8db56df 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -428,9 +428,9 @@ Sub B4XPage_Appear B4XPages.MainPage.tipo_venta = tipo_venta encuentasmapa.Initialize Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_CAMERA) - Wait For Activity_PermissionResult (Permission As String, resultC As Boolean) + Wait For B4XPage_PermissionResult (Permission As String, resultC As Boolean) Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) - Wait For Activity_PermissionResult (Permission As String, resultC As Boolean) + Wait For B4XPage_PermissionResult (Permission As String, resultC As Boolean) LA_GPS.TextColor = Colors.Red LA_GPS.Text = "SIN UBICACION GPS" diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 40a2f17..c368a49 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -296,7 +296,22 @@ Sub llenaCatalogo(limpiar As Boolean) Log("LlenaCatalogo") If limpiar Then clv_productos.Clear Private c2 As Cursor - c2=B4XPages.MainPage.skmt.ExecQuery("select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from cat_gunaprod where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD <> 'PROMOS' ") + c2 = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from cat_gunaprod where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD <> 'PROMOS' + order by + Case CAT_GP_TIPOPROD when 'PRIORITARIO' THEN 0 + WHEN 'ESTRATEGICO' THEN 1 + WHEN 'CATALOGO REGULAR' then 2 + Else 3 + End, CAT_GP_NOMBRE"$) + +' Select cAT_GP_ID, cat_gp_tipoprod from cat_gunaprod order by +' Case CAT_GP_TIPOPROD +' When 'PRIORITARIO' THEN 0 +' WHEN 'ESTRATEGICO' THEN 1 +' WHEN 'CATALOGO REGULAR' then 2 +' Else 3 +' End + Private bgColor, textColor As Int If c2.RowCount > 0 And clv_productos.Size <> c2.RowCount Then clv_productos.Clear : Log("limpiamos productos") diff --git a/B4A/Files/productos.bal b/B4A/Files/productos.bal index 6831048..dd3aada 100644 Binary files a/B4A/Files/productos.bal and b/B4A/Files/productos.bal differ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index eb82c4e..31d0de9 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -142,6 +142,7 @@ Library3=baqrcode Library30=xcustomlistview Library31=xui Library32=xui views +Library33=preoptimizedclv Library4=batteryprogressview Library5=bitmapcreator Library6=byteconverter @@ -172,9 +173,9 @@ Module7=C_Mapas Module8=C_Nota Module9=C_NoVenta NumberOfFiles=58 -NumberOfLibraries=32 +NumberOfLibraries=33 NumberOfModules=22 -Version=11.5 +Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Guna V3.1 diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index d2b6bb2..1c6e825 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -49,7 +49,7 @@ ModuleClosedNodes1=5,7,8,9,10,11,12,13,14 ModuleClosedNodes10= ModuleClosedNodes11=6 ModuleClosedNodes12=2,3,6,8,10,11,13,14,15 -ModuleClosedNodes13=1 +ModuleClosedNodes13=6,8,10,11,12,13,14,15,16,17,18,19,20,21,22,23 ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= @@ -67,6 +67,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,B_guardaencuesta_Click,1295,0,C_Cliente,B_guardaencuesta_m2_Click,2020,0,Diseñador Visual,ESNCUESTA_M2.bal,-100,5,C_Cliente,B_guardaencuesta_m4_Click,2288,0,C_Cliente,b_preguntag_Click,783,6,C_Cliente,CB1_P3_M3_CheckedChange,2806,0,C_Cliente,CB5_P3_M3_CheckedChange,2853,0,C_Cliente,Class_Globals,354,0,Diseñador Visual,ENCUESSTA_M3.bal,-100,6,C_Cliente,B_guardaencuesta_m3_Click,2196,0,MAPA_RUTAS,MapFragment1_Ready,177,0 +NavigationStack=Subs,hayPedido,676,0,Visual Designer,productos.bal,-100,1,C_Productos,BUSCA_TextChanged,381,0,C_Productos,b_buscar_Click,643,0,C_Productos,B4XPage_Appear,129,1,C_Productos,B4XPage_Created,68,0,C_Productos,Class_Globals,29,4,C_Productos,lv_catalogos_ItemClick,195,1,C_Productos,llenaCatalogo,298,6 SelectedBuild=0 -VisibleModules=20,2,21,12,13,4,8,11,5,10,19 +VisibleModules=20,2,21,12,13,4,8,11,5,10 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index e6a156e..b0e22c8 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -678,6 +678,16 @@ Sub traeUsuarioDeBD As String 'ignore Return u End Sub +'Regresa verdadero si hay pedido en la tabla "PEDIDO" del cliente actual. +Sub hayPedido As Boolean + Private thisC As Cursor=B4XPages.MainPage.skmt.ExecQuery($"select count(PE_CLIENTE) as hayPedido from PEDIDO where PE_CLIENTE = '${traeCliente}'"$) + thisC.Position=0 + Private hay As Boolean = False + If thisC.GetInt("hayPedido") > 0 Then hay = True +' Log($"Cliente actual=${traeCliente}, hayPedido=${hay}"$) + Return hay +End Sub + Sub guardaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String) LogColor("guardaProducto: "&prodId&", cant="&cant&" - TV:"&tipoVenta, Colors.Magenta) Private c As Cursor