diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index d5fbc98..0f90122 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1122,14 +1122,16 @@ Sub B_IMP_Click '' Msgbox2Async($"El pedido del cliente ${t.GetString("CAT_CL_CODIGO")} no está impreso, se va a borrar"$, "PEDIDO NO IMPRESO", "Aceptar", "", "", Null, True) ' Next ' End If - + Sleep(1000) - + Starter.skmt.Close : Log("Cerramos BD") : Starter.revisaBD Subs.panelAnchoAlto(Panel_INV_A, Root.Width, Root.Height) Panel_INV_A.Visible = True P_INF_GENERAL.Visible = False If logger Then Log("Panel general="&P_INF_GENERAL.Visible) + L_INVA.Left = 5dip + L_INVA.Width = Root.Width * 0.98 L_INVA.Clear Dim label1 As Label label1 = L_INVA.TwoLinesLayout.Label diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index fcd02a1..3c0e32e 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -98,7 +98,7 @@ Sub Class_Globals Private PORCENTAJE As Int Private P_RESUMEN As Panel Private B_OK_RES As Button - Private Resumen As Button + Dim Resumen As Button Private L_CUANTOST As Label Private img3 As ImageView Private ImageView3 As ImageView @@ -150,7 +150,7 @@ Sub Class_Globals Private Panel2 As Panel Dim ENVIADA As String Dim PORENVIAR As String - Private Btn_CheckList As Button + Dim Btn_CheckList As Button Dim Cedis_Check As String = "0" Private TIEMPO As String Private RUTA1 As Label @@ -274,6 +274,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) L_MONTOD.Text = 0 l_cuantosc.Text = 0 l_cuantosn.Text = 0 + Log(">>>> Ponemos en CERO!!") drop = 0 l_drop.Text = 0 efectiva = 0 @@ -288,7 +289,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) b.Position = 0 L_MONTOD.Text = c.GetString("MONTO_DIA") l_cuantosc.Text = c.GetString("CLIENTES_DIA") - l_cuantosn.Text = b.GetString("CUANTOS") + l_cuantosn.Text = b.GetString("CUANTOS") Try drop = c.GetString("MONTO_DIA") / c.GetString("CLIENTES_DIA") Catch @@ -2681,6 +2682,7 @@ Sub B_OK_RES_Click End Sub Sub Resumen_Click + Log("###############") L_ABORDO.Text = "0" P_RESUMEN.Visible = True P_RESUMEN.BringToFront @@ -2716,10 +2718,14 @@ Sub Resumen_Click l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close End If + b = Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa") + b.Position = 0 + l_cuantosn.Text = b.GetString("CUANTOS") If Cuantos = 0 Then L_MONTOD.Text = 0 l_cuantosc.Text = 0 - l_cuantosn.Text = 0 +' l_cuantosn.Text = 0 +' Log(">>>> Ponemos en CERO!!") drop = 0 l_drop.Text = 0 efectiva = 0 @@ -2790,10 +2796,8 @@ Sub Resumen_Click End If DDD.Close c = Starter.skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente where pc_cliente <> 0") - b = Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa") 'where pc_fecha = ?", Array As String(fecha) c.Position = 0 - b.Position = 0 ' L_MONTOD.Text = c.GetString("MONTO_DIA") L_MONTOD.Text = Subs.sumaPedido(Subs.traeCliente) 'Trae el monto sin el redondeo que a veces hace el SUM(). @@ -2806,7 +2810,8 @@ Sub Resumen_Click ' Log(Subs.sumaPedido(Subs.traeCliente) & " - " & L_MONTOD.Text) ' Subs.sumaPedido(Subs.traeCliente) l_cuantosc.Text = c.GetString("CLIENTES_DIA") - l_cuantosn.Text = b.GetString("CUANTOS") + + Log(">>>> Ponemos en " & b.GetString("CUANTOS")) l_porvisitar.Text = NumberFormat2((l_cuantosc.Text + l_cuantosn.Text), 1, 0, 0, False) ' efectiva = L_CUANTOST.Text / e.GetString("POR_VISITAR") efectiva = l_porvisitar.Text / L_CUANTOST.text ' Efectividad = Visitados de hoy / Totales de hoy diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 33f38cc..c82d345 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 23226d2..e8272cf 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -917,7 +917,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 5.10.15 + #VersionName: 5.10.16 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 273c6b0..d2edd70 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -70,7 +70,7 @@ ModuleClosedNodes0= ModuleClosedNodes1=6,10,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,29,31,32,33,34,35,37,38,39,40,41,42,43,45,46,47 ModuleClosedNodes10= ModuleClosedNodes11= -ModuleClosedNodes12=1 +ModuleClosedNodes12= ModuleClosedNodes13=1,7,8,9,10,11,12 ModuleClosedNodes14=6,7,8,9,12,13 ModuleClosedNodes15= @@ -100,6 +100,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,revisaPromoPorMonto,2022,0,C_Principal,cargar_Click,833,0,Subs,guardaProducto,906,0,Subs,procesaPromocion,1257,0,C_TrendSpending,maxPromosPorProdsVariables,403,0,Subs,traePromo,1099,1,Subs,revisaMaxPromosProdsFijosPorInventario,1369,1,C_Principal,e_ruta_EnterPressed,2412,0,C_Principal,JobDone,1833,6,Subs,comparaVersiones,2102,6,C_TrendSpending,traeMontoBonificacion,383,6,C_TrendSpending,traeBonificacionesMaximas,359,0 +NavigationStack=C_TrendSpending,traeBonificacionesMaximas,359,0,B4XMainPage,b_cargaLocalOk_Click,863,0,C_Cliente,B_IMP2_Click,1206,0,C_Principal,connecta_LongClick,2373,0,Subs,deshabilitaValidaciones,2452,6,C_Cliente,B_IMP_Click,1131,6,C_Principal,B4XPage_Created,285,6,Diseñador Visual,cliente.bal,-100,6,Diseñador Visual,principal.bal,-100,6,C_Principal,Resumen_Click,2713,6 SelectedBuild=0 -VisibleModules=31,1,12,5,16,3,32,13,14,9,8,26 +VisibleModules=31,1,12,5,16,3,32,13,14,9 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 63b2427..3ec4836 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -2453,5 +2453,12 @@ Sub deshabilitaValidaciones Log("Deshabilitamos VALIDA_VERSION") Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("VALIDA_VERSION")) Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("VALIDA_VERSION", 0)) + Log("Espeificamos LIGADO") + Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("LIGADO")) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("LIGADO", 1)) +' B4XPages.MainPage.principal.Btn_CheckList.Enabled = True +' B4XPages.MainPage.principal.trabajar.Enabled = True +' B4XPages.MainPage.principal.Resumen.Enabled = True +' B4XPages.MainPage.principal.BUSCA.Enabled = True ToastMessageShow("REALIZADO", False) End Sub \ No newline at end of file