diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index c72aa91..128734f 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -178,6 +178,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Root = Root1 Root.RemoveAllViews Root.LoadLayout("Cliente") + B4XPages.SetTitle(Me, "Cliente - " & Application.VersionName) cuest.Initialize(Me, "cuest", Root, Starter.skmt) c= Starter.skmt.ExecQuery("select 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_BFACTURA,CAT_CL_BCREDITO from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") s = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") @@ -1861,7 +1862,7 @@ Sub Cuestionario ' Log("--------------------------------") ' Log(gruposPermitidos) ' Log("--------------------------------") - Log(gr.GetString("CAT_EP_RUTAS")) +' Log(gr.GetString("CAT_EP_RUTAS")) ' Private enc As Cursor = Starter.skmt.ExecQuery($"SELECT CAT_EP_ID, CAT_EP_IDTIPOPREGUNTA, CAT_CE_DESCRIPCION, CAT_EP_PREGUNTA, CAT_EP_RES1_PRED, CAT_EP_RES2_PRED, CAT_EP_RES3_PRED, CAT_EP_ORDEN_PREGUNTA FROM CAT_ENCUESTA_PREGUNTA where CAT_EP_IDGRUPO in(${gruposPermitidos}) ORDER BY CAT_CE_DESCRIPCION, CAST(CAT_EP_ORDEN_PREGUNTA AS DECIMAL)"$) ' Log(enc.RowCount) gr.Close @@ -1876,10 +1877,14 @@ Sub Cuestionario CUANTOS = 0 If logger Then Log($"Tomar_Foto = ${TOMAR_FOTO}"$) If TOMAR_FOTO = 0 Then - s = Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_ENCUESTA3 where HE_CLIE In (Select cuenta from cuentaa)") + s = Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_ENCUESTA where HE_CLIE In (Select cuenta from cuentaa)") s.Position= 0 CUANTOS = s.GetString("CUANTOS") Private CUANTOS2 As Int = 0 + s = Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_ENCUESTA3 where HE_CLIE In (Select cuenta from cuentaa)") + s.Position= 0 + CUANTOS2 = s.GetString("CUANTOS") +' Private CUANTOS2 As Int = 0 End If If logger Then Log(CUANTOS & "|" & CUANTOS2) If CUANTOS = 0 And CUANTOS2 = 0 Then diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index a054854..3a88167 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -162,13 +162,13 @@ Sub Class_Globals Private l_montoColgateResumen As Label Private l_nes_humedos As Label Private l_nes_secos As Label + Private l_conagra As Label End Sub Sub initialize End Sub - Private Sub B4XPage_Created (Root1 As B4XView) EJECUTANDO=1 SERVER = Starter.DBReqServer @@ -177,7 +177,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Root = Root1 Root.LoadLayout("principal") img2.Visible =False - + B4XPages.SetTitle(Me, "Principal - " & Application.VersionName) ' valido donde escribo el archivo de la base de datos de kmt ruta = File.DirInternal Log(SERVER) @@ -2388,6 +2388,13 @@ Sub Resumen_Click Loop l_nes_secos.Text = NumberFormat2(cRes3, 1, 2, 2, True) + Private r9 As ResultSet = Starter.skmt.ExecQuery($"SELECT CAT_GP_CLASIF, PEDIDO.* FROM PEDIDO JOIN CAT_GUNAPROD WHERE CAT_GP_CLASIF LIKE '%CONAGRA%' AND PE_PROID = CAT_GP_ID"$) + Private cRes4 As String = 0 + Do While r9.NextRow + cRes4 = cRes4 + r9.GetString("PE_COSTO_TOT") + Loop + l_conagra.Text = NumberFormat2(cRes4, 1, 2, 2, True) + b=skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0") b.Position=0 Cuantos = b.GetString("CUANTOS") diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index 9bc1efe..efd0464 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -572,68 +572,69 @@ File611=celltitle.bal File612=Cliente.bal File613=Clientes.bal File614=colgate.png -File615=detalle_promo.bal -File616=durakelo.png -File617=durakelo_192x192.png -File618=durakelo1.png -File619=encuesta.bal +File615=conagra.jpg +File616=detalle_promo.bal +File617=durakelo.png +File618=durakelo_192x192.png +File619=durakelo1.png File62=117marker-verde.png -File620=engrane.jpg -File621=engrane3.png -File622=espera.gif -File623=fondo_kmt.jpg -File624=foto.bal -File625=guardagestion.bal -File626=guna_viejo.png -File627=historico.bal -File628=infonavit1.jpg -File629=itembuttonblue.png +File620=encuesta.bal +File621=engrane.jpg +File622=engrane3.png +File623=espera.gif +File624=fondo_kmt.jpg +File625=foto.bal +File626=guardagestion.bal +File627=guna_viejo.png +File628=historico.bal +File629=infonavit1.jpg File63=118.png -File630=k.png -File631=K-b27c0809.png -File632=kelloggs.png -File633=keymon_logo.png -File634=kmt.db -File635=login.bal -File636=logo sanfer.jpg -File637=Logo_durakelo_192xx192.jpeg -File638=logo_exitus1.jpg -File639=MainPage.bal +File630=itembuttonblue.png +File631=k.png +File632=K-b27c0809.png +File633=kelloggs.png +File634=keymon_logo.png +File635=kmt.db +File636=login.bal +File637=logo sanfer.jpg +File638=Logo_durakelo_192xx192.jpeg +File639=logo_exitus1.jpg File64=118marker-rojo.png -File640=Malo.jpg -File641=mapa.bal -File642=mapa_rutas.bal -File643=nestle.png -File644=nota.bal -File645=NoVenta.bal -File646=nuevocliente.bal -File647=palomita_verde.png -File648=pedido.bal -File649=pedidoitem.bal +File640=MainPage.bal +File641=Malo.jpg +File642=mapa.bal +File643=mapa_rutas.bal +File644=nestle.png +File645=nota.bal +File646=NoVenta.bal +File647=nuevocliente.bal +File648=palomita_verde.png +File649=pedido.bal File65=118marker-verde.png -File650=planfia_logo.png -File651=planfia_logo_old.png -File652=planfia_logo_old2.png -File653=principal.bal -File654=proditem.bal -File655=productos.bal -File656=productos.bal.old -File657=promociones.bal -File658=qr.bal -File659=rechazo.jpg +File650=pedidoitem.bal +File651=planfia_logo.png +File652=planfia_logo_old.png +File653=planfia_logo_old2.png +File654=principal.bal +File655=proditem.bal +File656=productos.bal +File657=productos.bal.old +File658=promociones.bal +File659=qr.bal File66=119.png -File660=rojo.png -File661=salma.jpg -File662=salma.png -File663=senial.jpg -File664=sync.png -File665=tache_rojo.png -File666=telefonos.bal -File667=ticketsDia.bal -File668=Tiendita.jpg -File669=unilever.jpg +File660=rechazo.jpg +File661=rojo.png +File662=salma.jpg +File663=salma.png +File664=senial.jpg +File665=sync.png +File666=tache_rojo.png +File667=telefonos.bal +File668=ticketsDia.bal +File669=Tiendita.jpg File67=119marker-rojo.png -File670=verde.png +File670=unilever.jpg +File671=verde.png File68=119marker-verde.png File69=11marker-rojo.png File7=100marker-rojo.png @@ -1304,6 +1305,7 @@ FileGroup668=Default Group FileGroup669=Default Group FileGroup67=Default Group FileGroup670=Default Group +FileGroup671=Default Group FileGroup68=Default Group FileGroup69=Default Group FileGroup7=Default Group @@ -1396,7 +1398,7 @@ Module6=C_Cuestionario Module7=C_Historico Module8=C_Nota Module9=C_NoVenta -NumberOfFiles=670 +NumberOfFiles=671 NumberOfLibraries=31 NumberOfModules=24 Version=12.8 @@ -1404,7 +1406,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 5.01.27 + #VersionName: 5.02.08 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 9d19baf..8974161 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -50,7 +50,7 @@ ModuleBreakpoints8= ModuleBreakpoints9= ModuleClosedNodes0= ModuleClosedNodes1= -ModuleClosedNodes10=1 +ModuleClosedNodes10= ModuleClosedNodes11=7,35,36,41,42 ModuleClosedNodes12= ModuleClosedNodes13= @@ -73,6 +73,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=B4XMainPage,B4XPage_Created,163,0,Main,Activity_Create,30,0,Main,Process_Globals,21,0,Main,Globals,23,0,C_Principal,Subir_Click,632,0,C_Cliente,gest_Click,481,0,C_Principal,cargar_Click,896,6,C_Principal,JobDone,1248,4,C_Cliente,Class_Globals,0,0,C_Cliente,Cuestionario,1857,6 +NavigationStack=Main,Globals,23,0,Main,Activity_Create,33,0,Main,Activity_ActionBarHomeClick,39,0,C_Principal,B_OK_PAS_Click,2330,0,C_Principal,Resumen_Click,2389,0,Main,Activity_KeyPress,40,0,DiseƱador Visual,principal.bal,-100,6,C_Principal,initialize,164,0,C_Principal,B4XPage_Created,173,4,C_Cliente,Class_Globals,0,0,C_Cliente,B4XPage_Created,174,1 SelectedBuild=0 VisibleModules=2,10,4,19,6,8,9,11,24,23 diff --git a/B4A/Files/conagra.jpg b/B4A/Files/conagra.jpg new file mode 100644 index 0000000..97354a3 Binary files /dev/null and b/B4A/Files/conagra.jpg differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index cc3279b..6c6a621 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/principal.bal.bak b/B4A/Files/principal.bal.bak new file mode 100644 index 0000000..cc3279b Binary files /dev/null and b/B4A/Files/principal.bal.bak differ