diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index e0c1984..a0b740b 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -521,7 +521,7 @@ Sub B4XPage_Appear Else Cuestionario End If -' Log(Subs.revisaImpresa) + Log("IMPRESO:" & Subs.revisaImpresa) If YA_IMPRIMIO2 = 0 Then Guardar.Visible = False Else diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index ff1d287..6130d77 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1957,7 +1957,7 @@ Sub connecta_Click cmd.Initialize cmd.Name = "select_ruta3_KELL" cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, usuario) - Log($"******* RUTA: ${ALMACEN}, ${e_ruta.text}, ${usuario}"$) + Log($"******* Almacen: ${ALMACEN}, ${e_ruta.text}, ${usuario}"$) reqManager.ExecuteQuery(cmd , 0, "ruta") e_ruta.Enabled = False If e_ruta.Text = "KMTSKLL1" Then e_ruta.Enabled = True diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 0ed2703..a8e2c6b 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1073,6 +1073,16 @@ Sub Busca_TextChanged (Old As String, New As String) ToastMessageShow("No hay promociones disponibles.", False) End If cPromo.Close + else if lfila.text = "RMI" Then + Dim p As ResultSet = Starter.db.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, '1000' as CAT_GP_ALMACEN from CAT_RMI where CAT_GP_NOMBRE like '%${New}%' order by CAT_GP_NOMBRE"$) + Log($"Llamamos LlenaProdsLL con ${p.RowCount} prods."$) + lfila.Text = "RMI" + b_rmi.Visible = False + lv_catalogos.Visible = False + LlenaProdsLL(p, "rmi") + clv_prods_ll.AsView.BringToFront + clv_prods_ll.AsView.Visible = True + l_mDisponible.Visible = True Else If Not(clv_prods_ll.AsView.Visible) Then clv_prods_ll.AsView.Visible = True clv_prods_ll.Clear diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 1f1fab9..487f95a 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -60,7 +60,7 @@ ModuleClosedNodes0= ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= -ModuleClosedNodes12= +ModuleClosedNodes12=1 ModuleClosedNodes13= ModuleClosedNodes14= ModuleClosedNodes15= @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Subs,dbInit,25,0,Starter,Service_Create,61,0,B4XMainPage,B4XPage_Appear,353,0,Starter,Service_Start,88,0,Starter,Subs_dbOk,90,0,C_Principal,B4XPage_Created,192,1,C_Principal,B4XPage_Appear,376,0,C_Principal,B_OK_PAS_Click,2145,1,B4XMainPage,Class_Globals,35,0,C_Principal,JobDone,1131,5 +NavigationStack=C_Productos,Initialize,96,0,C_Historico,B_RMI_Click,111,0,C_Productos,clv_prods_ll_VisibleRangeChanged,1047,0,C_Productos,Busca_TextChanged,1068,3,C_Principal,JobDone,1123,0,C_Principal,cargar_Click,809,0,C_Principal,connecta_Click,1908,1,Visual Designer,productos.bal,-100,2,Visual Designer,cliente.bal,-100,1,C_Cliente,B4XPage_Appear,511,3 SelectedBuild=0 -VisibleModules=1,26,11,14,27,3,4,13,12,2 +VisibleModules=1,26,11,14,27,3,4,13,12,2,5 diff --git a/B4J/Files/MainPage.bjl b/B4J/Files/MainPage.bjl deleted file mode 100644 index 405b3b7..0000000 Binary files a/B4J/Files/MainPage.bjl and /dev/null differ diff --git a/B4J/Kelloggs V3.b4j b/B4J/Kelloggs V3.b4j deleted file mode 100644 index cdedb76..0000000 --- a/B4J/Kelloggs V3.b4j +++ /dev/null @@ -1,53 +0,0 @@ -AppType=JavaFX -Build1=Default,b4j.example -File1=MainPage.bjl -FileGroup1=New Group -Group=Default Group -Library1=jcore -Library2=jfx -Library3=b4xpages -Module1=|relative|..\B4XMainPage -NumberOfFiles=1 -NumberOfLibraries=3 -NumberOfModules=1 -Version=8.31 -@EndOfDesignText@ -#Region Project Attributes - #MainFormWidth: 600 - #MainFormHeight: 600 -#End Region - -Sub Process_Globals - Private fx As JFX - Private MainForm As Form -End Sub - -Sub AppStart (Form1 As Form, Args() As String) - MainForm = Form1 - MainForm.Show - Dim PagesManager As B4XPagesManager - PagesManager.Initialize(MainForm) -End Sub - -'Template version: B4J-1.0 -#Region Delegates -Sub MainForm_FocusChanged (HasFocus As Boolean) - B4XPages.Delegate.MainForm_FocusChanged(HasFocus) -End Sub - -Sub MainForm_Resize (Width As Double, Height As Double) - B4XPages.Delegate.MainForm_Resize(Width, Height) -End Sub - -Sub MainForm_Closed - B4XPages.Delegate.MainForm_Closed -End Sub - -Sub MainForm_CloseRequest (EventData As Event) - B4XPages.Delegate.MainForm_CloseRequest(EventData) -End Sub - -Public Sub MainForm_IconifiedChanged (Iconified As Boolean) - B4XPages.Delegate.MainForm_IconifiedChanged(Iconified) -End Sub -#End Region \ No newline at end of file diff --git a/B4J/Kelloggs V3.b4j.meta b/B4J/Kelloggs V3.b4j.meta deleted file mode 100644 index 33c33ea..0000000 --- a/B4J/Kelloggs V3.b4j.meta +++ /dev/null @@ -1,9 +0,0 @@ -ModuleBookmarks0= -ModuleBookmarks1= -ModuleBreakpoints0= -ModuleBreakpoints1= -ModuleClosedNodes0=1,4 -ModuleClosedNodes1=1 -NavigationStack=Main,MainForm_IconifiedChanged,37,0,Main,AppStart,14,6,B4XMainPage,Button1_Click,19,0,B4XMainPage,Initialize,9,0,B4XMainPage,B4XPage_Created,18,0,B4XMainPage,Class_Globals,7,0 -SelectedBuild=0 -VisibleModules=1 diff --git a/B4i/Files/mainpage.bil b/B4i/Files/mainpage.bil deleted file mode 100644 index 9ac93b4..0000000 Binary files a/B4i/Files/mainpage.bil and /dev/null differ diff --git a/B4i/Kelloggs V3.b4i b/B4i/Kelloggs V3.b4i deleted file mode 100644 index 7b2433a..0000000 --- a/B4i/Kelloggs V3.b4i +++ /dev/null @@ -1,46 +0,0 @@ -Build1=Default,b4i.example -File1=MainPage.bil -FileGroup1=Default Group -Group=Default Group -Library1=icore -Library2=b4xpages -Module1=|relative|..\B4XMainPage -NumberOfFiles=1 -NumberOfLibraries=2 -NumberOfModules=1 -Version=6.5 -@EndOfDesignText@ -'Code module -#Region Project Attributes - #ApplicationLabel: B4i Example - #Version: 1.0.0 - 'Orientation possible values: Portrait, LandscapeLeft, LandscapeRight and PortraitUpsideDown - #iPhoneOrientations: Portrait, LandscapeLeft, LandscapeRight - #iPadOrientations: Portrait, LandscapeLeft, LandscapeRight, PortraitUpsideDown - #Target: iPhone, iPad - #ATSEnabled: True - #MinVersion: 8 -#End Region - -Sub Process_Globals - Public App As Application - Public NavControl As NavigationController - -End Sub - -Private Sub Application_Start (Nav As NavigationController) - NavControl = Nav - Dim PagesManager As B4XPagesManager - PagesManager.Initialize(NavControl) -End Sub - -'Template version: B4i-1.0 -#Region Delegates -Private Sub Application_Background - B4XPages.Delegate.Activity_Pause -End Sub - -Private Sub Application_Foreground - B4XPages.Delegate.Activity_Resume -End Sub -#End Region diff --git a/B4i/Kelloggs V3.b4i.meta b/B4i/Kelloggs V3.b4i.meta deleted file mode 100644 index cca4a05..0000000 --- a/B4i/Kelloggs V3.b4i.meta +++ /dev/null @@ -1,9 +0,0 @@ -ModuleBookmarks0= -ModuleBookmarks1= -ModuleBreakpoints0= -ModuleBreakpoints1= -ModuleClosedNodes0=1,4 -ModuleClosedNodes1=1 -NavigationStack=Main,Application_Start,25,4,Main,Application_Foreground,34,0,Main,Process_Globals,13,0,Visual Designer,MainPage.bil,-100,1,B4XMainPage,Initialize,9,0,B4XMainPage,Button1_Click,19,0,B4XMainPage,B4XPage_Created,10,1,B4XMainPage,Class_Globals,11,0 -SelectedBuild=0 -VisibleModules=1