From 7e91f23ddb47b1c7eab5e97dee9d8b6702cdf4dd Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 8 Apr 2025 17:45:47 +0200
Subject: [PATCH 1/3] Fix primo record giornaliero editabile in orario

---
 MP-TAB3/Components/InsManual.razor.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/MP-TAB3/Components/InsManual.razor.cs b/MP-TAB3/Components/InsManual.razor.cs
index 6f1f57bc..d2eba4b4 100644
--- a/MP-TAB3/Components/InsManual.razor.cs
+++ b/MP-TAB3/Components/InsManual.razor.cs
@@ -63,6 +63,11 @@ namespace MP_TAB3.Components
                     {
                         startPeriod = dtCurr.Date.AddHours(6);
                     }
+                    enableEditTime = ListDay.Count == 0;
+                }
+                else
+                {
+                    enableEditTime = true;
                 }
                 // evento da richiesta: default lavora/spenta
                 int idxTipo = isWork ? 1 : 12;
@@ -118,6 +123,7 @@ namespace MP_TAB3.Components
             }
             else
             {
+                enableEditTime = true;
                 if (ListDay != null && ListDay.Count > 0)
                 {
                     var firstRec = ListDay.FirstOrDefault();
@@ -509,7 +515,7 @@ namespace MP_TAB3.Components
                 string cssOkDay = "bg-success bg-opacity-50 text-light rounded-circle p-2";
                 string cssPartDay = "bg-info bg-opacity-25 text-light rounded-circle p-2";
                 string cssHasData = "bg-warning text-light rounded-circle p-2";
-                string cssToday = "border border-info text-info rounded-circle p-2";
+                string cssToday = " border border-info rounded-circle p-2";
                 if (ListDTO != null)
                 {
                     string currCss = "";
@@ -521,10 +527,12 @@ namespace MP_TAB3.Components
                         {
                             currCss = cssImport;
                         }
+#if false
                         else if (item.DataRif == oggi)
                         {
                             currCss = cssToday;
-                        }
+                        } 
+#endif
                         else if (IsTimeInfoOk(item.DataRif.Date, true))
                         {
                             currCss = item.MinProdTot < 1440 ? cssPartDay : cssOkDay;
@@ -541,6 +549,10 @@ namespace MP_TAB3.Components
                 {
                     DateCheck.Add(oggi, cssToday);
                 }
+                else
+                {
+                    DateCheck[oggi] += cssToday;
+                }
             }
         }
 

From a95447e3556a8076e8d9e868f1cd2107fad4e4b7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 8 Apr 2025 18:27:20 +0200
Subject: [PATCH 2/3] TAB3: - blocco display durante freeze update info

---
 MP-TAB3/Components/InsManual.razor    |  8 +++----
 MP-TAB3/Components/InsManual.razor.cs | 34 +++++++++++++++++----------
 MP-TAB3/MP-TAB3.csproj                |  2 +-
 MP-TAB3/Resources/ChangeLog.html      |  2 +-
 MP-TAB3/Resources/VersNum.txt         |  2 +-
 MP-TAB3/Resources/manifest.xml        |  2 +-
 MP.Data/Services/TabDataService.cs    |  3 +++
 7 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/MP-TAB3/Components/InsManual.razor b/MP-TAB3/Components/InsManual.razor
index 884b41b9..dd370a41 100644
--- a/MP-TAB3/Components/InsManual.razor
+++ b/MP-TAB3/Components/InsManual.razor
@@ -262,9 +262,9 @@
                 </tbody>
             </table>
         </div>
-        <div class="col-12 px-1">
-        </div>
     }
 </div>
-
-
+@if (showProgress)
+{
+    <ProgressDisplay RefreshInterval="50" Title="@progressTitle" MaxVal="100" CurrVal="@currVal" NextVal="@nextVal" ExpTimeMSec="@expTimeMsec" DisplaySize="ProgressDisplay.ModalSize.Medium"></ProgressDisplay>
+}
diff --git a/MP-TAB3/Components/InsManual.razor.cs b/MP-TAB3/Components/InsManual.razor.cs
index d2eba4b4..294aa501 100644
--- a/MP-TAB3/Components/InsManual.razor.cs
+++ b/MP-TAB3/Components/InsManual.razor.cs
@@ -377,19 +377,35 @@ namespace MP_TAB3.Components
 
             // esegue stored
             bool fatto = false;
+            progressTitle = "Avvio processo";
+            showProgress = true;
+            currVal = 0;
+            nextVal = 20;
+            await InvokeAsync(StateHasChanged);
             if (RecMSE != null)
             {
+                currVal = 20;
+                nextVal = 90;
+                progressTitle = "Start conferma giornaliera";
+                await InvokeAsync(StateHasChanged);
                 string IdxMacc = RecMSE.IdxMacchina;
                 fatto = await TabDServ.InsManFreezeDay(IdxMacc, dtCurr);
-                if (fatto)
-                {
-                    EditRecord = null;
-                    ReloadData();
-                    RecalcDayData(dtCurr);
-                }
+                currVal = 90;
+                nextVal = 100;
+                progressTitle = "Ricalcolo giornata";
+                await InvokeAsync(StateHasChanged);
+                EditRecord = null;
+                ReloadData();
+                RecalcDayData(dtCurr);
+                showProgress = false;
             }
             return;
         }
+        private int currVal = 0;
+        private int nextVal = 0;
+        private int expTimeMsec = 100;
+        private bool showProgress = false;
+        private string progressTitle = "Approvazione Giornata";
 
         private bool IsTimeInfoOk(DateTime reqDate, bool reloadDay)
         {
@@ -527,12 +543,6 @@ namespace MP_TAB3.Components
                         {
                             currCss = cssImport;
                         }
-#if false
-                        else if (item.DataRif == oggi)
-                        {
-                            currCss = cssToday;
-                        } 
-#endif
                         else if (IsTimeInfoOk(item.DataRif.Date, true))
                         {
                             currCss = item.MinProdTot < 1440 ? cssPartDay : cssOkDay;
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index e80c50bc..4c009b44 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2504.817</Version>
+      <Version>6.16.2504.818</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index df8aac49..74311ea4 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2504.817</h4>
+    <h4>Versione: 6.16.2504.818</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 1fe43d10..fa522a58 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.817
+6.16.2504.818
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 3fd86e6e..3a057580 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2504.817</version>
+  <version>6.16.2504.818</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index a987c167..135a9b11 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1195,11 +1195,14 @@ namespace MP.Data.Services
         public async Task<bool> InsManFreezeDay(string idxMacchina, DateTime dtCurr)
         {
             bool fatto = false;
+            Log.Info($"Inizio InsManFreezeDay | idxMacchina: {idxMacchina}");
             // salvo
             fatto = dbTabController.InsManFreezeDay(idxMacchina, dtCurr);
+            Log.Info($"Fine stored | idxMacchina: {idxMacchina}");
             // svuoto cache
             RedisValue pattern = $"{redisBaseKey}:InsMan:*";
             await ExecFlushRedisPatternAsync(pattern);
+            Log.Info($"Fine InsManFreezeDay | idxMacchina: {idxMacchina}");
             return fatto;
         }
 

From 8a94f6ed2d83c1b828e9dcd20bf730a8950b26a8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 8 Apr 2025 18:55:57 +0200
Subject: [PATCH 3/3] Update display avanzamento freeze day

---
 MP-TAB3/Components/InsManual.razor     |  4 +-
 MP-TAB3/Components/InsManual.razor.cs  | 65 +++++++++++++-------------
 MP.Data/Controllers/MpTabController.cs |  6 +--
 MP.Data/Services/TabDataService.cs     |  8 ++--
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/MP-TAB3/Components/InsManual.razor b/MP-TAB3/Components/InsManual.razor
index dd370a41..cd36b533 100644
--- a/MP-TAB3/Components/InsManual.razor
+++ b/MP-TAB3/Components/InsManual.razor
@@ -266,5 +266,5 @@
 </div>
 @if (showProgress)
 {
-    <ProgressDisplay RefreshInterval="50" Title="@progressTitle" MaxVal="100" CurrVal="@currVal" NextVal="@nextVal" ExpTimeMSec="@expTimeMsec" DisplaySize="ProgressDisplay.ModalSize.Medium"></ProgressDisplay>
-}
+    <ProgressDisplay RefreshInterval="100" Title="@progressTitle" MaxVal="100" CurrVal="@currVal" NextVal="@nextVal" ExpTimeMSec="@expTimeMsec" DisplaySize="ProgressDisplay.ModalSize.Medium"></ProgressDisplay>
+}
\ No newline at end of file
diff --git a/MP-TAB3/Components/InsManual.razor.cs b/MP-TAB3/Components/InsManual.razor.cs
index 294aa501..bbac7de9 100644
--- a/MP-TAB3/Components/InsManual.razor.cs
+++ b/MP-TAB3/Components/InsManual.razor.cs
@@ -33,6 +33,19 @@ namespace MP_TAB3.Components
 
         #region Protected Properties
 
+        protected DateTime dtCurr
+        {
+            get => selDtCurr;
+            set
+            {
+                if (selDtCurr != value)
+                {
+                    selDtCurr = value;
+                    dtMonthStart = new DateTime(value.Year, value.Month, 1);
+                }
+            }
+        }
+
         [Inject]
         protected IJSRuntime JSRuntime { get; set; } = null!;
 
@@ -226,13 +239,11 @@ namespace MP_TAB3.Components
             await Task.Delay(1);
         }
 
-        private string idxMacc = "";
-        private DateTime dtMonthStart = new DateTime(2000, 1, 1);
-
         #endregion Protected Methods
 
         #region Private Fields
 
+        private int currVal = 0;
         private Dictionary<DateTime, string> DateCFF = new Dictionary<DateTime, string>();
 
         /// <summary>
@@ -265,6 +276,7 @@ namespace MP_TAB3.Components
         /// </summary>
         private bool doSearchArt = false;
 
+        private DateTime dtMonthStart = new DateTime(2000, 1, 1);
         private InsManualiModel? EditRecord = null;
 
         /// <summary>
@@ -272,8 +284,14 @@ namespace MP_TAB3.Components
         /// </summary>
         private bool enableEditTime = false;
 
+        private int expTimeMsec = 1000;
+        private string idxMacc = "";
+        private int nextVal = 0;
+        private string progressTitle = "Approvazione Giornata";
         private List<ManualStatusDTO> SeqStatus = new List<ManualStatusDTO>();
 
+        private bool showProgress = false;
+
         #endregion Private Fields
 
         #region Private Properties
@@ -281,22 +299,6 @@ namespace MP_TAB3.Components
         private bool confProdActive { get; set; } = false;
 
         private MappaStatoExpl? currRecMSE { get; set; } = null;
-
-        protected DateTime dtCurr
-        {
-            get => selDtCurr;
-            set
-            {
-                if (selDtCurr != value)
-                {
-                    selDtCurr = value;
-                    dtMonthStart = new DateTime(value.Year, value.Month, 1);
-                }
-            }
-        }
-        //
-        private DateTime selDtCurr { get; set; } = DateTime.Today;
-
         private List<InsManualiModel>? ListDay { get; set; } = new List<InsManualiModel>();
 
         private List<InsManDayDto>? ListDTO { get; set; } = new List<InsManDayDto>();
@@ -313,6 +315,9 @@ namespace MP_TAB3.Components
         /// </summary>
         private Dictionary<decimal, string> ListTCiclo { get; set; } = new Dictionary<decimal, string>();
 
+        //
+        private DateTime selDtCurr { get; set; } = DateTime.Today;
+
         private bool showDetail { get; set; } = false;
 
         #endregion Private Properties
@@ -376,23 +381,22 @@ namespace MP_TAB3.Components
                 return;
 
             // esegue stored
-            bool fatto = false;
-            progressTitle = "Avvio processo";
             showProgress = true;
+            await Task.Delay(10);
+            bool fatto = false;
+            progressTitle = "Registrazione conferma giornaliera";
             currVal = 0;
-            nextVal = 20;
+            nextVal = 90;
             await InvokeAsync(StateHasChanged);
             if (RecMSE != null)
             {
-                currVal = 20;
-                nextVal = 90;
-                progressTitle = "Start conferma giornaliera";
+                await Task.Delay(10);
                 await InvokeAsync(StateHasChanged);
-                string IdxMacc = RecMSE.IdxMacchina;
-                fatto = await TabDServ.InsManFreezeDay(IdxMacc, dtCurr);
+                await Task.Delay(10);
+                fatto = await TabDServ.InsManFreezeDay(RecMSE.IdxMacchina, dtCurr);
                 currVal = 90;
                 nextVal = 100;
-                progressTitle = "Ricalcolo giornata";
+                progressTitle = "Ricalcolo Giornata";
                 await InvokeAsync(StateHasChanged);
                 EditRecord = null;
                 ReloadData();
@@ -401,11 +405,6 @@ namespace MP_TAB3.Components
             }
             return;
         }
-        private int currVal = 0;
-        private int nextVal = 0;
-        private int expTimeMsec = 100;
-        private bool showProgress = false;
-        private string progressTitle = "Approvazione Giornata";
 
         private bool IsTimeInfoOk(DateTime reqDate, bool reloadDay)
         {
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 8039b9a8..a3e62c7d 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -699,7 +699,7 @@ namespace MP.Data.Controllers
         /// <param name="idxMacchina"></param>
         /// <param name="dtCurr"></param>
         /// <returns></returns>
-        public bool InsManFreezeDay(string idxMacchina, DateTime dtCurr)
+        public async Task<bool> InsManFreezeDay(string idxMacchina, DateTime dtCurr)
         {
             bool fatto = false;
             using (var dbCtx = new MoonProContext(_configuration))
@@ -707,9 +707,9 @@ namespace MP.Data.Controllers
                 var IdxMacc = new SqlParameter("@IdxMacchina", idxMacchina);
                 var DataElab = new SqlParameter("@DataElab", dtCurr);
 
-                var dbResult = dbCtx
+                var dbResult = await dbCtx
                                 .Database
-                                .ExecuteSqlRaw("EXEC stp_IM_ElaboraInsManuali @IdxMacchina, @DataElab", IdxMacc, DataElab);
+                                .ExecuteSqlRawAsync("EXEC stp_IM_ElaboraInsManuali @IdxMacchina, @DataElab", IdxMacc, DataElab);
                 fatto = dbResult > 0;
             }
 
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 135a9b11..92c6b5cb 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1195,14 +1195,16 @@ namespace MP.Data.Services
         public async Task<bool> InsManFreezeDay(string idxMacchina, DateTime dtCurr)
         {
             bool fatto = false;
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
             Log.Info($"Inizio InsManFreezeDay | idxMacchina: {idxMacchina}");
             // salvo
-            fatto = dbTabController.InsManFreezeDay(idxMacchina, dtCurr);
-            Log.Info($"Fine stored | idxMacchina: {idxMacchina}");
+            fatto = await dbTabController.InsManFreezeDay(idxMacchina, dtCurr);
             // svuoto cache
             RedisValue pattern = $"{redisBaseKey}:InsMan:*";
             await ExecFlushRedisPatternAsync(pattern);
-            Log.Info($"Fine InsManFreezeDay | idxMacchina: {idxMacchina}");
+            sw.Stop();
+            Log.Info($"Fine InsManFreezeDay | idxMacchina: {idxMacchina} | elapsed: {sw.Elapsed.TotalMilliseconds:N2} ms");
             return fatto;
         }