diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 42f190d..1e1e38c 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -29,7 +29,6 @@ Sub Class_Globals Dim tipo_venta As String = "PREVENTA" Dim MAC_IMPRESORA As String - Dim c As Cursor Dim s As Cursor Dim DD As Cursor diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 834f5b6..0e3188e 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -8,6 +8,7 @@ Sub Class_Globals Private Root As B4XView 'ignore Private xui As XUI 'ignore Dim conectado As String + Dim reqManager As DBRequestManager Dim t1 As Timer Dim sb As StringBuilder Dim PHONE As Phone @@ -304,6 +305,7 @@ End Sub Sub B4XPage_Appear p_principal.Visible = True + reqManager.Initialize(Me, Starter.server) HORAINGRESO ="000000" Btn_Ubicar.Left = (Root.Width/2) - (Btn_Ubicar.Width/2) ' B4XPages.MainPage.reqManager.Initialize(Me, B4XPages.MainPage.SERVER) @@ -1613,7 +1615,7 @@ Sub connecta_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_version_GV2" - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "version") + reqManager.ExecuteQuery(cmd , 0, "version") ' Cuando nos conectamos verificamos que el usuario guardado en BD sea VALIDO. c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO, PASS from usuarioa") c.Position=0 @@ -1621,9 +1623,9 @@ Sub connecta_Click Private usrT As String = c.GetString("USUARIO") Private passT As String = c.GetString("PASS") cmd.Initialize - cmd.Name = "select_usuario_guna_GV2_1" + cmd.Name = "select_usuario_guna_GV2_10" cmd.Parameters = Array As Object(usrT, passT) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "usuarioA") + reqManager.ExecuteQuery(cmd , 0, "usuarioA") End If c.Close @@ -1631,13 +1633,13 @@ Sub connecta_Click cmd.Initialize cmd.Name = "select_ruta_GV2_70" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") + reqManager.ExecuteQuery(cmd , 0, "ruta") Else Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_ruta_GV2_70" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") + reqManager.ExecuteQuery(cmd , 0, "ruta") End If If e_ruta.Text = "KMTS1" Then diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 40a2f17..a91ca03 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -455,7 +455,7 @@ Sub b_prodMenos_Click Dim laCant As B4XView = pnl.GetView(2).GetView(3) ' Log($"precio|stock:${laCant.tag}"$) If laCant.Text = "" Then laCant.Text = 0 - laCant.Text = $"$1.0{laCant.Text-1}"$ + laCant.Text = NumberFormat2(laCant.Text - 1, 1, 0, 0, False) If laCant.Text < 0 Then laCant.Text = 0 ' Dim chk As B4XView = pnl.GetView(2) cuentaProds @@ -474,7 +474,7 @@ Sub b_prodMas_Click ' Log(laCant.Tag&"|"&esteTag) If laCant.Text = "" Then laCant.Text = 0 If laCant.Text + 1 <= esteTag.get(1) Then - laCant.Text = $"$1.0{laCant.Text+1}"$ + laCant.Text = NumberFormat2(laCant.Text + 1, 1, 0, 0, False) cuentaProds End If ' Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$) @@ -496,7 +496,7 @@ Sub cuentaProds If cant1.Text = "" Then cant1.Text = 0 ' Private cant2 As Int = 0 ' If cant1.Text <> "" Then cant2 = cant1.Text - totalProds = totalProds + cant1.Text + totalProds = totalProds + NumberFormat2(cant1.Text, 1, 0, 0, False) Private esteTag As List = Regex.Split("\|", cant1.Tag) If cant1.Text > esteTag.Get(1) Then cant1.Text = esteTag.Get(1) If cant1.Text > 0 Then diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index 068827f..0221d06 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -117,30 +117,28 @@ FileGroup8=Default Group FileGroup9=Default Group Group=Default Group Library1=appupdating -Library10=firebaseadmob -Library11=firebaseanalytics -Library12=firebasenotifications -Library13=fusedlocationprovider -Library14=googlemaps -Library15=googlemapsextras -Library16=gps -Library17=ime -Library18=javaobject -Library19=jhsicezxing1 +Library10=fileprovider +Library11=firebaseadmob +Library12=firebaseanalytics +Library13=firebasenotifications +Library14=fusedlocationprovider +Library15=googlemaps +Library16=googlemapsextras +Library17=gps +Library18=ime +Library19=javaobject Library2=b4xpages -Library20=json -Library21=okhttputils2 -Library22=phone -Library23=randomaccessfile -Library24=rspopupmenu -Library25=serial +Library20=jhsicezxing1 +Library21=json +Library22=okhttputils2 +Library23=phone +Library24=randomaccessfile +Library25=rspopupmenu Library26=sql Library27=togglelibrary -Library28=xcustomlistview -Library29=xui +Library28=xui views +Library29=serial Library3=baqrcode -Library30=xui views -Library31=fileprovider Library4=batteryprogressview Library5=bitmapcreator Library6=byteconverter @@ -171,9 +169,9 @@ Module7=C_Mapas Module8=C_Nota Module9=C_NoVenta NumberOfFiles=58 -NumberOfLibraries=31 +NumberOfLibraries=29 NumberOfModules=22 -Version=12.5 +Version=11.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Guna V3.1 diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 8fb5cfe..8e8c42a 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=1,2,3,4,6,7,8,10,11,12,13,14,15 +ModuleClosedNodes12=2,3,6,8,10,11,12,13,14,15 ModuleClosedNodes13=1 ModuleClosedNodes14= ModuleClosedNodes15= @@ -56,7 +56,7 @@ ModuleClosedNodes16= ModuleClosedNodes17= ModuleClosedNodes18= ModuleClosedNodes19= -ModuleClosedNodes2=2,3,5,6,9 +ModuleClosedNodes2=6,9 ModuleClosedNodes20=1 ModuleClosedNodes21= ModuleClosedNodes22= @@ -67,6 +67,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,ListView1_ItemLongClick,583,0,C_Cliente,gest_Click,587,0,C_Cliente,b_preguntag_Click,723,0,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,76,0,C_Cliente,Class_Globals,117,0,C_Cliente,b_like_Click,1523,0,C_Cliente,B_GUARDA_C_Click,1448,0,Visual Designer,cliente.bal,-100,6,C_Cliente,B4XPage_Appear,547,6,MAPA_RUTAS,MapFragment1_Ready,203,3 +NavigationStack=C_Principal,B4XPage_Appear,306,0,C_Cliente,B_GUARDA_C_Click,1448,0,Visual Designer,cliente.bal,-100,6,C_Cliente,B4XPage_Appear,547,6,MAPA_RUTAS,MapFragment1_Ready,203,3,Starter,ENVIA_ULTIMA_GPS,69,0,C_Cliente,Class_Globals,17,0,C_Principal,connecta_Click,1633,0,C_Productos,cuentaProds,492,2,C_Productos,b_prodMas_Click,470,0,C_Productos,b_prodMenos_Click,451,0 SelectedBuild=0 -VisibleModules=20,2,21,12,13,4,8,11,5,10,19 +VisibleModules=20,2,21,12,13,4,8,11,5,10,19,17