From 165d933cd8a772180cdb8a71869edc2ed2ec3275 Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <cheveguerra@gmail.com>
Date: Thu, 30 Nov 2023 23:43:40 -0600
Subject: [PATCH] =?UTF-8?q?30/11/23=20-=20Cambios=20en=20mensaje=20de=20"e?=
 =?UTF-8?q?nviando"=20y=20cambio=20de=20ruta,=20usuario=20y=20almacen=20-?=
 =?UTF-8?q?=20Se=20agreg=C3=B3=20un=20gif=20animado=20al=20mensaje=20de=20?=
 =?UTF-8?q?"Enviando".=20-=20Se=20modific=C3=B3=20el=20c=C3=B3digo=20que?=
 =?UTF-8?q?=20guarda=20el=20nuevo=20usuario,=20almacen=20y=20ruta=20cuando?=
 =?UTF-8?q?=20se=20hace=20clic=20largo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B4A/B4XMainPage.bas    |  20 +++++++++++++++++---
 B4A/DBCheck.b4a        |  27 +++++++++++++++++----------
 B4A/DBCheck.b4a.meta   |   4 ++--
 B4A/Files/mainpage.bal | Bin 25444 -> 25979 bytes
 4 files changed, 36 insertions(+), 15 deletions(-)

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~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="31"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\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~<intent-filter>~\n~<action android:name="android.intent.action.VIEW" />~\n~<category android:name="android.intent.category.DEFAULT" />~\n~<data android:mimeType="application/octet-stream" />~\n~</intent-filter>)
 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 c7d29dfba9efb80b6d9662940741a27b1de74a35..2f068033cad2bb379c6563d2787a150b282265bb 100644
GIT binary patch
delta 2406
zcmbu9Sx}Q#6vw|SB=|+LP#8goLWCj|NCbh(B1>2lP)J5?u_>#DMM`17E_OOiA6pk(
zj<(i{iY(H_Dn@B*>%eqq9}qg@LuLBXVWxf42m9bmYai18{X&u(r)BDtnREEvd+xdS
zo-hA%fBS*`HOsUrNs{`)BuRt+)f3uorsLGv)Z5q7-skM^cfZ9ZSFk+F487_KM??#Y
zfvthX!r}xr3cOa}bppo=oFK4C;PnD02G}Jf1qRZy0w)W+LEsdDQw4rb;532L1<nxI
ztgy>lu|)`M6gX4hEP*!(oGoyUz_|iHFYsn?9xNYLfb*q7*cMokz{LWW2wW<#Rp2s#
z%LT3wxKiM);BBy#Rd6d{G^C3%a54BqVs7tjqX+7J>_@jfY$S}WqvP6W8Z>CgVd$*p
zQrOqJx5K%&%iQHW*xmE0`IVLf=GN>tk@kA0^9>mb`a6314(vME>*VsYX4h}+Y<mHr
zC&c(jSI%h0aLDb5xR<KscUcKjdlnWJ+(iX-jM>OkTu8Hpc_Bulkrpd0q{~gve2PU}
zuq=!0Rq-?xttmZ>A<vhOz#WB!z$AG9PMJ0Uj`5k}a3?sNgyVmq-f7B=$_$Y_9<t;l
zG9qnpEWO+G4Ate!><In7IyQ!|mWwf54=2A5=iP?x)})3?9(+dc^>mTnA{Gr}QE<Gu
z@BuBkS#+pDLx;9!(d{w|J4G!8iDW33L8hYn>@-fa=}%*E;EYq)I)QyaM~eq6A0na@
zat6SAMaB4MmOp~ya+Z04T*_gR)LeR&=4%s7AN%Id0o0y{e|QG@%y~H8_VO8CS0vv-
zI1{4_G*Q{gF1q7N?Tigkx7DT}3SLBW)?{{x9&8(+$Bh~~T-L&d{RIu9pjzrEA7mp+
zQ6oXQ!%9)3%N8|;jQ>{@-yu-cFh;(j(q2SSmzAO}2QTs$^(Pzm7c-7xDyZirnOdp~
zUH@5SpI~dQQnlyjg<n1cF#h9x&LN#i(iMRG1>9Ab+Vjqh$BLG&VKf0#VTn(ed?)^>
zb3K!>W;?t758AwrV4&P_jJ*4~@7BaJ=0-K?@TQ`8x>Ar#jXNq<-M|_}Pd6oMj*O@I
z9g*@R=Dvifs3bqebQ821#(2-_U`jl2ikr?s!M)K@w5PV>U-kJF5}*7j-+LN;Ch;AF
zQ!%;#Q%U?CRx$np%U{!CO&qn?MX*~mRFR<K#a*QHb;sB@WVWTNc|*##so7TM!&TM{
zir=K6MO(OUs>W&}<L)ThVBbRByLBmUB=y3UPLjMQVIqR>#@mg*^717*YmZgVHPf&5
zF*ddI^W^HM5Ed>D-S4NJJFl^6zqqC;bJu-(yFP<lIY~5MuS1Nt{CB)NG=Y|<Fh>%5
zik_x6hfXz(<AX#$qlkVc=vLEy(GSpxJzea3-`(im%Q`X_ZHDy6=utxxBDfj7)>zHf
z(4u3MoK11G(UD7&O}eGnt@RqxH<Tc5YZ#@Un!WMlmZdnGMO9UZPB)ISJN~b9C+I%>
zl>L$XaaA5rE<NP|wb4{|3h9kqY|fuKw_IjgaHeZ*7n}EI&M%i)9mwR5_QQPDl7*sQ
F{sxV#)ARrU

delta 2078
zcmb7_Z%mtI5WwFXwB)TTucQo0*=SkW+`59aNX78CrNGz>jCIUKWJ5E8+USTHqahjb
zi&+H6#wptvw4!7FLn-T+e+D{<xCAx(=HeF<lEp7%5fT$&i>dd#rSuv@7Czk5-*eBO
zyX)OO@BKNr^AqSbk|ga-kt7}c)=%hPg77K0wh2nGGI_k)NXje{6G@D-8E<90jd2cR
zGh++mT*liOTjSg<<;5q`4#qnfKf-ty<K2vHjQ23MGtOsRpmIkv`bXJ9A!7$)C*vZ<
zk1;N0>|*>lwrI1vOG#5kQb7{qO2$=;-Hbhqs~LM4*D$Unt|Qq?0wfQUw7=YeD_T8f
zq#TEz!(AztQo?^LUO=<bgC%M2=w;gT>hmXFdF{}fo$cY7wBL5)ulsdL%gf8S)UrK%
zvos&Du&x{(<xk*!j}!kYOvSDY8GBta{#zj9Y`F!$bLlWx>4zR%Ot;hMsBOTvtA?Q$
zM-G{=!tGLe$%;tkW`zd12j9xHz`K~+T#t9%HCd-gxk)Va(I9F;1Hvu&44vNsXYpB&
zCAVKFL_kQQjVvxl-V>VlY0wMk!^L8g;S3?OL$d+A<#`Uyg`L$+0OwVQ0$!JLK5-)k
zojc(I>S|VCPz_>`f>?lyYXMwL*gvQSF!aCxhBq9*aH1U+z@B;vAg~rdAaUbb0H^Wn
zem?}&AcE+ArUBo0vaI_9+O7V>BLp9kB#}t+M>MEv@yA{gno$}qlV~Hq-~Quc0ubw;
z2(VL0eM%sIM#JYM+Q`YP_r`?g3mU#8(TJ*(lGkq1&`emusVya_xYJ>r{I_GsE5nG$
zmvNjH<M|5GEP5X<8EyY7x8n@~2vJ~GTqu=^9JOX_Z1g`gLC4f6u1I*(V8%O*202W+
zt0Wp6@fzU@<}{k=#8QzJE%jQph&vCgUwD%^UuH-;<=#N)<xP^ccqk#74G8;^crr8~
z9t-(ee^xf0Y)XT#aNcRbP*XCT!^x&T?boyl5uDGk>cn66joADx1{^zZ=wOa^b$a7q
zbqsTyxo}<hh!wta*LB*SXt|R#tCppxWm2SxTScP910`R;37<)IqyX>vF2fXM=72Iq
zOYEwIG`!dxf@!s`rqvD~I6RCtU%L7_boo+gO?3754{VAX8*K`#JDjSSCeLEMELs7J
zp30{}%2R$waCv&Q5lk&BFrzv<Lrt)NPany^Tg9dL%aK&l3rBwxjzSXt(>e;XYFm|M
zx|G?3+h!1~HncTY(Y}sjqiAnE7Cnt)t@}uKyKNMQj%MSS(S>)9ikn&88blT{NkDvn
z#WxmS==bcx*SGp{b6fOKYumbqV&Agpp+C3zVNOla99<Mo(K;6QC0G>ib7#AZC)zdC
GC;tJI;jy>?