diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 224a9f6..9477b9d 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -388,8 +388,8 @@ Sub GPS_LocationChanged (Location1 As Location) distance = l1.DistanceTo(l2) 'the result is in meter gest.Visible = True ' Log(distance) -' If distance < 3000000000000000000000000000000000000 Then - If distance < 30 Then + If distance < 3000000000000000000000000000000000000 Then +' If distance < 30 Then Tels.Visible = True gest.Visible = True LA_GEO.TextColor = Colors.Blue diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 0c40aa8..5e2983e 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -229,6 +229,10 @@ Sub Class_Globals Private l_version As Label Dim cpb As Cursor + Private Label22 As Label + Private Label27 As Label + Private l_faltan As Label + Private l_visitas As Label End Sub 'You can add more parameters here. @@ -319,6 +323,10 @@ End Sub Sub B4XPage_Appear checaPedido + l_faltan.Text = 0 + l_visitas.Text = 0 + + cpb = Starter.skmt.ExecQuery("SELECT PC_CLIENTE, PC_MONTO FROM PEDIDO_CLIENTE") If cpb.RowCount > 0 Then For i = 0 To cpb.RowCount-1 @@ -403,6 +411,26 @@ Sub B4XPage_Appear l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close End If + If l_ruta.Text = "0" Then + Label22.Visible = False + Label27.Visible = False + l_faltan.Visible = False + l_visitas.Visible = False + l_faltan.Text = 0 + l_visitas.Text = 0 + Else + Label22.Visible = True + Label27.Visible = True + l_faltan.Visible = True + l_visitas.Visible = True + Dim totalcisitas As Cursor = Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUENTA FROM KMT_INFO") + totalcisitas.Position = 0 + l_visitas.Text = totalcisitas.GetInt("CUENTA") + Dim visitasfaltantes As Cursor = Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUENTA FROM KMT_INFO WHERE gestion = 0") + visitasfaltantes.Position = 0 + l_faltan.Text = visitasfaltantes.GetInt("CUENTA") + End If + If Cuantos = 0 Then L_MONTOD.Text =0 l_cuantosc.Text = 0 @@ -1680,7 +1708,13 @@ Sub JobDone(Job As HttpJob) Dim VALIDO As String = records(RESULT.Columns.Get("VALIDO")) If VALIDO = "OK" Then cargar.Visible = True - Subir.Visible = True + + If l_ruta.Text <> 0 And l_faltan.Text = 0 Then + Subir.Visible = True + Else + Subir.Visible = False + End If + inv.Visible = True connecta.Visible = False If conn = "1" Then @@ -1879,6 +1913,12 @@ Sub e_ruta_EnterPressed Starter.skmt.ExecNonQuery("DELETE FROM HIST_CODIGO_BARRAS") Starter.skmt.ExecNonQuery("DELETE FROM HIST_FOTO_CLIENTE") Starter.skmt.ExecNonQuery("DELETE FROM CLIENTES_NUEVOS") + + Label22.Visible = False + Label27.Visible = False + l_faltan.Visible = False + l_visitas.Visible = False + B4XPage_Appear End If End If diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 7cdcdd4..c751ba1 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Profina.b4a b/B4A/Profina.b4a index e04a88f..2920e26 100644 --- a/B4A/Profina.b4a +++ b/B4A/Profina.b4a @@ -1069,7 +1069,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Profina #VersionCode: 1 - #VersionName: 4.07.20 + #VersionName: 5.09.20 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Profina.b4a.meta b/B4A/Profina.b4a.meta index 00876df..3a78f8f 100644 --- a/B4A/Profina.b4a.meta +++ b/B4A/Profina.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=DBRequestManager,ExecuteQuery,36,0,appUpdater,CreateNotification,220,0,appUpdater,CreateNotification2,218,0,appUpdater,download_newApk,158,0,B4XMainPage,B4XPage_Created,172,0,C_Cliente,GPS_LocationChanged,385,0,C_Principal,B4XPage_Created,247,0,C_Principal,JobDone,1025,0,MAPA_RUTAS,MapFragment1_Ready,165,1,C_Principal,Class_Globals,66,0 +NavigationStack=MAPA_RUTAS,MapFragment1_Ready,143,2,appUpdater,download_newApk,158,0,B4XMainPage,B4XPage_Created,172,0,DiseƱador Visual,login.bal,-100,2,C_Principal,Class_Globals,226,0,C_Cliente,GPS_LocationChanged,373,0,C_Principal,connecta_Click,1831,0,C_Principal,JobDone,1702,6,C_Principal,B4XPage_Created,276,0,C_Principal,B4XPage_Appear,420,6 SelectedBuild=0 VisibleModules=1,2,3,12,4,5,6,7,8,9,23