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 5b2a387..080445a 100644 Binary files a/B4A/Files/mainpage.bal and b/B4A/Files/mainpage.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 632fd05..0c3e840 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ 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