diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 3e0e268..0d08aa4 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -80,6 +80,7 @@ Sub Class_Globals
Private l_vProds2 As Label
Private l_vPedidos2 As Label
Private l_vNoVenta2 As Label
+ Private i_progress As B4XGifView
End Sub
Public Sub Initialize
@@ -90,6 +91,7 @@ End Sub
Sub B4XPage_Created (Root1 As B4XView)
Root = Root1
Root.LoadLayout("MainPage")
+ i_progress.SetGif(File.DirAssets, "progress.gif")
l_version.Text = Application.VersionName
p_principal.Width = Root.Width : p_principal.Height = Root.Height
Subs.centraPanel(p_datos, Root.Width)
@@ -246,7 +248,7 @@ End Sub
Sub b_enviar_Click
Dim resultado = Msgbox2("Se va a enviar la venta de la BD", "AVISO", "Continuar", "Cancelar", "", Null) 'ignore
If resultado = DialogResponse.POSITIVE Then
- B4XPages.MainPage.l_progressDialog.Text = " Enviando información ..."
+ B4XPages.MainPage.l_progressDialog.Text = " Enviando información"
B4XPages.MainPage.p_progressDialog.Top = l_pedidos2.Top
B4XPages.MainPage.p_progressDialog.Visible = True
B4XPages.MainPage.p_progressDialog.BringToFront
@@ -258,8 +260,9 @@ Sub b_enviar_Click
else if empresa.ToUpperCase = "INTMEX" Then
envioIntmex
End If
+' Sleep(5000)
End If
- ToastMessageShow("Se enviaran los datos, este proceso podria tardar hasta un minuto, gracias "& ruta , True)
+ ToastMessageShow($"Se enviaran los datos, este proceso podria tardar hasta un minuto."$ , True)
End Sub
Sub JobDone(Job As HttpJob)
@@ -411,27 +414,36 @@ Sub l_clienteNoNumerico_LongClick
p_clientes.Visible = True
End Sub
+'Cambiamos la ruta actual por la especificado.
Sub b_guardaRuta_Click
If et_nuevaRuta.Text <> "" Then
- skmt.ExecNonQuery($"update pedido set pe_ruta = '${et_nuevaRuta.Text}' where pe_ruta = '${ruta}'"$)
+ skmt.ExecNonQuery($"update PEDIDO set PE_RUTA = '${et_nuevaRuta.Text}' where PE_RUTA = '${ruta}'"$)
+ skmt.ExecNonQuery($"update PEDIDO_CLIENTE set PC_RUTA = '${et_nuevaRuta.Text}' where PC_RUTA = '${ruta}'"$)
l_ruta2.Text = et_nuevaRuta.text
End If
p_editaRuta.Visible = False
End Sub
+'Cambiamos el almacen actual por el especificado.
Sub b_guardaAlmacen_Click
If et_nuevoAlmacen.Text <> "" Then
skmt.ExecNonQuery($"delete from cat_almacen"$)
skmt.ExecNonQuery($"insert into cat_almacen (id_almacen) values ('${et_nuevoAlmacen.Text}')"$)
+ skmt.ExecNonQuery($"update PEDIDO set PE_CEDIS = '${et_nuevoAlmacen.Text}' where PE_CEDIS = '${l_almacen2.text}'"$)
+ skmt.ExecNonQuery($"update PEDIDO_CLIENTE set PC_ALMACEN = '${et_nuevoAlmacen.Text}' where PC_ALMACEN = '${l_almacen2.text}'"$)
l_almacen2.Text = et_nuevoAlmacen.text
End If
p_editaAlmacen.Visible = False
End Sub
+'Cambiamos el usuario actual por el especificado.
Private Sub b_guardaUsuario_Click
' skmt.ExecNonQuery($"delete from usuarioa"$)
If et_nuevoUsuario.Text <> "" Then
skmt.ExecNonQuery($"update usuarioa set usuario = '${et_nuevoUsuario.Text}'"$)
+ skmt.ExecNonQuery($"update NOVENTA set NV_USER = '${et_nuevoUsuario.Text}' where NV_USER = '${l_usuario2.text}'"$)
+ skmt.ExecNonQuery($"update PEDIDO set PE_USUARIO = '${et_nuevoUsuario.Text}' where PE_USUARIO = '${l_usuario2.text}'"$)
+ skmt.ExecNonQuery($"update PEDIDO_CLIENTE set PC_USER = '${et_nuevoUsuario.Text}' where PC_USER = '${l_usuario2.text}'"$)
l_usuario2.Text = et_nuevoUsuario.text
End If
p_editaUsuario.Visible = False
@@ -997,6 +1009,8 @@ Sub envioGuna 'ignore
x.Close
End Sub
+'Valida la venta contra web.
+'Revisa que la NOVENTA, la cantidad de pedidos y los productos de PEDIDO sean los mismos en web y locales.
Sub valida(identificador As String)
Log("Validamos " & identificador)
If empresa.ToUpperCase = "GUNA" Then
diff --git a/B4A/DBCheck.b4a b/B4A/DBCheck.b4a
index 77f8ec9..c99634a 100644
--- a/B4A/DBCheck.b4a
+++ b/B4A/DBCheck.b4a
@@ -1,21 +1,28 @@
Build1=Default,dbcheck.keymon.lat,HU2_PUBLIC
File1=engrane_gris.png
File2=listItem.bal
-File3=MainPage.bal
+File3=logo_192x192.jpg
+File4=logo_keymon.png
+File5=MainPage.bal
+File6=progress.gif
FileGroup1=Default Group
FileGroup2=Default Group
FileGroup3=Default Group
+FileGroup4=Default Group
+FileGroup5=Default Group
+FileGroup6=Default Group
Group=Default Group
Library1=b4xpages
-Library10=fileprovider
+Library10=xcustomlistview
+Library11=b4xgifview
Library2=byteconverter
Library3=contentresolver
Library4=core
-Library5=ime
-Library6=okhttputils2
-Library7=randomaccessfile
-Library8=sql
-Library9=xcustomlistview
+Library5=fileprovider
+Library6=ime
+Library7=okhttputils2
+Library8=randomaccessfile
+Library9=sql
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~'End of default text.~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~~\n~AddActivityText(main,~\n~~\n~~\n~~\n~~\n~)
Module1=B4XMainPage
Module2=C_Envios
@@ -23,15 +30,15 @@ Module3=DBRequestManager
Module4=FileHandler
Module5=Starter
Module6=Subs
-NumberOfFiles=3
-NumberOfLibraries=10
+NumberOfFiles=6
+NumberOfLibraries=11
NumberOfModules=6
Version=12.5
@EndOfDesignText@
#Region Project Attributes
#ApplicationLabel: DBCheck
#VersionCode: 1
- #VersionName: 3.11.15
+ #VersionName: 3.11.30
'SupportedOrientations possible values: unspecified, landscape or portrait.
#SupportedOrientations: portrait
#CanInstallToExternalStorage: False
diff --git a/B4A/DBCheck.b4a.meta b/B4A/DBCheck.b4a.meta
index 5c6bc98..a5bf6ee 100644
--- a/B4A/DBCheck.b4a.meta
+++ b/B4A/DBCheck.b4a.meta
@@ -13,12 +13,12 @@ ModuleBreakpoints4=
ModuleBreakpoints5=
ModuleBreakpoints6=
ModuleClosedNodes0=2,6
-ModuleClosedNodes1=3,5,6,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
+ModuleClosedNodes1=3,5,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
ModuleClosedNodes2=5
ModuleClosedNodes3=
ModuleClosedNodes4=
ModuleClosedNodes5=1
ModuleClosedNodes6=12,13,14,16,17,18
-NavigationStack=B4XMainPage,valida,995,6,B4XMainPage,envioGuna,991,0,B4XMainPage,envioMariana,614,0,B4XMainPage,envioIntmex,766,0,B4XMainPage,p_empresa_Click,1030,0,B4XMainPage,b_valida_Click,1033,0,B4XMainPage,B4XPage_Appear,114,0,B4XMainPage,JobDone,266,6,Visual Designer,MainPage.bal,-100,6,B4XMainPage,Class_Globals,75,0,B4XMainPage,B4XPage_Created,110,4
+NavigationStack=B4XMainPage,l_usuario2_LongClick,390,0,B4XMainPage,b_guardaUsuario_Click,436,6,B4XMainPage,b_guardaAlmacen_Click,424,1,B4XMainPage,l_clienteNoNumerico_LongClick,410,0,Visual Designer,MainPage.bal,-100,6,B4XMainPage,b_guardaRuta_Click,419,3,B4XMainPage,envioMariana,503,0,B4XMainPage,JobDone,320,0,B4XMainPage,B4XPage_Created,90,0,B4XMainPage,envioGuna,1006,0
SelectedBuild=0
VisibleModules=1,6,2,3
diff --git a/B4A/Files/mainpage.bal b/B4A/Files/mainpage.bal
index c7d29df..2f06803 100644
Binary files a/B4A/Files/mainpage.bal and b/B4A/Files/mainpage.bal differ