mirror of
https://github.com/KeymonSoft/Mariana.git
synced 2026-04-20 06:09:16 +00:00
- Se agregó la opción de importar la base de datos directamente desde Whatsapp, hay que ingresar al engrane con el usuario KMTS1.
- Se cambio el nombre del archivo que se envia por WhatsApp cuando se envia la base de datos, ahora es kmt_mariana.db
This commit is contained in:
@@ -42,7 +42,7 @@ Sub Class_Globals
|
||||
Public historico As C_Historico
|
||||
|
||||
Dim reqManager As DBRequestManager
|
||||
Dim s As C_Subs
|
||||
Dim kh As kms_helperSubs
|
||||
Dim v As String = Application.VersionName
|
||||
Dim ruta As String
|
||||
Dim tgl As Toggle
|
||||
@@ -92,6 +92,8 @@ Sub Class_Globals
|
||||
Dim MES1 As ManageExternalStorage
|
||||
Dim device As Phone
|
||||
Private b_importarBD As Button
|
||||
Private p_importarBDWA As Panel
|
||||
Private cb_importarBDWA As CheckBox
|
||||
End Sub
|
||||
|
||||
Public Sub Initialize
|
||||
@@ -103,7 +105,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
|
||||
B4XPages.GetManager.LogEvents = True
|
||||
Root = Root1
|
||||
Root.LoadLayout("login")
|
||||
s.Initialize(Me, "Subs")
|
||||
kh.Initialize(Me, "Subs")
|
||||
B4XPages.SetTitle(Me, "Mariana Preventa")
|
||||
login.Initialize
|
||||
B4XPages.AddPage("Login", login)
|
||||
@@ -158,7 +160,11 @@ Private Sub B4XPage_Created (Root1 As B4XView)
|
||||
End If
|
||||
' Log(ruta)
|
||||
' Starter.skmt.Initialize(ruta,"kmt.db", True)
|
||||
s.guardaAppInfo(Starter.skmt)
|
||||
|
||||
'Revisamos si se disparo el intent de cargar la base de datos desde WhatApp.
|
||||
If kh.traeUsarIntentBDWA Then kh.importaBDDesdeWhatsApp
|
||||
|
||||
kh.guardaAppInfo(Starter.skmt)
|
||||
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUOTAS (HC_META6 TEXT, HC_META5 TEXT, HC_META4 TEXT, HC_META3 TEXT, HC_META2 TEXT, HC_META1 TEXT, HC_RUTA TEXT, HC_CUOTA1 TEXT, HC_CUOTA2 TEXT, HC_CUOTA3 TEXT, HC_CUOTA4 TEXT, HC_CUOTA5 TEXT, HC_CUOTA6 TEXT)")
|
||||
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_GPS (HGDATE TEXT, HGLAT TEXT, HGLON TEXT)")
|
||||
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_STORE (HSS_CODIGO TEXT, HSS_IN TEXT, HSS_OUT TEXT, HSS_TOT TEXT)")
|
||||
@@ -284,7 +290,6 @@ Private Sub B4XPage_Created (Root1 As B4XView)
|
||||
End Sub
|
||||
|
||||
Sub B4XPage_Appear
|
||||
|
||||
If Starter.muestraProgreso = 1 Then
|
||||
muestraProgreso("Descargando actualización")
|
||||
Starter.muestraProgreso = 0
|
||||
@@ -295,6 +300,7 @@ Sub B4XPage_Appear
|
||||
DBReqServer = Starter.DBReqServer
|
||||
reqManager.Initialize(Me, Starter.DBReqServer)
|
||||
tgl.Initialize()
|
||||
cb_importarBDWA.Checked = kh.traeUsarIntentBDWA
|
||||
If Not(Starter.gps.GPSEnabled) Then
|
||||
ToastMessageShow("Es necesario tener el GPS encendido", True)
|
||||
Sleep(500)
|
||||
@@ -712,6 +718,11 @@ Sub i_engrane_Click
|
||||
et_server.Text = Starter.DBReqServer
|
||||
If user.Text = "KMTS1" Then b_importarBD.Visible = True Else b_importarBD.Visible = False
|
||||
Subs.panelVisible(p_appUpdate,0,0)
|
||||
If user.Text.Trim = "KMTS1" Then
|
||||
p_importarBDWA.Visible = True
|
||||
Else
|
||||
p_importarBDWA.Visible = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub b_regesar_Click
|
||||
@@ -728,7 +739,7 @@ Sub B_SERVER_Click
|
||||
If Logger Then Log("Inicializamos reqManager con " & Starter.DBReqServer)
|
||||
reqManager.Initialize(Me, Starter.DBReqServer)
|
||||
CallSubDelayed2(Starter, "reinicializaReqManager", Starter.DBReqServer)
|
||||
s.reqManagerReInit 'Inicializamos el reqManager de C_Subs.
|
||||
kh.reqManagerReInit 'Inicializamos el reqManager de C_Subs.
|
||||
Subs.panelVisible(p_Main,0,0)
|
||||
p_appUpdate.Visible = False
|
||||
' Entrar.Visible = True
|
||||
@@ -755,11 +766,11 @@ Private Sub b_envioBD_Click
|
||||
'copy the shared file to the shared folder
|
||||
Log("xxxxxx:"&Provider.SharedFolder)
|
||||
Sleep(1000)
|
||||
File.Copy(File.DirInternal, FileName, Provider.SharedFolder, FileName)
|
||||
File.Copy(File.DirInternal, FileName, Provider.SharedFolder, "kmt_mariana.db")
|
||||
Dim email As Email
|
||||
email.To.Add("cheveguerra@gmail.com")
|
||||
email.Subject = "subject"
|
||||
email.Attachments.Add(Provider.GetFileUri(FileName))
|
||||
email.Attachments.Add(Provider.GetFileUri("kmt_mariana.db"))
|
||||
' email.Attachments.Add(Provider.GetFileUri(FileName)) 'second attachment
|
||||
Dim in As Intent = email.GetIntent
|
||||
in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION
|
||||
@@ -783,4 +794,10 @@ Private Sub b_importarBD_Click
|
||||
File.Copy(Result.Dir, Result.FileName, File.DirInternal, "kmt.db") 'Copia la base de datos seleccionada al directorio interno.
|
||||
Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) 'Reiniciliza la base de datos con la recien importada.
|
||||
ToastMessageShow("¡BD importada!", False)
|
||||
End Sub
|
||||
|
||||
Private Sub cb_importarBDWA_CheckedChange(Checked As Boolean)
|
||||
' LogColor($"cb_importarBDWA_CheckedChange = ${Checked}"$, Colors.Red)
|
||||
Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'IMPORTAR_BD_WA'")
|
||||
Starter.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('IMPORTAR_BD_WA', '${Checked}')"$)
|
||||
End Sub
|
||||
Reference in New Issue
Block a user