mirror of
https://github.com/KeymonSoft/Mariana_Censos.git
synced 2026-04-21 06:39:14 +00:00
- VERSION 5.05.27
- Se cambio el servidor de DBReq a keymon.net - Se hizo que el envio de ubicacion en tiempo real siempre inicialize el servidor de DBReq con la ip correcta, porque si se modificaba la direccion desde el engrane, no enviaba bien la informacion!
This commit is contained in:
@@ -388,7 +388,7 @@ Sub Entrar_Click
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub JobDone(Job As HttpJob)
|
Sub JobDone(Job As HttpJob)
|
||||||
Log(Job.Success)
|
Log("Main.JobDone: " & Job.Success)
|
||||||
If Job.Success = False Then
|
If Job.Success = False Then
|
||||||
LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red)
|
LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red)
|
||||||
ToastMessageShow("Error: " & Job.ErrorMessage, True)
|
ToastMessageShow("Error: " & Job.ErrorMessage, True)
|
||||||
@@ -632,7 +632,7 @@ Sub i_engrane_Click
|
|||||||
b_mandaUsrs.Visible = False
|
b_mandaUsrs.Visible = False
|
||||||
cb_importarBDWA.Checked = Subs.traeUsarIntentBDWA
|
cb_importarBDWA.Checked = Subs.traeUsarIntentBDWA
|
||||||
p_importarBDWA.Visible = False
|
p_importarBDWA.Visible = False
|
||||||
lv_server.AddSingleLine("http://keymon.lat:1781")
|
lv_server.AddSingleLine("http://keymon.net:1781")
|
||||||
If user.Text = "KMTS1" Then
|
If user.Text = "KMTS1" Then
|
||||||
lv_server.AddSingleLine("http://10.0.0.205:1781")
|
lv_server.AddSingleLine("http://10.0.0.205:1781")
|
||||||
b_mandaUsrs.Visible = True
|
b_mandaUsrs.Visible = True
|
||||||
@@ -720,7 +720,7 @@ Private Sub b_mandaUsrs_Click
|
|||||||
Private c As Cursor = Starter.skmt.ExecQuery($"select * from kmt_info"$)
|
Private c As Cursor = Starter.skmt.ExecQuery($"select * from kmt_info"$)
|
||||||
Private dbr As DBRequestManager
|
Private dbr As DBRequestManager
|
||||||
Private cmd1 As DBCommand
|
Private cmd1 As DBCommand
|
||||||
dbr.Initialize(Me, "http://keymon.lat:1781")
|
dbr.Initialize(Me, "http://keymon.net:1781")
|
||||||
If c.RowCount > 0 Then
|
If c.RowCount > 0 Then
|
||||||
subirClientes = c.RowCount - 1
|
subirClientes = c.RowCount - 1
|
||||||
Subs.centraPanel(p_avanceSubirUsrs, p_appUpdate.Width)
|
Subs.centraPanel(p_avanceSubirUsrs, p_appUpdate.Width)
|
||||||
|
|||||||
@@ -49,6 +49,6 @@ ModuleClosedNodes6=
|
|||||||
ModuleClosedNodes7=
|
ModuleClosedNodes7=
|
||||||
ModuleClosedNodes8=1
|
ModuleClosedNodes8=1
|
||||||
ModuleClosedNodes9=1
|
ModuleClosedNodes9=1
|
||||||
NavigationStack=C_NuevoCliente,mandaPendientesNuevosClientes,502,1,C_Principal,e_ruta_EnterPressed,993,6,Subs,traeRuta,663,0,C_Cliente,cb_activo_SelectedIndexChanged,671,0,C_Cliente,b_guardaCambios_Click,397,0,C_Cliente,B4XPage_CloseRequest,390,0,C_Principal,cargar_Click,507,0,C_Principal,JobDone,634,0,MAPA_RUTAS,MapFragment1_Ready,202,0,C_Cliente,B4XPage_Appear,287,0
|
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,B4XMainPage,i_engrane_Click,639,0,Starter,ENVIA_ULTIMA_GPS,75,0
|
||||||
SelectedBuild=0
|
SelectedBuild=0
|
||||||
VisibleModules=2,14,9,4,8,15,7,16,13,5
|
VisibleModules=14,2,9,4,8,15,7,16,13,5
|
||||||
|
|||||||
@@ -19,12 +19,12 @@ Sub Process_Globals
|
|||||||
Public FLP As FusedLocationProvider
|
Public FLP As FusedLocationProvider
|
||||||
' Private flpStarted As Boolean
|
' Private flpStarted As Boolean
|
||||||
Dim reqManager As DBRequestManager
|
Dim reqManager As DBRequestManager
|
||||||
Dim server As String = "http://keymon.lat:1781"
|
Dim server As String = "http://keymon.net:1781"
|
||||||
' Dim server As String = "http://187.189.244.154:1783"
|
' Dim server As String = "http://187.189.244.154:1783"
|
||||||
' Dim server As String = "http://10.0.0.205:1782"
|
' Dim server As String = "http://10.0.0.205:1782"
|
||||||
' Dim server As String = "http://11.0.0.231:1782"
|
' Dim server As String = "http://11.0.0.231:1782"
|
||||||
Dim Timer1 As Timer
|
Dim Timer1 As Timer
|
||||||
Dim Interval As Int = 500
|
Dim Interval As Int = 10
|
||||||
Dim ruta As String = File.DirInternal
|
Dim ruta As String = File.DirInternal
|
||||||
'Para los Logs
|
'Para los Logs
|
||||||
Private logs As StringBuilder
|
Private logs As StringBuilder
|
||||||
@@ -77,12 +77,11 @@ Sub Service_Destroy
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub ENVIA_ULTIMA_GPS
|
Sub ENVIA_ULTIMA_GPS
|
||||||
' reqManager.Initialize(Me, server)
|
reqManager.Initialize(Me, server)
|
||||||
Dim logger As Boolean = True
|
Dim logger As Boolean = True
|
||||||
If logger Then LogColor("Iniciamos ENVIA_ULTIMA_GPS", Colors.Magenta)
|
If logger Then LogColor("############### Iniciamos ENVIA_ULTIMA_GPS #####################", Colors.Magenta)
|
||||||
Dim skmt As SQL
|
Dim skmt As SQL
|
||||||
skmt.Initialize(ruta,"kmt.db", False)
|
skmt.Initialize(ruta,"kmt.db", False)
|
||||||
|
|
||||||
If Subs.traeAlmacen <> Null And Subs.traeAlmacen <> "" Then
|
If Subs.traeAlmacen <> Null And Subs.traeAlmacen <> "" Then
|
||||||
'Primero borramos de CAT_RUTAS_CENSOS el registro (por almacen y ruta)
|
'Primero borramos de CAT_RUTAS_CENSOS el registro (por almacen y ruta)
|
||||||
'y LUEGO lo insertamos en JobDone
|
'y LUEGO lo insertamos en JobDone
|
||||||
@@ -90,7 +89,7 @@ Sub ENVIA_ULTIMA_GPS
|
|||||||
cmd.Initialize
|
cmd.Initialize
|
||||||
cmd.Name = "deleteRutaCensos2"
|
cmd.Name = "deleteRutaCensos2"
|
||||||
cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, Subs.traeUsuarioDeBD)
|
cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, Subs.traeUsuarioDeBD)
|
||||||
Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${Subs.traeUsuarioDeBD}"$)
|
' Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${Subs.traeUsuarioDeBD}"$)
|
||||||
reqManager.ExecuteCommand(cmd , "delCatRutas")
|
reqManager.ExecuteCommand(cmd , "delCatRutas")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -121,7 +120,7 @@ Sub Application_Error (Error As Exception, StackTrace As String) As Boolean
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub JobDone(Job As HttpJob)
|
Sub JobDone(Job As HttpJob)
|
||||||
' Log(Job.Success)
|
Log("Starter.JobDone: " & Job.Success)
|
||||||
If Job.Success = False Then
|
If Job.Success = False Then
|
||||||
' ToastMessageShow("Error: " & Job.ErrorMessage, True)
|
' ToastMessageShow("Error: " & Job.ErrorMessage, True)
|
||||||
LogColor("Error: " & Job.ErrorMessage, Colors.red)
|
LogColor("Error: " & Job.ErrorMessage, Colors.red)
|
||||||
@@ -136,6 +135,7 @@ Sub JobDone(Job As HttpJob)
|
|||||||
Subs.logJobDoneResultados(resultado)
|
Subs.logJobDoneResultados(resultado)
|
||||||
End If
|
End If
|
||||||
If resultado.Tag = "delCatRutas" Then
|
If resultado.Tag = "delCatRutas" Then
|
||||||
|
Log(123)
|
||||||
Subs.logJobDoneResultados(resultado)
|
Subs.logJobDoneResultados(resultado)
|
||||||
Dim cmd As DBCommand
|
Dim cmd As DBCommand
|
||||||
cmd.Initialize
|
cmd.Initialize
|
||||||
|
|||||||
10
B4A/Subs.bas
10
B4A/Subs.bas
@@ -660,8 +660,10 @@ Sub traeAlmacen As String 'ignore
|
|||||||
Private c As Cursor
|
Private c As Cursor
|
||||||
Private a As String
|
Private a As String
|
||||||
c=B4XPages.MainPage.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
|
c=B4XPages.MainPage.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
|
||||||
c.Position = 0
|
If c.RowCount > 0 Then
|
||||||
a = C.GetString("ID_ALMACEN")
|
c.Position = 0
|
||||||
|
a = C.GetString("ID_ALMACEN")
|
||||||
|
End If
|
||||||
c.Close
|
c.Close
|
||||||
Return a
|
Return a
|
||||||
End Sub
|
End Sub
|
||||||
@@ -1257,12 +1259,12 @@ Sub agregaColumna(tabla As String, columna As String, tipo As String)
|
|||||||
c.Position = 0
|
c.Position = 0
|
||||||
If c.GetString("fCol") = 0 Then 'Si no esta la columna la agregamos
|
If c.GetString("fCol") = 0 Then 'Si no esta la columna la agregamos
|
||||||
B4XPages.MainPage.skmt.ExecNonQuery($"ALTER TABLE ${tabla} ADD COLUMN ${columna} ${tipo}"$)
|
B4XPages.MainPage.skmt.ExecNonQuery($"ALTER TABLE ${tabla} ADD COLUMN ${columna} ${tipo}"$)
|
||||||
Log($"Columna "${columna} ${tipo}", agregada a "${tabla}"."$)
|
' Log($"Columna "${columna} ${tipo}", agregada a "${tabla}"."$)
|
||||||
End If
|
End If
|
||||||
Catch 'Si no funciona "pragma_table_info" lo hacemos con try/catch
|
Catch 'Si no funciona "pragma_table_info" lo hacemos con try/catch
|
||||||
Try
|
Try
|
||||||
B4XPages.MainPage.skmt.ExecNonQuery($"ALTER TABLE ${tabla} ADD COLUMN ${columna} ${tipo}"$)
|
B4XPages.MainPage.skmt.ExecNonQuery($"ALTER TABLE ${tabla} ADD COLUMN ${columna} ${tipo}"$)
|
||||||
Log($"Columna "${columna} ${tipo}", agregada a "${tabla}".."$)
|
' Log($"Columna "${columna} ${tipo}", agregada a "${tabla}".."$)
|
||||||
Catch
|
Catch
|
||||||
Log(LastException)
|
Log(LastException)
|
||||||
End Try
|
End Try
|
||||||
|
|||||||
Reference in New Issue
Block a user