From 90373fa40ded2cb599ac8e5bc83d4cf62047b032 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Mon, 29 Dec 2025 18:23:29 -0600 Subject: [PATCH] VERSION 5.12.06 - Correccion porque cuando inicaba Principal, si no habia datos en kmt_info mandaba error! --- B4A/ADM.b4a | 2 +- B4A/ADM.b4a.meta | 2 +- B4A/C_Principal.bas | 38 ++++++++++++++++++-------------------- B4A/_juntaBas.ps1 | 28 ++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 B4A/_juntaBas.ps1 diff --git a/B4A/ADM.b4a b/B4A/ADM.b4a index c86b111..ba29cae 100644 --- a/B4A/ADM.b4a +++ b/B4A/ADM.b4a @@ -1121,7 +1121,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: ADM #VersionCode: 1 - #VersionName: 5.12.04 + #VersionName: 5.12.06 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/ADM.b4a.meta b/B4A/ADM.b4a.meta index f3284af..dc19e87 100644 --- a/B4A/ADM.b4a.meta +++ b/B4A/ADM.b4a.meta @@ -97,6 +97,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Starter,Service_Create,46,0,Starter,Process_Globals,34,0,C_Principal,B4XPage_Created,253,0,C_BItacora,cargamosPanel,167,0,C_Principal,B4XPage_Appear,540,0,Tracker,flp_LocationChanged,195,0,Tracker,guardaYEnviaUbicacion,302,0,C_Cliente,GPS_LocationChanged,522,0,C_Cliente,B4XPage_Appear,507,0,Starter,JobDone,146,0 +NavigationStack=C_BItacora,b_Inicio_Fin_venta2_Click,136,0,C_Principal,JobDone,2029,2,Main,Activity_Create,26,0,Main,Globals,23,0,Diseñador Visual,principal.bal,-100,1,Main,Process_Globals,21,0,C_Principal,B4XPage_Appear,428,6,C_Principal,cargar_Click,890,0,C_Principal,Class_Globals,148,0,C_Principal,B4XPage_Created,232,6 SelectedBuild=0 VisibleModules=2,14,30,5,6,15,32,4,31,18,27 diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index db10f9b..cdd2a56 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -237,6 +237,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Root.LoadLayout("principal") rd.Initialize rd.vacuum + p_principal.Top = 0 : p_principal.Left = 0 : p_principal.Width = Root.Width : p_principal.Height = Root.Height EJECUTANDO=1 Dim ruta As String img2.Visible =False @@ -255,19 +256,19 @@ Private Sub B4XPage_Created (Root1 As B4XView) d.Position=0 e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info") e.Position=0 - f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") - f.Position=0 +' f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") +' f.Position=0 ' Log("-- A") - l_ruta.Text = f.GetString("CAT_CL_RUTA") - f.Close - If l_ruta.Text = 0 Then - l_ruta.Text = 0 - Else - f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") - f.Position=0 - l_ruta.Text = f.GetString("CAT_CL_RUTA") - f.Close - End If +' l_ruta.Text = f.GetString("CAT_CL_RUTA") +' f.Close +' If l_ruta.Text = 0 Then +' l_ruta.Text = 0 +' Else +' f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") +' f.Position=0 +'' l_ruta.Text = f.GetString("CAT_CL_RUTA") +' f.Close +' End If If Cuantos = 0 Then L_MONTOD.Text =0 l_cuantosc.Text = 0 @@ -423,20 +424,17 @@ Sub B4XPage_Appear d.Position = 0 e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_CODIGO <> 0 OR CAT_CL_CODIGO <> 1 ") e.Position = 0 - f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <> 0 OR CAT_CL_CODIGO <> 1 ") - f.Position = 0 - l_ruta.Text = f.GetString("CAT_CL_RUTA") -' Log("-- A:" & l_ruta.Text) - f.Close - If l_ruta.Text = 0 Then + f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <> 0 OR CAT_CL_CODIGO <> 1 ") + If f.RowCount = 0 Then l_ruta.Text = 0 Else f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") - f.Position=0 + f.Position = 0 l_ruta.Text = f.GetString("CAT_CL_RUTA") ' Log("-- A:" & l_ruta.Text) f.Close End If + f.Close If Cuantos = 0 Then L_MONTOD.Text = 0 l_cuantosc.Text = 0 @@ -2028,7 +2026,7 @@ Sub JobDone(Job As HttpJob) 'Para suplencia If Panel11.Visible = True And E_RUTA2.Visible = True Then Log("-- AA") - bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Carga día suplencia","",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","", "") + bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, e_ruta.text,"Carga día suplencia","",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","", "") Else if e_ruta.Text <> "" Then Log("-- BB") bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, Subs.traeRuta,"Carga día", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","", "") diff --git a/B4A/_juntaBas.ps1 b/B4A/_juntaBas.ps1 new file mode 100644 index 0000000..2fd691d --- /dev/null +++ b/B4A/_juntaBas.ps1 @@ -0,0 +1,28 @@ +# SCRIPT: _juntaBas.ps1 - Versión Saneada y Optimizada para LLM +$OutputFile="_CODIGO_COMPLETO_PARA_LLM.txt" + +# Eliminar el archivo anterior si existe (IMPORTANTE) +Remove-Item -Path $OutputFile -ErrorAction SilentlyContinue + +Write-Host "Iniciando fusion para LLM..." + +# Itera sobre los archivos .bas, .b4a, .b4j +Get-ChildItem -Path ".\*" -Include @("*.bas", "*.b4a", "*.b4j") | ForEach-Object { + $currentFile = $_.Name + Write-Host "Procesando: $currentFile" + + # --- ENCABEZADO ESTRUCTURADO Y COMENTADO EN B4X (Agregado al archivo) --- + Add-Content -Path $OutputFile -Value "`n'======================================================================================" + Add-Content -Path $OutputFile -Value $"// ARCHIVO_INICIO: ${currentFile}" + Add-Content -Path $OutputFile -Value "'======================================================================================`n" + + # Vuelca el contenido del archivo + Get-Content -Encoding UTF8 -Path $_.FullName -Raw | Add-Content -Path $OutputFile + + # --- DELIMITADOR DE FIN DE ARCHIVO (Agregado al archivo) --- + Add-Content -Path $OutputFile -Value "`n'======================================================================================" + Add-Content -Path $OutputFile -Value $"// ARCHIVO_FIN: ${currentFile}" + Add-Content -Path $OutputFile -Value "'======================================================================================`n" +} + +Write-Host "`nProceso terminado. Se ha creado el archivo: $OutputFile" \ No newline at end of file