diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index b657478..5943b46 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -4120,11 +4120,10 @@ Private Sub b_geopass_Click Else Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_geoPass" - cmd.Parameters = Array As Object(et_geopass.Text.Trim, Subs.traeAlmacen, Subs.traeRuta) - reqManager.ExecuteQuery(cmd , 0, "traeGeoPass") + cmd.Name = "selectBypass" ' Trae la contraseƱa desde la tabla "BYPASS" en web. (La ultima es KMT2025) + cmd.Parameters = Array As Object(et_geopass.Text.Trim) + reqManager.ExecuteQuery(cmd , 0, "bypass") Log($"${Starter.DBReqServer}, ${et_geopass.Text}, ${Subs.traeAlmacen}, ${Subs.traeRuta}"$) - et_geopass.Text = "" End If p_pideGeoPass.Visible = False ime.HideKeyboard @@ -4153,6 +4152,24 @@ Sub JobDone(Job As HttpJob) LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211110 If Job.JobName = "DBRequest" Then Dim result As DBResult = reqManager.HandleJob(Job) + If result.Tag = "bypass" Then 'query tag + Log("SIN REGISTROS " & result.Rows.Size) + Subs.logJobDoneResultados(result) + If result.Rows.Size = 1 Then + m_lat = Starter.lat_gps + m_lon = Starter.lon_gps + GPS_LocationChanged(Starter.ubicacionActual) + Starter.skmt.ExecNonQuery($"update kmt_info set CAT_CL_LAT = '${Starter.lat_gps}', CAT_CL_LONG = '${Starter.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) + else if result.Rows.Size = 0 Then + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "select_geoPass" + cmd.Parameters = Array As Object(et_geopass.Text.Trim, Subs.traeAlmacen, Subs.traeRuta) + reqManager.ExecuteQuery(cmd , 0, "traeGeoPass") + Log($"${Starter.DBReqServer}, ${et_geopass.Text}, ${Subs.traeAlmacen}, ${Subs.traeRuta}"$) + et_geopass.Text = "" + End If + End If If result.Tag = "traeGeoPass" Then 'query tag Log("SIN REGISTROS " & result.Rows.Size) If result.Rows.Size = 0 Then MsgboxAsync("ContraseƱa equivocada, por favor intente de nuevo.", "ATENCION") @@ -4170,7 +4187,7 @@ Sub JobDone(Job As HttpJob) cmd.Initialize cmd.Name = "delete_geoPass" cmd.Parameters = Array As Object( Subs.traeAlmacen, Subs.traeRuta) - reqManager.ExecuteQuery(cmd , 0, "traeGeoPass") + reqManager.ExecuteCommand(cmd , "borraGeoPass") End If Next End If diff --git a/B4A/DBRequestManager.bas b/B4A/DBRequestManager.bas index 2c85e93..9d1cab4 100644 --- a/B4A/DBRequestManager.bas +++ b/B4A/DBRequestManager.bas @@ -344,6 +344,7 @@ Sub trackInit 'ignore inicioJobDoneMap.Initialize End Sub + Sub trackNext(job As HttpJob) If reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos. Private quitamos As String = "" @@ -357,6 +358,6 @@ Sub trackNext(job As HttpJob) quitamos = $"Quitamos ${job.tag} - "$ End If If logger Then LogColor(">>>>>> Requests: " & reqsList.Size & " - " & quitamos & reqsList, Colors.Blue) - if logger then LogColor(">>>>>> inicioRequestMap:" & inicioRequestMap.Size & " - " & inicioRequestMap, Colors.Magenta) + If logger Then LogColor(">>>>>> inicioRequestMap:" & inicioRequestMap.Size & " - " & inicioRequestMap, Colors.Magenta) End If End Sub \ No newline at end of file diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 52b6f18..b568616 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -907,7 +907,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 5.03.25 + #VersionName: 5.04.08 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 9fc2d0e..ed638ca 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=foto,btnTakePicture_Click,166,0,Main,Process_Globals,21,0,C_Cliente,B4XPage_Appear,758,1,Subs,revisaPromoPorMonto,1928,0,Subs,generaGUID_EnExterno,1912,0,Subs,parseHTTPError,1924,0,Subs,revisaHora,1960,0,C_Productos,b_prodMenos_Click,617,0,C_Productos,b_prodMas_Click,639,6,C_Productos,et_pCant_TextChanged,748,6,C_Productos,et_pCant_FocusChanged,846,0 +NavigationStack=C_Productos,b_prodMas_Click,639,6,C_Productos,et_pCant_TextChanged,748,6,C_Productos,et_pCant_FocusChanged,846,0,C_Principal,Class_Globals,0,0,C_Principal,cargar_Click,757,0,C_Principal,JobDone,2099,0,DBRequestManager,trackNext,342,0,DBRequestManager,trackInit,333,0,C_Cliente,p_pideGeoPass_Click,4106,0,C_Cliente,b_geopass_Click,4129,6 SelectedBuild=0 -VisibleModules=1,28,11,3,29,12,7,9 +VisibleModules=1,28,11,3,29,12,7,9,17