From 9a3fe60aa7d38f544bece5fd584a3d7a699cd184 Mon Sep 17 00:00:00 2001 From: IsR0d Date: Thu, 22 Aug 2024 11:30:45 -0600 Subject: [PATCH] =?UTF-8?q?Version=204.08.18.EP=5Fd=20la=20ruta=20se=20agr?= =?UTF-8?q?ego=20al=20fin=20d=C3=ADa=20para=20la=20bitacora=20GPS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 2 +- B4A/C_Principal.bas | 8 +++++++- B4A/Guna Vistas V3.1.b4a | 34 +++++++++++++++++----------------- B4A/Guna Vistas V3.1.b4a.meta | 2 +- B4A/Subs.bas | 2 +- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index fec5ce5..63d2efd 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -151,7 +151,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) If File.Exists(ruta, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If - skmt.Initialize(ruta,"kmt.db", True) + skmt.Initialize(File.DirInternal,"kmt.db", True) skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS IMPRESORA (HABILITADA)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS GPS (HABILITADO)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PROMO_ESP (HVD_CLIENTE)") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index d9ea59b..8f36151 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -44,6 +44,7 @@ Sub Class_Globals Dim Cuantos As String Dim l_cuantosn As Label Dim e_ruta As EditText + Dim Rut_Rep As String Dim l_porvisitar As Label Dim b_mapa As Button Dim l_ruta As Label @@ -223,6 +224,7 @@ Sub Class_Globals Private panel_5 As Panel Private p_marcasRes As Panel Private p_sombra As Panel + End Sub 'You can add more parameters here. @@ -789,6 +791,8 @@ Sub Subir_Click End Sub Sub cargar_Click + Rut_Rep = e_ruta.Text + Log(Rut_Rep) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0)) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("CARGA_DIA")) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword")) @@ -1928,6 +1932,7 @@ Sub b_mapa_Click End Sub Sub e_ruta_EnterPressed + If e_ruta.Text = "FIN DIA" Then RES = Msgbox2("Seguro que desa hacer el cierre todos los datos se borraran?","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore If RES = DialogResponse.POSITIVE Then @@ -1959,10 +1964,11 @@ Sub e_ruta_EnterPressed B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD")) B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS") B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0)) - Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Fin Día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") B4XPage_Appear + Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Rut_Rep,"Fin Día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") End If End If + If e_ruta.Text = "IWL" Then ' trabajar.Visible = False NUEVO.Visible =False diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index b2337fc..4fab1eb 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -125,21 +125,21 @@ FileGroup8=Default Group FileGroup9=Default Group Group=Default Group Library1=appupdating -Library10=fileprovider -Library11=firebaseadmob -Library12=firebaseanalytics -Library13=firebasenotifications -Library14=fusedlocationprovider -Library15=googlemaps -Library16=googlemapsextras -Library17=gps -Library18=ime -Library19=javaobject +Library10=firebaseadmob +Library11=firebaseanalytics +Library12=firebasenotifications +Library13=fusedlocationprovider +Library14=googlemaps +Library15=googlemapsextras +Library16=gps +Library17=ime +Library18=javaobject +Library19=jhsicezxing1 Library2=b4xpages -Library20=jhsicezxing1 -Library21=json -Library22=okhttputils2 -Library23=phone +Library20=json +Library21=okhttputils2 +Library22=phone +Library23=preoptimizedclv Library24=randomaccessfile Library25=rspopupmenu Library26=runtimepermissions @@ -150,13 +150,13 @@ Library3=baqrcode Library30=xcustomlistview Library31=xui Library32=xui views -Library33=preoptimizedclv +Library33=compressstrings Library4=batteryprogressview Library5=bitmapcreator Library6=byteconverter Library7=camera -Library8=compressstrings -Library9=core +Library8=core +Library9=fileprovider ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~AddApplicationText(~\n~)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~ ''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddApplicationText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~ AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\n~ CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~ CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~ CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~ SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'//////////////////////////////////////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~ ~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~AddManifestText(~\n~ ~\n~ )~\n~AddManifestText()~\n~~\n~AddManifestText(~\n~ ~\n~ )~\n~ AddPermission(android.permission.MANAGE_EXTERNAL_STORAGE)~\n~ SetApplicationAttribute(android:allowBackup, "false")~\n~ ~\n~ ~\n~ AddManifestText(~\n~ )~\n~ AddPermission(android.permission.READ_EXTERNAL_STORAGE) Module1=appUpdater Module10=C_NoVenta diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index b6d5ff3..e8315ea 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -76,6 +76,6 @@ ModuleClosedNodes6=8,9,10 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,cargar_Click,784,0,C_Principal,B4XPage_CloseRequest,1838,0,C_Principal,connecta_Click,1846,0,C_Principal,BUSCA_Click,1914,0,B4XMainPage,b_aceptar_Click,844,0,C_Productos,b_QR_Click,417,0,C_Productos,b_prodMenos_Click,471,0,C_Cliente,B4XPage_Appear,563,0,C_Cliente,b_Inicio_Fin_venta_Click,4755,0,C_Principal,Class_Globals,15,0,C_Productos,lv_catalogos_ItemClick,176,0 +NavigationStack=Tracker,flp_LocationChanged,186,0,C_Principal,B4XPage_Appear,456,0,C_Principal,Class_Globals,16,0,B4XMainPage,i_engrane_Click,737,0,C_Promos,b_continuar_Click,374,0,C_Productos,B4XPage_Appear,114,0,Diseñador Visual,pedido.bal,-100,2,Diseñador Visual,productos.bal,-100,6,C_Productos,lv_catalogos_ItemClick,193,0,C_Principal,B_OK_PAS_Click,2055,0,C_Principal,cargar_Click,853,0 SelectedBuild=0 VisibleModules=23,2,24,13,14,4,6,9,12,5 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 438a210..25552bf 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -661,7 +661,7 @@ End Sub Sub traeRuta As String 'ignore Private c As Cursor Private r As String - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 limit 1") r = "0" If c.RowCount > 0 Then c.Position=0