diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index e64d076..ea13ec8 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -94,6 +94,7 @@ Sub Class_Globals Dim kh As kms_helperSubs Private p_login As Panel Private l_version As Label + End Sub Public Sub Initialize diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 6dde6ea..00596e6 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -132,6 +132,17 @@ Sub Class_Globals Private Label26 As Label Dim impresoraConectada As Boolean = False Dim printer As TextWriter + Private b_guadaenc As Button + Private cb_pregunta8 As B4XComboBox + Private rb_p7si As RadioButton + Private rb_p7no As RadioButton + Private et_pregunta6 As EditText + Private et_pregunta5 As EditText + Private et_pregunta4 As EditText + Private et_pregunta3 As EditText + Private et_pregunta2 As EditText + Private cb_pregunta1 As B4XComboBox + Private Label1 As Label End Sub Sub initialize @@ -184,6 +195,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Panel1.Top = La_nombre.Top + La_nombre.Height + 5 : Panel1.left = 0 Panel9.Top = La_nombre.Top + La_nombre.Height + 5 : Panel9.left = 0 Panel10.Top = La_nombre.Top + La_nombre.Height + 5 : Panel10.left = 0 + End Sub Sub B4XPage_Appear @@ -319,6 +331,16 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) End Sub Sub gest_Click +'' 1=1 ----> si no esta en el historico que se descargue del web ver si esta contestada de manera local +' If 1 = 1 Then +' '2=2 ----> si no esta en el historico local mostrar encuesta +' c = Starter.skmt.ExecQuery2("SELECT DISTINCT HE_CLIE FROM HIST_ENCUESTA WHERE HE_CLIE IN(SELECT CUENTA FROM CUENTAA) ",Array As String()) +' If Then +' +' End If +' Else +' +'' End If Starter.tipov = "PREVENTA" B4XPages.ShowPage("Productos") ' StartActivity(colonia2) @@ -1246,4 +1268,12 @@ Sub b_chk_e_Click Starter.tipov = "VENTA" 'TOMAR_FOTO = 1 cuestionario +End Sub + +Private Sub cb_pregunta1_SelectedIndexChanged (Index As Int) + +End Sub + +Private Sub cb_pregunta8_SelectedIndexChanged (Index As Int) + End Sub \ No newline at end of file diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 1c09876..766cd53 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -435,7 +435,7 @@ Sub trabajar_Click MARCASQ = c.GetString("CAT_VA_VALOR") c.Close skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &")" ) - skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_ID IN (SELECT CAT_DP_ID FROM CAT_DETALLES_PAQ WHERE CAT_DP_IDPROD NOT IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD))") + skmt.ExecNonQuery("delete from CAT_GUNAPROD2 WHERE CAT_GP_ID IN (SELECT CAT_DP_ID FROM CAT_DETALLES_PAQ WHERE CAT_DP_IDPROD NOT IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD2) and CAT_DP_TIPO = 0)") ' StartActivity(colonia) B4XPages.ShowPage("Clientes") diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 1fbbfc3..66c858c 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -643,7 +643,6 @@ Sub b_prodMas_Click Dim pnl As B4XView = pnl0.GetView(0) Dim lProdX As B4XView = pnl.GetView(1) Private existencias As String = lProdX.tag.As(Map).Get("almacen") - Log(1) LogColor(clv_prods_ll.GetValue(index).As(Map), Colors.blue) ' LogColor(lProdX.tag.As(Map), Colors.red) @@ -654,7 +653,10 @@ Sub b_prodMas_Click Private precio As String = tmpMap.Get("precio") Private precio2 As String = precio Private inv As Int = tmpMap.Get("almacen") -' Log(tmpMap) + inv = Subs.traeInventario(tmpMap.Get("id"), Starter.tipov) + Private rmis As String = kh.traeRMIdePedido(tmpMap.Get("id")) + Log($"${laCant.Text} + 1 <= ${inv} = ${(laCant.Text + 1) <= (inv)}"$) + Log($"RMIS: ${kh.traeRMIdePedido(tmpMap.Get("id"))}"$) If buttonTag = "vendido" Then ' Log("VENDIDO") ' Log($"${(laCant.Text + 1 <= inv)} And ${(Subs.totalPedido - precio > 1)}"$) @@ -666,7 +668,7 @@ Sub b_prodMas_Click laCant.Text = NumberFormat2((laCant.Text + 1), 1, 0, 0, False) ' Log(clv_prods_ll.GetValue(index).As(Map)) End If - else If laCant.Text + 1 <= inv And (lfila.Text = "PRODUCTOS" Or lfila.Text = "CATALOGO") Then + else If (inv > 0) And (lfila.Text = "PRODUCTOS" Or lfila.Text = "CATALOGO") Then ' LogColor(inv, Colors.blue) ' laCant.Text = $"$1.0{laCant.Text + 1}"$ laCant.Text = NumberFormat2((laCant.Text + 1), 1, 0, 0, False) @@ -1144,7 +1146,7 @@ Private Sub l_prodX_LongClick Private pId As String = clv_prods_ll.GetValue(index).As(Map).Get("id") Log(clv_prods_ll.GetValue(index)) Private pNombre As String = clv_prods_ll.GetValue(index).As(Map).Get("prod") - Private t As Cursor = Starter.skmt.ExecQuery($"select sum(PE_CANT) as cuantosProds from pedido where PE_PROID = '${pId}' and PE_CEDIS <> 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) + Private t As Cursor = Starter.skmt.ExecQuery($"select sum(PE_CANT) as cuantosProds from pedido where PE_CEDIS <> 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) t.Position = 0 Private ventaT As String = t.GetString("cuantosProds") If ventaT = Null Then ventaT = 0 diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 44af97a..bb9ce4f 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -48,7 +48,7 @@ ModuleBreakpoints8= ModuleBreakpoints9= ModuleClosedNodes0= ModuleClosedNodes1= -ModuleClosedNodes10=1,3,7,31,35,36,37,38,39,40,41,42 +ModuleClosedNodes10=1,3,7,35,36,37,38,39,40,41,42 ModuleClosedNodes11= ModuleClosedNodes12= ModuleClosedNodes13= @@ -70,6 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=1,3 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=B4XMainPage,B4XPage_Appear,193,0,C_Principal,B4XPage_Appear,409,6,C_Principal,connecta_Click,1876,0,Diseñador Visual,encuesta.bal,-100,2,C_Principal,cargar_Click,842,0,C_Principal,B4XPage_CloseRequest,1863,0,C_Principal,IsConnectedToInternet,257,0,Tracker,flp_LocationChanged,175,0,Starter,Timer1_Tick,69,6,Starter,ENVIA_ULTIMA_GPS,109,6 +NavigationStack=kms_helperSubs,traeRMIdePedido,548,0,C_Productos,B4XPage_Appear,148,0,C_Productos,b_prodMas_Click,714,0,C_Productos,l_prodX_Click,1093,0,C_Productos,l_prodX_LongClick,1142,0,C_Principal,B4XPage_Appear,409,0,C_Principal,trabajar_Click,431,3,Diseñador Visual,encuesta.bal,-100,4,Diseñador Visual,Cliente.bal,-100,6,C_Cliente,gest_Click,334,6 SelectedBuild=0 VisibleModules=21,2,9,18,7,4,10,22,11,23,15,1,13 diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 64fea75..f352e1e 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/encuesta.bal b/B4A/Files/encuesta.bal index d1473a6..669ebe9 100644 Binary files a/B4A/Files/encuesta.bal and b/B4A/Files/encuesta.bal differ diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas index f6b64bb..1ebd81d 100644 --- a/B4A/kms_helperSubs.bas +++ b/B4A/kms_helperSubs.bas @@ -543,6 +543,17 @@ Sub StartBluetooth 'ignore Log($"BTADMIN: ${btAdmin.IsEnabled}"$) End Sub +'Regresa el total de RMI de un producto dado. +Sub traeRMIdePedido(idProd As String) As String + Private cant As String = 0 + Private c As Cursor = Starter.skmt.ExecQuery($"select PE_CANT from pedido where PE_CEDIS = 'DUR' and PE_PROID = '${idProd}' and PE_CLIENTE in (select CUENTA from CUENTAA)"$) + If c.RowCount > 0 Then + c.Position = 0 + cant = c.GetString("PE_CANT") + End If + Return cant +End Sub + Sub EnableBluetooth As ResumableSub ToastMessageShow("Enabling Bluetooth adapter...", False) Private ph As Phone