Merge branch 'main' of https://github.com/jaguerrau/Bagon

# Conflicts:
#	B4A/B4XMainPage.bas

.gitignore

@@ -1,3 +1,2 @@
 **/Objects
-**/AutoBackups
+**/AutoBackups
-*.meta

B4A/AREstrategias.b4a.meta

@@ -0,0 +1,39 @@
+ModuleBookmarks0=
+ModuleBookmarks1=
+ModuleBookmarks10=
+ModuleBookmarks11=
+ModuleBookmarks2=
+ModuleBookmarks3=
+ModuleBookmarks4=
+ModuleBookmarks5=
+ModuleBookmarks6=
+ModuleBookmarks7=
+ModuleBookmarks8=
+ModuleBookmarks9=
+ModuleBreakpoints0=
+ModuleBreakpoints1=
+ModuleBreakpoints10=
+ModuleBreakpoints11=
+ModuleBreakpoints2=
+ModuleBreakpoints3=
+ModuleBreakpoints4=
+ModuleBreakpoints5=
+ModuleBreakpoints6=
+ModuleBreakpoints7=
+ModuleBreakpoints8=
+ModuleBreakpoints9=
+ModuleClosedNodes0=
+ModuleClosedNodes1=
+ModuleClosedNodes10=
+ModuleClosedNodes11=
+ModuleClosedNodes2=
+ModuleClosedNodes3=5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,45,46,47,48,49,50,51,52,53,54
+ModuleClosedNodes4=
+ModuleClosedNodes5=
+ModuleClosedNodes6=
+ModuleClosedNodes7=
+ModuleClosedNodes8=
+ModuleClosedNodes9=
+NavigationStack=B4XMainPage,B4XPage_Created,44,4,B4XMainPage,B4XPage_Appear,88,0,Subs,revisaBD,32,0,c_datos,B4XPage_Appear,259,0,c_datos,InitializeCamera2,1627,0,C_principal,B4XPage_Appear,75,0,C_principal,b_enviar_Click,532,0,c_datos,WobbleMenu1_Tab3Click,803,0,Diseñador Visual,MainPage.bal,-100,1,c_datos,Camera1_PictureTaken,1690,4
+SelectedBuild=0
+VisibleModules=9,2,4,3,10,7,6,11,1,5

B4A/Subs.bas

@@ -56,3 +56,10 @@ Sub revisaBD 'ignore
 '	Starter.skmt.ExecNonQuery("DROP TABLE IF EXISTS CAT_VARIABLES")
 	
 End Sub
+
+'Guarda la empresa y version de la app en CAT_VARIABLES.
+Sub guardaAppInfo(skmt As SQL) 'ignore
+	skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'EMPRESA' or CAT_VA_DESCRIPCION = 'APP_NAME' or CAT_VA_DESCRIPCION = 'APP_VERSION'")
+	skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_NAME', '${Application.LabelName}')"$)
+	skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_VERSION', '${Application.VersionName}')"$)
+End Sub

B4A/bagon.b4a

@@ -64,7 +64,7 @@ ManifestCode='This code will be applied to the manifest file during compilation.
 Module1=appUpdater
 Module10=Subs
 Module11=Tracker
-Module2=|relative|..\B4XMainPage
+Module2=B4XMainPage
 Module3=c_datos
 Module4=C_principal
 Module5=C_UpdateAvailable

B4A/bagon.b4a.meta

@@ -0,0 +1,39 @@
+ModuleBookmarks0=
+ModuleBookmarks1=
+ModuleBookmarks10=
+ModuleBookmarks11=
+ModuleBookmarks2=
+ModuleBookmarks3=
+ModuleBookmarks4=
+ModuleBookmarks5=
+ModuleBookmarks6=
+ModuleBookmarks7=
+ModuleBookmarks8=
+ModuleBookmarks9=
+ModuleBreakpoints0=
+ModuleBreakpoints1=
+ModuleBreakpoints10=
+ModuleBreakpoints11=
+ModuleBreakpoints2=
+ModuleBreakpoints3=
+ModuleBreakpoints4=
+ModuleBreakpoints5=
+ModuleBreakpoints6=
+ModuleBreakpoints7=
+ModuleBreakpoints8=
+ModuleBreakpoints9=
+ModuleClosedNodes0=
+ModuleClosedNodes1=
+ModuleClosedNodes10=
+ModuleClosedNodes11=
+ModuleClosedNodes2=
+ModuleClosedNodes3=
+ModuleClosedNodes4=
+ModuleClosedNodes5=
+ModuleClosedNodes6=
+ModuleClosedNodes7=
+ModuleClosedNodes8=
+ModuleClosedNodes9=
+NavigationStack=c_datos,Class_Globals,130,0,c_datos,B4XPage_Appear,267,6,Subs,guardaAppInfo,59,0,Subs,revisaBD,52,0,B4XMainPage,Initialize,56,0,B4XMainPage,B4XPage_Appear,59,0,B4XMainPage,B4XPage_Created,59,3
+SelectedBuild=0
+VisibleModules=1,2,4,3,8,9,10

B4J/AREstrategias.b4j

@@ -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

B4i/AREstrategias.b4i

@@ -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