diff --git a/soporteKMS.b4a b/soporteKMS.b4a index 6aef720..65581fc 100644 --- a/soporteKMS.b4a +++ b/soporteKMS.b4a @@ -34,7 +34,7 @@ Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Soporte Keymonsoft - #VersionName: 3.08.27 + #VersionName: 3.11.15 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -63,10 +63,10 @@ Version=12.5 Sub Process_Globals 'These global variables will be declared once when the application starts. 'These variables can be accessed from all modules. - Dim DBRSGuna1872 As String = "http://keymon.lat:1782" - Dim DBRSMards1873 As String = "http://keymon.lat:1782" -' Dim DBRSGuna1872 As String = "http://11.0.0.231:1783" 'Para pruebas locales -' Dim DBRSGuna1872 As String = "http://187.189.244.154:1782" 'Para pruebas locales + Dim DBRS_1782 As String = "http://keymon.lat:1782" + Dim DBRS_1781 As String = "http://keymon.lat:1781" +' Dim DBRS_1782 As String = "http://11.0.0.231:1783" 'Para pruebas locales +' Dim DBRS_1782 As String = "http://187.189.244.154:1782" 'Para pruebas locales Dim conexionDBRS As String = "externa" Dim DBRChecked As Boolean = False Dim atrasPresionado As Boolean = False @@ -183,7 +183,7 @@ Sub Globals Dim laEmpresa As String = "" Private l_tipoVentaBV As Label Private p_tipoVentaBV As Panel - dim elTipoDeVenta as string + Dim elTipoDeVenta As String End Sub Sub Activity_Create(FirstTime As Boolean) @@ -201,9 +201,9 @@ Sub Activity_Create(FirstTime As Boolean) Subs.centraPanelEnPanel(p_backLogin, p_login) l_version.text = "Version " & Application.VersionName ProgressDialogShow("Descargando información") - Log("DBServer: " & DBRSGuna1872) - reqManager.Initialize(Me, DBRSGuna1872) -' ToastMessageShow("Probando: " & DBRSGuna1872, False) + Log("DBServer: " & DBRS_1782) + reqManager.Initialize(Me, DBRS_1782) +' ToastMessageShow("Probando: " & DBRS_1782, False) cmd.Initialize cmd.Name = "select_soporte" 'Intentamos conectarnos al servido publico y si no responde cambiamos al interno. reqManager.ExecuteQuery(cmd , 0, "pruebaConexion", 750) 'request con timeout corto en ms. @@ -242,10 +242,19 @@ Sub Activity_Create(FirstTime As Boolean) s_empresaBV.AddAll(Array As String("-= Seleccione =-", "Danvit", "Guna", "Kelloggs", "Mards", "Salma")) s_tipoVentaBV.AddAll(Array As String("VENTA", "ABORDO")) s_tipoVentaBV.SelectedIndex = 0 + + + reqManager.Initialize(Me, DBRS_1782) 'Traemos los almacenes de Guna cmd.Initialize cmd.Name = "select_almacenes_GUNA" reqManager.ExecuteQuery(cmd , 0, "almacenesGuna", 0) + 'Traemos los almacenes de Danvit +' cmd.Initialize + cmd.Name = "select_almacenes_DANVIT" + reqManager.ExecuteQuery(cmd , 0, "almacenesDanvit", 0) + + reqManager.Initialize(Me, DBRS_1781) 'Traemos los almacenes de Kelloggs ' cmd.Initialize cmd.Name = "select_almacenes_KELL" @@ -254,12 +263,8 @@ Sub Activity_Create(FirstTime As Boolean) ' cmd.Initialize cmd.Name = "select_almacenes_SALMA" reqManager.ExecuteQuery(cmd , 0, "almacenesSalma", 0) - 'Traemos los almacenes de Danvit -' cmd.Initialize - cmd.Name = "select_almacenes_DANVIT" - reqManager.ExecuteQuery(cmd , 0, "almacenesDanvit", 0) 'Traemos los almacenes de Mards - reqManager.Initialize(Me, DBRSMards1873) + reqManager.Initialize(Me, DBRS_1781) cmd.Name = "select_almacenes_Mards" reqManager.ExecuteQuery(cmd , 0, "almacenesMards", 0) kb.Initialize("kb") @@ -267,11 +272,11 @@ Sub Activity_Create(FirstTime As Boolean) gv_bicho.SetGif(File.DirAssets, "ew.gif") timerBicho.Initialize("timerBicho", 5000) timerBicho.Enabled = True - reqManager.Initialize(Me, DBRSGuna1872) + reqManager.Initialize(Me, DBRS_1782) End Sub Sub Activity_Resume -' reqManager.Initialize(Me, DBRSGuna1872) +' reqManager.Initialize(Me, DBRS_1782) If Starter.mayusculasDesbloqueo = "1" Then cb_usrMayusc.Checked = True Dim label1 As Label = lv_resultadosBusqueda.TwoLinesLayout.Label label1.TextSize = 13 @@ -306,8 +311,8 @@ Sub timerBicho_Tick ' Log("Bicho visible = " & rand) End Sub -Sub WobbleMenu1_Tab1Click - reqManager.Initialize(Me, DBRSGuna1872) +Sub WobbleMenu1_Tab1Click 'Guna + reqManager.Initialize(Me, DBRS_1782) ' Log("Tab 1") ' sv_kelloggs.Visible = False WobbleMenu1.RemoveBadge(4) @@ -325,9 +330,9 @@ Sub WobbleMenu1_Tab1Click Subs.centraPanelEnPanel(p_botones1, Panel1) End Sub -Sub WobbleMenu1_Tab2Click +Sub WobbleMenu1_Tab2Click 'Kelloggs ' Log("Tab 2") - reqManager.Initialize(Me, DBRSGuna1872) + reqManager.Initialize(Me, DBRS_1781) WobbleMenu1.RemoveBadge(4) ' sv_kelloggs.Top = 0 ' sv_kelloggs.Left = 0 @@ -355,8 +360,8 @@ Sub WobbleMenu1_Tab2Click ' Subs.centraBotonEnPanel(b_borrarPagare, PanelKelloggs) End Sub -Sub WobbleMenu1_Tab3Click - reqManager.Initialize(Me, DBRSGuna1872) +Sub WobbleMenu1_Tab3Click 'Salma + reqManager.Initialize(Me, DBRS_1781) WobbleMenu1.RemoveBadge(4) Subs.panelVisible(Panel3, 0, 0, Activity) Subs.panelOculto(Panel1) @@ -373,10 +378,10 @@ Sub WobbleMenu1_Tab3Click Subs.centraPanelEnPanel(p_botones3, Panel3) End Sub -Sub WobbleMenu1_Tab4Click - reqManager.Initialize(Me, DBRSGuna1872) +Sub WobbleMenu1_Tab4Click 'Danvit + reqManager.Initialize(Me, DBRS_1782) WobbleMenu1.RemoveBadge(4) - Subs.panelVisible(Panel4, 0, 0, Activity) + Subs.panelVisible(Panel4, 0, 0, Activity) 'Danvit Subs.panelOculto(Panel1) ' Subs.panelOculto(PanelKelloggs) ' sv_kelloggs.Visible = False @@ -391,9 +396,9 @@ Sub WobbleMenu1_Tab4Click Subs.centraPanelEnPanel(p_botones4, Panel4) End Sub -Sub WobbleMenu1_Tab5Click +Sub WobbleMenu1_Tab5Click 'Borrar Venta ' WobbleMenu1.RemoveBadge(4) -' reqManager.Initialize(Me, DBRSMards1873) + reqManager.Initialize(Me, DBRS_1781) Subs.panelVisible(p_borrarVenta, 0, 0, Activity) Subs.panelOculto(Panel1) Subs.panelOculto(Panel2) @@ -427,9 +432,9 @@ End Sub ' lv_resultadosBusqueda.Height = Activity.Height - lv_resultadosBusqueda.Top - 200 'End Sub -Sub WobbleMenu1_Tab6Click +Sub WobbleMenu1_Tab6Click 'Facturacion ' Log("Tab Facturacion") - reqManager.Initialize(Me, DBRSGuna1872) + reqManager.Initialize(Me, DBRS_1781) l_cita.Text = Subs.dameCita(Starter.citas) Subs.panelVisible(PanelFacturacion, 0, 0, Activity) ' Subs.panelOculto(PanelKelloggs) @@ -446,9 +451,9 @@ Sub WobbleMenu1_Tab6Click Subs.centraBotonEnPanel(b_libBanderaCargaForanea, PanelFacturacion) End Sub -Sub WobbleMenu1_Tab7Click +Sub WobbleMenu1_Tab7Click 'About ' Log("Tab Otro") - reqManager.Initialize(Me, DBRSGuna1872) +' reqManager.Initialize(Me, DBRS_1782) ' WobbleMenu1.RemoveBadge(4) l_cita.Text = Subs.dameCita(Starter.citas) Subs.panelVisible(Panel5, 0, 0, Activity) @@ -664,10 +669,10 @@ Sub JobDone(Job As HttpJob) ' ToastMessageShow("Venta Eliminada.", False) 'El request de eliminar venta (Stored Procedure) siempre regresa error, asi que asumimos que SI se borro la venta. '/////////////////// Si hay error de conexion con keymon.lat nos cambiamos a 10.0.0.205 /////////////////////// else If Job.Tag = "pruebaConexion" And Job.ErrorMessage.IndexOf("Failed to connect to keymon.lat") = -1 Then - DBRSGuna1872 = "http://10.0.0.205:1782" - Dim DBRSMards1873 As String = "http://10.0.0.205:1782" -' DBRSGuna1872 = "http://11.0.0.231:1783" 'Para pruebas locales - reqManager.Initialize(Me, DBRSGuna1872) + DBRS_1782 = "http://10.0.0.205:1782" + Dim DBRS_1781 As String = "http://10.0.0.205:1782" +' DBRS_1782 = "http://11.0.0.231:1783" 'Para pruebas locales + reqManager.Initialize(Me, DBRS_1782) conexionDBRS = "interna" pruebaPaso = pruebaPaso + 1 Toast("Cambiando a servidor interno. 🕵🏼", 0) @@ -704,7 +709,7 @@ Sub JobDone(Job As HttpJob) If Job.JobName = "DBRequest" Then 'Traemos info de soporte. Dim result As DBResult = reqManager.HandleJob(Job) If result.Tag = "pruebaConexion" Then 'query tag - Log($"Conectado a ${DBRSGuna1872} - ${conexionDBRS}"$) + Log($"Conectado a ${DBRS_1782} - ${conexionDBRS}"$) For Each records() As Object In result.Rows ' For Each k As String In result.Columns.Keys ' Log(result.Tag & ": " & k & ": " & records(result.Columns.Get(k))) @@ -1120,6 +1125,7 @@ End Sub 'Revisamos que la contraseña ingresada sea la correcta para el día y hora. Private Sub et_login_TextChanged (Old As String, New As String) Private contrasenaHoy As String = pass1 & DateTime.GetDayOfMonth(DateTime.Now) & DateTime.GetHour(DateTime.now) + Log($"${contrasenaHoy}"$) If New = contrasenaHoy Then p_login.Visible = False Sleep(80) @@ -1417,9 +1423,9 @@ Private Sub s_empresaBV_ItemClick (Position As Int, Value As Object) p_tipoVentaBV.Visible = False End If If laEmpresa = "Mards" Then - reqManager.Initialize(Me, DBRSMards1873) + reqManager.Initialize(Me, DBRS_1781) Else - reqManager.Initialize(Me, DBRSGuna1872) + reqManager.Initialize(Me, DBRS_1782) End If spinnerEmpresaMap = empresasMap.Get(Value) ' Log(empresasMap & "|" & Value) diff --git a/soporteKMS.b4a.meta b/soporteKMS.b4a.meta index 7f0e8c6..82edd08 100644 --- a/soporteKMS.b4a.meta +++ b/soporteKMS.b4a.meta @@ -6,10 +6,10 @@ ModuleBreakpoints0= ModuleBreakpoints1= ModuleBreakpoints2= ModuleBreakpoints3= -ModuleClosedNodes0=2,6,7,8,18,19,20,26,29,30,31,32,33 +ModuleClosedNodes0=2,7,8,18,19,20,26,31,32,33 ModuleClosedNodes1= ModuleClosedNodes2=1 ModuleClosedNodes3=1,8,9,10,11 -NavigationStack=Main,b_revisaVentaMards_Click,1258,0,Main,s_empresaBV_ItemClick,1341,4,Main,b_borrarVenta2_Click,498,0,Main,b_borrarVentaBV_Click,1309,6,Main,borrarVentaForzadaGuna,534,6,Main,borrarVentaForzadaKelloggs,517,2,Visual Designer,layout1.bal,-100,6,Main,Activity_Create,158,0,Main,Process_Globals,21,0,DBRequestManager,ExecuteQuery,35,0,DBRequestManager,Initialize,22,0 +NavigationStack=Main,borrarVentaForzadaGuna,561,0,Main,b_borrarVenta2_Click,517,0,Main,b_borrarVenta1_Click,498,0,Main,WobbleMenu1_Tab3Click,326,0,Main,WobbleMenu1_Tab7Click,416,0,Main,WobbleMenu1_Tab2Click,293,0,Main,WobbleMenu1_Tab1Click,274,0,Main,WobbleMenu1_Tab6Click,399,1,Main,Globals,47,0,Main,Activity_Create,198,0,Main,et_login_TextChanged,1093,5 SelectedBuild=0 VisibleModules=2,3,1