This commit is contained in:
2024-02-08 11:02:59 -06:00
parent a2f3983e4d
commit 72bf3cae3b
4 changed files with 37 additions and 39 deletions

View File

@@ -837,25 +837,24 @@ Module10=C_Pedidos
Module11=C_Principal Module11=C_Principal
Module12=C_Productos Module12=C_Productos
Module13=C_Promos Module13=C_Promos
Module14=C_Subs Module14=C_TicketsDia
Module15=C_TicketsDia Module15=C_updateAvailable
Module16=C_updateAvailable Module16=CameraExClass
Module17=CameraExClass Module17=DBRequestManager
Module18=DBRequestManager Module18=DownloadService
Module19=DownloadService Module19=errorManager
Module2=C_CheckList Module2=C_CheckList
Module20=errorManager Module20=EscPosPrinter
Module21=EscPosPrinter Module21=FileHandler
Module22=FileHandler Module22=foto
Module23=foto Module23=kms_helperSubs
Module24=kms_helperSubs Module24=ManageExternalStorage
Module25=ManageExternalStorage Module25=MAPA_RUTAS
Module26=MAPA_RUTAS Module26=SD_Spinner
Module27=SD_Spinner Module27=Starter
Module28=Starter Module28=Subs
Module29=Subs Module29=Tracker
Module3=C_Cliente Module3=C_Cliente
Module30=Tracker
Module4=C_Clientes Module4=C_Clientes
Module5=C_Historico Module5=C_Historico
Module6=C_Mapas Module6=C_Mapas
@@ -864,7 +863,7 @@ Module8=C_NoVenta
Module9=C_NuevoCliente Module9=C_NuevoCliente
NumberOfFiles=401 NumberOfFiles=401
NumberOfLibraries=29 NumberOfLibraries=29
NumberOfModules=30 NumberOfModules=29
Version=12.5 Version=12.5
@EndOfDesignText@ @EndOfDesignText@
#Region Project Attributes #Region Project Attributes

View File

@@ -22,7 +22,6 @@ ModuleBookmarks27=
ModuleBookmarks28= ModuleBookmarks28=
ModuleBookmarks29= ModuleBookmarks29=
ModuleBookmarks3= ModuleBookmarks3=
ModuleBookmarks30=
ModuleBookmarks4= ModuleBookmarks4=
ModuleBookmarks5= ModuleBookmarks5=
ModuleBookmarks6= ModuleBookmarks6=
@@ -53,7 +52,6 @@ ModuleBreakpoints27=
ModuleBreakpoints28= ModuleBreakpoints28=
ModuleBreakpoints29= ModuleBreakpoints29=
ModuleBreakpoints3= ModuleBreakpoints3=
ModuleBreakpoints30=
ModuleBreakpoints4= ModuleBreakpoints4=
ModuleBreakpoints5= ModuleBreakpoints5=
ModuleBreakpoints6= ModuleBreakpoints6=
@@ -61,36 +59,35 @@ ModuleBreakpoints7=
ModuleBreakpoints8= ModuleBreakpoints8=
ModuleBreakpoints9= ModuleBreakpoints9=
ModuleClosedNodes0= ModuleClosedNodes0=
ModuleClosedNodes1= ModuleClosedNodes1=2
ModuleClosedNodes10= ModuleClosedNodes10=
ModuleClosedNodes11=1,3,50,51,52 ModuleClosedNodes11=1,3,50,51,52
ModuleClosedNodes12=3 ModuleClosedNodes12=3
ModuleClosedNodes13= ModuleClosedNodes13=
ModuleClosedNodes14=39,40,41,43,44 ModuleClosedNodes14=
ModuleClosedNodes15= ModuleClosedNodes15=
ModuleClosedNodes16= ModuleClosedNodes16=
ModuleClosedNodes17= ModuleClosedNodes17=5,7,8,9,10,11,12,13,15,16,18
ModuleClosedNodes18=5,7,8,9,10,11,12,13,15,16,18 ModuleClosedNodes18=
ModuleClosedNodes19= ModuleClosedNodes19=
ModuleClosedNodes2= ModuleClosedNodes2=
ModuleClosedNodes20= ModuleClosedNodes20=20,21,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39
ModuleClosedNodes21=20,21,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39 ModuleClosedNodes21=
ModuleClosedNodes22= ModuleClosedNodes22=
ModuleClosedNodes23= ModuleClosedNodes23=
ModuleClosedNodes24= ModuleClosedNodes24=
ModuleClosedNodes25= ModuleClosedNodes25=2
ModuleClosedNodes26=2 ModuleClosedNodes26=
ModuleClosedNodes27= ModuleClosedNodes27=9,10
ModuleClosedNodes28=9,10,11 ModuleClosedNodes28=
ModuleClosedNodes29= ModuleClosedNodes29=
ModuleClosedNodes3=3,86 ModuleClosedNodes3=3,86
ModuleClosedNodes30=
ModuleClosedNodes4= ModuleClosedNodes4=
ModuleClosedNodes5= ModuleClosedNodes5=
ModuleClosedNodes6= ModuleClosedNodes6=
ModuleClosedNodes7=3,11,12 ModuleClosedNodes7=3,11,12
ModuleClosedNodes8= ModuleClosedNodes8=
ModuleClosedNodes9= ModuleClosedNodes9=
NavigationStack=C_Principal,JobDone,969,6,B4XMainPage,B4XPage_Created,143,6,C_Cliente,B4XPage_Appear,587,6,Subs,traePromo,986,6,Subs,procesaPromocion,1180,0,Subs,traePromosVendidas,1169,0,Main,Process_Globals,20,0,Main,Activity_KeyPress,42,0,Main,Activity_ActionBarHomeClick,37,0,Main,Activity_Create,33,0 NavigationStack=Starter,Process_Globals,9,0,kms_helperSubs,RD_Init,62,0,Starter,ENVIA_ULTIMA_GPS,140,0,Subs,revisaBD,180,0,Starter,revisaBD,225,0,Starter,Service_Start,81,0,Starter,Service_Create,61,0,Main,Activity_Create,33,0,C_Productos,Busca_TextChanged,1201,0,B4XMainPage,b_importarBD_Click,757,0
SelectedBuild=0 SelectedBuild=0
VisibleModules=1,28,11,3,12,4,29,13,14,24 VisibleModules=1,27,11,3,12,4,28,13,23

View File

@@ -13,7 +13,7 @@ Sub Process_Globals
'These global variables will be declared once when the application starts. 'These global variables will be declared once when the application starts.
'These variables can be accessed from all modules. 'These variables can be accessed from all modules.
Public rp As RuntimePermissions Public rp As RuntimePermissions
Dim s As C_Subs ' Dim s As C_Subs
Dim reqManager As DBRequestManager Dim reqManager As DBRequestManager
Dim skmt, errorLog As SQL Dim skmt, errorLog As SQL
Dim ruta As String = File.DirInternal Dim ruta As String = File.DirInternal
@@ -57,7 +57,7 @@ End Sub
Sub Service_Create Sub Service_Create
'This is the program entry point. 'This is the program entry point.
'This is a good place to load resources that are not specific to a single activity. 'This is a good place to load resources that are not specific to a single activity.
s.Initialize(Me, "Subs") 'Inicializamos la clase Subs ' s.Initialize(Me, "Subs") 'Inicializamos la clase Subs
If Logger Then LogColor("'/////////////////////////////////////////////////////////////////////////////////////////////", Colors.Green) If Logger Then LogColor("'/////////////////////////////////////////////////////////////////////////////////////////////", Colors.Green)
If Logger Then LogColor("'///////////////////////////////////// Iniciamos Starter /////////////////////////////////", Colors.Green) If Logger Then LogColor("'///////////////////////////////////// Iniciamos Starter /////////////////////////////////", Colors.Green)
If Logger Then LogColor("'/////////////////////////////////////////////////////////////////////////////////////////////", Colors.Green) If Logger Then LogColor("'/////////////////////////////////////////////////////////////////////////////////////////////", Colors.Green)
@@ -65,8 +65,9 @@ Sub Service_Create
Timer1.Enabled = True Timer1.Enabled = True
GPS.Initialize("GPS") GPS.Initialize("GPS")
ubicacionActual.Initialize ubicacionActual.Initialize
Subs.revisaBD
pe.Initialize("pe") 'Para obtener la bateria pe.Initialize("pe") 'Para obtener la bateria
skmt = s.dbInit 'Inicializamos BD. ' skmt = s.dbInit 'Inicializamos BD.
DBReqServer = "http://keymon.lat:1781" DBReqServer = "http://keymon.lat:1781"
Private c As Cursor = skmt.ExecQuery($"select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'SERVER'"$) Private c As Cursor = skmt.ExecQuery($"select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'SERVER'"$)
If c.RowCount > 0 Then If c.RowCount > 0 Then
@@ -86,7 +87,6 @@ End Sub
Sub Service_Start (StartingIntent As Intent) Sub Service_Start (StartingIntent As Intent)
Service.StopAutomaticForeground 'Starter service can start in the foreground state in some edge cases. Service.StopAutomaticForeground 'Starter service can start in the foreground state in some edge cases.
Subs.revisaBD
#if DEBUG #if DEBUG
Logger = True Logger = True
#else #else

View File

@@ -203,6 +203,7 @@ Sub revisaBD 'ignore
If Starter.logger Then LogColor(LastException, Colors.Red) If Starter.logger Then LogColor(LastException, Colors.Red)
End Try End Try
End Try End Try
Try 'Si no existe la columna CAT_CL_SEGMENTO la agregamos. Try 'Si no existe la columna CAT_CL_SEGMENTO la agregamos.
Starter.skmt.ExecQuery("select count(CAT_CL_SEGMENTO) from kmt_info") Starter.skmt.ExecQuery("select count(CAT_CL_SEGMENTO) from kmt_info")
Catch Catch
@@ -975,7 +976,8 @@ Sub traePromo(promo As String, cliente As String) As Map
c.Position = 0 c.Position = 0
promoMap = CreateMap("id":promo, "maxXcliente":0, "maxRecurrente":0, "maxPromos":0) 'Ponemos el DEFAULT en CERO. promoMap = CreateMap("id":promo, "maxXcliente":0, "maxRecurrente":0, "maxPromos":0) 'Ponemos el DEFAULT en CERO.
If c.RowCount > 0 Then promoMap = CreateMap("id":promo, "maxXcliente":c.GetString("CAT_PA_MAXPROMCLIE"), "maxRecurrente":c.GetString("CAT_PA_MAXPROMREC"), "maxPromos":c.GetString("CAT_PA_MAXPROM")) If c.RowCount > 0 Then promoMap = CreateMap("id":promo, "maxXcliente":c.GetString("CAT_PA_MAXPROMCLIE"), "maxRecurrente":c.GetString("CAT_PA_MAXPROMREC"), "maxPromos":c.GetString("CAT_PA_MAXPROM"))
'PROMOCIONES SEGMENTADAS, si la promo esta en la lista, SOLO los clientes que la tengan la pueden ver. '######### PROMOCIONES SEGMENTADAS ##########
' Si la promo esta en la lista, SOLO los clientes que la tengan la pueden ver.
Private ps As Cursor = Starter.skmt.ExecQuery($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$) Private ps As Cursor = Starter.skmt.ExecQuery($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$)
Log($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$) Log($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$)
' Log($"PROMOS SEGMENTADAS DISPONIBLES: ${ps.RowCount}"$) ' Log($"PROMOS SEGMENTADAS DISPONIBLES: ${ps.RowCount}"$)
@@ -993,7 +995,7 @@ Sub traePromo(promo As String, cliente As String) As Map
promoMap = CreateMap("id":promo, "maxXcliente":(ps2.GetString("HCCP_CANT")-ps2.GetString("HCCP_CANT_VENDIDA")), "maxRecurrente":0, "maxPromos":ps2.GetString("HCCP_CANT")) 'Si es segmentada SOLO le aparece a ciertos clientes. promoMap = CreateMap("id":promo, "maxXcliente":(ps2.GetString("HCCP_CANT")-ps2.GetString("HCCP_CANT_VENDIDA")), "maxRecurrente":0, "maxPromos":ps2.GetString("HCCP_CANT")) 'Si es segmentada SOLO le aparece a ciertos clientes.
End If End If
End If End If
'Termina promos segmentadas ' ########## TERMINA PROMOS SEGMENTADAS ##########
c = Starter.skmt.ExecQuery("Select count(*) as hist from HIST_PROMOS where HP_CLIENTE = '"& cliente & "' and HP_CODIGO_PROMOCION = '" & promo & "'") 'Revisamos si hay historico de la promoción. c = Starter.skmt.ExecQuery("Select count(*) as hist from HIST_PROMOS where HP_CLIENTE = '"& cliente & "' and HP_CODIGO_PROMOCION = '" & promo & "'") 'Revisamos si hay historico de la promoción.
c.Position = 0 c.Position = 0
If c.GetString("hist") > 0 Then siHistorico = 1 If c.GetString("hist") > 0 Then siHistorico = 1