diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 50ad9b4..b88f5d1 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -95,6 +95,8 @@ Sub Class_Globals Dim intentUsado As Boolean = False Private p_importarBDWA As Panel Private cb_importarBDWA As CheckBox + + Dim pkg As PackageManager End Sub Public Sub Initialize @@ -184,6 +186,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("PEDIDO", "PE_RECALCULO", "TEXT") Subs.agregaColumna("PEDIDO", "PE_RECALCULOTOT", "TEXT") Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "TEXT") + Subs.agregaColumna("kmt_info2", "encuesta", "TEXT") Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna "P10" en la tabla c=skmt.ExecQuery("SELECT COUNT(*) AS fCol FROM pragma_table_info('ENCUESTA_MODULO3') WHERE name='P10'") c.Position = 0 @@ -511,6 +514,26 @@ Sub JobDone(Job As HttpJob) Next End If End If + + If Job.JobName = "DBRequest" Then + Dim result1 As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + If result1.Tag = "CHECAENCUESTA" Then 'query tag + For Each records() As Object In result1.Rows + Dim CUANTOSENCUESTA As String = records(result1.Columns.Get("CUANTOS")) + Log(CUANTOSENCUESTA) + Next + Dim sDate,sTime As String + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + If CUANTOSENCUESTA = "0" Then + cmd.Initialize + cmd.Name ="insert_drop_GV2_4" + cmd.Parameters = Array As Object(usuario,Subs.traeRuta,sDate,"",sTime,"","","","","ENCUESTA",almacen,Application.VersionName,Starter.encuesta) + B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop") + End If + End If + End If If Job.JobName = "DBRequest" Then Dim result As DBResult = reqManager.HandleJob(Job) @@ -812,9 +835,9 @@ Sub b_regesar_Click Starter.reqManager.Initialize(Me, et_server.Text) End Sub -Sub i_engrane_LongClick - copiaDB -End Sub +'Sub i_engrane_LongClick +' copiaDB +'End Sub Private Sub lv_server_ItemClick (Position As Int, Value As Object) Starter.server = Value @@ -1027,4 +1050,16 @@ Private Sub cb_importarBDWA_CheckedChange(Checked As Boolean) ' LogColor($"cb_importarBDWA_CheckedChange = ${Checked}"$, Colors.Red) Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'IMPORTAR_BD_WA'") Starter.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('IMPORTAR_BD_WA', '${Checked}')"$) +End Sub + + +Private Sub i_engrane_LongClick + Dim Intent1 As Intent + Intent1.Initialize(Intent1.ACTION_VIEW, "guna://tienda360/config?clienteId=12&almacen=45&ruta=143") + Try + StartActivity(Intent1) + Catch +' Log(LastException) + ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True) + End Try End Sub \ No newline at end of file diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 2f4dc7d..de9fc91 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1231,6 +1231,26 @@ Sub JobDone(Job As HttpJob) Next End If End If + +' If Job.JobName = "DBRequest" Then +' Dim result1 As DBResult = reqManager.HandleJob(Job) +' If result1.Tag = "CHECAENCUESTA" Then 'query tag +' Log("SIN REGISTROS " & result1.Rows.Size) +' +' For Each records() As Object In result1.Rows +' Dim CUANTOSENCUESTA As String = records(result1.Columns.Get("CUANTOS")) +' Log(CUANTOSENCUESTA) +' If CUANTOSENCUESTA = "0" Then +' cmd.Initialize +' cmd.Name ="insert_drop_GV2_4" +' cmd.Parameters = Array As Object(usuario,B4XPages.MainPage.principal.e_ruta.text,sDate,"",sTime,"","","","","ENCUESTA",ALMACEN,Application.VersionName,Starter.encuesta) +' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop") +' End If +' Next +' End If +' End If + + End If Job.Release End Sub @@ -1240,6 +1260,52 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) End Sub Sub gest_Click + + c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info2 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + c.Position = 0 + If c.GetString("encuesta") = "0" Then + Dim Intent1 As Intent + Dim enviorutas As String = "guna://tienda360/config?clienteId="&la_cuenta.Text&"&almacen="&ALMACEN&"&ruta="&Subs.traeRuta + Log(enviorutas) + Intent1.Initialize(Intent1.ACTION_VIEW, enviorutas) + Try + Starter.encuesta = 1 + + Dim cmd As DBCommand + + + + + + + skmt.ExecNonQuery2("UPDATE kmt_info2 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) + StartActivity(Intent1) + compra + Catch + + + Starter.encuesta = 0 + Dim cmd As DBCommand + + + + skmt.ExecNonQuery2("UPDATE kmt_info2 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2)) + ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True) + compra + End Try + cmd.Initialize + cmd.Name = "SELECT_TMP_DROP_ENCUESTA_GUNA" + cmd.Parameters = Array As Object(usuario, B4XPages.MainPage.principal.e_ruta.text, ALMACEN, "ENCUESTA") + B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CHECAENCUESTA") + + Else + compra + End If + +End Sub + +Sub compra + ' If ALMACEN = "4" Or ALMACEN = "36" Then ' Log(Subs.traeAlmacen) @@ -1262,7 +1328,7 @@ Sub gest_Click ' ALMACEN = 79 ' LA_RUTA = 732 -' Or (ALMACEN = 79 And rutasEncuesta.IndexOf(LA_RUTA.As(Int)) > -1) + ' Or (ALMACEN = 79 And rutasEncuesta.IndexOf(LA_RUTA.As(Int)) > -1) ' Encuesta Pedigree ' If (alamcenesEncuesta.IndexOf(ALMACEN.As(Int)) > -1 ) Or (ALMACEN = 6 And LA_RUTA = 3) Then @@ -1409,6 +1475,9 @@ Sub gest_Click 'Else ' B4XPages.ShowPage("productos") 'End If + + + End Sub diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 036110f..f05bf12 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1223,6 +1223,26 @@ Sub JobDone(Job As HttpJob) 'Log("***************** "&n) End If End If + + If Job.JobName = "DBRequest" Then + Dim result1 As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + If result1.Tag = "CHECAENCUESTA" Then 'query tag + For Each records() As Object In result1.Rows + Dim CUANTOSENCUESTA As String = records(result1.Columns.Get("CUANTOS")) + Log(CUANTOSENCUESTA) + Next + Dim sDate,sTime As String + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + If CUANTOSENCUESTA = "0" Then + cmd.Initialize + cmd.Name ="insert_drop_GV2_4" + cmd.Parameters = Array As Object(usuario,B4XPages.MainPage.principal.e_ruta.text,sDate,"",sTime,"","","","","ENCUESTA",ALMACEN,Application.VersionName,Starter.encuesta) + B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop") + End If + End If + End If If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) @@ -2891,4 +2911,5 @@ Private Sub b_abordo_Click Starter.skmt.ExecNonQuery($"delete from cuentaa"$) Starter.skmt.ExecNonQuery($"insert into cuentaa (cuenta) values ('0')"$) B4XPages.ShowPage("Cliente") -End Sub \ No newline at end of file +End Sub + diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index 1afc5ef..96d3a8a 100644 Binary files a/B4A/Files/login.bal and b/B4A/Files/login.bal differ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index 72f4550..0657757 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -255,7 +255,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 5.01.28 + #VersionName: 5.01.30 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 26ff3ed..10f645e 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -69,7 +69,7 @@ ModuleClosedNodes20= ModuleClosedNodes21= ModuleClosedNodes22= ModuleClosedNodes23=3,4 -ModuleClosedNodes24=4,6,7,8,9,10 +ModuleClosedNodes24=4,6,7,8,9 ModuleClosedNodes25= ModuleClosedNodes26= ModuleClosedNodes3= @@ -79,6 +79,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=5,6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Promos,b_terminar1_Click,339,2,Visual Designer,cliente.bal,-100,3,C_Principal,Class_Globals,223,0,Visual Designer,principal.bal,-100,4,C_Principal,B4XPage_Created,253,4,C_Principal,Initialize,242,0,B4XMainPage,Class_Globals,21,0,C_Principal,B4XPage_Appear,442,0,C_Principal,Subir_Click,651,4,DBRequestManager,WriteObject,144,0,C_Cliente,gest_Click,1243,0 +NavigationStack=DBRequestManager,HandleJob,250,0,C_Principal,JobDone,1230,0,C_Principal,Class_Globals,44,0,C_Principal,B4XPage_Created,273,0,B4XMainPage,B4XPage_Created,100,2,B4XMainPage,JobDone,525,4,Starter,Process_Globals,34,0,C_Cliente,JobDone,1236,6,Starter,ENVIA_ULTIMA_GPS,107,0,C_Cliente,gest_Click,1261,6 SelectedBuild=0 -VisibleModules=24,2,14,25,4,5,7,6,15,12,16,20 +VisibleModules=24,2,14,25,4,5,7,6,15,12,20 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 5874dbf..e5e24a2 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -38,6 +38,7 @@ Sub Process_Globals Public newApp As mNewVersion 'Parte de la funcionalidad "appUpdater" Dim nuevoLink As String Dim idCliente As String = "" + Dim encuesta As String = 0 End Sub Sub Service_Create @@ -109,8 +110,8 @@ Sub ENVIA_ULTIMA_GPS ' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "fechat") Dim cmd As DBCommand cmd.Initialize - cmd.Name = "UPDATE_GUNA_ACTUAL2_GPS" - cmd.Parameters = Array As Object(B4XPages.MainPage.montoActual, B4XPages.MainPage.clientestotal, B4XPages.MainPage.clientesventa,B4XPages.MainPage.clientesvisitados,B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,B4XPages.MainPage.batt,0, 0, 0,B4XPages.MainPage.ALMACEN,B4XPages.MainPage.rutapreventa) + cmd.Name = "UPDATE_GUNA_ACTUAL2_GPS2" + cmd.Parameters = Array As Object(B4XPages.MainPage.montoActual, B4XPages.MainPage.clientestotal, B4XPages.MainPage.clientesventa,B4XPages.MainPage.clientesvisitados,B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,B4XPages.MainPage.batt,0, 0, 0,encuesta,B4XPages.MainPage.ALMACEN,B4XPages.MainPage.rutapreventa) ' Log($"montoActual: ${B4XPages.MainPage.montoActual}, cTotal: ${B4XPages.MainPage.clientestotal}, cVenta: ${B4XPages.MainPage.clientesventa}, cVisitados: ${B4XPages.MainPage.clientesvisitados}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}, Batt: ${B4XPages.MainPage.batt}, 0, 0, 0, Almacen: ${B4XPages.MainPage.ALMACEN}, Ruta: ${B4XPages.MainPage.rutapreventa}"$) reqManager.ExecuteCommand(cmd, "actualizaUltimaGPS") skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ? WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))