diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 59975b6..ab67706 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -229,6 +229,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + reqManager.Initialize(Me, Starter.server) If Starter.muestraProgreso = 1 Then muestraProgreso("Descargando actualización") Starter.muestraProgreso = 0 @@ -254,7 +255,6 @@ Sub B4XPage_Appear ToastMessageShow("No permission", True) End If server = Starter.server - reqManager.Initialize(Me, Starter.server) tgl.Initialize() If Not(Starter.gps.GPSEnabled) Then ToastMessageShow("Es necesario tener el GPS encendido", True) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 8db56df..ea1429f 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -798,30 +798,41 @@ Private Sub b_preguntag_Click - If ALMACEN = "35" Or ALMACEN = "43" Or ALMACEN = "54" Or ALMACEN = "73" Or ALMACEN = "56" Then 'ALMACEN = "7" Then ' - ''Or ALMACEN = "56" ATIZAPAN PEDIGRI - p_pregunta1.Visible = False - SV_ENCUESTA.Visible = True - SV_ENCUESTA.Panel.LoadLayout("ENCUESTA_PED") - SV_ENCUESTA.Panel.Height = Panel4.Height - Panel4.Visible = True - b_like.Visible = False - BT_QR.Visible = False - B_GALLINA.Visible = False - Tar.Visible = False - Tels.Visible = False - gest.Visible = False - b_venta.Visible = False - Guardar.Visible = False - HIST.Visible = False - - - Else +' If ALMACEN = "35" Or ALMACEN = "43" Or ALMACEN = "54" Or ALMACEN = "73" Or ALMACEN = "56" Then 'ALMACEN = "7" Then ' +' ''Or ALMACEN = "56" ATIZAPAN PEDIGRI +' p_pregunta1.Visible = False +' SV_ENCUESTA.Visible = True +' SV_ENCUESTA.Panel.LoadLayout("ENCUESTA_PED") +' SV_ENCUESTA.Panel.Height = Panel4.Height +' Panel4.Visible = True +' b_like.Visible = False +' BT_QR.Visible = False +' B_GALLINA.Visible = False +' Tar.Visible = False +' Tels.Visible = False +' gest.Visible = False +' b_venta.Visible = False +' Guardar.Visible = False +' HIST.Visible = False +' +' +' Else If que_modulo = Null Or que_modulo = " " Then que_modulo = "1" ' Msgbox(que_modulo,"ALO") If que_modulo < = ENCUESTA Then If que_modulo = "1" Then + + If p_m2.IsInitialized And p_m2.Visible Then + p_m2.Visible = False + Else If p_m3.IsInitialized And p_m3.Visible Then + p_m3.Visible = False + Else If p_m4.IsInitialized And p_m4.Visible Then + p_m4.Visible = False + Else If p_modulo5.IsInitialized And p_modulo5.Visible Then + p_modulo5.Visible = False + Else + End If ' esto para la primera encuesta m1 p_pregunta1.Visible = False p_cliente.Visible = False @@ -955,7 +966,7 @@ Private Sub b_preguntag_Click End If - End If +' End IF Case DialogResponse.NEGATIVE @@ -2152,8 +2163,8 @@ Private Sub B_guardaencuesta_m3_Click Private P9_M3 As String = "" - If et_p1_m3.Text = "" Then PASA = "0" - If et_p2_m3.Text = "" Then PASA = "0" +' If et_p1_m3.Text = "" Then PASA = "0" +' If et_p2_m3.Text = "" Then PASA = "0" If rd1_p5_m3.Checked Then P5_M3 = "SI" If rd2_p5_m3.Checked Then P5_M3 = "NO" @@ -2213,7 +2224,7 @@ Private Sub B_guardaencuesta_m3_Click ' skmt.ExecNonQuery2("INSERT INTO ENCUESTA_MODULO2 (CLIENTE, ALMACEN,P1, P2, P3, P4, P5, P6) VALUES (?,?,?,?,?,?,?,?)", Array As Object(Subs.traeCliente, ALMACEN,et_p1_m2.Text,et_p2_m2.Text,P3_M2,P4_M2,et_p5_m2.Text,"MODULO_3" )) - skmt.ExecNonQuery2("INSERT INTO ENCUESTA_MODULO3 (CLIENTE, ALMACEN,P1, P2, P3, P4, P5, P6,P7,P8,P9,P10,P11) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(Subs.traeCliente, ALMACEN,et_p1_m3.Text,et_p2_m3.Text,P3_M3,P4_M3,textemp4,textemp5,P5_M3,textemp6,textemp7, textemp8, P9_M3)) + skmt.ExecNonQuery2("INSERT INTO ENCUESTA_MODULO3 (CLIENTE, ALMACEN,P1, P2, P3, P4, P5, P6,P7,P8,P9,P10,P11) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(Subs.traeCliente, ALMACEN,"x","x",P3_M3,P4_M3,textemp4,textemp5,P5_M3,textemp6,textemp7, textemp8, P9_M3)) SV_ENCUESTA.Visible = False p_cliente.Visible = True ' B4XPages.MainPage.tipo_venta = "PREVENTA" @@ -2514,22 +2525,22 @@ End Sub ' FIN P7 M1 ''aqui -Private Sub et_p1_m3_TextChanged (Old As String, New As String) - If et_p1_m3.Text.Length > 2 Or et_p1_m3.Text = 0 Then - - Msgbox("Valida tu respuesta, dato no valido","Aviso") - et_p1_m3.Text = "" - End If -End Sub +'Private Sub et_p1_m3_TextChanged (Old As String, New As String) +' If et_p1_m3.Text.Length > 2 Or et_p1_m3.Text = 0 Then +' +' Msgbox("Valida tu respuesta, dato no valido","Aviso") +' et_p1_m3.Text = "" +' End If +'End Sub -Private Sub et_p2_m3_TextChanged (Old As String, New As String) - If et_p2_m3.Text.Length > 2 Or et_p2_m3.Text = 0 Then - - Msgbox("Valida tu respuesta, dato no valido","Aviso") - et_p2_m3.Text = "" - - End If -End Sub +'Private Sub et_p2_m3_TextChanged (Old As String, New As String) +' If et_p2_m3.Text.Length > 2 Or et_p2_m3.Text = 0 Then +' +' Msgbox("Valida tu respuesta, dato no valido","Aviso") +' et_p2_m3.Text = "" +' +' End If +'End Sub Private Sub et_p1_m2_TextChanged (Old As String, New As String) If et_p1_m2.Text.Length > 2 Or et_p1_m2.Text = 0 Then diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index b0bb147..07283ca 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -867,7 +867,7 @@ Sub cargar_Click cmd.Initialize cmd.Name = "select_cat_clientes_guna_GV2" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos2") cmd.Initialize cmd.Name = "select_hist_datos_GV2" @@ -911,7 +911,7 @@ Sub cargar_Click B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "marcas_rutas") cmd.Initialize - cmd.Name = "select_CUEST_GV2" + cmd.Name = "select_CUEST2_GV2" cmd.Parameters = Array As Object(ALMACEN) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO") @@ -1006,7 +1006,7 @@ Sub JobDone(Job As HttpJob) Dim CAT_CL_LAT As String = records(RESULT.Columns.Get("CAT_CL_LAT")) Dim CAT_CL_MTOCOMPRA As String = records(RESULT.Columns.Get("CAT_CL_MTOCOMPRA")) Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO")) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,e_ruta.Text,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO, HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO)) Next Listo1 = 1 @@ -1019,6 +1019,38 @@ Sub JobDone(Job As HttpJob) End If End If End If + + If Job.JobName = "DBRequest" Then + Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + If RESULT.Tag = "kmt_datos2" Then 'query tag + S_CC.TEXT = "CARGANDO" + For Each records() As Object In RESULT.Rows + Dim CAT_CL_CODIGO As String = records(RESULT.Columns.Get("CAT_CL_CODIGO")) + Dim CAT_CL_RUTA As String = records(RESULT.Columns.Get("CAT_CL_RUTA")) + Dim CAT_CL_NOMBRE As String = records(RESULT.Columns.Get("CAT_CL_NOMBRE")) + Dim CAT_CL_ATIENDE1 As String = records(RESULT.Columns.Get("CAT_CL_ATIENDE1")) + Dim CAT_CL_ATIENTE2 As String = records(RESULT.Columns.Get("CAT_CL_ATIENTE2")) + Dim CAT_CL_TELEFONO As String = records(RESULT.Columns.Get("CAT_CL_TELEFONO")) + Dim CAT_CL_EMAIL As String = records(RESULT.Columns.Get("CAT_CL_EMAIL")) + Dim CAT_CL_CALLE As String = records(RESULT.Columns.Get("CAT_CL_CALLE")) + Dim CAT_CL_NOEXT As String = records(RESULT.Columns.Get("CAT_CL_NOEXT")) + Dim CAT_CL_NOINT As String = records(RESULT.Columns.Get("CAT_CL_NOINT")) + Dim CAT_CL_CALLE1 As String = records(RESULT.Columns.Get("CAT_CL_CALLE1")) + Dim CAT_CL_CALLE2 As String = records(RESULT.Columns.Get("CAT_CL_CALLE2")) + Dim CAT_CL_COLONIA As String = records(RESULT.Columns.Get("CAT_CL_COLONIA")) + Dim CAT_CL_MUNI As String = records(RESULT.Columns.Get("CAT_CL_MUNI")) + Dim CAT_CL_EDO As String = records(RESULT.Columns.Get("CAT_CL_EDO")) + Dim CAT_CL_CP As String = records(RESULT.Columns.Get("CAT_CL_CP")) + Dim CAT_CL_LONG As String = records(RESULT.Columns.Get("CAT_CL_LONG")) + Dim CAT_CL_LAT As String = records(RESULT.Columns.Get("CAT_CL_LAT")) + Dim CAT_CL_MTOCOMPRA As String = records(RESULT.Columns.Get("CAT_CL_MTOCOMPRA")) + Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO")) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,E_RUTA2.Text,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO, HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO)) + Next + + End If + End If If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index c368a49..338047d 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -300,7 +300,7 @@ Sub llenaCatalogo(limpiar As Boolean) order by Case CAT_GP_TIPOPROD when 'PRIORITARIO' THEN 0 WHEN 'ESTRATEGICO' THEN 1 - WHEN 'CATALOGO REGULAR' then 2 + WHEN 'COMPLEMENTARIO' then 2 Else 3 End, CAT_GP_NOMBRE"$) diff --git a/B4A/Files/encuessta_m3.bal b/B4A/Files/encuessta_m3.bal index 25448ca..8f29097 100644 Binary files a/B4A/Files/encuessta_m3.bal and b/B4A/Files/encuessta_m3.bal differ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index 31d0de9..f85f65a 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -180,7 +180,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Guna V3.1 #VersionCode: 1 - #VersionName: 4.01.09ENC + #VersionName: 4.01.19_1ENC '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 1c6e825..59ac547 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -48,7 +48,7 @@ ModuleClosedNodes0= ModuleClosedNodes1=5,7,8,9,10,11,12,13,14 ModuleClosedNodes10= ModuleClosedNodes11=6 -ModuleClosedNodes12=2,3,6,8,10,11,13,14,15 +ModuleClosedNodes12=2,3,8,10,11,13,14,15 ModuleClosedNodes13=6,8,10,11,12,13,14,15,16,17,18,19,20,21,22,23 ModuleClosedNodes14= ModuleClosedNodes15= @@ -67,6 +67,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,hayPedido,676,0,Visual Designer,productos.bal,-100,1,C_Productos,BUSCA_TextChanged,381,0,C_Productos,b_buscar_Click,643,0,C_Productos,B4XPage_Appear,129,1,C_Productos,B4XPage_Created,68,0,C_Productos,Class_Globals,29,4,C_Productos,lv_catalogos_ItemClick,195,1,C_Productos,llenaCatalogo,298,6 +NavigationStack=C_Principal,Class_Globals,0,0,Diseñador Visual,ENCUESSTA_M3.bal,-100,3,C_Cliente,B_guardaencuesta_m3_Click,2159,6,C_Cliente,p6_TextChanged,2500,0,C_Principal,cargar_Click,907,0,C_Cliente,p8_TextChanged,2529,0,C_Cliente,b_preguntag_Click,794,1,Main,Globals,24,0,C_Principal,JobDone,1018,2,C_Cliente,B_guardaencuesta_m2_Click,2093,0 SelectedBuild=0 VisibleModules=20,2,21,12,13,4,8,11,5,10