From cc10ad5d69db65ad9c392c32e05359ea54679d07 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Thu, 29 Feb 2024 16:45:03 -0600 Subject: [PATCH] .. --- B4A/B4XMainPage.bas | 2 ++ B4A/C_Cliente.bas | 3 ++- B4A/C_Productos.bas | 1 + B4A/INTMEX.b4a | 2 +- B4A/INTMEX.b4a.meta | 4 ++-- B4A/Starter.bas | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 0843eab..7402def 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -691,7 +691,9 @@ Sub i_engrane_Click ' lv_server.AddSingleLine("http://keymon.lat:1781") If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781") ' lv_server.AddSingleLine("http://40.123.36.38:1782") + Log($"|${Starter.DBReqServer}|"$) l_server.Text = Starter.DBReqServer + et_server.Text = Starter.DBReqServer Subs.panelVisible(p_appUpdate,0,0) If user.Text.trim = "KMTS1" Then b_importarBD.Visible = True Else b_importarBD.Visible = False End Sub diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index b47af73..5090a87 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -920,8 +920,9 @@ Sub mandaPendientes ' c.Close ' CUESTIONARIO (Pendientes) - c = B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM CUESTIONARIO where Q_ENVIO_OK <> 1 order by Q_IDCLIENTE, Q_IDPREGUNTA; Q_IDRESPUESTA") + c = B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM CUESTIONARIO where ifnull(Q_ENVIO_OK, 0) = 0 order by Q_IDCLIENTE, Q_IDPREGUNTA; Q_IDRESPUESTA") Private rutaActual As String = Subs.traeRuta + Log("CUEST PENDIENTES: " & c.RowCount) If c.RowCount > 0 Then For x = 0 To c.RowCount - 1 c.Position = x diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 505e754..cba9076 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -622,6 +622,7 @@ Sub b_terminar1_Click End If c_prods.Close p_vistaPreviaTrans.Width = Root.Width + p_vistaPreviaTrans.Height = Root.Height Subs.centraPanel(p_vistaPrevia, Root.Width) If Subs.pedidoGuardado Then b_rechazar.Enabled = False Else b_rechazar.Enabled = True p_vistaPrevia.Visible=True diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index 0874f45..767de5b 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -157,7 +157,7 @@ Module9=C_Nota NumberOfFiles=46 NumberOfLibraries=33 NumberOfModules=28 -Version=12.5 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index d11985a..93ddded 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9=1 -NavigationStack=C_Principal,cargar_Click,995,0,C_Principal,connecta_Click,1791,0,C_Principal,B4XPage_Appear,353,3,B4XMainPage,Entrar_Click,320,2,B4XMainPage,B4XPage_Created,178,0,Starter,ENVIA_ULTIMA_GPS,87,0,Starter,Service_Start,52,5,C_Subs,traeDBReqServerDeBD,435,0,C_Principal,JobDone,1635,6,B4XMainPage,B4XPage_Appear,259,4 +NavigationStack=Starter,GPS_LocationChanged,65,0,Starter,Service_Start,52,1,Starter,Process_Globals,16,0,B4XMainPage,Entrar_Click,320,0,B4XMainPage,B4XPage_Appear,259,0,Visual Designer,productos.bal,-100,1,Visual Designer,login.bal,-100,1,B4XMainPage,i_engrane_Click,689,6,B4XMainPage,ocultaProgreso,679,0,B4XMainPage,muestraProgreso,674,0 SelectedBuild=0 -VisibleModules=2,26,13,16,14,4,27,15,9,6,17 +VisibleModules=2,26,13,16,14,4,27,15,9,6 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 5b7eb8f..6bc9943 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -56,7 +56,7 @@ Sub Service_Start (StartingIntent As Intent) Service.StopAutomaticForeground 'Starter service can start in the foreground state in some edge cases. Subs.revisaBD ' Log(marcaCel) - If s.traeDBReqServerDeBD(skmt) <> "N/A" Then DBReqServer = s.traeDBReqServerDeBD(skmt) + If s.traeDBReqServerDeBD(skmt) <> "N/A" And s.traeDBReqServerDeBD(skmt) <> "" Then DBReqServer = s.traeDBReqServerDeBD(skmt) reqManager.Initialize(Me, DBReqServer) Log($"Starter - |${DBReqServer}|"$) End Sub