From a2b5aa3ca68f61819a3fcdcfe9616885b40f6368 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 15 Dec 2023 10:27:44 +0100
Subject: [PATCH] inizio gestione avanzamento progress bar

---
 MP-TAB-SERV/Components/CmpFooter.razor    |  9 +++++++--
 MP-TAB-SERV/Components/CmpFooter.razor.cs | 10 ++++++++--
 MP-TAB-SERV/Components/CmpTop.razor.cs    | 15 +++++++++++----
 MP-TAB-SERV/Shared/MainLayout.razor.cs    |  5 +++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index 2411d848..25b798f0 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -1,8 +1,13 @@
 <div class="row bg-dark text-light px-2 small">
-    <div class="col-6 text-left">
+    <div class="col-4 text-left">
         <b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
     </div>
-    <div class="col-6 text-end">
+    <div class="col-4 d-flex flex-column justify-content-center">
+        <div class="progress" role="progressbar" aria-label="Basic example" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-bar" style="width: @dtScadProg"></div>
+        </div>
+    </div>
+    <div class="col-4 text-end d-flex align-items-center justify-content-end">
         <span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light text-decoration-none" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
     </div>
 </div>
diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index 33884c6e..cfaecd10 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -18,14 +18,17 @@ namespace MP_TAB_SERV.Components
             }
         }
 
+        protected string dtScadProg { get; set; } = "";
+
         public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
-            var diffOfTime = DateTime.Now - MsgServ.dtLastAction;
 
             var pUpd = Task.Run(async () =>
                    {
+                       var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction);
+                       dtScadProg = $"{((int)diffOfTime.TotalMinutes * 100) / dtScadLogin}%";
                        await InvokeAsync(() => StateHasChanged());
-                   });
+                   }); 
             pUpd.Wait();
         }
 
@@ -42,6 +45,8 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Properties
 
+        protected int dtScadLogin { get; set; } = 0;
+
         [Inject]
         protected MessageService MsgServ { get; set; } = null!;
 
@@ -60,6 +65,7 @@ namespace MP_TAB_SERV.Components
             await Task.Delay(1);
             var rawVers = typeof(Program).Assembly.GetName().Version;
             version = rawVers != null ? rawVers : new Version("0.0.0.0");
+            dtScadLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin");
             StartTimer();
         }
 
diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index 08dfd29e..afd3f049 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -35,7 +35,7 @@ namespace MP_TAB_SERV.Components
 
         protected string CurrOprTknRedis { get; set; } = null!;
 
-        protected DateTime expDT { get; set; } = DateTime.Now;
+        protected int expLoginType { get; set; } = 0;
 
         protected bool HideMenu
         {
@@ -66,7 +66,15 @@ namespace MP_TAB_SERV.Components
 
         protected async Task RefreshLogIn(string decodValue)
         {
-            bool done = await MsgServ.DoLogIn(decodValue, false);
+            bool done = false;
+            if (expLoginType == 0)
+            {
+                done = await MsgServ.DoLogIn(decodValue, false);
+            }
+            else
+            {
+                done = await MsgServ.DoLogIn(decodValue, true);
+            }
             if (done)
             {
                 if (!string.IsNullOrEmpty(LastOpenedPage) && !string.IsNullOrEmpty(CurrMacc))
@@ -124,8 +132,7 @@ namespace MP_TAB_SERV.Components
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
-            int expDays = SMServ.GetConfInt("cookieDayExpire");
-            expDT = DateTime.Now.AddDays(expDays);
+            expLoginType = SMServ.GetConfInt("TAB_TypeScadLogin");
             var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
 
             //if (string.IsNullOrEmpty(CurrDevGuid.ToString()))
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index c702c78c..fe4593a8 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -107,6 +107,11 @@ namespace MP_TAB_SERV.Shared
                     {
                         NavMan.NavigateTo("logout");
                     }
+                    else
+                    {
+                        MsgServ.dtLastAction = DateTime.Now;
+                        MsgServ.dtLastSave = DateTime.Now;
+                    }
                     break;
                 case 1:
                     if (tsDeltaAct.Minutes >= dtScadLogin)