From 17462911c355bdb6ed1b67c3de57269fec438260 Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <cheveguerra@gmail.com>
Date: Wed, 29 May 2024 20:40:56 -0600
Subject: [PATCH] - Se agregaron la ruta y el almacen para la descarga de la
 carta porte

---
 B4A/B4XMainPage.bas          |   2 +-
 B4A/C_Principal.bas          |  30 +++++++++++++++++++++++++-----
 B4A/Files/mainpage.bal       | Bin 13038 -> 13030 bytes
 B4A/Files/principal.bal      | Bin 8430 -> 10204 bytes
 B4A/Guna CartaPorte.b4a.meta |   6 +++---
 B4A/Subs.bas                 |  11 +++++++++++
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index b9f001e..48b4b43 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -72,7 +72,7 @@ Sub B4XPage_Appear
 	Private c As Cursor = skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("FECHA"))
 	c.Position = 0
 	If c.GetString("CUANTOS") = 0 Then
-		LogColor($"No hay fecha: ${c.GetString("CUANTOS")}"$, Colors.Red)
+'		LogColor($"No hay fecha: ${c.GetString("CUANTOS")}"$, Colors.Red)
 		cmd.Initialize
 		cmd.Name = "select_fecha"
 		reqManager.ExecuteQuery(cmd , 0, "fecha")
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 3528dea..c7df2d0 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -36,6 +36,9 @@ Sub Class_Globals
 	Dim usuario, almacen, rutapreventa As String = ""
 	Private b_verCartaPorte As Button
 	Private p_botones As Panel
+	Private et_ruta As EditText
+	Private l_ruta1 As Label
+	Private l_almacen As Label
 End Sub
 
 'You can add more parameters here.
@@ -62,6 +65,10 @@ Sub B4XPage_Appear
 			b_verCartaPorte.Enabled = True
 		End If
 	End If
+	b_descargaCartaPorte.Enabled = False
+	et_ruta.Text = "131"
+	l_almacen.Text= Subs.traeAlmacen
+	et_ruta.RequestFocus
 End Sub
 
 Sub B4XPage_CloseRequest As ResumableSub
@@ -123,8 +130,13 @@ Sub descargaCartaPorte
 	cartaPorteLista = False
 	'Generamos el nombre del PDF de la carta porte
 	DateTime.DateFormat = "ddMMyyyy"
+	
+	Private rutaX As String = et_ruta.text 'rutaPreventa
+	Private almacenX As String = Subs.traeAlmacen
+	'#################################
 	Private almacenX As String = "2" 'almacen
-	Private rutaX As String = "131" 'rutapreventa
+	'#################################
+	
 	Private cartaPortePDF As String = $"CPORTE${almacenX}_${rutaX}.pdf"$
 '	cartaPortePDF = "CPORTE2_100_Prueba.pdf"  'Para pruebas
 '	Log(cartaPortePDF)
@@ -207,11 +219,11 @@ Sub descargaCartaPorteyProgreso (urlx As String) As ResumableSub
 		Log("Carta porte lista")
 		ToastMessageShow("Carta Porte descargada exitosamente!!", False)
 		b_verCartaPorte.Enabled = True
-		
-		
+
+
 		' AQUI VA EL CODIGO DE CARTA PORTE DSCARGADA
-		
-		
+
+
 		Subs.panelOculto(p_downloadPDF)
 '		p_progress1.Visible = False
 	Else
@@ -329,4 +341,12 @@ Private Sub b_verCartaPorte_Click
 	Dim cfg As Configurator = PDFView1.fromUri(File.DirInternal,"/cartaPorte.pdf")
 	cfg.SetEventname("PDFium")
 	cfg.pageFitPolicy("BOTH").autoSpacing(True).enableSwipe(True).pageSnap(True).swipeHorizontal(False).addOnErrorListener.addOnLoadCompleteListener.addOnPageChangeListener.addOnPageErrorListener.load
+End Sub
+
+Private Sub et_ruta_TextChanged (Old As String, New As String)
+	If New <> "" Then
+		b_descargaCartaPorte.Enabled = True
+	Else
+		b_descargaCartaPorte.Enabled = False
+	End If
 End Sub
\ No newline at end of file
diff --git a/B4A/Files/mainpage.bal b/B4A/Files/mainpage.bal
index 5b2a3879a6e453533f9aac3a92296fc99ef7ed7a..080445ae617a071be14e84bf69d6d997211c2d1a 100644
GIT binary patch
delta 1452
zcmb_cO-vI}5Z*yHx=0G8KR`>tTCfea4Q(PQs05Ti69sGtDoP7zRX~w{l!7D{<IMwK
zjJL+bg9k5~jW>;Y*BB2TjEQ)Wg9qb9<3XbHmO#5G2#K4_mw9jBe6#PHnf(%5h&_Cg
zNjKD|neQ?zMoE$mH8i(1griL@;ZR3Qb6edJHM#XGsrM8|HU;s*(n#&_1$WYMM0SNR
zW^HLa!BH7(%1H*9Z3~;EbTDY!r`S0yb~+g%Y&5|jo=k;7rYuG!%G|axK~ca)Y*G%J
z5@qnPW#@{Oo1q=AocoZ-Z^-K6m6oC#cXMobW|q-cSVujmHCZqpkP$Umodyxt&7kp~
zWoNJ05qH%R^kA{jPiGL>9m3Co8nZaDbb~JT{z4zy6n#viKL@XE_SpFq>J4jlfkW2R
ztQTarnN~CtI%-$yh2Q>-`Y>;Bq12wQMv9U|{aAF^v=Z*A?B|myQTuq+&L&IM8rCo>
z7a8(|BZN92oJ(Bsu==*RlV~7~Yk=Qvn(MOQ!glBW|I|H$Yjn@xpC8BFGrCrhcc9CX
zhmYoMcwX+Hq4Yur^nLW1iS>Onv^o_6!D0*;vry@ZTT-PT=5tzCjYznYU4l<8lRV0M
zV_0+*IY-#j8dc1QR!s3OO<z=(4%0Xu`44lyFVI9<B}7QtNnUNBs#mxYvvd^>lanU-
z!a-EIYjY;`RA@3*;IaEV#kHP#?NKo9HXu@zhaaAoc;G3`NJx0&u~2-jd`dr;dQGSC
zq1-0svQ@8VJtx%bIj#GIDPFDHo!5APZ>`R3^;Xf$a>j%I$~d!bMsylonD^esQLh>A
zb4zgFSBs?AKvO~;wah<981-4je}|`x2NS;nb}aY|a-4aWewx?O8Vsp7E9!|7%gvQK
OY)a@pAQd*tVaea3+Uzy}

delta 1284
zcmbVMO-vJE5ZytLE;MavDXvSUg;M@%OIw4WL=jC1jSUb&MA6ERf*3#qQNR{S5Iqos
ziE|`Dk0u;MH{LMu;!P7h8iR5&CMFG@J?Ps7r3EqQ;Z0^{XQngr=IiI~c=zH`D&19H
zq`ptlr3!)&4%W3O3+bz5&4P6z*w7MeZm(}_4z)ElwA6-`IdPw!PO&Mkg5y>*wKC-t
z&}n|^2=PEpqxTGwQUI|HA`RFD2;x}?&3z6^MD?79Xy+AKq7D?3U241p5Fi)<u>+z6
z(3@1N7^0P5<sahco?u2NEUjJ_Pa0&7?5(2<yjU)yvu|ZGb#bR8!xNLdbdeXN>FjPK
zthMro)SfM=J!)#^B_tgMcK^_Ghr5Oc<m#&4--UKO>Sd&8qjIjz%yGX+ZCq)y^MTwi
z)W@qvC)e0SXzxnwO0Vr6Q9r+RsiR=Y2m6t{v4uWZtw5S^Sd-O|;sAtMRaC}~sLB=a
z(X715ix3Sa)EdOMf39^EwPyc^*P(5A9opIjcpce}q5v<Jxo9|vq7MbKaX7gQ&qxkl
zwq&r^8MSVZbPZA3p^ON8UvKASr$xLD-why*Kl!En5op@sjY825PyL>-CJq!1)95pM
z8PQn6GRKmmVC{gIag`W;Toj<2Ja5XUD8Dp0z;s@5lQEiHkdI~gFpQ3$7sq+2v@qi&
z=Fs|!;ZnZRgmyVAr6L!(&HTM|Jo!;*YqQ-#O)sFGMmdypL3mW_S3SR8iry{z)Ub_-
zCt&^cye9FaLj2IZ=^Z-Qu)mV~J=wagKfxb82Gi!k{MzE=C8>&yo(MlF&*88o6U&(O
zG(GScFyQ(I6qk2~Xlnfemi-l$sib~mu-5*EZgYJgq)hsb6HO<CPj3@`2jTNS0Rl1U
AmjD0&

diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal
index 632fd05fea04e9b147f4c7387e2de2b16ae5e43a..0c3e840328490d7c7eb081713c66c04398ce09d4 100644
GIT binary patch
delta 1090
zcmZ{jOH30{6o%&(+S=NJE#=Wt`cR3I5F&_y)K?loFfoykCK?ywXh*2l&N!XgB1+dR
zo3n7~!nIL@F5Me9uG|<+NnE%yx*%~^|8q_0l$6Ce^W8J|&OhfrGr!W`uKAscqO5f(
ziWk?THUINjH$byi%#x)Z0Zz<kb5=&HSl3O}Ff{WJYR!@doL^D%57oO`f$Hx5)K&G4
zmiNnYRxcOwx|&^@yX=z%LpQO_QtxXnxn>0>d1kU!|1SFJgIKNhpw^3E^(F^w9JFzt
zjYBr>2M-_y5koc(+c;w5;T8`lQ7lFfF+?1ZKqP6)@jz5x?mFD$=o+dvE$C#C%|UkP
z9``+`7qo6H)^Y`li+sJL=XH}8xq?x$GV6xik(s}dVUrEDSS;&imQR)8eakeAY(`nW
zvap!p;Vr|)RLe&`n*KkLlmMS;8`Ac!XDb*wk2<>|J|eLtqFd05o{RJ&wnJ}6>f-fw
zEf#QyTU3ip(yNGfx`0g%ghxjjMK}dN*JB`^W?&zt5$OGP`VqjXP(404dJbqJ<c1=^
z)%g9lVR5B|#Gi^sr+PRN<42u9_;~i7EYf3yQ<>!~C=f}qA`et}X(={#>K(8wZ}POe
zc-&$YNp6_{$QGvnvc)9Tq7nL>aMIVHmlncPwBz^Eo4}~3(5HArtka*sG5Q$}_EvDj
z_9oQuCHkJA#=W>2NP90a6J_J&att5^Zvv#?$vwgGP`lv9KEVwf*)RAMwN8TkK}ta$
u^Z|n68C?jUMSsKeJ{}UAkQ=8j;p4rV9fZ;c2yw?!=x|er|A#g!<Np8-5XKz<

delta 277
zcmccP|IU$@m4Sib4HE+c7m${j$U9w-7s$woPsuOO%gIkn32<?nct=Wr2P{~SUzD7h
zSCW{OI$4|XE~DUNPNwvFZlDxMnh%I!Y<?hH0Eh*FSO|$NjKmf}Vv8cN#ei&aAeI1P
zNg$R2Vrd`-fdn9y@8$q88CV#CgUZjGoGi~A$e6ddkePk6J$I*&NFGoMq?PdmkO1ii
vGA1kVYD^YW_&)i!+<nH>$!`@6C%@z4+AOAUjge6V%sne3!Uj~!z{mgq-q|hY

diff --git a/B4A/Guna CartaPorte.b4a.meta b/B4A/Guna CartaPorte.b4a.meta
index 345ad51..24f7b4d 100644
--- a/B4A/Guna CartaPorte.b4a.meta	
+++ b/B4A/Guna CartaPorte.b4a.meta	
@@ -13,12 +13,12 @@ ModuleBreakpoints4=
 ModuleBreakpoints5=
 ModuleBreakpoints6=
 ModuleClosedNodes0=
-ModuleClosedNodes1=10
-ModuleClosedNodes2=6,7,9,10
+ModuleClosedNodes1=
+ModuleClosedNodes2=5,6,9,10,11,12,13,14,15,16,17,18,19,20,21,22
 ModuleClosedNodes3=
 ModuleClosedNodes4=
 ModuleClosedNodes5=1
 ModuleClosedNodes6=
-NavigationStack=C_updateAvailable,Class_Globals,0,0,B4XMainPage,B4XPage_Appear,78,0,B4XMainPage,JobDone,189,0,B4XMainPage,b_entrar_Click,114,0,B4XMainPage,b_regesar_Click,90,3,B4XMainPage,lv_server_ItemClick,212,3,C_Principal,B4XPage_Created,46,0,C_Principal,descargaCartaPorteyProgreso,204,6,Visual Designer,MainPage.bal,-100,6,B4XMainPage,i_engrane_Click,206,5
+NavigationStack=Subs,traeAlmacen,274,0,C_Principal,et_ruta_TextChanged,337,6,C_Principal,b_descargaCartaPorte_Click,113,0,C_Principal,Class_Globals,35,0,Visual Designer,MainPage.bal,-100,4,Visual Designer,principal.bal,-100,6,C_Principal,B4XPage_CloseRequest,78,0,C_Principal,B4XPage_Created,49,0,C_Principal,B4XPage_Appear,66,6,C_Principal,descargaCartaPorte,127,6
 SelectedBuild=0
 VisibleModules=1,2,6
diff --git a/B4A/Subs.bas b/B4A/Subs.bas
index b4c19e9..3547c5e 100644
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -272,4 +272,15 @@ Sub logJobDoneResultados(resultado As DBResult)
 			LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0))
 		Next
 	Next
+End Sub
+
+'Regresa el almacen actual de la base de datos.
+Sub traeAlmacen As String 'ignore
+	Private c As Cursor
+	Private a As String
+	c = B4XPages.MainPage.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+	c.Position = 0
+	a = C.GetString("ID_ALMACEN")
+	c.Close
+	Return a
 End Sub
\ No newline at end of file