mirror of
https://github.com/KeymonSoft/Mariana.git
synced 2026-04-20 14:19:21 +00:00
-VERSION 5.06.26
- Cambio de 50 segundos a 10 segundos en la revision de la hora para los recordatorios. - Cambio en el envio de la ruta para la contraseña de la geocerca, si no habia cliente seleccionado, no regresaba la ruta correcta.
This commit is contained in:
@@ -898,7 +898,15 @@ Private Sub b_passGeocerca_Click
|
|||||||
cmd.Initialize
|
cmd.Initialize
|
||||||
cmd.Name = "traePassGeocerca"
|
cmd.Name = "traePassGeocerca"
|
||||||
cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, et_passGeocerca.text)
|
cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, et_passGeocerca.text)
|
||||||
Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${et_passGeocerca.text}"$)
|
|
||||||
|
c=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
||||||
|
Private r As String = "0"
|
||||||
|
If c.RowCount > 0 Then
|
||||||
|
c.Position=0
|
||||||
|
r = c.GetString("CAT_CL_RUTA")
|
||||||
|
End If
|
||||||
|
|
||||||
|
Log($"${Subs.traeAlmacen}, ${r}, ${et_passGeocerca.text}"$)
|
||||||
reqManager.ExecuteQuery(cmd , 0, "traePassGeocerca")
|
reqManager.ExecuteQuery(cmd , 0, "traePassGeocerca")
|
||||||
|
|
||||||
' If et_passGeocerca.Text = "12345" Then
|
' If et_passGeocerca.Text = "12345" Then
|
||||||
@@ -914,7 +922,7 @@ End Sub
|
|||||||
Private Sub p_geocerca_Click
|
Private Sub p_geocerca_Click
|
||||||
Log("CLICKED")
|
Log("CLICKED")
|
||||||
Dim activa As Int = 1
|
Dim activa As Int = 1
|
||||||
If Subs.estamosEnAlmacen(50) Then
|
If Subs.estamosEnAlmacen(500) Then
|
||||||
If l_geocerca.Text <> "Buscando ubicación ..." Then
|
If l_geocerca.Text <> "Buscando ubicación ..." Then
|
||||||
If passSupervisor = "" Then
|
If passSupervisor = "" Then
|
||||||
p_transparente.Visible = True
|
p_transparente.Visible = True
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ ModuleClosedNodes23=
|
|||||||
ModuleClosedNodes24=
|
ModuleClosedNodes24=
|
||||||
ModuleClosedNodes25=
|
ModuleClosedNodes25=
|
||||||
ModuleClosedNodes26=
|
ModuleClosedNodes26=
|
||||||
ModuleClosedNodes27=9,10,11,12,13,14
|
ModuleClosedNodes27=2,3,4,5,6,7,8,9,10,11,12,13,14
|
||||||
ModuleClosedNodes28=
|
ModuleClosedNodes28=
|
||||||
ModuleClosedNodes29=9,10,11
|
ModuleClosedNodes29=9,10,11
|
||||||
ModuleClosedNodes3=
|
ModuleClosedNodes3=
|
||||||
@@ -88,6 +88,6 @@ ModuleClosedNodes6=
|
|||||||
ModuleClosedNodes7=
|
ModuleClosedNodes7=
|
||||||
ModuleClosedNodes8=
|
ModuleClosedNodes8=
|
||||||
ModuleClosedNodes9=
|
ModuleClosedNodes9=
|
||||||
NavigationStack=B4XMainPage,b_passGeocerca_Click,885,6,Starter,ENVIA_ULTIMA_GPS,90,0,Starter,Service_Start,57,0,Starter,IsConnectedToInternet,158,0,C_Cliente,B4XPage_Created,198,0,Subs,geocercaHabilitada,1394,0,C_Cliente,B4XPage_Appear,358,2,C_Cliente,GPS_LocationChanged,395,0,Starter,timerRecordatorio_Tick,160,6,B4XMainPage,JobDone,577,6
|
NavigationStack=Diseñador Visual,login.bal,-100,1,Starter,Service_Start,51,0,Starter,IsConnectedToInternet,158,0,Starter,timerRecordatorio_Tick,162,6,B4XMainPage,i_engrane_Click,771,0,C_Principal,JobDone,1795,0,C_Principal,cargar_Click,971,0,B4XMainPage,p_geocerca_Click,912,0,B4XMainPage,p_transparente_Click,888,0,B4XMainPage,b_passGeocerca_Click,898,6
|
||||||
SelectedBuild=0
|
SelectedBuild=0
|
||||||
VisibleModules=27,2,12,4,28,15,5,8,14,18,29
|
VisibleModules=27,2,12,4,28,15,5,8,14,18,29
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ Sub Service_Start (StartingIntent As Intent)
|
|||||||
If s.traeDBReqServerDeBD(skmt) <> "N/A" Then DBReqServer = s.traeDBReqServerDeBD(skmt)
|
If s.traeDBReqServerDeBD(skmt) <> "N/A" Then DBReqServer = s.traeDBReqServerDeBD(skmt)
|
||||||
reqManager.Initialize(Me, DBReqServer)
|
reqManager.Initialize(Me, DBReqServer)
|
||||||
' StartService(NotificationService)
|
' StartService(NotificationService)
|
||||||
timerRecordatorio.Initialize("timerRecordatorio", 50 * 1000)
|
timerRecordatorio.Initialize("timerRecordatorio", 10 * 1000)
|
||||||
timerRecordatorio.Enabled = True
|
timerRecordatorio.Enabled = True
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -165,6 +165,7 @@ End Sub
|
|||||||
|
|
||||||
Private Sub timerRecordatorio_Tick
|
Private Sub timerRecordatorio_Tick
|
||||||
'10:30, 13:00 y 15:30
|
'10:30, 13:00 y 15:30
|
||||||
|
Log($"${DateTime.GetHour(DateTime.now)}:${DateTime.GetMinute(DateTime.now)}"$)
|
||||||
Log("Revisando la hora - UltimoRecordatorio: " & ultimoRecordatorio)
|
Log("Revisando la hora - UltimoRecordatorio: " & ultimoRecordatorio)
|
||||||
If ultimoRecordatorio <> DateTime.GetHour(DateTime.now) & DateTime.GetMinute(DateTime.now) Then
|
If ultimoRecordatorio <> DateTime.GetHour(DateTime.now) & DateTime.GetMinute(DateTime.now) Then
|
||||||
If (DateTime.GetHour(DateTime.now) = 10 And DateTime.GetMinute(DateTime.now) = 20) _ 'Recordatorio de las 10:20
|
If (DateTime.GetHour(DateTime.now) = 10 And DateTime.GetMinute(DateTime.now) = 20) _ 'Recordatorio de las 10:20
|
||||||
@@ -179,7 +180,8 @@ Private Sub timerRecordatorio_Tick
|
|||||||
Or (DateTime.GetHour(DateTime.now) = 15 And DateTime.GetMinute(DateTime.now) = 25) _ 'Recordatorio de las 15:25
|
Or (DateTime.GetHour(DateTime.now) = 15 And DateTime.GetMinute(DateTime.now) = 25) _ 'Recordatorio de las 15:25
|
||||||
Or (DateTime.GetHour(DateTime.now) = 15 And DateTime.GetMinute(DateTime.now) = 29) _ 'Recordatorio de las 15:29
|
Or (DateTime.GetHour(DateTime.now) = 15 And DateTime.GetMinute(DateTime.now) = 29) _ 'Recordatorio de las 15:29
|
||||||
Or (DateTime.GetHour(DateTime.now) = 15 And DateTime.GetMinute(DateTime.now) = 30) _ 'Recordatorio de las 15:30
|
Or (DateTime.GetHour(DateTime.now) = 15 And DateTime.GetMinute(DateTime.now) = 30) _ 'Recordatorio de las 15:30
|
||||||
Or (DateTime.GetHour(DateTime.now) = 17 And DateTime.GetMinute(DateTime.now) = 70) Then ' HORARIO DE PRUEBA
|
Or (DateTime.GetHour(DateTime.now) = 10 And DateTime.GetMinute(DateTime.now) = 70) Then ' HORARIO DE PRUEBA
|
||||||
|
Log("¡¡MANDAMOS RECORDATORIO!!")
|
||||||
If Not(B4XPages.GetManager.IsForeground) Then Subs.notiHigh("¡¡ATENCION!!", "Recuerda enviar tu venta.", Main)
|
If Not(B4XPages.GetManager.IsForeground) Then Subs.notiHigh("¡¡ATENCION!!", "Recuerda enviar tu venta.", Main)
|
||||||
If B4XPages.MainPage.IsInitialized And B4XPages.MainPage.pantallaActual.IsInitialized Then
|
If B4XPages.MainPage.IsInitialized And B4XPages.MainPage.pantallaActual.IsInitialized Then
|
||||||
B4XPages.MainPage.recordatorio.agregaPanelRecordatorio(B4XPages.MainPage.pantallaActual)
|
B4XPages.MainPage.recordatorio.agregaPanelRecordatorio(B4XPages.MainPage.pantallaActual)
|
||||||
|
|||||||
Reference in New Issue
Block a user