cheveguerra/Mariana_Censos
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Mariana_Censos.git synced 2026-04-23 07:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: cheveguerra:5.05.27
Branches Tags
cheveguerra:main
cheveguerra:5.09.13 cheveguerra:5.06.08 cheveguerra:5.06.05 cheveguerra:5.05.P cheveguerra:5.05.27
..
compare: cheveguerra:5.06.05
Branches Tags
cheveguerra:main
cheveguerra:5.09.13 cheveguerra:5.06.08 cheveguerra:5.06.05 cheveguerra:5.05.P cheveguerra:5.05.27

2 Commits
5.05.27 ... 5.06.05

Author SHA1 Message Date
Jose Alberto Guerra Ugalde
07bc4afb70 - VERSION 5.06.05 
- Se quitó que aparezcan tiendas en CERRADOS (globos rojos)
 2025-06-05 12:07:25 -06:00
Jose Alberto Guerra Ugalde
4bacb20c6a - VERSION 5.05.27 
- Prueba release
 2025-06-03 11:04:13 -06:00
7 changed files with 35 additions and 25 deletions
Expand all files Collapse all files

2
B4A/B4XMainPage.bas
View File

@@ -21,6 +21,8 @@ Version=9.85
'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip
Sub Class_Globals
Private Root As B4XView
' Dim rp As RuntimePermissions

2
B4A/C_Principal.bas
View File

@@ -588,7 +588,7 @@ Sub JobDone(Job As HttpJob)
B4XPages.ShowPage("B4XMainPage")
End If
Log("***************** "&n)
End If
End If
If RESULT.Tag = "kmt_datos" Then 'query tag
' Subs.logJobDoneResultados(RESULT)

14
B4A/MAPA_RUTAS.bas
View File

@@ -160,6 +160,7 @@ Sub MapFragment1_Ready
Dim JavaMapsObject As JavaObject
JavaMapsObject = gmap.GetUiSettings
JavaMapsObject.RunMethod("setMapToolbarEnabled", Array As Object(True))
'''''''----------------------------MARKER AZUL - NUEVOS
If azul = 1 Or todos = 1 Then
' c.IsInitialized
@@ -186,10 +187,11 @@ Sub MapFragment1_Ready
' Log("4")
If MARK_AZUL.IsInitialized Then LIST_AZUL.Add(MARK_AZUL)
End If
'''''''----------------------------MARKER VERDE
'''''''----------------------------MARKER VERDE - ACTIVOS
If verde = 1 Or todos = 1 Then
' c2.IsInitialized
c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_SECUENCIA from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and NUEVO <> '1' and CAT_CL_SECUENCIA <> '0' and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0")
c2=skmt.ExecQuery($"select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_SECUENCIA from kmt_info where gestion = 0 And CAT_CL_LAT Is Not Null And CAT_CL_LONG Is Not Null And NUEVO <> '1' And CAT_CL_SECUENCIA <> '0' And CAT_CL_LAT <> 0 And CAT_CL_LONG <> 0"$)
Log($"============== Verde Resultados = ${c2.RowCount}"$)
For i = 0 To c2.RowCount -1
c2.Position = i
@@ -207,7 +209,7 @@ Sub MapFragment1_Ready
c.Close
End If
' '''''''----------------------------MARKER ROJO - NO VENTA
' '''''''----------------------------MARKER ROJO - CERRADOS
If rojo = 1 Or todos = 1 Then
' c3.IsInitialized
' c3 = skmt.ExecQuery($"Select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_SECUENCIA from kmt_info
@@ -215,7 +217,7 @@ Sub MapFragment1_Ready
' And CAT_CL_LAT <> 0 And CAT_CL_LONG <> 0 and CAT_CL_ESTATUS <> 'Inactivo' and CAT_CL_ESTATUS <> 'Activo'"$) ' Se agrego la condicion de "<> inactivo" para que solo aparezcan los "cerrados permanentes" y no los inactivos.
c3 = skmt.ExecQuery($"Select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_SECUENCIA from kmt_info
where CAT_CL_CODIGO Not like 'N%' and CAT_CL_LAT is not null and CAT_CL_LONG is not null
And CAT_CL_LAT <> 0 And CAT_CL_LONG <> 0 and CAT_CL_ESTATUS = 'Activo' and HV_MOTIVO = 'CERRADO'"$)
And CAT_CL_LAT <> 0 And CAT_CL_LONG <> 0 and CAT_CL_ESTATUS = 'Activo' and HV_MOTIVO = 'CERRADO_XXXXX'"$)
Log($"Select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_SECUENCIA from kmt_info where CAT_CL_CODIGO Not like 'N%' and CAT_CL_SECUENCIA = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null And CAT_CL_LAT <> 0 And CAT_CL_LONG <> 0 and CAT_CL_ESTATUS <> 'Inactivo'"$)
Log($"============== Rojo Resultados = ${c3.RowCount}"$)
@@ -233,8 +235,8 @@ Sub MapFragment1_Ready
c3.Close
End If
' '''''''----------------------------MARKER NEGRO - NO VENTA
If pVisitar = 1 Then
' '''''''----------------------------MARKER NEGRO - VISITADOS
If pVisitar = 1 Or todos = 1 Then
' c3.IsInitialized
c3 = skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_SECUENCIA from kmt_info where gestion = '11' and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_ESTATUS <> 'Inactivo'")
Log($"============== Negro Resultados = ${c3.RowCount}"$)

4
B4A/Mariana Censos.b4a
View File

File diff suppressed because one or more lines are too long

2
B4A/Mariana Censos.b4a.meta
View File

@@ -49,6 +49,6 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=1
ModuleClosedNodes9=1
NavigationStack=C_Principal,cargar_Click,507,0,Diseñador Visual,login.bal,-100,1,Starter,JobDone,133,6,Starter,Service_Destroy,71,0,B4XMainPage,JobDone,383,0,Starter,Service_Start,52,0,B4XMainPage,Entrar_Click,382,0,B4XMainPage,b_guardar_Click,642,0,Starter,ENVIA_ULTIMA_GPS,75,0,B4XMainPage,i_engrane_Click,639,0
NavigationStack=Starter,Service_Create,35,0,C_Principal,Class_Globals,0,0,C_Principal,B4XPage_Created,240,0,C_Principal,JobDone,585,0,B4XMainPage,Class_Globals,77,0,B4XMainPage,B4XPage_Appear,235,0,Subs,importaBDDesdeWhatsApp,1343,6,Subs,traeUsarIntentBDWA,1335,0,MAPA_RUTAS,MapFragment1_Ready,187,6,B4XMainPage,B4XPage_Created,163,0
SelectedBuild=0
VisibleModules=14,2,9,4,8,15,7,16,13,5

19
B4A/Starter.bas
View File

@@ -24,7 +24,7 @@ Sub Process_Globals
' Dim server As String = "http://10.0.0.205:1782"
' Dim server As String = "http://11.0.0.231:1782"
Dim Timer1 As Timer
Dim Interval As Int = 10
Dim Interval As Int = 300
Dim ruta As String = File.DirInternal
'Para los Logs
Private logs As StringBuilder
@@ -137,16 +137,17 @@ Sub JobDone(Job As HttpJob)
If resultado.Tag = "delCatRutas" Then
Log(123)
Subs.logJobDoneResultados(resultado)
Dim cmd As DBCommand
cmd.Initialize
cmd.Name = "insert_UTR_MARDS_C"
If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0"
cmd.Parameters = Array As Object(Subs.traeAlmacen, B4XPages.MainPage.batt, B4XPages.MainPage.principal.l_dia.tag, B4XPages.MainPage.principal.l_nuevos_c.text, B4XPages.MainPage.principal.l_nuevos_p.text, Subs.traeRuta, B4XPages.MainPage.principal.l_total.text, Subs.traeUsuarioDeBD, B4XPages.MainPage.principal.l_visitados.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
If logger Then Log($"${Subs.traeAlmacen}, ${B4XPages.MainPage.batt}, ${B4XPages.MainPage.principal.l_dia.tag}, ${B4XPages.MainPage.principal.l_nuevos_c.text}, ${B4XPages.MainPage.principal.l_nuevos_p.text}, ${Subs.traeRuta}, ${B4XPages.MainPage.principal.l_total.text}, ${Subs.traeUsuarioDeBD}, ${B4XPages.MainPage.principal.l_visitados.text}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}"$)
reqManager.ExecuteCommand(cmd, "ins_UTR")
If B4XPages.MainPage.principal.l_dia.IsInitialized Then
Dim cmd As DBCommand
cmd.Initialize
cmd.Name = "insert_UTR_MARDS_C"
If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0"
cmd.Parameters = Array As Object(Subs.traeAlmacen, B4XPages.MainPage.batt, B4XPages.MainPage.principal.l_dia.tag, B4XPages.MainPage.principal.l_nuevos_c.text, B4XPages.MainPage.principal.l_nuevos_p.text, Subs.traeRuta, B4XPages.MainPage.principal.l_total.text, Subs.traeUsuarioDeBD, B4XPages.MainPage.principal.l_visitados.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
If logger Then Log($"${Subs.traeAlmacen}, ${B4XPages.MainPage.batt}, ${B4XPages.MainPage.principal.l_dia.tag}, ${B4XPages.MainPage.principal.l_nuevos_c.text}, ${B4XPages.MainPage.principal.l_nuevos_p.text}, ${Subs.traeRuta}, ${B4XPages.MainPage.principal.l_total.text}, ${Subs.traeUsuarioDeBD}, ${B4XPages.MainPage.principal.l_visitados.text}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}"$)
reqManager.ExecuteCommand(cmd, "ins_UTR")
End If
End If
End If
Job.Release
End If
End Sub

17
B4A/Subs.bas
View File

@@ -1337,20 +1337,24 @@ Sub traeUsarIntentBDWA As Boolean 'ignore
x.Position = 0
If x.GetString("CAT_VA_VALOR") = "true" Then BDWA = True
End If
' Log($"cb_importarBDWA = ${BDWA}"$)
Return BDWA
End Sub
' Se revisa si hay una intención (intent) de abrir una base de datos y si es así, entonces se importa esa base de datos.
Sub importaBDDesdeWhatsApp
Log($"IMPORTAMOS BD DESDE WA"$)
Private tmpBDWA As Boolean = traeUsarIntentBDWA
If Not(in.IsInitialized) Then in = B4XPages.GetNativeParent(B4XPages.MainPage).GetStartingIntent ' Si se usa esta funcion en Mainpage, se pone "Me" en lugar de B4XPages.MainPage.
Log("IN: " & in.As(String))
Log("INTENT USADO: " & intentUsado)
' If Not(in.IsInitialized) Then
' Log(987)
in = B4XPages.GetNativeParent(B4XPages.MainPage).GetStartingIntent ' Si se usa esta funcion en Mainpage, se pone "Me" en lugar de B4XPages.MainPage.
' End If
If Not(intentUsado) And in <> Null Then
' Log(in)
intentUsado = True
' Log(in.As(String))
Log("IN.DATA: " & in.GetData.As(String))
If in.GetData <> Null Then
' Log(333)
intentUsado = True
Log("Hay DB!!")
Dim XmlData As String
XmlData = in.GetData
Try
@@ -1360,6 +1364,7 @@ Sub importaBDDesdeWhatsApp
LogColor("BD copiada a interna.", Colors.Blue)
OutStr.Close
If in.As(String).Contains("whatsapp") Then ToastMessageShow("BD cargada desde Whatsapp", False)
Catch
Log(LastException)
End Try