From 1b733dfe8759cefca4a4176938435caf473c86f6 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Mon, 11 Sep 2023 21:55:18 -0600 Subject: [PATCH 1/6] 11/9/23 - Cambio de ligas de Github. --- B4XMainPage.bas => B4A/B4XMainPage.bas | 5 +++-- B4A/bagon.b4a | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename B4XMainPage.bas => B4A/B4XMainPage.bas (98%) diff --git a/B4XMainPage.bas b/B4A/B4XMainPage.bas similarity index 98% rename from B4XMainPage.bas rename to B4A/B4XMainPage.bas index 9a24489..f703f3f 100644 --- a/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -9,12 +9,13 @@ Version=9.85 'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True '########################################################################################################### '###################### PULL ############################################################# -'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=..\..\gitpull.bat +'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=git&Args=pull '########################################################################################################### '###################### PUSH ############################################################# -'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\ +'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\ '########################################################################################################### #End Region +'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\ 'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip diff --git a/B4A/bagon.b4a b/B4A/bagon.b4a index 482db24..6c71735 100644 --- a/B4A/bagon.b4a +++ b/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 @@ -75,7 +75,7 @@ Module9=Starter NumberOfFiles=17 NumberOfLibraries=26 NumberOfModules=11 -Version=11.5 +Version=12.2 @EndOfDesignText@ #Region Project Attributes #AdditionalJar: com.android.support:support-v4 From baf55c6111be2af3c967159561e0ba5a5ae139f7 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Tue, 12 Sep 2023 01:50:42 -0600 Subject: [PATCH 2/6] 12/9/23 - Codigo para guardar app info en CAT_VARIABLES --- B4A/B4XMainPage.bas | 1 + B4A/Subs.bas | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index f703f3f..2038414 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -60,6 +60,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) db.Initialize(Starter.rutaBD,"kmt.db",True) Provider.Initialize l_version.Text = Application.VersionName + Subs.guardaAppInfo(db) End Sub Sub B4XPage_Appear diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 1b670f8..2225a2f 100644 --- a/B4A/Subs.bas +++ b/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 \ No newline at end of file From 5f9ad5bacdc1b6348d69e93a0642a0adf2ae5233 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Wed, 20 Sep 2023 01:56:44 -0600 Subject: [PATCH 3/6] Agregamos meta --- .gitignore | 3 +-- B4A/bagon.b4a.meta | 39 ++++++++++++++++++++++++++++++ B4J/AREstrategias.b4j | 53 ----------------------------------------- B4J/Files/MainPage.bjl | Bin 1959 -> 0 bytes B4i/AREstrategias.b4i | 46 ----------------------------------- B4i/Files/mainpage.bil | Bin 3084 -> 0 bytes 6 files changed, 40 insertions(+), 101 deletions(-) create mode 100644 B4A/bagon.b4a.meta delete mode 100644 B4J/AREstrategias.b4j delete mode 100644 B4J/Files/MainPage.bjl delete mode 100644 B4i/AREstrategias.b4i delete mode 100644 B4i/Files/mainpage.bil diff --git a/.gitignore b/.gitignore index 618d244..af94e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ **/Objects -**/AutoBackups -*.meta \ No newline at end of file +**/AutoBackups \ No newline at end of file diff --git a/B4A/bagon.b4a.meta b/B4A/bagon.b4a.meta new file mode 100644 index 0000000..9edbe53 --- /dev/null +++ b/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_Created,55,3,B4XMainPage,B4XPage_Appear,59,0 +SelectedBuild=0 +VisibleModules=1,2,4,3,8,9,10 diff --git a/B4J/AREstrategias.b4j b/B4J/AREstrategias.b4j deleted file mode 100644 index cdedb76..0000000 --- a/B4J/AREstrategias.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/Files/MainPage.bjl b/B4J/Files/MainPage.bjl deleted file mode 100644 index 405b3b756ed703481ce30bdf2802b885d8384a70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1959 zcma)6&yy2H6z;f5WIzQ)5ELZ>u0eKV5by{7ShGo1R(7`_WChC$ote&N+{tvRr?UZ1 zSXO!QU(h?{*+0Pp;+98GUZng3JX+;p{l1=^0aq-Ys`uvW?$_^q{k@(k2_b%g?S_?M zkHY51*6R556M(f8Uo~>Fj(19Ob!@DaTE6kx8}~k4s;E`(3AgrhZ%WzPb0?_g{BEY1YJM^T>ynk!}G->VDF_IZ}s!T0NPB zeyydFa4lA*wydn=aY)A^rh@l>9gDPOG#bb~06lF2WtuwD=Kk<%7}&vMSoO6*m5vO; zal-QjMowfeQq#aYskFA&YA#tedK{5|n_zXH<(SWbi|Xdnz_a}uvpwmruNgg#gV{VL z7#nFr9kanIX7#`$+)%Mykwe8ilwd)dA+fq)jcg_fpzBgUjMS6B0~rUA>Oi^ARGXU_ z{HffK)Ry|iNX9plQ44KCMCG*?S1zI#WlgpKjA5ZkteNCLE}6ZD6?(Ed7BtE=LL(cz!($5?;Uhvv50==OsvQ_djnw zrIHaY%MgrNs@Y!YwmUqZuVV|bmQ_3^&s6_JvGn$bM9O_cJ?!Q!VEzLW1}r&$c9FyF zPl>yFItrMSyV)crZM7E~t4rN%`U?6$LZJmepM)6Pn5aY#6|c=uS_SE%MG#FGnG9s0 zCl6ELid!Ka7SjEGqU^Q%@MG>a?iRC7n#bKriktAmA!(|?i6;20Q#ekzFs8CvN8NBl z`V;(Bx>#dJgt#?#4Sxk1A20h$c-e0Pn{UlAZ+VLj#&pg(z>JI)9&0j<$DbORmbZTY zV~Zc6M?v@$skf`U7ob$w2k-HEKSi(~j^C042LMWigB&vbGX(79VFIf7909i+$-wgj zFTfpzl?oO3sTbi~!DAUXPH+eAL|K@TE6U%0pz<4*>9IgNVmK zJVyoo>Y(G_JZNyvTCZ*G-Ml#Y@zkyJd#6ubnp~Z}H8puBnmTjy@apPbHUCjmDsNZ5 z`e|%O{POG1-(NpgxcKARr#sia+x>QT;`hz#pL_0_xU%`f`owST_Kmz%9zXQwXRy5j zV%&{*<7z0M0a~hyST&}XWUQLLjHWM0Etm^q)6n^soP-y)1o!Hq(QZaT*LN2KFNhwd zD2QAcT~@AcO<>swA{ed-S9N2q-EJpTezPXD3Yf3kjR<`QSoWl^S4BrAb!*Df5lCCY zcRg7{h+oQOYCJ-ra^(V?CoQ0%E21Zu7DM-8BW=qQX5CXw<7PobmsG6ko=M*qseB^{ zyn43BB84J?F91`rFbX=MX4|xAGCZxcXMC)QrlfzJSSY>#e6XzWngse`q}->Wz}u9{ zs#Uin^q2`R2stNAv`mLXU*Xttf^*87l#+6;YE3PF*CfFWt6?7HMH9k zkrKWxGB{6eCZ!KT2EE0*#TKZROs*T@3UG)!k|Hw z3Tr%mZTILLZQDCI&%x&~6F$?t%_Q;`Z0%mF?yyXt> z>`@SdvK%&n@jB0eJrA<~?)UqAFM0bIc%pS2$Y{L?a02AK1a=aHxWAsqzm?{Bj5P5$Qz-9sN9o|cjEE^rLY>H=f%!-v%+mw~T{8!nzpGBSJky*m7sq8^!S$6^X C Date: Wed, 20 Sep 2023 03:19:09 -0600 Subject: [PATCH 4/6] Ligas TortoiseGit --- B4A/B4XMainPage.bas | 3 +++ B4A/bagon.b4a | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 2038414..30dc154 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -14,6 +14,9 @@ Version=9.85 '###################### PUSH ############################################################# 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\ '########################################################################################################### +'###################### PUSH TORTOISE GIT ######################################################### +'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../" +'########################################################################################################### #End Region 'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\ diff --git a/B4A/bagon.b4a b/B4A/bagon.b4a index 6c71735..38f8a4a 100644 --- a/B4A/bagon.b4a +++ b/B4A/bagon.b4a @@ -75,7 +75,7 @@ Module9=Starter NumberOfFiles=17 NumberOfLibraries=26 NumberOfModules=11 -Version=12.2 +Version=12.5 @EndOfDesignText@ #Region Project Attributes #AdditionalJar: com.android.support:support-v4 From 46659a5a6824328ac0a0102156e04400fabc0c38 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Sun, 24 Sep 2023 00:18:25 -0600 Subject: [PATCH 5/6] Meta --- B4A/AREstrategias.b4a.meta | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 B4A/AREstrategias.b4a.meta diff --git a/B4A/AREstrategias.b4a.meta b/B4A/AREstrategias.b4a.meta new file mode 100644 index 0000000..22541a1 --- /dev/null +++ b/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 From 5e328dc4712ee39b3a89fdbba120260a4e99afaa Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Sun, 24 Sep 2023 03:07:14 -0600 Subject: [PATCH 6/6] Ligas de Github. --- B4A/B4XMainPage.bas | 23 +++++++++++------------ B4A/bagon.b4a.meta | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 30dc154..b6f1d25 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -6,19 +6,18 @@ Version=9.85 @EndOfDesignText@ #Region Shared Files #CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files" -'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True -'########################################################################################################### -'###################### PULL ############################################################# -'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=git&Args=pull -'########################################################################################################### -'###################### PUSH ############################################################# -'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\ -'########################################################################################################### -'###################### PUSH TORTOISE GIT ######################################################### -'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../" -'########################################################################################################### + 'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True + '########################################################################################################### + '###################### PULL ############################################################# + 'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=git&Args=pull + '########################################################################################################### + '###################### PUSH ############################################################# + 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\ + '########################################################################################################### + '###################### PUSH TORTOISE GIT ######################################################### + 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2 + '########################################################################################################### #End Region -'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\ 'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip diff --git a/B4A/bagon.b4a.meta b/B4A/bagon.b4a.meta index 9edbe53..ad8a234 100644 --- a/B4A/bagon.b4a.meta +++ b/B4A/bagon.b4a.meta @@ -34,6 +34,6 @@ 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_Created,55,3,B4XMainPage,B4XPage_Appear,59,0 +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