From 9b909a4421c66c4a0ed8387cc0d98d93985ea80e Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 11 Dec 2023 17:27:32 +0100
Subject: [PATCH 01/69] aumentato sample multiplier pagina odl

---
 MP-TAB-SERV/MP-TAB-SERV.csproj         | 2 +-
 MP-TAB-SERV/Pages/ODL.razor            | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt      | 2 +-
 MP-TAB-SERV/Resources/manifest.xml     | 2 +-
 MP-TAB-SERV/Shared/MainLayout.razor.cs | 2 +-
 MP.Data/Services/MessageService.cs     | 8 --------
 7 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 9fd21e92..c74167ee 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1115</Version>
+      <Version>6.16.2312.1117</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/ODL.razor b/MP-TAB-SERV/Pages/ODL.razor
index cea8d71f..5f2f525d 100644
--- a/MP-TAB-SERV/Pages/ODL.razor
+++ b/MP-TAB-SERV/Pages/ODL.razor
@@ -1,6 +1,6 @@
 ﻿@page "/odl"
 
-<MseSampler SampleMult="0.05" E_Updated="RefreshData"></MseSampler>
+<MseSampler SampleMult="0.5" E_Updated="RefreshData"></MseSampler>
 @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null)
 {
     <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index aa25c504..416babf1 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1115</h4>
+    <h4>Versione: 6.16.2312.1117</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index ea217199..37708e5b 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1115
+6.16.2312.1117
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 5c669432..333426eb 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1115</version>
+  <version>6.16.2312.1117</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 8e4c9e6d..cdc81dbe 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -94,7 +94,7 @@ namespace MP_TAB_SERV.Shared
                     }
                     break;
                 case 1:
-                    if (diffOfTime.Minutes >= dtScadLogin)
+                    if ((diffOfTime.Minutes >= dtScadLogin) && (!NavMan.Uri.Contains("reg-new-device")))
                     {
                         var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
                         if (!string.IsNullOrEmpty(userTkn))
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index cd063eb6..068e3459 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -466,14 +466,6 @@ namespace MP.Data.Services
                     await SetCurrOperDtoAsync(hash);
                     await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
                     answ = true;
-                    //if (LastOpenedPage != "" && CurrMacc != "")
-                    //{
-                    //    NavMan.NavigateTo(LastOpenedPage);
-                    //}
-                    //else
-                    //{
-                    //    NavMan.NavigateTo("status-map");
-                    //}
                 }
             }
             return answ;

From cb2162fed810f4c4c85c7885eb381a9751882c74 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 11 Dec 2023 19:41:22 +0100
Subject: [PATCH 02/69] Aggiunto modulo check x - dichiarazioni fermo
 necessarie - dichiarazione controlli scaduti

---
 MP-TAB-SERV/Components/CheckControls.razor    |   8 ++
 MP-TAB-SERV/Components/CheckControls.razor.cs | 123 ++++++++++++++++++
 .../Components/CheckControls.razor.css        |  63 +++++++++
 .../Components/CheckControls.razor.less       |  71 ++++++++++
 .../Components/CheckControls.razor.min.css    |   1 +
 MP-TAB-SERV/Components/ControlsMan.razor.cs   |   8 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj                |   2 +-
 MP-TAB-SERV/Pages/Alarms.razor                |   1 +
 MP-TAB-SERV/Pages/Controls.razor              |   1 +
 MP-TAB-SERV/Pages/Declarations.razor          |   1 +
 MP-TAB-SERV/Pages/IobInfo.razor               |   5 +-
 MP-TAB-SERV/Pages/MachineDetail.razor         |   1 +
 MP-TAB-SERV/Pages/Notes.razor                 |   1 +
 MP-TAB-SERV/Pages/ODL.razor                   |   1 +
 MP-TAB-SERV/Pages/Parameters.razor            |   1 +
 MP-TAB-SERV/Pages/ProdPlan.razor              |   1 +
 MP-TAB-SERV/Pages/ProdStop.razor              |   5 +-
 MP-TAB-SERV/Pages/Scrap.razor                 |   1 +
 MP-TAB-SERV/Pages/TechSheet.razor             |   1 +
 MP-TAB-SERV/Pages/WorkShift.razor             |   1 +
 MP-TAB-SERV/Resources/ChangeLog.html          |   2 +-
 MP-TAB-SERV/Resources/VersNum.txt             |   2 +-
 MP-TAB-SERV/Resources/manifest.xml            |   2 +-
 MP-TAB-SERV/compilerconfig.json               |   4 +
 MP.Data/Controllers/MpTabController.cs        | 114 +++++++++-------
 MP.Data/Services/TabDataService.cs            |  36 +++++
 26 files changed, 398 insertions(+), 59 deletions(-)
 create mode 100644 MP-TAB-SERV/Components/CheckControls.razor
 create mode 100644 MP-TAB-SERV/Components/CheckControls.razor.cs
 create mode 100644 MP-TAB-SERV/Components/CheckControls.razor.css
 create mode 100644 MP-TAB-SERV/Components/CheckControls.razor.less
 create mode 100644 MP-TAB-SERV/Components/CheckControls.razor.min.css

diff --git a/MP-TAB-SERV/Components/CheckControls.razor b/MP-TAB-SERV/Components/CheckControls.razor
new file mode 100644
index 00000000..c839d79a
--- /dev/null
+++ b/MP-TAB-SERV/Components/CheckControls.razor
@@ -0,0 +1,8 @@
+﻿@if (ShowInsFermata)
+{
+    <button class="btn w-100 btn-lg flashingRed mb-2 p-3" @onclick="@GoToFermate"><i class="fa fa-lg fa-exclamation-triangle"></i> DICHIARARE FERMO <i class="fa fa-lg fa-exclamation-triangle"></i></button>
+}
+@if (ShowReqControls)
+{
+    <button class="btn w-100 btn-lg flashingPurple mb-2 p-3" @onclick="GoToControls"><i class="fa fa-lg fa-flask"></i> EFFETTUARE CONTROLLO<i class="fa fa-lg fa-flask"></i></button>
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/CheckControls.razor.cs b/MP-TAB-SERV/Components/CheckControls.razor.cs
new file mode 100644
index 00000000..cf2c1fda
--- /dev/null
+++ b/MP-TAB-SERV/Components/CheckControls.razor.cs
@@ -0,0 +1,123 @@
+using Microsoft.AspNetCore.Components;
+using MP.Data.DatabaseModels;
+using MP.Data.Services;
+using MP_TAB_SERV.Shared;
+
+namespace MP_TAB_SERV.Components
+{
+    public partial class CheckControls
+    {
+        #region Public Properties
+
+        [Parameter]
+        public MappaStatoExpl? RecMSE { get; set; } = null;
+
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected NavigationManager NavMan { get; set; } = null!;
+
+        /// <summary>
+        /// Determina se dato lo stato dell'impianto si debba mostrare btn fermata perch�
+        /// - fermo &gt; xx min (da web.config, es 20')
+        /// - impianto fermo (controllando idxStato: priorit� &gt; 1)
+        /// </summary>
+        protected bool ShowInsFermata
+        {
+            get
+            {
+                bool answ = false;
+                int idxStato = 0;
+                double durata = 0;
+                int durMinWarning = SMServ.GetConfInt("durMinWarning");
+                if (RecMSE != null)
+                {
+                    idxStato = RecMSE.IdxStato ?? 0;
+                    durata = RecMSE.Durata ?? 0;
+                    if (durata >= durMinWarning)
+                    {
+                        try
+                        {
+                            // in questo caso controllo idxStato... e recupero priorit� se > 1 -->
+                            // richiesta qualifica
+                            answ = SMServ.GetStateRow(idxStato).Priorita > 1;
+                        }
+                        catch
+                        { }
+                    }
+                }
+                return answ;
+            }
+        }
+
+        /// <summary>
+        /// Verifica necessit� visualizzare il check controlli
+        /// </summary>
+        protected bool ShowReqControls
+        {
+            get
+            {
+                bool answ = false;
+                if (RecMSE != null)
+                {
+                    // SE abilitata gestione controlli...
+                    bool enableCtrl = SMServ.GetConfBool("enableControlli");
+                    if (enableCtrl)
+                    {
+                        int intervalloControlli = SMServ.GetConfInt("intervalloControlli");
+                        // cerco ultimo controllo fatto
+                        DateTime lastControl = DateTime.Now.AddYears(-1);
+                        try
+                        {
+                            var pUpd = Task.Run(async () =>
+                            {
+                                await Task.Delay(1);
+                                var tabCtrls = await TabDServ.RegControlliLast(RecMSE.IdxMacchina);
+                                if (tabCtrls != null && tabCtrls.Count > 0)
+                                {
+                                    var thisRec = tabCtrls.FirstOrDefault();
+                                    if (thisRec != null)
+                                    {
+                                        lastControl = thisRec.DataOra;
+                                        if (Math.Abs(DateTime.Now.Subtract(lastControl).TotalMinutes) >= intervalloControlli)
+                                        {
+                                            answ = true;
+                                        }
+                                    }
+                                }
+                            });
+                            pUpd.Wait();
+                        }
+                        catch
+                        { }
+                    }
+                }
+                return answ;
+            }
+        }
+
+        [Inject]
+        protected SharedMemService SMServ { get; set; } = null!;
+
+        [Inject]
+        protected TabDataService TabDServ { get; set; } = null!;
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected void GoToControls()
+        {
+            NavMan.NavigateTo("controls");
+        }
+
+        protected void GoToFermate()
+        {
+            NavMan.NavigateTo("prod-stop");
+        }
+
+        #endregion Protected Methods
+    }
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/CheckControls.razor.css b/MP-TAB-SERV/Components/CheckControls.razor.css
new file mode 100644
index 00000000..a7a1bb2c
--- /dev/null
+++ b/MP-TAB-SERV/Components/CheckControls.razor.css
@@ -0,0 +1,63 @@
+﻿.flashingPurple {
+  animation-duration: 0.75s;
+  animation-timing-function: steps(2);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  animation-play-state: running;
+  animation-name: flsBlue;
+  transform: translateZ(0);
+}
+@keyframes flsBlue {
+  from {
+    color: #ffc107;
+    background-color: #7623c8;
+    /*border: 5px solid #dc3545;*/
+  }
+  to {
+    color: #FFF;
+    background-color: #00b1ec;
+    /*border: 5px solid #ffc107;*/
+  }
+}
+.flashingRed {
+  animation-duration: 0.75s;
+  animation-timing-function: steps(2);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  animation-play-state: running;
+  animation-name: flsRed;
+  transform: translateZ(0);
+}
+@keyframes flsRed {
+  from {
+    color: #ffc107;
+    background-color: #c82332;
+    /*border: 5px solid #dc3545;*/
+  }
+  to {
+    color: #FFF;
+    background-color: #ecb100;
+    /*border: 5px solid #ffc107;*/
+  }
+}
+.flashingBlue {
+  animation-duration: 0.75s;
+  animation-timing-function: steps(2);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  animation-play-state: running;
+  animation-name: flsBlue;
+  transform: translateZ(0);
+}
+@keyframes flsBlue {
+  from {
+    color: #ffc107;
+    background-color: #2323c8;
+    /*border: 5px solid #dc3545;*/
+  }
+  to {
+    color: #FFF;
+    background-color: #00b1ec;
+    /*border: 5px solid #ffc107;*/
+  }
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/CheckControls.razor.less b/MP-TAB-SERV/Components/CheckControls.razor.less
new file mode 100644
index 00000000..92d27830
--- /dev/null
+++ b/MP-TAB-SERV/Components/CheckControls.razor.less
@@ -0,0 +1,71 @@
+﻿
+.flashingPurple {
+    animation-duration: 0.75s;
+    animation-timing-function: steps(2);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+    animation-play-state: running;
+    animation-name: flsBlue;
+    transform: translateZ(0);
+}
+
+@keyframes flsBlue {
+    from {
+        color: #ffc107;
+        background-color: #7623c8;
+        /*border: 5px solid #dc3545;*/
+    }
+
+    to {
+        color: #FFF;
+        background-color: #00b1ec;
+        /*border: 5px solid #ffc107;*/
+    }
+}
+.flashingRed {
+    animation-duration: 0.75s;
+    animation-timing-function: steps(2);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+    animation-play-state: running;
+    animation-name: flsRed;
+    transform: translateZ(0);
+}
+
+@keyframes flsRed {
+    from {
+        color: #ffc107;
+        background-color: #c82332;
+        /*border: 5px solid #dc3545;*/
+    }
+
+    to {
+        color: #FFF;
+        background-color: #ecb100;
+        /*border: 5px solid #ffc107;*/
+    }
+}
+
+.flashingBlue {
+    animation-duration: 0.75s;
+    animation-timing-function: steps(2);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+    animation-play-state: running;
+    animation-name: flsBlue;
+    transform: translateZ(0);
+}
+
+@keyframes flsBlue {
+    from {
+        color: #ffc107;
+        background-color: #2323c8;
+        /*border: 5px solid #dc3545;*/
+    }
+
+    to {
+        color: #FFF;
+        background-color: #00b1ec;
+        /*border: 5px solid #ffc107;*/
+    }
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/CheckControls.razor.min.css b/MP-TAB-SERV/Components/CheckControls.razor.min.css
new file mode 100644
index 00000000..71fb7b6d
--- /dev/null
+++ b/MP-TAB-SERV/Components/CheckControls.razor.min.css
@@ -0,0 +1 @@
+﻿.flashingPurple{animation-duration:.75s;animation-timing-function:steps(2);animation-iteration-count:infinite;animation-direction:alternate;animation-play-state:running;animation-name:flsBlue;transform:translateZ(0);}@keyframes flsBlue{from{color:#ffc107;background-color:#7623c8;}to{color:#fff;background-color:#00b1ec;}}.flashingRed{animation-duration:.75s;animation-timing-function:steps(2);animation-iteration-count:infinite;animation-direction:alternate;animation-play-state:running;animation-name:flsRed;transform:translateZ(0);}@keyframes flsRed{from{color:#ffc107;background-color:#c82332;}to{color:#fff;background-color:#ecb100;}}.flashingBlue{animation-duration:.75s;animation-timing-function:steps(2);animation-iteration-count:infinite;animation-direction:alternate;animation-play-state:running;animation-name:flsBlue;transform:translateZ(0);}@keyframes flsBlue{from{color:#ffc107;background-color:#2323c8;}to{color:#fff;background-color:#00b1ec;}}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/ControlsMan.razor.cs b/MP-TAB-SERV/Components/ControlsMan.razor.cs
index 83d548d4..07d5e907 100644
--- a/MP-TAB-SERV/Components/ControlsMan.razor.cs
+++ b/MP-TAB-SERV/Components/ControlsMan.razor.cs
@@ -45,28 +45,28 @@ namespace MP_TAB_SERV.Components
             get => showInsert ? "Nascondi Controllo" : "Registra Controllo";
         }
 
+        protected bool enableControlli { get; set; } = true;
         protected List<RegistroControlliModel> ListComplete { get; set; } = new List<RegistroControlliModel>();
         protected List<RegistroControlliModel> ListPaged { get; set; } = new List<RegistroControlliModel>();
 
         [Inject]
         protected MessageService MServ { get; set; } = null!;
 
-        [Inject]
-        protected TabDataService TabDServ { get; set; } = null!;
         [Inject]
         protected SharedMemService SMServ { get; set; } = null!;
 
+        [Inject]
+        protected TabDataService TabDServ { get; set; } = null!;
+
         #endregion Protected Properties
 
         #region Protected Methods
 
-        protected bool enableControlli { get; set; } = true;
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
             if (RecMSE != null)
             {
-
                 enableControlli = SMServ.GetConfBool("enableControlli");
                 IdxMaccSel = RecMSE.IdxMacchina;
                 DateTime fine = DateTime.Today.AddDays(1);
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index c74167ee..a5d9d7ab 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1117</Version>
+      <Version>6.16.2312.1119</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Alarms.razor b/MP-TAB-SERV/Pages/Alarms.razor
index ff411c7a..cba45328 100644
--- a/MP-TAB-SERV/Pages/Alarms.razor
+++ b/MP-TAB-SERV/Pages/Alarms.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <AlarmsMan RecMSE="CurrMSE"></AlarmsMan>
 }
diff --git a/MP-TAB-SERV/Pages/Controls.razor b/MP-TAB-SERV/Pages/Controls.razor
index 21bef545..d6545f1a 100644
--- a/MP-TAB-SERV/Pages/Controls.razor
+++ b/MP-TAB-SERV/Pages/Controls.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <ControlsMan RecMSE="CurrMSE"></ControlsMan>
 }
diff --git a/MP-TAB-SERV/Pages/Declarations.razor b/MP-TAB-SERV/Pages/Declarations.razor
index 7be4b8f6..5a45a974 100644
--- a/MP-TAB-SERV/Pages/Declarations.razor
+++ b/MP-TAB-SERV/Pages/Declarations.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <DeclarMan RecMSE="CurrMSE"></DeclarMan>
 }
diff --git a/MP-TAB-SERV/Pages/IobInfo.razor b/MP-TAB-SERV/Pages/IobInfo.razor
index c8e7575f..35077c37 100644
--- a/MP-TAB-SERV/Pages/IobInfo.razor
+++ b/MP-TAB-SERV/Pages/IobInfo.razor
@@ -7,8 +7,7 @@
 }
 else
 {
-    <div>
-        <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
-    </div>
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
+    <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <IobInfoMan idxMacch="@IdxMacc"></IobInfoMan>
 }
diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor b/MP-TAB-SERV/Pages/MachineDetail.razor
index fd965bef..a068cce3 100644
--- a/MP-TAB-SERV/Pages/MachineDetail.razor
+++ b/MP-TAB-SERV/Pages/MachineDetail.razor
@@ -8,6 +8,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
     <ProdConfirm RecMSE="CurrMSE" E_Updated="RefreshData" E_MachSel="SetMacc"></ProdConfirm>
     <ProdStat RecMSE="CurrMSE"></ProdStat>
diff --git a/MP-TAB-SERV/Pages/Notes.razor b/MP-TAB-SERV/Pages/Notes.razor
index 15e2b1a9..de63c2db 100644
--- a/MP-TAB-SERV/Pages/Notes.razor
+++ b/MP-TAB-SERV/Pages/Notes.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <NotesMan RecMSE="CurrMSE"></NotesMan>
 }
diff --git a/MP-TAB-SERV/Pages/ODL.razor b/MP-TAB-SERV/Pages/ODL.razor
index 5f2f525d..85cdcb6b 100644
--- a/MP-TAB-SERV/Pages/ODL.razor
+++ b/MP-TAB-SERV/Pages/ODL.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
     <OdlMan RecMSE="CurrMSE" E_Updated="RefreshData" E_MachSel="SetMacc"></OdlMan>
 }
diff --git a/MP-TAB-SERV/Pages/Parameters.razor b/MP-TAB-SERV/Pages/Parameters.razor
index 16b8b68e..3ecd6b07 100644
--- a/MP-TAB-SERV/Pages/Parameters.razor
+++ b/MP-TAB-SERV/Pages/Parameters.razor
@@ -8,6 +8,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <ParamsMan RecMSE="CurrMSE"></ParamsMan>
 }
diff --git a/MP-TAB-SERV/Pages/ProdPlan.razor b/MP-TAB-SERV/Pages/ProdPlan.razor
index 8c0674dc..4130f6ac 100644
--- a/MP-TAB-SERV/Pages/ProdPlan.razor
+++ b/MP-TAB-SERV/Pages/ProdPlan.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <ProdPlanMan RecMSE="CurrMSE"></ProdPlanMan>
 }
diff --git a/MP-TAB-SERV/Pages/ProdStop.razor b/MP-TAB-SERV/Pages/ProdStop.razor
index 0f9b2505..6f32c69f 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor
+++ b/MP-TAB-SERV/Pages/ProdStop.razor
@@ -8,9 +8,8 @@
 }
 else
 {
-    <div>
-        <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
-    </div>
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
+    <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
 
     <NotesEditor @ref="noteEdit" Title="Dichiarazione Fermo Retroattiva + Commento" RecMSE="CurrMSE" CanSave="false" E_DateSel="SetDate"></NotesEditor>
 
diff --git a/MP-TAB-SERV/Pages/Scrap.razor b/MP-TAB-SERV/Pages/Scrap.razor
index 64aa41ba..ef0f6528 100644
--- a/MP-TAB-SERV/Pages/Scrap.razor
+++ b/MP-TAB-SERV/Pages/Scrap.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <ScrapMan RecMSE="CurrMSE"></ScrapMan>
 }
diff --git a/MP-TAB-SERV/Pages/TechSheet.razor b/MP-TAB-SERV/Pages/TechSheet.razor
index 612cfe71..5c37ccea 100644
--- a/MP-TAB-SERV/Pages/TechSheet.razor
+++ b/MP-TAB-SERV/Pages/TechSheet.razor
@@ -8,6 +8,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     @if (enableSchedaTecnica)
     {
diff --git a/MP-TAB-SERV/Pages/WorkShift.razor b/MP-TAB-SERV/Pages/WorkShift.razor
index ae0bd885..f6e8f517 100644
--- a/MP-TAB-SERV/Pages/WorkShift.razor
+++ b/MP-TAB-SERV/Pages/WorkShift.razor
@@ -7,6 +7,7 @@
 }
 else
 {
+    <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
     <h2>Gestione Turni</h2>
     <div class="my-2 d-flex justify-content-center">
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 416babf1..cc6d4acd 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1117</h4>
+    <h4>Versione: 6.16.2312.1119</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 37708e5b..81fa670d 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1117
+6.16.2312.1119
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 333426eb..2203e907 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1117</version>
+  <version>6.16.2312.1119</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/compilerconfig.json b/MP-TAB-SERV/compilerconfig.json
index 81657133..0ae6cb7f 100644
--- a/MP-TAB-SERV/compilerconfig.json
+++ b/MP-TAB-SERV/compilerconfig.json
@@ -34,5 +34,9 @@
   {
     "outputFile": "Components/ProdPlanMan.razor.css",
     "inputFile": "Components/ProdPlanMan.razor.less"
+  },
+  {
+    "outputFile": "Components/CheckControls.razor.css",
+    "inputFile": "Components/CheckControls.razor.less"
   }
 ]
\ No newline at end of file
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index e7311b81..5edb6991 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -54,51 +54,6 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
-
-        /// <summary>
-        /// Elenco operatori
-        /// </summary>
-        /// <returns></returns>
-        public List<AnagOperatoriModel> ElencoOperatori()
-        {
-            List<AnagOperatoriModel> dbResult = new List<AnagOperatoriModel>();
-            using (var dbCtx = new MoonProContext(_configuration))
-            {
-                dbResult = dbCtx
-                            .DbOperatori
-                            .Where(s => s.MatrOpr > 0)
-                            .AsNoTracking()
-                            .OrderBy(x => x.MatrOpr)
-                            .ToList();
-            }
-            return dbResult;
-        }
-
-        /// <summary>
-        /// login operatori
-        /// </summary>
-        /// /// <param name="matrOpr"></param>
-        /// /// <param name="authKey"></param>
-        /// <returns></returns>
-        public AnagOperatoriModel OperatoreSearch(int matrOpr, string authKey)
-        {
-            AnagOperatoriModel dbResult = null;
-            AnagOperatoriModel answ = new AnagOperatoriModel();
-            using (var dbCtx = new MoonProContext(_configuration))
-            {
-                dbResult = dbCtx
-                            .DbOperatori
-                            .Where(s => (s.MatrOpr > 0) && (s.MatrOpr == matrOpr) && (s.authKey == authKey))
-                            .AsNoTracking()
-                            .FirstOrDefault();
-                if (dbResult != null)
-                {
-                    answ = dbResult;
-                }
-            }
-            return answ;
-        }
-
         /// <summary>
         /// Registrato ACK allarme
         /// </summary>
@@ -560,6 +515,25 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
+        /// <summary>
+        /// Elenco operatori
+        /// </summary>
+        /// <returns></returns>
+        public List<AnagOperatoriModel> ElencoOperatori()
+        {
+            List<AnagOperatoriModel> dbResult = new List<AnagOperatoriModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbOperatori
+                            .Where(s => s.MatrOpr > 0)
+                            .AsNoTracking()
+                            .OrderBy(x => x.MatrOpr)
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         //stp_DDB_getNextByMacchinaFrom
         /// <summary>
         /// Eliminazione record EventList (SE trovato)
@@ -1264,6 +1238,33 @@ namespace MP.Data.Controllers
             return answ;
         }
 
+        /// <summary>
+        /// login operatori
+        /// </summary>
+        /// ///
+        /// <param name="matrOpr"></param>
+        /// ///
+        /// <param name="authKey"></param>
+        /// <returns></returns>
+        public AnagOperatoriModel OperatoreSearch(int matrOpr, string authKey)
+        {
+            AnagOperatoriModel dbResult = null;
+            AnagOperatoriModel answ = new AnagOperatoriModel();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbOperatori
+                            .Where(s => (s.MatrOpr > 0) && (s.MatrOpr == matrOpr) && (s.authKey == authKey))
+                            .AsNoTracking()
+                            .FirstOrDefault();
+                if (dbResult != null)
+                {
+                    answ = dbResult;
+                }
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Stato prod macchina
         /// </summary>
@@ -1444,6 +1445,29 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
+        /// Restituisce elenco Ultimi RC macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="idxODL"></param>
+        /// <param name="dataFrom"></param>
+        /// <param name="dataTo"></param>
+        /// <returns></returns>
+        public List<RegistroControlliModel> RegControlliLast(string idxMacchina)
+        {
+            List<RegistroControlliModel> dbResult = new List<RegistroControlliModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var IdxMacc = new SqlParameter("@IdxMacchina", idxMacchina);
+
+                dbResult = dbCtx
+                            .DbSetRegControlli
+                            .FromSqlRaw("EXEC stp_RC_getLast @IdxMacchina", IdxMacc)
+                            .AsNoTracking()
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Aggiunta record RegistroScarti
         /// </summary>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index baa9cbb9..70427841 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1942,6 +1942,42 @@ namespace MP.Data.Services
             return result;
         }
 
+        /// <summary>
+        /// Restituisce elenco ULTIMI RC x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public async Task<List<RegistroControlliModel>> RegControlliLast(string idxMacchina)
+        {
+            // setup parametri costanti
+            string source = "DB";
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
+            List<RegistroControlliModel>? result = new List<RegistroControlliModel>();
+            // cerco in redis...
+            string currKey = $"{redisBaseKey}:RecContr:{idxMacchina}:LAST";
+            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<RegistroControlliModel>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = dbTabController.RegControlliLast(idxMacchina);
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+            }
+            if (result == null)
+            {
+                result = new List<RegistroControlliModel>();
+            }
+            sw.Stop();
+            Log.Debug($"RegControlliLast | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            return result;
+        }
+
         /// <summary>
         /// Registra controllo
         /// </summary>

From 0e604ab18676d39c7a36305ede1ae7d251125e51 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 08:57:09 +0100
Subject: [PATCH 03/69] Fix refresh pagina controlli (btn richiesto controllo)

---
 MP-TAB-SERV/Components/ControlsMan.razor.cs | 5 +++++
 MP-TAB-SERV/MP-TAB-SERV.csproj              | 2 +-
 MP-TAB-SERV/Pages/Controls.razor            | 4 ++--
 MP-TAB-SERV/Pages/Controls.razor.cs         | 8 ++++++++
 MP-TAB-SERV/Resources/ChangeLog.html        | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt           | 2 +-
 MP-TAB-SERV/Resources/manifest.xml          | 2 +-
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/MP-TAB-SERV/Components/ControlsMan.razor.cs b/MP-TAB-SERV/Components/ControlsMan.razor.cs
index 07d5e907..d2f37dfd 100644
--- a/MP-TAB-SERV/Components/ControlsMan.razor.cs
+++ b/MP-TAB-SERV/Components/ControlsMan.razor.cs
@@ -10,6 +10,9 @@ namespace MP_TAB_SERV.Components
     {
         #region Public Properties
 
+        [Parameter]
+        public EventCallback<bool> E_Updated { get; set; }
+
         [Parameter]
         public MappaStatoExpl? RecMSE { get; set; } = null;
 
@@ -83,6 +86,7 @@ namespace MP_TAB_SERV.Components
             showInsert = false;
             showNote = false;
             await doUpdate();
+            await E_Updated.InvokeAsync(false);
             isProcessing = false;
         }
 
@@ -99,6 +103,7 @@ namespace MP_TAB_SERV.Components
             showInsert = false;
             showNote = false;
             await doUpdate();
+            await E_Updated.InvokeAsync(true);
             isProcessing = false;
         }
 
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index a5d9d7ab..fd6eb6b6 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1119</Version>
+      <Version>6.16.2312.1208</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Controls.razor b/MP-TAB-SERV/Pages/Controls.razor
index d6545f1a..8f7e5fe9 100644
--- a/MP-TAB-SERV/Pages/Controls.razor
+++ b/MP-TAB-SERV/Pages/Controls.razor
@@ -1,7 +1,7 @@
 ﻿@page "/controls"
 
 <MseSampler SampleMult="0.5" E_Updated="RefreshData"></MseSampler>
-@if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null)
+@if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null || IsLoading)
 {
     <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
 }
@@ -9,5 +9,5 @@ else
 {
     <CheckControls RecMSE="CurrMSE"></CheckControls>
     <MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
-    <ControlsMan RecMSE="CurrMSE"></ControlsMan>
+    <ControlsMan RecMSE="CurrMSE" E_Updated="ForceReload"></ControlsMan>
 }
diff --git a/MP-TAB-SERV/Pages/Controls.razor.cs b/MP-TAB-SERV/Pages/Controls.razor.cs
index e9449abd..d03f3572 100644
--- a/MP-TAB-SERV/Pages/Controls.razor.cs
+++ b/MP-TAB-SERV/Pages/Controls.razor.cs
@@ -41,6 +41,14 @@ namespace MP_TAB_SERV.Pages
             await InvokeAsync(StateHasChanged);
         }
 
+        protected async Task ForceReload()
+        {
+            IsLoading = true;
+            await Task.Delay(50);
+            IsLoading = false;
+        }
+        private bool IsLoading = false;
+
         #endregion Protected Methods
 
         #region Private Methods
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index cc6d4acd..d21e6bdd 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1119</h4>
+    <h4>Versione: 6.16.2312.1208</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 81fa670d..1fce9f41 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1119
+6.16.2312.1208
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 2203e907..7213ab97 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1119</version>
+  <version>6.16.2312.1208</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From a4edd711f6759145d659730700fe9aefc3616002 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 12 Dec 2023 09:47:01 +0100
Subject: [PATCH 04/69] fix bypass controllo  click in pagina reg new device

---
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Pages/Logout.razor.cs      |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 MP-TAB-SERV/Shared/MainLayout.razor.cs |  7 +++++--
 MP-TAB-SERV/Shared/NavMenu.razor       | 25 ++++++++++++++++++++++---
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index c74167ee..37c695a4 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1117</Version>
+      <Version>6.16.2312.1209</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Logout.razor.cs b/MP-TAB-SERV/Pages/Logout.razor.cs
index 81f91ac5..b35a8819 100644
--- a/MP-TAB-SERV/Pages/Logout.razor.cs
+++ b/MP-TAB-SERV/Pages/Logout.razor.cs
@@ -42,7 +42,7 @@ namespace MP_TAB_SERV.Pages
             await localStorage.SetItemAsync("currTkn", "");
             await TDService.OperatoreDeleteRedis(MsgServ.MatrOpr);
             MsgServ.RigaOper = null;
-            NavMan.NavigateTo("reg-new-device");
+            NavMan.NavigateTo("reg-new-device", true);
         }
     }
 }
\ No newline at end of file
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 416babf1..0373e16a 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1117</h4>
+    <h4>Versione: 6.16.2312.1209</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 37708e5b..bef5f6be 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1117
+6.16.2312.1209
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 333426eb..905c9299 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1117</version>
+  <version>6.16.2312.1209</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index cdc81dbe..73566389 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -72,7 +72,10 @@ namespace MP_TAB_SERV.Shared
         protected async Task handleBodyClick()
         {
             await Task.Delay(1);
-            await checkDtDiff2Logout();
+            if (!NavMan.Uri.Contains("reg-new-device"))
+            {
+                await checkDtDiff2Logout();
+            }
 
         }
         private int MatrOpr
@@ -94,7 +97,7 @@ namespace MP_TAB_SERV.Shared
                     }
                     break;
                 case 1:
-                    if ((diffOfTime.Minutes >= dtScadLogin) && (!NavMan.Uri.Contains("reg-new-device")))
+                    if (diffOfTime.Minutes >= dtScadLogin)
                     {
                         var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
                         if (!string.IsNullOrEmpty(userTkn))
diff --git a/MP-TAB-SERV/Shared/NavMenu.razor b/MP-TAB-SERV/Shared/NavMenu.razor
index a3cfec58..2bdf92e1 100644
--- a/MP-TAB-SERV/Shared/NavMenu.razor
+++ b/MP-TAB-SERV/Shared/NavMenu.razor
@@ -14,9 +14,18 @@
             foreach (var item in MenuItems)
             {
                 <div class="nav-item px-2">
-                    <NavLink class="nav-link px-2" @onclick="()=>SetPage(item.NavigateUrl)">
-                        <i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
-                    </NavLink>
+                    @if (@linkActive(item.NavigateUrl))
+                    {
+                        <NavLink class="nav-link px-2 active" @onclick="()=>SetPage(item.NavigateUrl)">
+                            <i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
+                        </NavLink>
+                    }
+                    else
+                    {
+                        <NavLink class="nav-link px-2" @onclick="()=>SetPage(item.NavigateUrl)">
+                            <i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
+                        </NavLink>
+                    }
                 </div>
             }
         }
@@ -34,6 +43,16 @@
     [Inject]
     protected NavigationManager navManager { get; set; } = null!;
 
+    protected bool linkActive(string objUrl)
+    {
+        bool answ = false;
+        if (navManager.Uri.Contains(objUrl))
+        {
+            answ = true;
+        }
+        return answ;
+    }
+
     protected async Task SetPage(string tgtUrl)
     {
         await Task.Delay(1);

From 2f765cf0954627e72d28d9d64f12da059351bac1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 14:44:33 +0100
Subject: [PATCH 05/69] Fix salvataggio tav selezionata

---
 MP-TAB-SERV/Components/MachSel.razor.cs    | 30 ++++++-
 MP-TAB-SERV/Components/MseSampler.razor.cs |  1 -
 MP-TAB-SERV/MP-TAB-SERV.csproj             |  2 +-
 MP-TAB-SERV/Pages/User.razor               |  6 +-
 MP-TAB-SERV/Resources/ChangeLog.html       |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt          |  2 +-
 MP-TAB-SERV/Resources/manifest.xml         |  2 +-
 MP.Data/Services/MessageService.cs         | 93 ++++++++++++----------
 8 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachSel.razor.cs b/MP-TAB-SERV/Components/MachSel.razor.cs
index b328ed09..761ef777 100644
--- a/MP-TAB-SERV/Components/MachSel.razor.cs
+++ b/MP-TAB-SERV/Components/MachSel.razor.cs
@@ -1,6 +1,7 @@
 using global::Microsoft.AspNetCore.Components;
 using MP.Data.DatabaseModels;
 using MP.Data.Services;
+using MP_TAB_SERV.Shared;
 using System;
 using System.Reflection.Metadata;
 
@@ -28,12 +29,16 @@ namespace MP_TAB_SERV.Components
                 if (idxMaccSel != value)
                 {
                     idxMaccSel = value;
+                    MsgServ.UserPrefSet(idxMaccCurr, value);
                     E_MachSel.InvokeAsync(value).ConfigureAwait(false);
                 }
             }
         }
         private string idxMaccSel { get; set; } = "";
 
+        [Inject]
+        protected MessageService MsgServ { get; set; } = null!;
+
         protected Dictionary<string, string>? ListMacchine { get; set; } = null;
 
         [Inject]
@@ -43,6 +48,19 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Methods
 
+        protected string idxMaccCurr
+        {
+            get
+            {
+                string answ = "";
+                if (RecMSE != null)
+                {
+                    answ = RecMSE?.IdxMacchina ?? "";
+                }
+                return answ;
+            }
+        }
+
         protected override async Task OnParametersSetAsync()
         {
             // inizilamente riporto machcina corrente da MSE
@@ -63,8 +81,16 @@ namespace MP_TAB_SERV.Components
 
                     if (ListMacchine.Count > 0 && string.IsNullOrEmpty(idxMaccSel))
                     {
-                        IdxMaccSel = ListMacchine.FirstOrDefault().Key;
-                        //await E_MachSel.InvokeAsync(idxMaccSel);
+                        // cerco se ho in storage la macchina selezionata...
+                        var idxMSel = MsgServ.UserPrefGet(idxMaccCurr);
+                        if (!string.IsNullOrEmpty(idxMSel))
+                        {
+                            idxMaccSel = idxMSel;
+                        }
+                        else
+                        {
+                            IdxMaccSel = ListMacchine.FirstOrDefault().Key;
+                        }
                     }
                 }
             }
diff --git a/MP-TAB-SERV/Components/MseSampler.razor.cs b/MP-TAB-SERV/Components/MseSampler.razor.cs
index 0f96ac5a..0c90ce82 100644
--- a/MP-TAB-SERV/Components/MseSampler.razor.cs
+++ b/MP-TAB-SERV/Components/MseSampler.razor.cs
@@ -72,7 +72,6 @@ namespace MP_TAB_SERV.Components
                 {
                     aTimer.Interval = fastRefreshMs;
                     await InvokeAsync(RefreshData);
-                    //Log.Trace("MseSampler Timer elapsed");
                 });
             pUpd.Wait(); 
         }
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index fd6eb6b6..03e15603 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1208</Version>
+      <Version>6.16.2312.1214</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/User.razor b/MP-TAB-SERV/Pages/User.razor
index d23fee31..c475e85f 100644
--- a/MP-TAB-SERV/Pages/User.razor
+++ b/MP-TAB-SERV/Pages/User.razor
@@ -191,7 +191,7 @@
             if (_tcModIns != value)
             {
                 _tcModIns = value;
-                MsgServ.UserPrefSave("TcMode", value);
+                MsgServ.UserPrefSet("TcMode", value);
             }
         }
     }
@@ -206,7 +206,7 @@
             if (_langIns != value)
             {
                 _langIns = value;
-                MsgServ.UserPrefSave("Lang", value);
+                MsgServ.UserPrefSet("Lang", value);
             }
         }
     }
@@ -220,7 +220,7 @@
             if (_defCardMode != value)
             {
                 _defCardMode = value;
-                MsgServ.UserPrefSave("DefCardMode", value);
+                MsgServ.UserPrefSet("DefCardMode", value);
             }
         }
     }
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index d21e6bdd..2457f48d 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1208</h4>
+    <h4>Versione: 6.16.2312.1214</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 1fce9f41..d11d7a4c 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1208
+6.16.2312.1214
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 7213ab97..7b5b0f8a 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1208</version>
+  <version>6.16.2312.1214</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index 068e3459..50cece25 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -53,8 +53,6 @@ namespace MP.Data.Services
 
         #endregion Public Events
 
-        #region Public Properties
-
 #if false
         protected bool _tReset { get; set; } = false;
         protected bool tReset
@@ -76,10 +74,10 @@ namespace MP.Data.Services
             {
                 EA_ResetFooterTimer?.Invoke();
             }
-        } 
+        }
 #endif
 
-        public DateTime dtLastAction { get; set; } = DateTime.Now;
+        #region Public Properties
 
         public string CognomeNome
         {
@@ -120,6 +118,8 @@ namespace MP.Data.Services
             }
         }
 
+        public DateTime dtLastAction { get; set; } = DateTime.Now;
+
         public int MatrOpr
         {
             get
@@ -247,6 +247,37 @@ namespace MP.Data.Services
             return SteamCrypto.DecryptString(encData, Constants.passPhrase);
         }
 
+        public async Task<bool> DoLogIn(string decodValue)
+        {
+            bool answ = false;
+            expDays = SMService.GetConfInt("cookieDayExpire");
+            var expDT = DateTime.Now.AddDays(expDays);
+            // decifro i valori..
+            var decrVal = DecryptData(decodValue);
+            var opData = JsonConvert.DeserializeObject<userTknDTO>(decrVal);
+            if (opData != null)
+            {
+                var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
+                if (rigaOpr != null)
+                {
+                    userTknDTO newUserTkn = new userTknDTO()
+                    {
+                        currOpr = rigaOpr,
+                        expTime = expDT
+                    };
+
+                    var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
+                    string hash = TDService.EncryptData(jsonTkn);
+                    RigaOper = rigaOpr;
+                    await SetLastMatrOprAsync(rigaOpr.MatrOpr);
+                    await SetCurrOperDtoAsync(hash);
+                    await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
+                    answ = true;
+                }
+            }
+            return answ;
+        }
+
         public string EncryptData(string rawData)
         {
             return SteamCrypto.EncryptString(rawData, Constants.passPhrase);
@@ -344,6 +375,7 @@ namespace MP.Data.Services
         {
             await localStorage.SetItemAsync("CurrMach", machSel);
         }
+
         /// <summary>
         /// Scrive sul local storage pagina corrente
         /// </summary>
@@ -438,40 +470,6 @@ namespace MP.Data.Services
             return answ;
         }
 
-        protected int expDays { get; set; } = 0;
-
-        public async Task<bool> DoLogIn(string decodValue)
-        {
-            bool answ = false;
-            expDays = SMService.GetConfInt("cookieDayExpire");
-            var expDT = DateTime.Now.AddDays(expDays);
-            // decifro i valori..
-            var decrVal = DecryptData(decodValue);
-            var opData = JsonConvert.DeserializeObject<userTknDTO>(decrVal);
-            if (opData != null)
-            {
-                var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
-                if (rigaOpr != null)
-                {
-                    userTknDTO newUserTkn = new userTknDTO()
-                    {
-                        currOpr = rigaOpr,
-                        expTime = expDT
-                    };
-
-                    var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
-                    string hash = TDService.EncryptData(jsonTkn);
-                    RigaOper = rigaOpr;
-                    await SetLastMatrOprAsync(rigaOpr.MatrOpr);
-                    await SetCurrOperDtoAsync(hash);
-                    await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
-                    answ = true;
-                }
-            }
-            return answ;
-        }
-
-
         /// <summary>
         /// Salva matrOpr nel localstorage
         /// </summary>
@@ -484,6 +482,7 @@ namespace MP.Data.Services
             return answ;
         }
 
+
         /// <summary>
         /// Recupero singola preferenza utente
         /// </summary>
@@ -501,12 +500,12 @@ namespace MP.Data.Services
         }
 
         /// <summary>
-        /// Salvo singola rpeferenza utente
+        /// Salvo singola preferenza utente
         /// </summary>
         /// <param name="chiave"></param>
         /// <param name="valore"></param>
         /// <returns></returns>
-        public bool UserPrefSave(string chiave, string valore)
+        public bool UserPrefSet(string chiave, string valore)
         {
             bool done = false;
             var currDict = UsersPrefDict;
@@ -540,7 +539,7 @@ namespace MP.Data.Services
             {
                 if (MatrOpr > 0)
                 {
-                    UserPrefSave(chiave, defValue);
+                    UserPrefSet(chiave, defValue);
                 }
             }
             return answ;
@@ -569,11 +568,11 @@ namespace MP.Data.Services
 
         #region Protected Properties
 
+        protected int expDays { get; set; } = 0;
         protected ILocalStorageService localStorage { get; set; } = null!;
-        protected TabDataService TDService { get; set; } = null!;
-        protected SharedMemService SMService { get; set; } = null!;
-
         protected ISessionStorageService sessionStore { get; set; } = null!;
+        protected SharedMemService SMService { get; set; } = null!;
+        protected TabDataService TDService { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -597,6 +596,12 @@ namespace MP.Data.Services
 
         #endregion Private Fields
 
+        #region Private Properties
+
+        private Dictionary<string, string> UserPrefs { get; set; } = new Dictionary<string, string>();
+
+        #endregion Private Properties
+
         #region Private Methods
 
         private string machineMse(string idxMacc)

From 75b330abc41936d7ad2d45574010bb6685da25b5 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 15:52:50 +0100
Subject: [PATCH 06/69] Fix reload post ODL action

---
 MP-TAB-SERV/Components/MseSampler.razor.cs | 19 +++++---
 MP-TAB-SERV/Components/OdlMan.razor.cs     | 29 +++++++-----
 MP-TAB-SERV/MP-TAB-SERV.csproj             |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html       |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt          |  2 +-
 MP-TAB-SERV/Resources/manifest.xml         |  2 +-
 MP.Data/Services/TabDataService.cs         | 54 +++++++++-------------
 7 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/MP-TAB-SERV/Components/MseSampler.razor.cs b/MP-TAB-SERV/Components/MseSampler.razor.cs
index 0c90ce82..085d46e3 100644
--- a/MP-TAB-SERV/Components/MseSampler.razor.cs
+++ b/MP-TAB-SERV/Components/MseSampler.razor.cs
@@ -68,12 +68,19 @@ namespace MP_TAB_SERV.Components
 
         protected void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
-            var pUpd = Task.Run(async () =>
-                {
-                    aTimer.Interval = fastRefreshMs;
-                    await InvokeAsync(RefreshData);
-                });
-            pUpd.Wait(); 
+            try
+            {
+                var pUpd = Task.Run(async () =>
+                    {
+                        aTimer.Interval = fastRefreshMs;
+                        await InvokeAsync(RefreshData);
+                    });
+                pUpd.Wait();
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione durante MseSampler.ElapsedTimer{Environment.NewLine}{exc}");
+            }
         }
 
         protected override void OnInitialized()
diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index 6d084393..4c2b32c3 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -242,7 +242,7 @@ namespace MP_TAB_SERV.Components
                 await advStep(currStep++);
 
                 // cancella dati correnti ODL
-                DoRemoveCurrOdlData();
+                DoRemoveCurrOdlData(false);
                 await advStep(currStep++);
             }
             catch
@@ -255,6 +255,10 @@ namespace MP_TAB_SERV.Components
             await advStep(currStep++);
             isProcessing = false;
             await InvokeAsync(StateHasChanged);
+#if false
+            await Task.Delay(50);
+            NavMan.NavigateTo(NavMan.Uri, true); 
+#endif
         }
 
         /// <summary>
@@ -630,7 +634,7 @@ namespace MP_TAB_SERV.Components
             checkBtnStatus();
             fixSplitBtn(false);
             // faccio refresh e riporto
-            await TabDServ.FlushCache("ODL");
+            await TabDServ.FlushOdlCache();
             IdxPOdlSel = 0;
             RecMSE = null;
             await RefreshData();
@@ -972,7 +976,6 @@ namespace MP_TAB_SERV.Components
         private bool showOdlProvv = false;
         private bool showReopenOdlTav = false;
         private bool showSplitOdlOnTav = false;
-        private decimal tcRichAttr = 1;
 
         #endregion Private Fields
 
@@ -994,7 +997,6 @@ namespace MP_TAB_SERV.Components
         }
 
         private ODLExpModel currOdl { get; set; } = new ODLExpModel();
-
         private PODLExpModel currPodl { get; set; } = new PODLExpModel();
 
         /// <summary>
@@ -1185,6 +1187,8 @@ namespace MP_TAB_SERV.Components
             }
         }
 
+        private decimal tcRichAttr { get; set; } = 1;
+
         private string titleOdlDetail
         {
             get => IdxPOdlSel > 0 ? "Verifica parametri attrezzaggio NUOVO PODL" : inAttr ? "Parametri PODL in Attrezzaggio" : "Parametri ODL Corrente";
@@ -1426,7 +1430,7 @@ namespace MP_TAB_SERV.Components
         /// <summary>
         /// Rimozione dati e parametri (TAB e su PLC) x ODL corrente
         /// </summary>
-        private void DoRemoveCurrOdlData()
+        private void DoRemoveCurrOdlData(bool nav2detail)
         {
             // invio task x end produzione...
             string setArtVal = "NO ART";
@@ -1453,8 +1457,11 @@ namespace MP_TAB_SERV.Components
                     TabDServ.addTask4Machine(machine.IdxMacchinaSlave, taskType.setComm, setCommVal);
                 }
             }
-            // rimando a pagina dettaglio...
-            NavMan.NavigateTo("machine-detail", true);
+            // se richiesto rimando a pagina dettaglio...
+            if (nav2detail)
+            {
+                NavMan.NavigateTo("machine-detail", true);
+            }
         }
 
 #if false
@@ -1564,14 +1571,14 @@ namespace MP_TAB_SERV.Components
             // imposto tcRichAttr in base allo stato...
             if (odlOk)
             {
-                // prendo TCRich da ODL...
-                if (IdxOdl > 0)
+                // prendo TCRich da PODL...
+                if (IdxPOdlSel > 0)
                 {
-                    tcRichAttr = currOdl.TCRichAttr;
+                    tcRichAttr = currPodl.Tcassegnato;
                 }
                 else
                 {
-                    tcRichAttr = currPodl.Tcassegnato;
+                    tcRichAttr = currOdl.TCRichAttr;
                 }
             }
         }
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 03e15603..3c00190a 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1214</Version>
+      <Version>6.16.2312.1215</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 2457f48d..61e95d92 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1214</h4>
+    <h4>Versione: 6.16.2312.1215</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index d11d7a4c..14723875 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1214
+6.16.2312.1215
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 7b5b0f8a..9189f131 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1214</version>
+  <version>6.16.2312.1215</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 70427841..d676ccce 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1225,9 +1225,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.OdlClearSetup(idxODL, idxMacchina);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1236,6 +1234,17 @@ namespace MP.Data.Services
             }
             return answ;
         }
+        /// <summary>
+        /// Flush di tutta la cache relativa ad i dati ODL/PODL
+        /// </summary>
+        /// <returns></returns>
+        public async Task FlushOdlCache()
+        {
+            await FlushCache("ODL");
+            await FlushCache("PODL");
+            await FlushCache("VSODL");
+            await FlushCache("StatoMacc");
+        }
 
         /// <summary>
         /// ODL corrente macchina
@@ -1287,9 +1296,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.OdlDividiDaAltraTavola(idxODL, matrOpr, idxMacchinaTo);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1312,9 +1319,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.OdlFineProd(idxODL, idxMacchina);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1338,9 +1343,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.OdlFixMachineSlave(idxMacchina, numDayPrev, doInsert);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1367,9 +1370,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.OdlInizioSetup(idxODL, matrOpr, idxMacchina, tcRich, pzPallet, note);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1473,9 +1474,7 @@ namespace MP.Data.Services
             // riordino
             result = results.FirstOrDefault();
             // svuoto cache
-            await FlushCache("ODL");
-            await FlushCache("PODL");
-            await FlushCache("VSODL");
+            await FlushOdlCache();
             if (result == null)
             {
                 result = new ODLModel();
@@ -1498,9 +1497,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = await Task.FromResult(dbTabController.OdlSetupPostumo(idxODL, idxMacchina));
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1524,9 +1521,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = await Task.FromResult(dbTabController.OdlSetupPromPostuma(idxPromOdl, matrOpr, idxMacchina));
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1555,9 +1550,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = await Task.FromResult(dbTabController.OdlSplit(idxODL, matrOpr, idxMacchina, TCRich, pzPallet, note, startNewOdl, qtyRich));
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1583,9 +1576,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.OdlUpdate(idxODL, matrOpr, tCRichAttr, pzPallet, note);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
-                await FlushCache("VSODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {
@@ -1759,8 +1750,7 @@ namespace MP.Data.Services
             {
                 // inserisco evento
                 answ = dbTabController.PODL_startSetup(editRec, matrOpr, tcRich, pzPallet, note, dtEvent);
-                await FlushCache("ODL");
-                await FlushCache("PODL");
+                await FlushOdlCache();
             }
             catch (Exception exc)
             {

From 3fdb713a05d556a23c1bc3b530ec11368e28cad0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 16:13:08 +0100
Subject: [PATCH 07/69] Fix login che sparisce da timeout cookie

---
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Pages/_Layout.cshtml       |  7 -----
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 MP-TAB-SERV/Shared/MainLayout.razor.cs | 37 +++++++++++++++++++++-----
 MP.Data/Services/MessageService.cs     |  1 +
 7 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 3c00190a..ffe19f03 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1215</Version>
+      <Version>6.16.2312.1216</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/_Layout.cshtml b/MP-TAB-SERV/Pages/_Layout.cshtml
index 0a7d54c9..0059df26 100644
--- a/MP-TAB-SERV/Pages/_Layout.cshtml
+++ b/MP-TAB-SERV/Pages/_Layout.cshtml
@@ -38,14 +38,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @*<script src="_content/ZXingBlazor/lib/barcodereader/zxing.js"></script>
-    <script src="_content/ZXingBlazor/lib/barcodereader/barcode.js"></script>*@
-    @*<script src="_content/ZXingBlazor/lib/barcodereader/zxing.js"></script>*@
-    @*<script src="_content/ZXingBlazor/lib/zxing/zxing.min.js"></script>
-    <script src="MP/TAB3/_content/ZXingBlazor/lib/zxing/zxing.min.js"></script>*@
-    @*<script src="_content/ZXingBlazor/lib/barcodereader/barcode.js"></script>*@
     <script src="~/lib//BarcodeReade.razor.js"></script>
-
     <script src="lib/WindowSize.js"></script>
     <script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
     <script src="_framework/blazor.server.js"></script>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 61e95d92..880e6407 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1215</h4>
+    <h4>Versione: 6.16.2312.1216</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 14723875..7de4424c 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1215
+6.16.2312.1216
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 9189f131..e503a1d4 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1215</version>
+  <version>6.16.2312.1216</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 73566389..c8fc0d4a 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.Services;
+using MP_TAB_SERV.Components;
 using NLog;
 
 namespace MP_TAB_SERV.Shared
@@ -65,14 +66,24 @@ namespace MP_TAB_SERV.Shared
 
         protected string bodyTipe
         {
-            get => NavMan.Uri.Contains("reg-new-device") ? "mainBodyNoSide" : "mainBody";
+            get => pageOk ? "mainBodyNoSide" : "mainBody";
+        }
+
+        protected bool pageOk
+        {
+            get
+            {
+                string currPage = NavMan.Uri;
+                return currPage.Contains("logout") || currPage.Contains("reg-new-device");
+            }
         }
 
 
         protected async Task handleBodyClick()
         {
             await Task.Delay(1);
-            if (!NavMan.Uri.Contains("reg-new-device"))
+            MsgServ.dtLastAction = DateTime.Now;
+            if (!pageOk)
             {
                 await checkDtDiff2Logout();
             }
@@ -87,29 +98,43 @@ namespace MP_TAB_SERV.Shared
 
         protected async Task checkDtDiff2Logout()
         {
-            var diffOfTime = DateTime.Now - MsgServ.dtLastAction;
+            TimeSpan tsDeltaAct = DateTime.Now.Subtract(MsgServ.dtLastAction);
+            TimeSpan tsDeltaSave = DateTime.Now.Subtract(MsgServ.dtLastSave);
             switch (typeScadLogin)
             {
                 case 0:
-                    if (diffOfTime.Minutes >= dtScadLogin)
+                    if (tsDeltaAct.Minutes >= dtScadLogin)
                     {
                         NavMan.NavigateTo("logout");
                     }
                     break;
                 case 1:
-                    if (diffOfTime.Minutes >= dtScadLogin)
+                    if (tsDeltaAct.Minutes >= dtScadLogin)
                     {
                         var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
                         if (!string.IsNullOrEmpty(userTkn))
                         {
                             await MsgServ.DoLogIn(userTkn);
-                            MsgServ.dtLastAction = DateTime.Now;
+                            MsgServ.dtLastSave = DateTime.Now;
                         }
                         else
                         {
                             NavMan.NavigateTo("logout");
                         }
                     }
+                    else
+                    {
+                        // se fosse oltre mezzo periodo da ultimo save --> salvo!
+                        if (tsDeltaSave.TotalMinutes > dtScadLogin * 0.8)
+                        {
+                            var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
+                            if (!string.IsNullOrEmpty(userTkn))
+                            {
+                                await MsgServ.DoLogIn(userTkn);
+                                MsgServ.dtLastSave = DateTime.Now;
+                            }
+                        }
+                    }
                     break;
             }
         }
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index 50cece25..2855c6ec 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -119,6 +119,7 @@ namespace MP.Data.Services
         }
 
         public DateTime dtLastAction { get; set; } = DateTime.Now;
+        public DateTime dtLastSave { get; set; } = DateTime.Now;
 
         public int MatrOpr
         {

From 45108c1aeae337ca51bdd38d5f37b7edd6970259 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 16:16:38 +0100
Subject: [PATCH 08/69] Fix lettura multipla stato prod macchina

---
 MP.Data/Services/TabDataService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index d676ccce..0de3b7aa 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -2658,7 +2658,7 @@ namespace MP.Data.Services
             sw.Start();
             StatoProdModel? result = new StatoProdModel();
             // cerco in redis...
-            string currKey = $"{redisBaseKey}:StatoProd:{idxMacchina}:{dtReq:HHmmss}";
+            string currKey = $"{redisBaseKey}:StatoProd:{idxMacchina}:{dtReq:HHmm}";
             RedisValue rawData = await redisDb.StringGetAsync(currKey);
             //if (!string.IsNullOrEmpty($"{rawData}"))
             if (rawData.HasValue)

From bbc17db69672091730273e42ffac8a92f19fc206 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 16:31:46 +0100
Subject: [PATCH 09/69] Ottimizzazione meccanismo lettura dati di prod da
 DB/REDIS x TAB

---
 MP-TAB-SERV/Components/MachineBlock.razor.cs | 15 +++-
 MP-TAB-SERV/Components/MseSampler.razor.cs   |  4 +-
 MP.Data/Services/StatusData.cs               | 73 ++++++++++++++++++++
 3 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs
index 493cf73a..3d673874 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.cs
+++ b/MP-TAB-SERV/Components/MachineBlock.razor.cs
@@ -160,9 +160,11 @@ namespace MP_TAB_SERV.Components
                 imgBasePath = $"{Environment.CurrentDirectory}/images/";
             }
 
-            
+
 
         }
+        [Inject]
+        protected StatusData SDService { get; set; } = null!;
 
         /// <summary>
         /// Dati produzioen rilevati
@@ -175,7 +177,16 @@ namespace MP_TAB_SERV.Components
             // controllo SE avessi idxMacchSub --> rileggo!
             if (RecMSE != null)
             {
-                datiProdAct = await TabDServ.StatoProdMacchina(RecMSE.IdxMacchina, adesso);
+                if (SDService.MachNumPzGet(RecMSE.IdxMacchina) != RecMSE.NumPezzi)
+                {
+                    datiProdAct = await TabDServ.StatoProdMacchina(RecMSE.IdxMacchina, adesso);
+                    SDService.MachProdStSet(RecMSE.IdxMacchina, datiProdAct);
+                    SDService.MachNumPzSet(RecMSE.IdxMacchina, RecMSE.NumPezzi);
+                }
+                else
+                {
+                    datiProdAct = SDService.MachProdStGet(RecMSE.IdxMacchina);
+                }
             }
             if (!string.IsNullOrEmpty(IdxMacchSub) && RecMSE != null)
             {
diff --git a/MP-TAB-SERV/Components/MseSampler.razor.cs b/MP-TAB-SERV/Components/MseSampler.razor.cs
index 085d46e3..788802a9 100644
--- a/MP-TAB-SERV/Components/MseSampler.razor.cs
+++ b/MP-TAB-SERV/Components/MseSampler.razor.cs
@@ -57,7 +57,7 @@ namespace MP_TAB_SERV.Components
         }
 
         [Inject]
-        protected StatusData MDataService { get; set; } = null!;
+        protected StatusData SDService { get; set; } = null!;
 
         [Inject]
         protected MessageService MServ { get; set; } = null!;
@@ -113,7 +113,7 @@ namespace MP_TAB_SERV.Components
 
         private async Task RefreshData()
         {
-            List<MappaStatoExpl> ListMSE = await MDataService.MseGetAll();
+            List<MappaStatoExpl> ListMSE = await SDService.MseGetAll();
             await MServ.SaveMse(ListMSE);
             await E_Updated.InvokeAsync(ListMSE);
         }
diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs
index 3c1782c9..caed4352 100644
--- a/MP.Data/Services/StatusData.cs
+++ b/MP.Data/Services/StatusData.cs
@@ -143,6 +143,79 @@ namespace MP.Data.Services
             return result;
         }
 
+        /// <summary>
+        /// Restituisce numPezzi (ultimo) x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public int MachNumPzGet(string idxMacchina)
+        {
+            int answ = 0;
+            if (MachineNumPz.ContainsKey(idxMacchina))
+            {
+                answ = MachineNumPz[idxMacchina];
+            }
+            return answ;
+        }
+        /// <summary>
+        /// Salva numPezzi x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="numPz"></param>
+        /// <returns></returns>
+        public bool MachNumPzSet(string idxMacchina, int numPz)
+        {
+            bool answ = false;
+            if (MachineNumPz.ContainsKey(idxMacchina))
+            {
+                MachineNumPz[idxMacchina] = numPz;
+            }
+            else
+            {
+                MachineNumPz.Add(idxMacchina, numPz);
+            }
+            answ = true;
+            return answ;
+        }
+
+        /// <summary>
+        /// Restituisce numPezzi (ultimo) x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public StatoProdModel MachProdStGet(string idxMacchina)
+        {
+            StatoProdModel answ = new StatoProdModel();
+            if (MachineProdStatus.ContainsKey(idxMacchina))
+            {
+                answ = MachineProdStatus[idxMacchina];
+            }
+            return answ;
+        }
+        /// <summary>
+        /// Salva numPezzi x macchina
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="currStatus"></param>
+        /// <returns></returns>
+        public bool MachProdStSet(string idxMacchina, StatoProdModel currStatus)
+        {
+            bool answ = false;
+            if (MachineProdStatus.ContainsKey(idxMacchina))
+            {
+                MachineProdStatus[idxMacchina] = currStatus;
+            }
+            else
+            {
+                MachineProdStatus.Add(idxMacchina, currStatus);
+            }
+            answ = true;
+            return answ;
+        }
+
+        private Dictionary<string, int> MachineNumPz { get; set; } = new Dictionary<string, int>();
+        private Dictionary<string, StatoProdModel> MachineProdStatus { get; set; } = new Dictionary<string, StatoProdModel>();
+
         #endregion Public Methods
 
         #region Protected Fields

From d40c68267390101b2de264dbf38292fd2589966f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 12 Dec 2023 16:51:28 +0100
Subject: [PATCH 10/69] Code reorg

---
 MP-TAB-SERV/Components/MachineBlock.razor.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs
index 3d673874..1cf8f397 100644
--- a/MP-TAB-SERV/Components/MachineBlock.razor.cs
+++ b/MP-TAB-SERV/Components/MachineBlock.razor.cs
@@ -1,5 +1,6 @@
 using EgwCoreLib.Razor;
 using global::Microsoft.AspNetCore.Components;
+using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
 using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.Services;
@@ -118,6 +119,11 @@ namespace MP_TAB_SERV.Components
             }
         }
 
+        /// <summary>
+        /// Dati produzioen rilevati
+        /// </summary>
+        protected StatoProdModel? datiProdAct { get; set; } = null;
+
         [Inject]
         protected IJSRuntime JSRuntime { get; set; } = null!;
 
@@ -127,6 +133,9 @@ namespace MP_TAB_SERV.Components
         [Inject]
         protected NavigationManager NavMan { get; set; } = null!;
 
+        [Inject]
+        protected StatusData SDService { get; set; } = null!;
+
         [Inject]
         protected TabDataService TabDServ { get; set; } = null!;
 
@@ -159,17 +168,9 @@ namespace MP_TAB_SERV.Components
             {
                 imgBasePath = $"{Environment.CurrentDirectory}/images/";
             }
-
-
-
+            await Task.Delay(1);
         }
-        [Inject]
-        protected StatusData SDService { get; set; } = null!;
 
-        /// <summary>
-        /// Dati produzioen rilevati
-        /// </summary>
-        protected StatoProdModel? datiProdAct { get; set; } = null;
         protected override async Task OnParametersSetAsync()
         {
             DateTime adesso = DateTime.Now;

From 67a83732c8059e3900007c73506b8dd6d300b1e0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 13 Dec 2023 10:00:04 +0100
Subject: [PATCH 11/69] modifica check a 1 minuto x controllo rapido

---
 MP-TAB-SERV/Shared/MainLayout.razor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index c8fc0d4a..617d1c18 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -124,8 +124,8 @@ namespace MP_TAB_SERV.Shared
                     }
                     else
                     {
-                        // se fosse oltre mezzo periodo da ultimo save --> salvo!
-                        if (tsDeltaSave.TotalMinutes > dtScadLogin * 0.8)
+                        // se fosse oltre 1 minuto da ultimo save --> salvo!
+                        if (tsDeltaSave.TotalMinutes > 1)
                         {
                             var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
                             if (!string.IsNullOrEmpty(userTkn))

From b7567d2598b61252ca7df3c6ab4537f29e138bbd Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 13 Dec 2023 10:28:36 +0100
Subject: [PATCH 12/69] fix scrittura ultima azione

---
 MP-TAB-SERV/MP-TAB-SERV.csproj         | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt      | 2 +-
 MP-TAB-SERV/Resources/manifest.xml     | 2 +-
 MP-TAB-SERV/Shared/MainLayout.razor.cs | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index ffe19f03..f33436fd 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1216</Version>
+      <Version>6.16.2312.1310</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 880e6407..8adfd7f7 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1216</h4>
+    <h4>Versione: 6.16.2312.1310</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 7de4424c..9ed58e4a 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1216
+6.16.2312.1310
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index e503a1d4..81e982f9 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1216</version>
+  <version>6.16.2312.1310</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 617d1c18..5fdee5ae 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -82,7 +82,6 @@ namespace MP_TAB_SERV.Shared
         protected async Task handleBodyClick()
         {
             await Task.Delay(1);
-            MsgServ.dtLastAction = DateTime.Now;
             if (!pageOk)
             {
                 await checkDtDiff2Logout();
@@ -115,6 +114,7 @@ namespace MP_TAB_SERV.Shared
                         if (!string.IsNullOrEmpty(userTkn))
                         {
                             await MsgServ.DoLogIn(userTkn);
+                            MsgServ.dtLastAction = DateTime.Now;
                             MsgServ.dtLastSave = DateTime.Now;
                         }
                         else
@@ -131,6 +131,7 @@ namespace MP_TAB_SERV.Shared
                             if (!string.IsNullOrEmpty(userTkn))
                             {
                                 await MsgServ.DoLogIn(userTkn);
+                                MsgServ.dtLastAction = DateTime.Now;
                                 MsgServ.dtLastSave = DateTime.Now;
                             }
                         }

From ceac06f5ddf29c01589544b79fbd2278e01c5c0c Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 13 Dec 2023 11:29:33 +0100
Subject: [PATCH 13/69] forse fix refresh post fine attr

---
 MP-TAB-SERV/Components/OdlMan.razor.cs | 8 +++++---
 MP-TAB-SERV/MP-TAB-SERV.csproj         | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt      | 2 +-
 MP-TAB-SERV/Resources/manifest.xml     | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index 4c2b32c3..c47869cd 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -418,6 +418,7 @@ namespace MP_TAB_SERV.Components
             }
             await advStep(currStep++);
 
+
             // riporto stringa
             lblOut = sb.ToString().Replace("---", "<br/>");
             // update buttons...
@@ -427,15 +428,15 @@ namespace MP_TAB_SERV.Components
             inAttr = false;
             IdxPOdlSel = 0;
             RecMSE = null;
-            await advStep(currStep++);
             // faccio refresh e riporto
             await RefreshData();
             await CheckAttr();
+            await advStep(currStep++);
             // chiudo update...
             isProcessing = false;
-            //await InvokeAsync(StateHasChanged);
+            await InvokeAsync(StateHasChanged);
             // qui rimando a pag principale...
-            NavMan.NavigateTo("status-map", true);
+            //NavMan.NavigateTo("status-map", true);
         }
 
         /// <summary>
@@ -629,6 +630,7 @@ namespace MP_TAB_SERV.Components
                 lblOut = "Selezionare un ORDINE valido!";
             }
 
+
             // refresh finale
             var tmpTCR = tcRichAttr;
             checkBtnStatus();
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index f33436fd..0960f010 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1310</Version>
+      <Version>6.16.2312.1311</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 8adfd7f7..5e5df3f6 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1310</h4>
+    <h4>Versione: 6.16.2312.1311</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 9ed58e4a..c4c43220 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1310
+6.16.2312.1311
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 81e982f9..0d4bca50 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1310</version>
+  <version>6.16.2312.1311</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From db9d67e84126458547cb9906a18fd90579c1c982 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 13 Dec 2023 16:23:24 +0100
Subject: [PATCH 14/69] ok logout post scadenza chiave

---
 .vscode/extensions.json                |  5 +++++
 MP-TAB-SERV/Components/CmpTop.razor.cs | 15 ++++++++-------
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 MP-TAB-SERV/Shared/MainLayout.razor.cs |  4 ++--
 MP.Data/Services/MessageService.cs     |  7 +++++--
 8 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 .vscode/extensions.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..e051a0d8
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "cweijan.dbclient-jdbc"
+    ]
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index 8f465e08..7182d1de 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -63,7 +63,7 @@ namespace MP_TAB_SERV.Components
 
         protected async Task RefreshLogIn(string decodValue)
         {
-            bool done = await MsgServ.DoLogIn(decodValue);
+            bool done = await MsgServ.DoLogIn(decodValue, false);
             if (done)
             {
                 if (!string.IsNullOrEmpty(LastOpenedPage) && !string.IsNullOrEmpty(CurrMacc))
@@ -137,23 +137,24 @@ namespace MP_TAB_SERV.Components
             //    NavMan.NavigateTo("logout");
             //}
             //else 
-            if (MsgServ.RigaOper == null)
-            {
-                await RefreshLogIn(decodedUrl);
-            }
+            
 
             CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr);
 
 
-            if (CurrOprTknRedis == "")
+            if (string.IsNullOrEmpty(CurrOprTknRedis))
             {
                 if (!NavMan.Uri.Contains("reg-new-device"))
                 {
                     NavMan.NavigateTo("reg-new-device", true);
                 }
             }
-            else if (CurrOprTknRedis != "")
+            else if (!string.IsNullOrEmpty(CurrOprTknRedis))
             {
+                if (MsgServ.RigaOper == null)
+                {
+                    await RefreshLogIn(decodedUrl);
+                } 
                 //if (!NavMan.Uri.Contains("status-map"))
                 //{
                 //}
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 0960f010..47063082 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1311</Version>
+      <Version>6.16.2312.1315</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 5e5df3f6..5e1ba71a 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1311</h4>
+    <h4>Versione: 6.16.2312.1315</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index c4c43220..c4cfb8be 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1311
+6.16.2312.1315
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 0d4bca50..2d3e7584 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1311</version>
+  <version>6.16.2312.1315</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 5fdee5ae..5ba285e2 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -113,7 +113,7 @@ namespace MP_TAB_SERV.Shared
                         var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
                         if (!string.IsNullOrEmpty(userTkn))
                         {
-                            await MsgServ.DoLogIn(userTkn);
+                            await MsgServ.DoLogIn(userTkn, true);
                             MsgServ.dtLastAction = DateTime.Now;
                             MsgServ.dtLastSave = DateTime.Now;
                         }
@@ -130,7 +130,7 @@ namespace MP_TAB_SERV.Shared
                             var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
                             if (!string.IsNullOrEmpty(userTkn))
                             {
-                                await MsgServ.DoLogIn(userTkn);
+                                await MsgServ.DoLogIn(userTkn, true);
                                 MsgServ.dtLastAction = DateTime.Now;
                                 MsgServ.dtLastSave = DateTime.Now;
                             }
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index 2855c6ec..b6db96e8 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -248,7 +248,7 @@ namespace MP.Data.Services
             return SteamCrypto.DecryptString(encData, Constants.passPhrase);
         }
 
-        public async Task<bool> DoLogIn(string decodValue)
+        public async Task<bool> DoLogIn(string decodValue, bool saveOpr)
         {
             bool answ = false;
             expDays = SMService.GetConfInt("cookieDayExpire");
@@ -272,7 +272,10 @@ namespace MP.Data.Services
                     RigaOper = rigaOpr;
                     await SetLastMatrOprAsync(rigaOpr.MatrOpr);
                     await SetCurrOperDtoAsync(hash);
-                    await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
+                    if (saveOpr)
+                    {
+                        await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
+                    }
                     answ = true;
                 }
             }

From ec94724c794d9b74b0e86a0aec4e39cffceb76db Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 13 Dec 2023 18:18:45 +0100
Subject: [PATCH 15/69] aggiunta gestione login con guid dispositivo

---
 MP-TAB-SERV/Components/CmpTop.razor.cs  | 48 ++++++++++++++-----------
 MP-TAB-SERV/MP-TAB-SERV.csproj          |  2 +-
 MP-TAB-SERV/Pages/RegNewDevice.razor.cs | 10 +++---
 MP-TAB-SERV/Resources/ChangeLog.html    |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt       |  2 +-
 MP-TAB-SERV/Resources/manifest.xml      |  2 +-
 MP-TAB-SERV/Shared/MainLayout.razor.cs  |  8 +++--
 MP.Data/DTO/userTknDTO.cs               |  3 +-
 MP.Data/Services/MessageService.cs      | 41 ++++++++++++++++-----
 MP.Data/Services/TabDataService.cs      | 10 +++---
 10 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index 7182d1de..8453c92b 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -27,6 +27,7 @@ namespace MP_TAB_SERV.Components
         #region Protected Properties
 
         protected string CurrOprTknLS { get; set; } = null!;
+        //protected Guid CurrDevGuid { get; set; } 
         protected string LastOpenedPage { get; set; } = null!;
         protected string CurrMacc { get; set; } = null!;
 
@@ -84,7 +85,7 @@ namespace MP_TAB_SERV.Components
             Log.Info("Start ForceReload");
             ResetClass = "btn-warning";
             await InvokeAsync(StateHasChanged);
-            var currToken = await MsgServ.GetCurrOperDtoAsync();
+            var currToken = await MsgServ.GetCurrOperDtoLSAsync();
             var lastOpr = await MsgServ.GetLastMatrOprAsync();
             // reset cache varie
             await MsgServ.ClearLocalStor();
@@ -92,7 +93,7 @@ namespace MP_TAB_SERV.Components
             await MDataService.FlushCache();
             // salvo di nuovo opr
             await MsgServ.SetLastMatrOprAsync(lastOpr);
-            await MsgServ.SetCurrOperDtoAsync(currToken);
+            await MsgServ.SetCurrOperDtoLSAsync(currToken);
             // reload MStor
             await ReloadMemStor();
             // calcolo tempo esecuzione
@@ -123,23 +124,35 @@ namespace MP_TAB_SERV.Components
             await Task.Delay(1);
             int expDays = SMServ.GetConfInt("cookieDayExpire");
             expDT = DateTime.Now.AddDays(expDays);
+            var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
+             
+            //if (string.IsNullOrEmpty(CurrDevGuid.ToString()))
+            if (CurrDevGuid == Guid.Empty)
+            {
+                CurrDevGuid = Guid.NewGuid();
+                await MsgServ.SetCurrDevGuidLSAsync(CurrDevGuid);
+            }
 
-            CurrOprTknLS = await MsgServ.GetCurrOperDtoAsync();
+            CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
             LastOpenedPage = await MsgServ.LastOpenedPageGet();
             CurrMacc = await MsgServ.IdxMaccGet();
             var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
 
-            // verifico se non avessi dati operatore
-            //var diffOfTime = DateTime.Now - MsgServ.dtLastAction;
-
-            //if (diffOfTime.Minutes >= 1)
-            //{
-            //    NavMan.NavigateTo("logout");
-            //}
-            //else 
+            if (!string.IsNullOrEmpty(CurrOprTknLS))
+            {
+                var decryptedData = MsgServ.DecryptData(CurrOprTknLS);
+                if (!string.IsNullOrEmpty(decryptedData))
+                {
+                    var oprObj = JsonConvert.DeserializeObject<userTknDTO>(decryptedData);
+                    if(oprObj != null)
+                    {
+                        MsgServ.RigaOper = oprObj.currOpr;
+                    }
+                }
+            }
             
 
-            CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr);
+            CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr, CurrDevGuid);
 
 
             if (string.IsNullOrEmpty(CurrOprTknRedis))
@@ -149,19 +162,12 @@ namespace MP_TAB_SERV.Components
                     NavMan.NavigateTo("reg-new-device", true);
                 }
             }
-            else if (!string.IsNullOrEmpty(CurrOprTknRedis))
+            else if (!string.IsNullOrEmpty(CurrOprTknRedis) && CurrOprTknRedis == CurrOprTknLS)
             {
                 if (MsgServ.RigaOper == null)
                 {
                     await RefreshLogIn(decodedUrl);
-                } 
-                //if (!NavMan.Uri.Contains("status-map"))
-                //{
-                //}
-                //if (LastOpenedPage != "")
-                //{
-                //    NavMan.NavigateTo(LastOpenedPage, true);
-                //}
+                }
             }
         }
 
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 47063082..ee372790 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1315</Version>
+      <Version>6.16.2312.1317</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/RegNewDevice.razor.cs b/MP-TAB-SERV/Pages/RegNewDevice.razor.cs
index 993a095c..a42d0b2d 100644
--- a/MP-TAB-SERV/Pages/RegNewDevice.razor.cs
+++ b/MP-TAB-SERV/Pages/RegNewDevice.razor.cs
@@ -45,8 +45,6 @@ namespace MP_TAB_SERV.Pages
 
         protected string CurrOprTknRedis { get; set; } = null!;
 
-        protected DateTime expDT { get; set; } = DateTime.Now;
-
         protected int matrOpr
         {
             get
@@ -90,6 +88,7 @@ namespace MP_TAB_SERV.Pages
         protected async Task FirstLogIn()
         {
             rigaOpr = await TDService.OperatoreSearch(matrOpr, authKey);
+            var devGuid = await MsgServ.GetCurrDevGuidLSAsync();
             if (rigaOpr == null)
             {
                 var deHash = TDService.DecryptData(authKey);
@@ -100,15 +99,15 @@ namespace MP_TAB_SERV.Pages
                 userTknDTO newUserTkn = new userTknDTO()
                 {
                     currOpr = rigaOpr,
-                    expTime = expDT
+                    DevGuid = devGuid
                 };
 
                 var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
                 string hash = TDService.EncryptData(jsonTkn);
                 MsgServ.RigaOper = rigaOpr;
-                await MsgServ.SetCurrOperDtoAsync(hash);
+                await MsgServ.SetCurrOperDtoLSAsync(hash);
                 await MsgServ.SetLastMatrOprAsync(rigaOpr.MatrOpr);
-                await TDService.OperatoreSetRedis(matrOpr, hash);
+                await TDService.OperatoreSetRedis(matrOpr, hash, devGuid);
                 NavMan.NavigateTo("status-map");
             }
             else
@@ -124,7 +123,6 @@ namespace MP_TAB_SERV.Pages
             matrOpr = await MsgServ.GetLastMatrOprAsync();
             TDService.ConfigGetVal("cookieDayExpire", ref expDays);
             ShowScanBarcode = !SMServ.GetConfBool("TAB_WebCamHide");
-            expDT = DateTime.Now.AddDays(expDays);
             oprsList = await TDService.ElencoOperatori();
         }
 
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 5e1ba71a..0b375e34 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1315</h4>
+    <h4>Versione: 6.16.2312.1317</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index c4cfb8be..0fa88e2a 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1315
+6.16.2312.1317
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 2d3e7584..18bab537 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1315</version>
+  <version>6.16.2312.1317</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 5ba285e2..2d993db9 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -94,6 +94,7 @@ namespace MP_TAB_SERV.Shared
         }
         protected int typeScadLogin { get; set; } = 0;
         protected int dtScadLogin { get; set; } = 0;
+        protected Guid currDevGuid { get; set; } = new Guid();
 
         protected async Task checkDtDiff2Logout()
         {
@@ -110,7 +111,7 @@ namespace MP_TAB_SERV.Shared
                 case 1:
                     if (tsDeltaAct.Minutes >= dtScadLogin)
                     {
-                        var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
+                        var userTkn = await TDataService.OperatoreGetRedis(MatrOpr, currDevGuid);
                         if (!string.IsNullOrEmpty(userTkn))
                         {
                             await MsgServ.DoLogIn(userTkn, true);
@@ -127,7 +128,7 @@ namespace MP_TAB_SERV.Shared
                         // se fosse oltre 1 minuto da ultimo save --> salvo!
                         if (tsDeltaSave.TotalMinutes > 1)
                         {
-                            var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
+                            var userTkn = await TDataService.OperatoreGetRedis(MatrOpr, currDevGuid);
                             if (!string.IsNullOrEmpty(userTkn))
                             {
                                 await MsgServ.DoLogIn(userTkn, true);
@@ -149,6 +150,9 @@ namespace MP_TAB_SERV.Shared
             typeScadLogin = MStor.GetConfInt("TAB_TypeScadLogin");
             dtScadLogin = MStor.GetConfInt("TAB_dtTimerScadLogin");
             NavMan.LocationChanged += HandleLocationChanged;
+
+            currDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
+
             // verifica preliminare setup mdati
             if (!MStor.MenuOk)
             {
diff --git a/MP.Data/DTO/userTknDTO.cs b/MP.Data/DTO/userTknDTO.cs
index bc9a8db5..4ff3b3bd 100644
--- a/MP.Data/DTO/userTknDTO.cs
+++ b/MP.Data/DTO/userTknDTO.cs
@@ -10,6 +10,7 @@ namespace MP.Data.DTO
     public class userTknDTO
     {
         public AnagOperatoriModel currOpr { get; set; } = null;
-        public DateTime expTime { get; set; } = DateTime.Now;
+        //public DateTime expTime { get; set; } = DateTime.Now;
+        public Guid DevGuid { get; set; }
     }
 }
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index b6db96e8..000f9e77 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -251,8 +251,9 @@ namespace MP.Data.Services
         public async Task<bool> DoLogIn(string decodValue, bool saveOpr)
         {
             bool answ = false;
-            expDays = SMService.GetConfInt("cookieDayExpire");
-            var expDT = DateTime.Now.AddDays(expDays);
+            //expDays = SMService.GetConfInt("cookieDayExpire");
+            //var expDT = DateTime.Now.AddDays(expDays);
+            var devGuid = await GetCurrDevGuidLSAsync();
             // decifro i valori..
             var decrVal = DecryptData(decodValue);
             var opData = JsonConvert.DeserializeObject<userTknDTO>(decrVal);
@@ -264,17 +265,17 @@ namespace MP.Data.Services
                     userTknDTO newUserTkn = new userTknDTO()
                     {
                         currOpr = rigaOpr,
-                        expTime = expDT
+                        DevGuid = devGuid
                     };
 
                     var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
                     string hash = TDService.EncryptData(jsonTkn);
                     RigaOper = rigaOpr;
                     await SetLastMatrOprAsync(rigaOpr.MatrOpr);
-                    await SetCurrOperDtoAsync(hash);
+                    await SetCurrOperDtoLSAsync(hash);
                     if (saveOpr)
                     {
-                        await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
+                        await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash, devGuid);
                     }
                     answ = true;
                 }
@@ -287,17 +288,30 @@ namespace MP.Data.Services
             return SteamCrypto.EncryptString(rawData, Constants.passPhrase);
         }
 
+        /// <summary>
+        /// Restituisce il record device GUID da localstorage
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Guid> GetCurrDevGuidLSAsync()
+        {
+            Guid answ = new Guid();
+            var result = await localStorage.GetItemAsync<string>("devGuid");
+            if (result != null)
+            {
+                answ = Guid.Parse(result);
+            }
+            return answ;
+        }
         /// <summary>
         /// Restituisce il record OperatoreDTO da localstorage
         /// </summary>
         /// <returns></returns>
-        public async Task<string> GetCurrOperDtoAsync()
+        public async Task<string> GetCurrOperDtoLSAsync()
         {
             string answ = "";
             var result = await localStorage.GetItemAsync<string>("currTkn");
             if (result != null)
             {
-                //var data = JsonConvert.DeserializeObject<userTknDTO>(result);
                 answ = result;
             }
             return answ;
@@ -426,13 +440,24 @@ namespace MP.Data.Services
         /// scrive il record OperatoreDTO nel localstorage
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> SetCurrOperDtoAsync(string currTkn)
+        public async Task<bool> SetCurrOperDtoLSAsync(string currTkn)
         {
             bool answ = false;
             await localStorage.SetItemAsync("currTkn", currTkn);
             answ = true;
             return answ;
         }
+        /// <summary>
+        /// scrive il record Device GUID nel localstorage
+        /// </summary>
+        /// <returns></returns>
+        public async Task<bool> SetCurrDevGuidLSAsync(Guid currDevGuid)
+        {
+            bool answ = false;
+            await localStorage.SetItemAsync("devGuid", currDevGuid.ToString());
+            answ = true;
+            return answ;
+        }
 
         /// <summary>
         /// Scrive il valore di IPV4 del device nel localstoragee
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 0de3b7aa..c5963172 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1615,18 +1615,18 @@ namespace MP.Data.Services
         }
 
         /// <summary>
-        /// Scrive l'hash dell'oggetto curr opr
+        /// Legge l'oggetto operatore loggato
         /// </summary>
         /// <param name="matrOpr"></param>
         /// <returns></returns>
-        public async Task<string> OperatoreGetRedis(int matrOpr)
+        public async Task<string> OperatoreGetRedis(int matrOpr, Guid currDevGuid)
         {
             string source = "REDIS";
             Stopwatch sw = new Stopwatch();
             sw.Start();
             string answ = "";
             // cerco in redis...
-            string currKey = $"{redisUserDataKey}:CurrOpr:{matrOpr}";
+            string currKey = $"{redisUserDataKey}:CurrOpr:{matrOpr}:CurrDevGuid:{currDevGuid}";
             RedisValue rawData = await redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
@@ -1672,7 +1672,7 @@ namespace MP.Data.Services
         /// </summary>
         /// <param name="currOpr"></param>
         /// <returns></returns>
-        public async Task<string> OperatoreSetRedis(int matrOpr, string currOpr)
+        public async Task<string> OperatoreSetRedis(int matrOpr, string currOpr, Guid currDevGuid)
         {
             setExpDays();
             string source = "REDIS";
@@ -1680,7 +1680,7 @@ namespace MP.Data.Services
             sw.Start();
             string answ = "";
             // cerco in redis...
-            string currKey = $"{redisUserDataKey}:CurrOpr:{matrOpr}";
+            string currKey = $"{redisUserDataKey}:CurrOpr:{matrOpr}:CurrDevGuid:{currDevGuid}";
             //RedisValue rawData = await redisDb.StringGetAsync(currKey);
             // serializzo e salvo...
             //rawData = JsonConvert.SerializeObject(currOpr);

From 6cd5c8919745ac8f4801b8c6b0250c8c518594f0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 13 Dec 2023 19:35:03 +0100
Subject: [PATCH 16/69] Aggiunto model dati RSK + stored x split (empty)

---
 MP-TAB-SERV/MP-TAB-SERV.csproj                |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html          |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt             |  2 +-
 MP-TAB-SERV/Resources/manifest.xml            |  2 +-
 MP.Data/Controllers/MpTabController.cs        | 28 +++++++++++++++
 .../DatabaseModels/RegistroScartiKitModel.cs  | 36 +++++++++++++++++++
 MP.Data/MoonProContext.cs                     |  3 +-
 7 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 MP.Data/DatabaseModels/RegistroScartiKitModel.cs

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index ffe19f03..31ec9e16 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1216</Version>
+      <Version>6.16.2312.1319</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 880e6407..869ebd6a 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1216</h4>
+    <h4>Versione: 6.16.2312.1319</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 7de4424c..b25f3a8c 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1216
+6.16.2312.1319
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index e503a1d4..641dadb5 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1216</version>
+  <version>6.16.2312.1319</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 5edb6991..a3a73f25 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -1607,6 +1607,34 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
+        /// <summary>
+        /// Aggiunta record RegistroScartiKit in tab RSK esplodendo x kit
+        /// </summary>
+        /// <param name="newRec"></param>
+        /// <returns></returns>
+        public async Task<bool> RegScartiKitSplit(RegistroScartiModel newRec)
+        {
+            await Task.Delay(1);
+            bool fatto = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var IdxMacchina = new SqlParameter("@idxMacchina", newRec.IdxMacchina);
+                var DataOra = new SqlParameter("@DataOra", newRec.DataOra);
+                var Causale = new SqlParameter("@Causale", newRec.Causale);
+                var CodArt = new SqlParameter("@CodArticolo", newRec.CodArticolo);
+                var Qta = new SqlParameter("@QtyKit", newRec.Qta);
+
+                var result = dbCtx
+                                 .DbSetRegWithCheck
+                                 .FromSqlRaw("exec dbo.stp_RSK_Split @idxMacchina, @DataOra, @Causale, @CodArticolo, @QtyKit", IdxMacchina, DataOra, Causale, CodArt, Qta)
+                                 .AsNoTracking()
+                                 .ToList();
+                // indico eseguito!
+                fatto = result.Count != 0;
+            }
+            return fatto;
+        }
+
         /// <summary>
         /// Effettua ricalcolo MSE x macchina indicata
         /// </summary>
diff --git a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
new file mode 100644
index 00000000..d4a54cde
--- /dev/null
+++ b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
@@ -0,0 +1,36 @@
+﻿using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+
+#nullable disable
+// <Auto-Generated>
+// This is here so CodeMaid doesn't reorganize this document
+// </Auto-Generated>
+namespace MP.Data.DatabaseModels
+{
+    public partial class RegistroScartiKitModel
+    {
+        #region Public Properties
+
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int IdxRSK { get; set; }
+        public string IdxMacchina { get; set; } = "";
+        public DateTime DataOra { get; set; } = DateTime.Now;
+        public string Causale { get; set; } = "";
+        public string CodArticoloKit { get; set; } = "";
+        public string CodArticolo { get; set; } = "";
+        public string Operatore { get; set; } = "";
+
+        public int Qta { get; set; } = 0;
+        public string Note { get; set; } = "";
+        public int MatrOpr { get; set; } = 0;
+        public DateTime? DataOraProdRec { get; set; } = null;
+        public string Descrizione { get; set; } = "";
+        public string cssClass { get; set; } = "";
+        public string icona { get; set; } = "";
+
+        #endregion Public Properties
+    }
+}
\ No newline at end of file
diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs
index b36b607f..4d40c12f 100644
--- a/MP.Data/MoonProContext.cs
+++ b/MP.Data/MoonProContext.cs
@@ -77,6 +77,7 @@ namespace MP.Data
         public virtual DbSet<TurniMaccModel> DbSetTurniMacc { get; set; }
         public virtual DbSet<RegistroControlliModel> DbSetRegControlli { get; set; }
         public virtual DbSet<RegistroScartiModel> DbSetRegScarti { get; set; }
+        public virtual DbSet<RegistroScartiKitModel> DbSetRegScartiKit { get; set; }
         public virtual DbSet<RegistroDichiarazioniModel> DbSetRegDich { get; set; }
         public virtual DbSet<RegCheckModel> DbSetRegWithCheck { get; set; }
 
@@ -549,7 +550,7 @@ namespace MP.Data
             });
             modelBuilder.Entity<RegistroScartiModel>(entity =>
             {
-                entity.HasKey(e => new { e.IdxMacchina, e.DataOra, e.Causale});
+                entity.HasKey(e => new { e.IdxMacchina, e.DataOra, e.Causale });
             });
 
             modelBuilder.Entity<FermiNonQualModel>(entity =>

From 22803313ed5e1acdb629e4f999d4da21abda7f5b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 08:45:38 +0100
Subject: [PATCH 17/69] Modifiche MSFD: - rimesso metodo calcolo post reset -
 aggiunta gestione expity hashSet - abbozzata gestione ScartiKitSplit

---
 MP-TAB-SERV/MP-TAB-SERV.csproj       |   2 +-
 MP-TAB-SERV/Pages/ProdStop.razor.cs  |   2 +-
 MP-TAB-SERV/Resources/ChangeLog.html |   2 +-
 MP-TAB-SERV/Resources/VersNum.txt    |   2 +-
 MP-TAB-SERV/Resources/manifest.xml   |   2 +-
 MP.Data/Services/TabDataService.cs   | 252 ++++++++++++++++-----------
 6 files changed, 151 insertions(+), 111 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 31ec9e16..90aa256f 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1319</Version>
+      <Version>6.16.2312.1408</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/ProdStop.razor.cs b/MP-TAB-SERV/Pages/ProdStop.razor.cs
index e76ce62c..6bb2e732 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor.cs
+++ b/MP-TAB-SERV/Pages/ProdStop.razor.cs
@@ -105,7 +105,7 @@ namespace MP_TAB_SERV.Pages
                         // se realtime
                         await TabDServ.EvListInsert(newRec, MP.Data.Objects.Enums.tipoInputEvento.barcode);
                         // resetta il microstato in modo da ricevere successive info HW
-                        TabDServ.resetMicrostatoMacchina(IdxMacc);
+                        await TabDServ.resetMicrostatoMacchina(IdxMacc);
                     }
                     else
                     {
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 869ebd6a..8691b8da 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1319</h4>
+    <h4>Versione: 6.16.2312.1408</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index b25f3a8c..fca95d87 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1319
+6.16.2312.1408
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 641dadb5..9881676f 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1319</version>
+  <version>6.16.2312.1408</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index c5963172..b854612c 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -6,6 +6,7 @@ using MP.Data.DTO;
 using MP.Data.Objects;
 using Newtonsoft.Json;
 using NLog;
+using Org.BouncyCastle.Asn1.IsisMtt.Ocsp;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
@@ -513,6 +514,7 @@ namespace MP.Data.Services
             }
             return answ;
         }
+
         /// <summary>
         /// Recupera il valore in formato DOUBLE
         /// </summary>
@@ -841,6 +843,18 @@ namespace MP.Data.Services
             return answ;
         }
 
+        /// <summary>
+        /// Flush di tutta la cache relativa ad i dati ODL/PODL
+        /// </summary>
+        /// <returns></returns>
+        public async Task FlushOdlCache()
+        {
+            await FlushCache("ODL");
+            await FlushCache("PODL");
+            await FlushCache("VSODL");
+            await FlushCache("StatoMacc");
+        }
+
         /// <summary>
         /// Recupero info IOB x TAB (da info registrate IOB-WIN--&gt; MP-IO)
         /// </summary>
@@ -1234,17 +1248,6 @@ namespace MP.Data.Services
             }
             return answ;
         }
-        /// <summary>
-        /// Flush di tutta la cache relativa ad i dati ODL/PODL
-        /// </summary>
-        /// <returns></returns>
-        public async Task FlushOdlCache()
-        {
-            await FlushCache("ODL");
-            await FlushCache("PODL");
-            await FlushCache("VSODL");
-            await FlushCache("StatoMacc");
-        }
 
         /// <summary>
         /// ODL corrente macchina
@@ -1932,6 +1935,32 @@ namespace MP.Data.Services
             return result;
         }
 
+        /// <summary>
+        /// Registra controllo
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="matrOpr"></param>
+        /// <param name="esitoOk"></param>
+        /// <param name="note"></param>
+        /// <param name="dataOra"></param>
+        /// <returns></returns>
+        public async Task<bool> RegControlliInsert(string idxMacchina, int matrOpr, bool esitoOk, string note, DateTime dataOra)
+        {
+            bool answ = false;
+            try
+            {
+                // inserisco evento
+                answ = dbTabController.RegControlliInsert(idxMacchina, matrOpr, esitoOk, note, dataOra);
+                await FlushCache("RecContr");
+            }
+            catch (Exception exc)
+            {
+                string logMsg = $"Eccezione in RegControlliInsert | macchina: {idxMacchina} | DataOra: {dataOra} | MatrOpr: {matrOpr} | Qta {esitoOk} | Note: {note}{Environment.NewLine}{exc}";
+                Log.Error(logMsg);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Restituisce elenco ULTIMI RC x macchina
         /// </summary>
@@ -1968,32 +1997,6 @@ namespace MP.Data.Services
             return result;
         }
 
-        /// <summary>
-        /// Registra controllo
-        /// </summary>
-        /// <param name="idxMacchina"></param>
-        /// <param name="matrOpr"></param>
-        /// <param name="esitoOk"></param>
-        /// <param name="note"></param>
-        /// <param name="dataOra"></param>
-        /// <returns></returns>
-        public async Task<bool> RegControlliInsert(string idxMacchina, int matrOpr, bool esitoOk, string note, DateTime dataOra)
-        {
-            bool answ = false;
-            try
-            {
-                // inserisco evento
-                answ = dbTabController.RegControlliInsert(idxMacchina, matrOpr, esitoOk, note, dataOra);
-                await FlushCache("RecContr");
-            }
-            catch (Exception exc)
-            {
-                string logMsg = $"Eccezione in RegControlliInsert | macchina: {idxMacchina} | DataOra: {dataOra} | MatrOpr: {matrOpr} | Qta {esitoOk} | Note: {note}{Environment.NewLine}{exc}";
-                Log.Error(logMsg);
-            }
-            return answ;
-        }
-
         /// <summary>
         /// Aggiunta record RegistroScarti
         /// </summary>
@@ -2134,6 +2137,7 @@ namespace MP.Data.Services
                 answ = await dbTabController.RegScartiInsert(newRec);
                 // reset cache eventi/commenti
                 await FlushCache("RegScarti");
+                await FlushCache("RegScartiKit");
             }
             catch (Exception exc)
             {
@@ -2143,88 +2147,99 @@ namespace MP.Data.Services
             return answ;
         }
 
+        /// <summary>
+        /// Split record RegistroScarti --&gt; RegistroScartiKit
+        /// </summary>
+        /// <param name="newRec"></param>
+        /// <returns></returns>
+        public async Task<bool> RegScartiKitSplit(RegistroScartiModel newRec)
+        {
+            bool answ = false;
+            try
+            {
+                // inserisco evento
+                answ = await dbTabController.RegScartiKitSplit(newRec);
+                // reset cache eventi/commenti
+                await FlushCache("RegScarti");
+                await FlushCache("RegScartiKit");
+            }
+            catch (Exception exc)
+            {
+                string logMsg = $"Eccezione in RegScartiKitSplit | macchina: {newRec.IdxMacchina} | DataOra: {newRec.DataOra} | Causale: {newRec.Causale} | MatrOpr: {newRec.MatrOpr} | Qta {newRec.Qta} | Note: {newRec.Note}{Environment.NewLine}{exc}";
+                Log.Error(logMsg);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Resetta (rileggendo) i dati della macchina
         /// </summary>
         /// <param name="idxMacchina"></param>
         /// <returns></returns>
-        public Dictionary<string, string> resetDatiMacchina(string idxMacchina)
+        public async Task<Dictionary<string, string>> resetDatiMacchina(string idxMacchina)
         {
             Dictionary<string, string> answ = new Dictionary<string, string>();
-#if false
-            string currHash = dtMaccHash(idxMacchina);
             // inizio con un bel reset...
-            memLayer.ML.redFlushKey(currHash);
-            DS_applicazione.MSFDDataTable tabMSFD = new DS_applicazione.MSFDDataTable();
-            // 2018.01.08 SEMPRE senza singleton: instanzio un nuovo oggetto MapoDb
-            MapoDb connDb = new MapoDb();
-            tabMSFD = connDb.taMSFD.getByIdxMacc(idxMacchina);
-            bool trovato = false;
-            // se ho righe...
-            DS_applicazione.MSFDDataTable tab = new DS_applicazione.MSFDDataTable();
-            DS_applicazione.MSFDRow rigaMSFD;
-            if (tabMSFD.Rows.Count > 0)
-            {
-                try
-                {
-                    rigaMSFD = tabMSFD[0];
-                    trovato = true;
-                }
-                catch
-                {
-                    rigaMSFD = tab.NewMSFDRow();
-                }
-            }
-            else
-            {
-                rigaMSFD = tab.NewMSFDRow();
-            }
-            if (trovato)
+            string currKey = $"{redisBaseKey}:MSFD";
+            await FlushCache(currKey);
+            var tabMSFD = await VMSFDGetByMacc(idxMacchina);
+            if (tabMSFD != null && tabMSFD.Count > 0)
             {
+                var rigaMSFD = tabMSFD.FirstOrDefault();
                 // ora provo a compilare...
                 try
                 {
                     // salvo 1:1 i valori... STATO
-                    answ.Add("IdxMicroStato", rigaMSFD.IdxMicroStato.ToString());
-                    answ.Add("IdxStato", rigaMSFD.IdxStato.ToString());
-                    answ.Add("CodArticolo", rigaMSFD.CodArticolo);
-                    answ.Add("insEnabled", rigaMSFD.insEnabled.ToString());
-                    answ.Add("sLogEnabled", rigaMSFD.sLogEnabled.ToString());
-                    answ.Add("pallet", rigaMSFD.pallet);
-                    answ.Add("CodArticolo_A", rigaMSFD.CodArticolo_A);
-                    answ.Add("CodArticolo_B", rigaMSFD.CodArticolo_B);
-                    answ.Add("TempoCicloBase", rigaMSFD.TempoCicloBase.ToString());
-                    answ.Add("PzPalletProd", rigaMSFD.PzPalletProd.ToString());
-                    answ.Add("MatrOpr", rigaMSFD.MatrOpr.ToString());
-                    answ.Add("lastVal", rigaMSFD.lastVal);
-                    answ.Add("TCBase", rigaMSFD.TempoCicloBase.ToString());
+                    answ.Add("IdxMicroStato", $"{rigaMSFD.IdxMicroStato}");
+                    answ.Add("IdxStato", $"{rigaMSFD.IdxStato}");
+                    answ.Add("CodArticolo", $"{rigaMSFD.CodArticolo}");
+                    answ.Add("insEnabled", $"{rigaMSFD.InsEnabled}");
+                    answ.Add("sLogEnabled", $"{rigaMSFD.SLogEnabled}");
+                    answ.Add("pallet", $"{rigaMSFD.Pallet}");
+                    answ.Add("CodArticolo_A", $"{rigaMSFD.CodArticoloA}");
+                    answ.Add("CodArticolo_B", $"{rigaMSFD.CodArticoloB}");
+                    answ.Add("TempoCicloBase", $"{rigaMSFD.TempoCicloBase}");
+                    answ.Add("PzPalletProd", $"{rigaMSFD.PzPalletProd}");
+                    answ.Add("MatrOpr", $"{rigaMSFD.MatrOpr}");
+                    answ.Add("lastVal", $"{rigaMSFD.LastVal}");
+                    answ.Add("TCBase", $"{rigaMSFD.TempoCicloBase}");
 
                     //...e SETUP
-                    answ.Add("CodMacc", rigaMSFD.codmacchina);
-                    answ.Add("IdxFamIn", rigaMSFD.IdxFamigliaIngresso.ToString());
-                    answ.Add("Multi", rigaMSFD.Multi.ToString());
-                    answ.Add("BitFilt", rigaMSFD.BitFilt.ToString());
-                    answ.Add("MaxVal", rigaMSFD.MaxVal.ToString());
-                    answ.Add("BSR", rigaMSFD.BSR.ToString());
-                    answ.Add("ExplodeBit", rigaMSFD.ExplodeBit.ToString());
-                    answ.Add("NumBit", rigaMSFD.NumBit.ToString());
-                    answ.Add("IdxFamMacc", rigaMSFD.IdxFamiglia.ToString());
-                    answ.Add("simplePallet", rigaMSFD.simplePallet.ToString());
-                    answ.Add("palletChange", rigaMSFD.palletChange.ToString());
+                    answ.Add("CodMacc", rigaMSFD.Codmacchina);
+                    answ.Add("IdxFamIn", $"{rigaMSFD.IdxFamigliaIngresso}");
+                    answ.Add("Multi", $"{rigaMSFD.Multi}");
+                    answ.Add("BitFilt", $"{rigaMSFD.BitFilt}");
+                    answ.Add("MaxVal", $"{rigaMSFD.MaxVal}");
+                    answ.Add("BSR", $"{rigaMSFD.Bsr}");
+                    answ.Add("ExplodeBit", $"{rigaMSFD.ExplodeBit}");
+                    answ.Add("NumBit", $"{rigaMSFD.NumBit}");
+                    answ.Add("IdxFamMacc", $"{rigaMSFD.IdxFamiglia}");
+                    answ.Add("simplePallet", $"{rigaMSFD.SimplePallet}");
+                    answ.Add("palletChange", $"{rigaMSFD.PalletChange}");
+                    // cerco dati master/slave...
+                    var macSlave = await Macchine2Slave();
+                    var mastList = macSlave
+                                   .Where(x => x.IdxMacchina.Equals(idxMacchina, StringComparison.InvariantCultureIgnoreCase))
+                                   .ToList();
+                    var slaveList = macSlave
+                                   .Where(x => x.IdxMacchinaSlave.Equals(idxMacchina, StringComparison.InvariantCultureIgnoreCase))
+                                   .ToList();
+
+                    string isMaster = mastList.Count > 0 ? "1" : "0";
+                    string isSlave = slaveList.Count > 0 ? "1" : "0";
+                    answ.Add("Master", isMaster);
+                    answ.Add("Slave", isSlave);
                 }
                 catch (Exception exc)
                 {
-                    Log.Info(string.Format("Errore in compilazione dati MSFD:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
+                    Log.Error($"Errore in compilazione dati MSFD:{Environment.NewLine}{exc}");
                 }
-                // cerco dati master/slave...
-                string isMaster = connDb.taM2S.getByMaster(idxMacchina).Count > 0 ? "1" : "0";
-                string isSlave = connDb.taM2S.getBySlave(idxMacchina).Count > 0 ? "1" : "0";
-                answ.Add("Master", isMaster);
-                answ.Add("Slave", isSlave);
 
                 // verifico il timeout che cambia a seconda che sia vero o falso insEnabled...
-                int tOutShort = memLayer.ML.cdvi("TmOut.MS.S");
-                int tOutLong = memLayer.ML.cdvi("TmOut.MS.L");
+                int tOutShort = 0;
+                int tOutLong = 0;
+                ConfigGetVal("TmOut.MS.S", ref tOutShort);
+                ConfigGetVal("TmOut.MS.L", ref tOutLong);
                 int redDtMacTOut = tOutLong;
                 try
                 {
@@ -2235,13 +2250,8 @@ namespace MP.Data.Services
                     Log.Info($"Eccezione in calcolo timeout dati macchina: idxMacchina{idxMacchina} | TShort: {tOutShort} | TLong {tOutLong}{Environment.NewLine}{exc}");
                 }
                 // salvo in redis!
-                memLayer.ML.redSaveHashDict(currHash, answ, redDtMacTOut);
+                redisHashDictSet(currKey, answ, TimeSpan.FromSeconds(redDtMacTOut));
             }
-            else
-            {
-                Log.Info("Errore in chiamata stp_MSFD_getMacc (connDb.taMSFD.getByIdxMacc(idxMacchina))");
-            }
-#endif
             return answ;
         }
 
@@ -2249,7 +2259,7 @@ namespace MP.Data.Services
         /// Effettua reset microstato macchina
         /// </summary>
         /// <param name="idxMacchina"></param>
-        public void resetMicrostatoMacchina(string idxMacchina)
+        public async Task resetMicrostatoMacchina(string idxMacchina)
         {
             // salvo microstato 0...
             MicroStatoMacchinaModel newRecMS = new MicroStatoMacchinaModel()
@@ -2261,7 +2271,7 @@ namespace MP.Data.Services
             };
             var result = dbTabController.MicroStatoMacchinaUpsert(newRecMS);
             // reset in redis
-            resetDatiMacchina(idxMacchina);
+            await resetDatiMacchina(idxMacchina);
         }
 
         /// <summary>
@@ -3216,6 +3226,36 @@ namespace MP.Data.Services
             return fatto;
         }
 
+        /// <summary>
+        /// Salvataggio Dictionary come HashSet Redis
+        /// </summary>
+        /// <param name="currKey"></param>
+        /// <param name="dict"></param>
+        /// <param name="ttl"></param>
+        private bool redisHashDictSet(RedisKey currKey, Dictionary<string, string> dict, TimeSpan ttl)
+        {
+            bool fatto = false;
+            try
+            {
+                HashEntry[] data2ins = new HashEntry[dict.Count];
+                int i = 0;
+                foreach (KeyValuePair<string, string> kvp in dict)
+                {
+                    data2ins[i] = new HashEntry(kvp.Key, kvp.Value);
+                    i++;
+                }
+                // salvo!
+                redisDb.HashSet(currKey, data2ins);
+                redisDb.KeyExpire(currKey, ttl);
+                fatto = true;
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in redisHashDictSet | currKey: {currKey}{Environment.NewLine}{exc}");
+            }
+            return fatto;
+        }
+
         /// <summary>
         /// registra su REDIS eventuale superamento numero limite di call x il metodo in oggetto
         /// </summary>

From d62c63ef93477c05ebba234064f8d9bb8785d110 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 09:16:12 +0100
Subject: [PATCH 18/69] Fix vista fermate errata + fix kit esploso

---
 MP-TAB-SERV/MP-TAB-SERV.csproj                 | 2 +-
 MP-TAB-SERV/Pages/ProdStop.razor               | 2 +-
 MP-TAB-SERV/Pages/ProdStop.razor.cs            | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html           | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt              | 2 +-
 MP-TAB-SERV/Resources/manifest.xml             | 2 +-
 MP.Data/DatabaseModels/RegistroScartiModel.cs  | 1 +
 MP.Data/DatabaseModels/vSelEventiBCodeModel.cs | 4 ++--
 MP.Data/MoonProContext.cs                      | 2 +-
 MP.Data/Services/TabDataService.cs             | 1 -
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 90aa256f..63ea1c32 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1408</Version>
+      <Version>6.16.2312.1409</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/ProdStop.razor b/MP-TAB-SERV/Pages/ProdStop.razor
index 6f32c69f..12aa29a2 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor
+++ b/MP-TAB-SERV/Pages/ProdStop.razor
@@ -23,7 +23,7 @@ else
         }
         @foreach (var item in events2show)
         {
-            <ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@(item.Label)" IdxEvento="@item.IdxTipo" E_EventSelected="EventRecord"></ProdStopMan>
+            <ProdStopMan objCss="@item.CssClass" objIcon="@item.Icon" objTxt="@(item.label)" IdxEvento="@item.value" E_EventSelected="EventRecord"></ProdStopMan>
         }
     </div>
 }
diff --git a/MP-TAB-SERV/Pages/ProdStop.razor.cs b/MP-TAB-SERV/Pages/ProdStop.razor.cs
index 6bb2e732..dc3019d3 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor.cs
+++ b/MP-TAB-SERV/Pages/ProdStop.razor.cs
@@ -271,7 +271,7 @@ namespace MP_TAB_SERV.Pages
                     var eventsAll = await TabDServ.AnagEventiGetByMacch(IdxMacc);
                     if (eventsAll != null)
                     {
-                        events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.Label).ToList();
+                        events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.label).ToList();
                     }
                 }
                 catch
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 8691b8da..6ca93d8c 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1408</h4>
+    <h4>Versione: 6.16.2312.1409</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index fca95d87..8a3e8bbb 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1408
+6.16.2312.1409
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 9881676f..d1955c26 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1408</version>
+  <version>6.16.2312.1409</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/DatabaseModels/RegistroScartiModel.cs b/MP.Data/DatabaseModels/RegistroScartiModel.cs
index 2082712d..2f1c0c81 100644
--- a/MP.Data/DatabaseModels/RegistroScartiModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiModel.cs
@@ -25,6 +25,7 @@ namespace MP.Data.DatabaseModels
         public string Descrizione { get; set; } = "";
         public string cssClass { get; set; } = "";
         public string icona { get; set; } = "";
+        public bool KitSplit {  get; set; } = false;
 
         #endregion Public Properties
     }
diff --git a/MP.Data/DatabaseModels/vSelEventiBCodeModel.cs b/MP.Data/DatabaseModels/vSelEventiBCodeModel.cs
index caa0b4d9..f0b44ae0 100644
--- a/MP.Data/DatabaseModels/vSelEventiBCodeModel.cs
+++ b/MP.Data/DatabaseModels/vSelEventiBCodeModel.cs
@@ -11,8 +11,8 @@ namespace MP.Data.DatabaseModels
     public class vSelEventiBCodeModel
     {
         [Key]
-        public int IdxTipo { get; set; } = 0;
-        public string Label { get; set; } = "";
+        public int value { get; set; } = 0;
+        public string label { get; set; } = "";
         public bool EventoTablet { get; set; } = true;
         public string CssClass { get; set; } = "";
         public string Icon { get; set; } = "";
diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs
index 4d40c12f..a0c0cdd7 100644
--- a/MP.Data/MoonProContext.cs
+++ b/MP.Data/MoonProContext.cs
@@ -539,7 +539,7 @@ namespace MP.Data
 
             modelBuilder.Entity<vSelEventiBCodeModel>(entity =>
             {
-                entity.HasKey(e => e.IdxTipo);
+                entity.HasKey(e => e.value);
 
                 entity.ToView("v_selEventiBCode");
             });
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index b854612c..e313679c 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -254,7 +254,6 @@ namespace MP.Data.Services
             // cerco in redis...
             string currKey = $"{redisBaseKey}:VSEB:{IdxMacch}";
             RedisValue rawData = await redisDb.StringGetAsync(currKey);
-            //if (!string.IsNullOrEmpty($"{rawData}"))
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<vSelEventiBCodeModel>>($"{rawData}");

From 425dd249c7832cd62a49d8f4d95a18d56db8fa63 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 09:44:52 +0100
Subject: [PATCH 19/69] Aggiunta indicazione kit/art

---
 MP-TAB-SERV/Components/ScrapMan.razor         | 24 +++++++++++++++++--
 MP.Data/DatabaseModels/RegistroScartiModel.cs |  4 +++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index d7eed171..f5af2fc3 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -62,8 +62,28 @@
                                                 <i class="@item.icona"></i> @item.Descrizione
                                             </div>
                                         </div>
-                                        <div class="col-2 px-0 text-center">
-                                            <b class="fs-2">@item.Qta</b> pz
+                                        <div class="col-2 px-0 text-center text-nowrap d-flex justify-content-center">
+                                            <div>
+                                                <b class="fs-2">@item.Qta</b>
+                                            </div>
+                                            <div class="ps-1 fs-4">
+                                                &times;
+                                                @if (item.Tipo == "KIT")
+                                                {
+                                                    @if (item.KitSplit)
+                                                    {
+                                                        <i class="fa-solid fa-box-open"></i>
+                                                    }
+                                                    else
+                                                    {
+                                                        <i class="fa-solid fa-box"></i>
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    <span>pz</span>
+                                                }
+                                            </div>
                                         </div>
                                         <div class="col-5 text-end small">
                                             <div class="text-truncate">
diff --git a/MP.Data/DatabaseModels/RegistroScartiModel.cs b/MP.Data/DatabaseModels/RegistroScartiModel.cs
index 2f1c0c81..1eb3597b 100644
--- a/MP.Data/DatabaseModels/RegistroScartiModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiModel.cs
@@ -22,10 +22,12 @@ namespace MP.Data.DatabaseModels
         public string CodArticolo { get; set; } = "";
         public int MatrOpr { get; set; } = 0;
         public DateTime? DataOraProdRec { get; set; } = null;
+        public bool KitSplit {  get; set; } = false;
         public string Descrizione { get; set; } = "";
         public string cssClass { get; set; } = "";
         public string icona { get; set; } = "";
-        public bool KitSplit {  get; set; } = false;
+        public string DescArticolo { get; set; } = "";
+        public string Tipo { get; set; } = "";
 
         #endregion Public Properties
     }

From 9553cfb38f2123a8b267cd6a173209f493a37586 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 10:01:35 +0100
Subject: [PATCH 20/69] Bozza display gestione scrap kit

---
 MP-TAB-SERV/Components/ScrapKitMan.razor      |  5 ++++
 MP-TAB-SERV/Components/ScrapMan.razor         | 30 ++++++++++++-------
 MP-TAB-SERV/Components/ScrapMan.razor.cs      | 28 ++++++++++++++---
 MP-TAB-SERV/MP-TAB-SERV.csproj                |  2 +-
 MP-TAB-SERV/Pages/Index.razor                 |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html          |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt             |  2 +-
 MP-TAB-SERV/Resources/manifest.xml            |  2 +-
 MP.Data/DatabaseModels/RegistroScartiModel.cs | 21 ++++++++++++-
 9 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 MP-TAB-SERV/Components/ScrapKitMan.razor

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
new file mode 100644
index 00000000..061a13c6
--- /dev/null
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -0,0 +1,5 @@
+﻿<h3>ScrapKitMan</h3>
+
+@code {
+
+}
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index f5af2fc3..da267d45 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -51,7 +51,7 @@
                     <tbody>
                         @foreach (var item in ListPaged)
                         {
-                            <tr>
+                            <tr class="@selectedCss(item)">
                                 <td>
                                     <div class="row">
                                         <div class="col-5 small">
@@ -68,16 +68,18 @@
                                             </div>
                                             <div class="ps-1 fs-4">
                                                 &times;
-                                                @if (item.Tipo == "KIT")
+                                                @if (item.Tipo == "ART")
                                                 {
-                                                    @if (item.KitSplit)
-                                                    {
-                                                        <i class="fa-solid fa-box-open"></i>
-                                                    }
-                                                    else
-                                                    {
-                                                        <i class="fa-solid fa-box"></i>
-                                                    }
+                                                    <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)">
+                                                        @if (item.KitSplit)
+                                                        {
+                                                            <i class="fa-solid fa-box-open"></i>
+                                                        }
+                                                        else
+                                                        {
+                                                            <i class="fa-solid fa-box"></i>
+                                                        }
+                                                    </button>
                                                 }
                                                 else
                                                 {
@@ -104,6 +106,14 @@
                                     </div>
                                 </td>
                             </tr>
+                            @if(item.Equals(selItem))
+                            {
+                                <tr>
+                                    <td>
+                                        <ScrapKitMan></ScrapKitMan>
+                                    </td>
+                                </tr>
+                            }
                         }
                     </tbody>
                 </table>
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor.cs b/MP-TAB-SERV/Components/ScrapMan.razor.cs
index 022eb904..a294e372 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapMan.razor.cs
@@ -40,7 +40,7 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Properties
 
-       
+
 
         protected List<RegistroScartiModel> ListComplete { get; set; } = new List<RegistroScartiModel>();
         protected List<RegistroScartiModel> ListPaged { get; set; } = new List<RegistroScartiModel>();
@@ -73,7 +73,7 @@ namespace MP_TAB_SERV.Components
             }
         }
 
-   
+
 
         protected void SaveNumRec(int newNum)
         {
@@ -81,7 +81,7 @@ namespace MP_TAB_SERV.Components
             UpdateTable();
         }
 
-      
+
 
         protected void SavePage(int newNum)
         {
@@ -115,7 +115,7 @@ namespace MP_TAB_SERV.Components
             await doUpdate();
         }
 
-    
+
 
         protected void UpdateTable()
         {
@@ -132,6 +132,26 @@ namespace MP_TAB_SERV.Components
 
         #endregion Protected Methods
 
+        protected void ShowKitDetail(RegistroScartiModel currItem)
+        {
+            // faccio toggle show item (se era gi� selezionato --> null!)
+            if (!currItem.Equals(selItem))
+            {
+                selItem = currItem;
+            }
+            else
+            {
+                selItem = null;
+            }
+        }
+
+        protected string selectedCss(RegistroScartiModel currItem)
+        {
+            return currItem.Equals(selItem) ? "table-info" : "";
+        }
+
+        private RegistroScartiModel? selItem = null;
+
         #region Private Fields
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 63ea1c32..d1707d37 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1409</Version>
+      <Version>6.16.2312.1410</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Index.razor b/MP-TAB-SERV/Pages/Index.razor
index b5d0a9fb..c7d708b6 100644
--- a/MP-TAB-SERV/Pages/Index.razor
+++ b/MP-TAB-SERV/Pages/Index.razor
@@ -1,7 +1,7 @@
 ﻿@page "/"
 @page "/home"
 
-<img src="~/images/LogoEgw.png" />
+<img src="images/LogoEgw.png" />
 
 @code {
     protected override async Task OnInitializedAsync()
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 6ca93d8c..efc6fa93 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1409</h4>
+    <h4>Versione: 6.16.2312.1410</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 8a3e8bbb..1c86197a 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1409
+6.16.2312.1410
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index d1955c26..ac6a8336 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1409</version>
+  <version>6.16.2312.1410</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/DatabaseModels/RegistroScartiModel.cs b/MP.Data/DatabaseModels/RegistroScartiModel.cs
index 1eb3597b..00ab4363 100644
--- a/MP.Data/DatabaseModels/RegistroScartiModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiModel.cs
@@ -1,5 +1,7 @@
-﻿using System;
+﻿using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System;
 using System.Collections.Generic;
+using static MP.Data.MgModels.RecipeModel;
 
 
 #nullable disable
@@ -30,5 +32,22 @@ namespace MP.Data.DatabaseModels
         public string Tipo { get; set; } = "";
 
         #endregion Public Properties
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is RegistroScartiModel item))
+                return false;
+
+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
+            if (DataOra != item.DataOra)
+                return false;
+
+            if (Causale != item.Causale)
+                return false;
+
+            return true;
+        }
     }
 }
\ No newline at end of file

From e0a40e7ad0e10cd37bf36f77db67e2eb98088523 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 10:14:41 +0100
Subject: [PATCH 21/69] FIX display kit

---
 MP-TAB-SERV/Components/ScrapKitMan.razor | 9 ++++++++-
 MP-TAB-SERV/Components/ScrapMan.razor    | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index 061a13c6..0ebc9b1f 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -1,4 +1,11 @@
-﻿<h3>ScrapKitMan</h3>
+﻿<div class="bg-info p-3">
+    <div class="bg-dark">
+
+        <h3>ScrapKitMan</h3>
+        dettaglio gestione kit
+    </div>
+
+</div>
 
 @code {
 
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index da267d45..de4fa036 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -68,9 +68,9 @@
                                             </div>
                                             <div class="ps-1 fs-4">
                                                 &times;
-                                                @if (item.Tipo == "ART")
+                                                @if (item.Tipo == "KIT")
                                                 {
-                                                    <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)">
+                                                    <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
                                                         @if (item.KitSplit)
                                                         {
                                                             <i class="fa-solid fa-box-open"></i>

From abb9a21e2909239cc38538105ee9ed7919d7cb99 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 10:29:47 +0100
Subject: [PATCH 22/69] fix mostra body post refresh

---
 MP-TAB-SERV/Shared/MainLayout.razor | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor
index df3d355f..43b7f5e9 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor
+++ b/MP-TAB-SERV/Shared/MainLayout.razor
@@ -7,8 +7,6 @@
 <div class="page" @onclick="()=>handleBodyClick()">
     <main>
         <CmpTop CurrMenuItems="@CurrMenuItems"></CmpTop>
-        @if (MsgServ.RigaOper != null || NavMan.Uri.Contains("reg-new-device"))
-        {
             <article class="content pt-1 d-flex mb-5">
                 <div class="" id="@bodyTipe">
                     @Body
@@ -20,7 +18,6 @@
                     </div>
                 }
             </article>
-        }
     </main>
 </div>
 <div class="fixed-bottom">

From 79768464eff7f71c21aef8d0652ac31e5a217d89 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 10:58:25 +0100
Subject: [PATCH 23/69] Continuo dettaglio scarti KIT

---
 MP-TAB-SERV/Components/ScrapKitMan.razor      |  74 ++++++++++-
 MP-TAB-SERV/Components/ScrapKitMan.razor.cs   |  83 ++++++++++++
 MP-TAB-SERV/Components/ScrapMan.razor         | 125 ++++++++++--------
 MP-TAB-SERV/Components/ScrapMan.razor.cs      |  53 +++-----
 MP.Data/Controllers/MpTabController.cs        |  33 ++++-
 MP.Data/DatabaseModels/RegistroScartiModel.cs |   5 +
 MP.Data/Services/TabDataService.cs            |  36 +++++
 7 files changed, 308 insertions(+), 101 deletions(-)
 create mode 100644 MP-TAB-SERV/Components/ScrapKitMan.razor.cs

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index 0ebc9b1f..b8af8abd 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -1,12 +1,74 @@
-﻿<div class="bg-info p-3">
+﻿
+<ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
+<div class="bg-info p-2">
     <div class="bg-dark">
-
-        <h3>ScrapKitMan</h3>
-        dettaglio gestione kit
+        <div class="d-flex justify-content-between">
+            <table class="table table-light table-sm table-striped">
+                <thead>
+                    <tr class="text-start1">
+                        <th class="fs-5">
+                            Esplosione scarti KIT
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @if (TotalCount == 0)
+                    {
+                        <tr>
+                            <td class="p-0">
+                                <div class="alert fs-4">No record found</div>
+                            </td>
+                        </tr>
+                    }
+                    else
+                    {
+                        @foreach (var item in ListPaged)
+                        {
+                            <tr>
+                                <td>
+                                    <div class="row">
+                                        <div class="col-5 small">
+                                            <div>
+                                                Art: <b>@item.CodArticolo</b>
+                                            </div>
+                                            <div class="@($"text-{item.cssClass}")">
+                                                <i class="@item.icona"></i> @item.Descrizione
+                                            </div>
+                                        </div>
+                                        <div class="col-2 px-0 text-center text-nowrap d-flex justify-content-center">
+                                            <div>
+                                                <b class="fs-2">@item.Qta</b>
+                                            </div>
+                                            <div class="ps-1 fs-4">
+                                                &times;<span>pz</span>
+                                            </div>
+                                        </div>
+                                        <div class="col-5 text-end small">
+                                            <div class="text-truncate">
+                                                @($"{item.DataOra:ddd dd.MM.yy HH:mm:ss}")
+                                                <i class="fa fa-clock-o" aria-hidden="true"></i>
+                                            </div>
+                                            <div class="text-truncate">
+                                                <b>@item.Operatore</b>
+                                                <i class="fa fa-user" aria-hidden="true"></i>
+                                            </div>
+                                        </div>
+                                        <div class="col-12 small text-secondary">
+                                            @if (!string.IsNullOrEmpty(item.Note))
+                                            {
+                                                <span>Nota: <b>@item.Note</b></span>
+                                            }
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                        }
+                    }
+                </tbody>
+            </table>
+        </div>
     </div>
 
 </div>
 
-@code {
 
-}
diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor.cs b/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
new file mode 100644
index 00000000..3d1f352c
--- /dev/null
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
@@ -0,0 +1,83 @@
+using Microsoft.AspNetCore.Components;
+using MP.Data.DatabaseModels;
+using MP.Data.Services;
+using NLog;
+
+namespace MP_TAB_SERV.Components
+{
+    public partial class ScrapKitMan
+    {
+        #region Public Properties
+
+        [Parameter]
+        public RegistroScartiModel ParentKit { get; set; } = null!;
+
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        protected List<RegistroScartiKitModel> ListComplete { get; set; } = new List<RegistroScartiKitModel>();
+
+        protected List<RegistroScartiKitModel> ListPaged { get; set; } = new List<RegistroScartiKitModel>();
+
+        [Inject]
+        protected TabDataService TabDServ { get; set; } = null!;
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected override async Task OnParametersSetAsync()
+        {
+            await ReloadData();
+        }
+
+        protected void UpdateTable()
+        {
+            // esegue paginazione
+            if (TotalCount > NumRecPage)
+            {
+                ListPaged = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList();
+            }
+            else
+            {
+                ListPaged = ListComplete;
+            }
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        private bool isProcessing = false;
+
+        private int NumRecPage = 10;
+
+        private int PageNum = 1;
+
+        private int TotalCount = 0;
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        private async Task ReloadData()
+        {
+            isProcessing = true;
+            await Task.Delay(1);
+            if (ParentKit != null)
+            {
+                ListComplete = await TabDServ.RegScartiKitGetFilt(ParentKit);
+                TotalCount = ListComplete.Count;
+                // esegue paginazione
+                UpdateTable();
+            }
+            isProcessing = false;
+            await Task.Delay(1);
+        }
+
+        #endregion Private Methods
+    }
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index de4fa036..0c5916e7 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -49,70 +49,81 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var item in ListPaged)
+                        @if (TotalCount == 0)
                         {
-                            <tr class="@selectedCss(item)">
-                                <td>
-                                    <div class="row">
-                                        <div class="col-5 small">
-                                            <div>
-                                                Art: <b>@item.CodArticolo</b>
-                                            </div>
-                                            <div class="@($"text-{item.cssClass}")">
-                                                <i class="@item.icona"></i> @item.Descrizione
-                                            </div>
-                                        </div>
-                                        <div class="col-2 px-0 text-center text-nowrap d-flex justify-content-center">
-                                            <div>
-                                                <b class="fs-2">@item.Qta</b>
-                                            </div>
-                                            <div class="ps-1 fs-4">
-                                                &times;
-                                                @if (item.Tipo == "KIT")
-                                                {
-                                                    <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
-                                                        @if (item.KitSplit)
-                                                        {
-                                                            <i class="fa-solid fa-box-open"></i>
-                                                        }
-                                                        else
-                                                        {
-                                                            <i class="fa-solid fa-box"></i>
-                                                        }
-                                                    </button>
-                                                }
-                                                else
-                                                {
-                                                    <span>pz</span>
-                                                }
-                                            </div>
-                                        </div>
-                                        <div class="col-5 text-end small">
-                                            <div class="text-truncate">
-                                                @($"{item.DataOra:ddd dd.MM.yy HH:mm:ss}")
-                                                <i class="fa fa-clock-o" aria-hidden="true"></i>
-                                            </div>
-                                            <div class="text-truncate">
-                                                <b>@item.Operatore</b>
-                                                <i class="fa fa-user" aria-hidden="true"></i>
-                                            </div>
-                                        </div>
-                                        <div class="col-12 small text-secondary">
-                                            @if (!string.IsNullOrEmpty(item.Note))
-                                            {
-                                                <span>Nota: <b>@item.Note</b></span>
-                                            }
-                                        </div>
-                                    </div>
+                            <tr>
+                                <td class="p-0">
+                                    <div class="alert fs-4">No record found</div>
                                 </td>
                             </tr>
-                            @if(item.Equals(selItem))
+                        }
+                        else
+                        {
+                            @foreach (var item in ListPaged)
                             {
-                                <tr>
+                                <tr class="@selectedCss(item)">
                                     <td>
-                                        <ScrapKitMan></ScrapKitMan>
+                                        <div class="row">
+                                            <div class="col-5 small">
+                                                <div>
+                                                    Art: <b>@item.CodArticolo</b>
+                                                </div>
+                                                <div class="@($"text-{item.cssClass}")">
+                                                    <i class="@item.icona"></i> @item.Descrizione
+                                                </div>
+                                            </div>
+                                            <div class="col-2 px-0 text-center text-nowrap d-flex justify-content-center">
+                                                <div>
+                                                    <b class="fs-2">@item.Qta</b>
+                                                </div>
+                                                <div class="ps-1 fs-4">
+                                                    &times;
+                                                    @if (item.Tipo == "ART")
+                                                    {
+                                                        <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
+                                                            @if (item.KitSplit)
+                                                            {
+                                                                <i class="fa-solid fa-box-open"></i>
+                                                            }
+                                                            else
+                                                            {
+                                                                <i class="fa-solid fa-box"></i>
+                                                            }
+                                                        </button>
+                                                    }
+                                                    else
+                                                    {
+                                                        <span>pz</span>
+                                                    }
+                                                </div>
+                                            </div>
+                                            <div class="col-5 text-end small">
+                                                <div class="text-truncate">
+                                                    @($"{item.DataOra:ddd dd.MM.yy HH:mm:ss}")
+                                                    <i class="fa fa-clock-o" aria-hidden="true"></i>
+                                                </div>
+                                                <div class="text-truncate">
+                                                    <b>@item.Operatore</b>
+                                                    <i class="fa fa-user" aria-hidden="true"></i>
+                                                </div>
+                                            </div>
+                                            <div class="col-12 small text-secondary">
+                                                @if (!string.IsNullOrEmpty(item.Note))
+                                                {
+                                                    <span>Nota: <b>@item.Note</b></span>
+                                                }
+                                            </div>
+                                        </div>
                                     </td>
                                 </tr>
+                                @if (item.Equals(selItem))
+                                {
+                                    <tr>
+                                        <td class="p-0">
+                                            <ScrapKitMan ParentKit="item"></ScrapKitMan>
+                                        </td>
+                                    </tr>
+                                }
                             }
                         }
                     </tbody>
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor.cs b/MP-TAB-SERV/Components/ScrapMan.razor.cs
index a294e372..284b7eb5 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapMan.razor.cs
@@ -40,25 +40,23 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Properties
 
-
-
+        protected bool enableScarti { get; set; } = true;
         protected List<RegistroScartiModel> ListComplete { get; set; } = new List<RegistroScartiModel>();
         protected List<RegistroScartiModel> ListPaged { get; set; } = new List<RegistroScartiModel>();
 
         [Inject]
         protected MessageService MServ { get; set; } = null!;
 
-        [Inject]
-        protected TabDataService TabDServ { get; set; } = null!;
         [Inject]
         protected SharedMemService SMServ { get; set; } = null!;
 
+        [Inject]
+        protected TabDataService TabDServ { get; set; } = null!;
+
         #endregion Protected Properties
 
         #region Protected Methods
 
-        protected bool enableScarti { get; set; } = true;
-
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
@@ -73,22 +71,23 @@ namespace MP_TAB_SERV.Components
             }
         }
 
-
-
         protected void SaveNumRec(int newNum)
         {
             NumRecPage = newNum;
             UpdateTable();
         }
 
-
-
         protected void SavePage(int newNum)
         {
             PageNum = newNum;
             UpdateTable();
         }
 
+        protected string selectedCss(RegistroScartiModel currItem)
+        {
+            return currItem.Equals(selItem) ? "table-info" : "";
+        }
+
         protected async Task SetMacc(string selIdxMacc)
         {
             isProcessing = true;
@@ -115,7 +114,18 @@ namespace MP_TAB_SERV.Components
             await doUpdate();
         }
 
-
+        protected void ShowKitDetail(RegistroScartiModel currItem)
+        {
+            // faccio toggle show item (se era gi� selezionato --> null!)
+            if (!currItem.Equals(selItem))
+            {
+                selItem = currItem;
+            }
+            else
+            {
+                selItem = null;
+            }
+        }
 
         protected void UpdateTable()
         {
@@ -132,32 +142,13 @@ namespace MP_TAB_SERV.Components
 
         #endregion Protected Methods
 
-        protected void ShowKitDetail(RegistroScartiModel currItem)
-        {
-            // faccio toggle show item (se era gi� selezionato --> null!)
-            if (!currItem.Equals(selItem))
-            {
-                selItem = currItem;
-            }
-            else
-            {
-                selItem = null;
-            }
-        }
-
-        protected string selectedCss(RegistroScartiModel currItem)
-        {
-            return currItem.Equals(selItem) ? "table-info" : "";
-        }
-
-        private RegistroScartiModel? selItem = null;
-
         #region Private Fields
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
         private bool isProcessing = false;
         private int NumRecPage = 10;
         private int PageNum = 1;
+        private RegistroScartiModel? selItem = null;
         private int TotalCount = 0;
         private bool useOdl = false;
 
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index a3a73f25..2162756a 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -1445,13 +1445,9 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
-        /// Restituisce elenco Ultimi RC macchina
-        /// </summary>
-        /// <param name="idxMacchina"></param>
-        /// <param name="idxODL"></param>
-        /// <param name="dataFrom"></param>
-        /// <param name="dataTo"></param>
-        /// <returns></returns>
+        /// Restituisce elenco Ultimi RC macchina </summary> <param name="idxMacchina"></param>
+        /// <param name="idxODL"></param> <param name="dataFrom"></param> <param
+        /// name="dataTo"></param> <returns></returns>
         public List<RegistroControlliModel> RegControlliLast(string idxMacchina)
         {
             List<RegistroControlliModel> dbResult = new List<RegistroControlliModel>();
@@ -1607,6 +1603,29 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
+        /// <summary>
+        /// Elenco scarti KIT dato record parent
+        /// </summary>
+        /// <param name="parentRec"></param>
+        /// <returns></returns>
+        public List<RegistroScartiKitModel> RegScartiKitGetFilt(RegistroScartiModel parentRec)
+        {
+            List<RegistroScartiKitModel> dbResult = new List<RegistroScartiKitModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var IdxMacc = new SqlParameter("@IdxMacchina", parentRec.IdxMacchina);
+                var DtRif = new SqlParameter("@DataRif", parentRec.DataOra);
+                var Causale = new SqlParameter("@Causale", parentRec.Causale);
+
+                dbResult = dbCtx
+                            .DbSetRegScartiKit
+                            .FromSqlRaw("EXEC stp_RSK_getByFilt @IdxMacchina, @DataRif, @Causale", IdxMacc, DtRif, Causale)
+                            .AsNoTracking()
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Aggiunta record RegistroScartiKit in tab RSK esplodendo x kit
         /// </summary>
diff --git a/MP.Data/DatabaseModels/RegistroScartiModel.cs b/MP.Data/DatabaseModels/RegistroScartiModel.cs
index 00ab4363..a0829887 100644
--- a/MP.Data/DatabaseModels/RegistroScartiModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiModel.cs
@@ -49,5 +49,10 @@ namespace MP.Data.DatabaseModels
 
             return true;
         }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
     }
 }
\ No newline at end of file
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index e313679c..0e93a842 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -2122,6 +2122,42 @@ namespace MP.Data.Services
             return result;
         }
 
+        /// <summary>
+        /// Restituisce elenco RSK filtrato x parent
+        /// </summary>
+        /// <param name="ParentRec"></param>
+        /// <returns></returns>
+        public async Task<List<RegistroScartiKitModel>> RegScartiKitGetFilt(RegistroScartiModel ParentRec)
+        {
+            // setup parametri costanti
+            string source = "DB";
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
+            List<RegistroScartiKitModel>? result = new List<RegistroScartiKitModel>();
+            // cerco in redis...
+            string currKey = $"{redisBaseKey}:RegScartiKit:{ParentRec.IdxMacchina}:{ParentRec.DataOra:yyyyyMMdd-HHmm}:{ParentRec.Causale}";
+            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<RegistroScartiKitModel>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = dbTabController.RegScartiKitGetFilt(ParentRec);
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+            }
+            if (result == null)
+            {
+                result = new List<RegistroScartiKitModel>();
+            }
+            sw.Stop();
+            Log.Debug($"RegScartiKitGetFilt | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            return result;
+        }
+
         /// <summary>
         /// Aggiunta record RegistroScarti
         /// </summary>

From c516632b63f1881df16faa0ca8fdf4875ba0edd4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 11:03:01 +0100
Subject: [PATCH 24/69] Fix datamodel ScartiKit

---
 MP-TAB-SERV/MP-TAB-SERV.csproj                   | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html             | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt                | 2 +-
 MP-TAB-SERV/Resources/manifest.xml               | 2 +-
 MP.Data/DatabaseModels/RegistroScartiKitModel.cs | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index d1707d37..261225b1 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1410</Version>
+      <Version>6.16.2312.1411</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index efc6fa93..618f9362 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1410</h4>
+    <h4>Versione: 6.16.2312.1411</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 1c86197a..473ffdaa 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1410
+6.16.2312.1411
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index ac6a8336..b1d0684a 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1410</version>
+  <version>6.16.2312.1411</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
index d4a54cde..5701d4c0 100644
--- a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
@@ -30,6 +30,8 @@ namespace MP.Data.DatabaseModels
         public string Descrizione { get; set; } = "";
         public string cssClass { get; set; } = "";
         public string icona { get; set; } = "";
+        public string DescArticolo { get; set; } = "";
+        public string Tipo { get; set; } = "";
 
         #endregion Public Properties
     }

From fbfc74106c3e0b3e1422820d885b2f2e522ddada Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 11:58:39 +0100
Subject: [PATCH 25/69] Aggiunto chiamata stored quando si chiede show KIT

---
 MP-TAB-SERV/Components/ScrapMan.razor.cs      | 25 +++++++++++++------
 .../DatabaseModels/RegistroScartiKitModel.cs  |  2 --
 MP.Data/MoonProContext.cs                     |  4 +++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapMan.razor.cs b/MP-TAB-SERV/Components/ScrapMan.razor.cs
index 284b7eb5..6d23dc6d 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapMan.razor.cs
@@ -114,16 +114,25 @@ namespace MP_TAB_SERV.Components
             await doUpdate();
         }
 
-        protected void ShowKitDetail(RegistroScartiModel currItem)
+        protected async Task ShowKitDetail(RegistroScartiModel currItem)
         {
-            // faccio toggle show item (se era gi� selezionato --> null!)
-            if (!currItem.Equals(selItem))
+            // deve essere != null in primis...
+            if (currItem != null)
             {
-                selItem = currItem;
-            }
-            else
-            {
-                selItem = null;
+                // verifico se serve creare split dell'oggetto (hard coded!!!)
+                if (currItem.Tipo == "KIT" && !currItem.KitSplit)
+                {
+                    await TabDServ.RegScartiKitSplit(currItem);
+                }
+                // faccio toggle show item (se era gi� selezionato --> null!)
+                if (!currItem.Equals(selItem))
+                {
+                    selItem = currItem;
+                }
+                else
+                {
+                    selItem = null;
+                }
             }
         }
 
diff --git a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
index 5701d4c0..ed84ff8b 100644
--- a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
@@ -14,8 +14,6 @@ namespace MP.Data.DatabaseModels
     {
         #region Public Properties
 
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int IdxRSK { get; set; }
         public string IdxMacchina { get; set; } = "";
         public DateTime DataOra { get; set; } = DateTime.Now;
         public string Causale { get; set; } = "";
diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs
index a0c0cdd7..bcda74b5 100644
--- a/MP.Data/MoonProContext.cs
+++ b/MP.Data/MoonProContext.cs
@@ -552,6 +552,10 @@ namespace MP.Data
             {
                 entity.HasKey(e => new { e.IdxMacchina, e.DataOra, e.Causale });
             });
+            modelBuilder.Entity<RegistroScartiKitModel>(entity =>
+            {
+                entity.HasKey(e => new { e.IdxMacchina, e.DataOra, e.Causale, e.CodArticolo });
+            });
 
             modelBuilder.Entity<FermiNonQualModel>(entity =>
             {

From 5c7c34e0112d2a68424f0090f498923cf74f4c17 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 11:59:27 +0100
Subject: [PATCH 26/69] FIX: mostra solo x i veri kit

---
 MP-TAB-SERV/Components/ScrapMan.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index 0c5916e7..4dbd766f 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -78,7 +78,7 @@
                                                 </div>
                                                 <div class="ps-1 fs-4">
                                                     &times;
-                                                    @if (item.Tipo == "ART")
+                                                    @if (item.Tipo == "KIT")
                                                     {
                                                         <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
                                                             @if (item.KitSplit)

From ff7ad85373fb791ae5f205a97512ef713595555c Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 12:00:23 +0100
Subject: [PATCH 27/69] fix errore script barcode reader

---
 MP-TAB-SERV/Pages/_Layout.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP-TAB-SERV/Pages/_Layout.cshtml b/MP-TAB-SERV/Pages/_Layout.cshtml
index 0059df26..6691bfc3 100644
--- a/MP-TAB-SERV/Pages/_Layout.cshtml
+++ b/MP-TAB-SERV/Pages/_Layout.cshtml
@@ -38,7 +38,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    <script src="~/lib//BarcodeReade.razor.js"></script>
+    @*<script src="~/lib//BarcodeReade.razor.js"></script>*@
     <script src="lib/WindowSize.js"></script>
     <script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
     <script src="_framework/blazor.server.js"></script>

From 9b397c747830043c88c641f725b32692d7567a93 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 12:18:05 +0100
Subject: [PATCH 28/69] fix grafici pagina scarti

---
 MP-TAB-SERV/Components/ScrapMan.razor | 15 +++++++++++----
 MP-TAB-SERV/MP-TAB-SERV.csproj        |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html  |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt     |  2 +-
 MP-TAB-SERV/Resources/manifest.xml    |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index 4dbd766f..9c5303a5 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -77,9 +77,8 @@
                                                     <b class="fs-2">@item.Qta</b>
                                                 </div>
                                                 <div class="ps-1 fs-4">
-                                                    &times;
-                                                    @if (item.Tipo == "KIT")
-                                                    {
+                                                    <div class="d-flex justify-content-center align-items-center flex-wrap h-100">
+                                                        <sub class="pe-1">&times;</sub>
                                                         <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
                                                             @if (item.KitSplit)
                                                             {
@@ -90,10 +89,18 @@
                                                                 <i class="fa-solid fa-box"></i>
                                                             }
                                                         </button>
+                                                    </div>
+                                                    @if (item.Tipo == "KIT")
+                                                    {
+                                                        
                                                     }
                                                     else
                                                     {
-                                                        <span>pz</span>
+
+                                                        @*<sub>
+                                                            &times;
+                                                            <span>pz</span>
+                                                        </sub>*@
                                                     }
                                                 </div>
                                             </div>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 261225b1..9e717cc6 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1411</Version>
+      <Version>6.16.2312.1412</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 618f9362..fe09f92f 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1411</h4>
+    <h4>Versione: 6.16.2312.1412</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 473ffdaa..7c19e07a 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1411
+6.16.2312.1412
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index b1d0684a..0f924aed 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1411</version>
+  <version>6.16.2312.1412</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From f8661ab8158752202492d1881cdb529d2bc65ec2 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 12:22:34 +0100
Subject: [PATCH 29/69] Fix spazio tabella

---
 MP-TAB-SERV/Components/ScrapKitMan.razor | 2 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj           | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html     | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt        | 2 +-
 MP-TAB-SERV/Resources/manifest.xml       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index b8af8abd..f52bad9a 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -3,7 +3,7 @@
 <div class="bg-info p-2">
     <div class="bg-dark">
         <div class="d-flex justify-content-between">
-            <table class="table table-light table-sm table-striped">
+            <table class="table table-light table-sm table-striped mb-0">
                 <thead>
                     <tr class="text-start1">
                         <th class="fs-5">
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 261225b1..9e717cc6 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1411</Version>
+      <Version>6.16.2312.1412</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 618f9362..fe09f92f 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1411</h4>
+    <h4>Versione: 6.16.2312.1412</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 473ffdaa..7c19e07a 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1411
+6.16.2312.1412
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index b1d0684a..0f924aed 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1411</version>
+  <version>6.16.2312.1412</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 861d4e0820a47fd2d43ccce1d3af0b735c89293f Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 12:24:37 +0100
Subject: [PATCH 30/69] fix visualizzazione bottone kitting

---
 MP-TAB-SERV/Components/ScrapMan.razor | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index 9c5303a5..c9045a34 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -77,30 +77,30 @@
                                                     <b class="fs-2">@item.Qta</b>
                                                 </div>
                                                 <div class="ps-1 fs-4">
-                                                    <div class="d-flex justify-content-center align-items-center flex-wrap h-100">
-                                                        <sub class="pe-1">&times;</sub>
-                                                        <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
-                                                            @if (item.KitSplit)
-                                                            {
-                                                                <i class="fa-solid fa-box-open"></i>
-                                                            }
-                                                            else
-                                                            {
-                                                                <i class="fa-solid fa-box"></i>
-                                                            }
-                                                        </button>
-                                                    </div>
+                                                    
                                                     @if (item.Tipo == "KIT")
                                                     {
-                                                        
+                                                        <div class="d-flex justify-content-center align-items-center flex-wrap h-100">
+                                                            <sub class="pe-1">&times;</sub>
+                                                            <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
+                                                                @if (item.KitSplit)
+                                                                {
+                                                                    <i class="fa-solid fa-box-open"></i>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <i class="fa-solid fa-box"></i>
+                                                                }
+                                                            </button>
+                                                        </div>
                                                     }
                                                     else
                                                     {
 
-                                                        @*<sub>
+                                                        <sub>
                                                             &times;
                                                             <span>pz</span>
-                                                        </sub>*@
+                                                        </sub>
                                                     }
                                                 </div>
                                             </div>

From 745b5ac6a7559d54feb0a570944c2f83f785a120 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 12:48:58 +0100
Subject: [PATCH 31/69] KIT SCARTI: - metodo gestione delete kit scarti -
 metodo edit Qty

---
 MP-TAB-SERV/Components/ScrapMan.razor.cs      |  2 +
 MP.Data/Controllers/MpTabController.cs        | 48 +++++++++
 .../DatabaseModels/RegistroScartiKitModel.cs  |  1 +
 MP.Data/Services/TabDataService.cs            | 97 ++++++++++++++-----
 4 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapMan.razor.cs b/MP-TAB-SERV/Components/ScrapMan.razor.cs
index 6d23dc6d..e2df7839 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapMan.razor.cs
@@ -116,6 +116,7 @@ namespace MP_TAB_SERV.Components
 
         protected async Task ShowKitDetail(RegistroScartiModel currItem)
         {
+            isProcessing = true;
             // deve essere != null in primis...
             if (currItem != null)
             {
@@ -134,6 +135,7 @@ namespace MP_TAB_SERV.Components
                     selItem = null;
                 }
             }
+            isProcessing = false;
         }
 
         protected void UpdateTable()
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 2162756a..f04927a0 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -1603,6 +1603,54 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
+        /// <summary>
+        /// Elimina scarti KIT dato record parent (e lo resetta)
+        /// </summary>
+        /// <param name="parentRec"></param>
+        /// <returns></returns>
+        public bool RegScartiKitDelete(RegistroScartiModel parentRec)
+        {
+            bool answ = false;
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                var IdxMacc = new SqlParameter("@IdxMacchina", parentRec.IdxMacchina);
+                var DtRif = new SqlParameter("@DataOra", parentRec.DataOra);
+                var Causale = new SqlParameter("@Causale", parentRec.Causale);
+
+                var dbResult = dbCtx
+                              .Database
+                              .ExecuteSqlRaw("EXEC stp_RSK_Delete @IdxMacchina, @DataOra, @Causale", IdxMacc, DtRif, Causale);
+
+                answ = dbResult != 0;
+            }
+            return answ;
+        }
+        /// <summary>
+        /// Aggiorna un record scarti KIT ( SE ESISTE...)
+        /// </summary>
+        /// <param name="currRec"></param>
+        /// <returns></returns>
+        public RegistroScartiKitModel RegScartiKitUpdateQty(RegistroScartiKitModel currRec)
+        {
+            RegistroScartiKitModel dbResult = new RegistroScartiKitModel();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                dbResult = dbCtx
+                            .DbSetRegScartiKit
+                            .Where(x => x.IdxMacchina == currRec.IdxMacchina && x.DataOra == currRec.DataOra && x.Causale == currRec.Causale && x.CodArticolo == currRec.CodArticolo)
+                            .FirstOrDefault();
+
+                // aggiorno solo QTY
+                if (dbResult != null)
+                {
+                    dbResult.Qta = currRec.Qta;
+                    dbCtx.Entry(dbResult).State = EntityState.Modified;
+                    dbCtx.SaveChanges();
+                }
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco scarti KIT dato record parent
         /// </summary>
diff --git a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
index ed84ff8b..1980ca3a 100644
--- a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
@@ -22,6 +22,7 @@ namespace MP.Data.DatabaseModels
         public string Operatore { get; set; } = "";
 
         public int Qta { get; set; } = 0;
+        public int QtaMax { get; set; } = 0;
         public string Note { get; set; } = "";
         public int MatrOpr { get; set; } = 0;
         public DateTime? DataOraProdRec { get; set; } = null;
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 0e93a842..4132f126 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -2122,6 +2122,54 @@ namespace MP.Data.Services
             return result;
         }
 
+        /// <summary>
+        /// Aggiunta record RegistroScarti
+        /// </summary>
+        /// <param name="newRec"></param>
+        /// <returns></returns>
+        public async Task<bool> RegScartiInsert(RegistroScartiModel newRec)
+        {
+            bool answ = false;
+            try
+            {
+                // inserisco evento
+                answ = await dbTabController.RegScartiInsert(newRec);
+                // reset cache eventi/commenti
+                await FlushCache("RegScarti");
+                await FlushCache("RegScartiKit");
+            }
+            catch (Exception exc)
+            {
+                string logMsg = $"Eccezione in RegScartiInsert | macchina: {newRec.IdxMacchina} | DataOra: {newRec.DataOra} | Causale: {newRec.Causale} | MatrOpr: {newRec.MatrOpr} | Qta {newRec.Qta} | Note: {newRec.Note}{Environment.NewLine}{exc}";
+                Log.Error(logMsg);
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Elimina elenco RSK da parent
+        /// </summary>
+        /// <param name="ParentRec"></param>
+        /// <returns></returns>
+        public async Task<bool> RegScartiKitDelete(RegistroScartiModel ParentRec)
+        {
+            bool answ = false;
+            try
+            {
+                // inserisco evento
+                answ = dbTabController.RegScartiKitDelete(ParentRec);
+                // reset cache eventi/commenti
+                await FlushCache("RegScarti");
+                await FlushCache("RegScartiKit");
+            }
+            catch (Exception exc)
+            {
+                string logMsg = $"Eccezione in RegScartiKitDelete | macchina: {ParentRec.IdxMacchina} | DataOra: {ParentRec.DataOra} | Causale: {ParentRec.Causale} | MatrOpr: {ParentRec.MatrOpr} | Qta {ParentRec.Qta} | Note: {ParentRec.Note}{Environment.NewLine}{exc}";
+                Log.Error(logMsg);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Restituisce elenco RSK filtrato x parent
         /// </summary>
@@ -2158,30 +2206,6 @@ namespace MP.Data.Services
             return result;
         }
 
-        /// <summary>
-        /// Aggiunta record RegistroScarti
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns></returns>
-        public async Task<bool> RegScartiInsert(RegistroScartiModel newRec)
-        {
-            bool answ = false;
-            try
-            {
-                // inserisco evento
-                answ = await dbTabController.RegScartiInsert(newRec);
-                // reset cache eventi/commenti
-                await FlushCache("RegScarti");
-                await FlushCache("RegScartiKit");
-            }
-            catch (Exception exc)
-            {
-                string logMsg = $"Eccezione in RegScartiInsert | macchina: {newRec.IdxMacchina} | DataOra: {newRec.DataOra} | Causale: {newRec.Causale} | MatrOpr: {newRec.MatrOpr} | Qta {newRec.Qta} | Note: {newRec.Note}{Environment.NewLine}{exc}";
-                Log.Error(logMsg);
-            }
-            return answ;
-        }
-
         /// <summary>
         /// Split record RegistroScarti --&gt; RegistroScartiKit
         /// </summary>
@@ -2206,6 +2230,31 @@ namespace MP.Data.Services
             return answ;
         }
 
+        /// <summary>
+        /// Update qty record singolo articolo di un KIT Scarti
+        /// </summary>
+        /// <param name="editRec"></param>
+        /// <returns></returns>
+        public async Task<bool> RegScartiKitUpdateQty(RegistroScartiKitModel editRec)
+        {
+            bool answ = false;
+            try
+            {
+                // aggiorno record
+                var updRec = dbTabController.RegScartiKitUpdateQty(editRec);
+                answ = updRec.Qta == editRec.Qta;
+                // reset cache eventi/commenti
+                await FlushCache("RegScarti");
+                await FlushCache("RegScartiKit");
+            }
+            catch (Exception exc)
+            {
+                string logMsg = $"Eccezione in RegScartiKitUpdateQty | macchina: {editRec.IdxMacchina} | DataOra: {editRec.DataOra} | Causale: {editRec.Causale} | MatrOpr: {editRec.MatrOpr} | Qta {editRec.Qta} | Note: {editRec.Note}{Environment.NewLine}{exc}";
+                Log.Error(logMsg);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Resetta (rileggendo) i dati della macchina
         /// </summary>

From 9c5a0c57e99e52bcffc2a1a8b56d6675c142434b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 12:58:29 +0100
Subject: [PATCH 32/69] Ok delete kit intero

---
 MP-TAB-SERV/Components/ScrapKitMan.razor    |  9 +++++++--
 MP-TAB-SERV/Components/ScrapKitMan.razor.cs | 20 ++++++++++++++++++++
 MP-TAB-SERV/Components/ScrapMan.razor       |  4 ++--
 MP-TAB-SERV/Components/ScrapMan.razor.cs    | 19 ++++++++++++++-----
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index f52bad9a..638ca44f 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -6,8 +6,13 @@
             <table class="table table-light table-sm table-striped mb-0">
                 <thead>
                     <tr class="text-start1">
-                        <th class="fs-5">
-                            Esplosione scarti KIT
+                        <th class="fs-5 d-flex justify-content-between">
+                            <div>
+                                Esplosione scarti KIT
+                            </div>
+                            <div>
+                                <button class="btn btn-danger" @onclick="DeleteKitSplit"><i class="fa-solid fa-trash-can"></i> Remove Split</button>
+                            </div>
                         </th>
                     </tr>
                 </thead>
diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor.cs b/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
index 3d1f352c..a5dceec4 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.Services;
 using NLog;
@@ -9,6 +10,9 @@ namespace MP_TAB_SERV.Components
     {
         #region Public Properties
 
+        [Parameter]
+        public EventCallback<bool> E_Updated { get; set; }
+
         [Parameter]
         public RegistroScartiModel ParentKit { get; set; } = null!;
 
@@ -16,6 +20,9 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Properties
 
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; } = null!;
+
         protected List<RegistroScartiKitModel> ListComplete { get; set; } = new List<RegistroScartiKitModel>();
 
         protected List<RegistroScartiKitModel> ListPaged { get; set; } = new List<RegistroScartiKitModel>();
@@ -27,6 +34,19 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Methods
 
+        protected async Task DeleteKitSplit()
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sicuro di voler eliminare il dettaglio del KIT scartato?"))
+                return;
+
+            if (ParentKit != null)
+            {
+                await TabDServ.RegScartiKitDelete(ParentKit);
+                await ReloadData();
+                await E_Updated.InvokeAsync(true);
+            }
+        }
+
         protected override async Task OnParametersSetAsync()
         {
             await ReloadData();
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index c9045a34..15404ad7 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -8,7 +8,7 @@
     @if (enableScarti)
     {
         <div class="mb-2">
-            <ScrapEditor RecMSE="@RecMSE" E_Updated="doUpdate"></ScrapEditor>
+            <ScrapEditor RecMSE="@RecMSE" E_Updated="ReloadData"></ScrapEditor>
         </div>
     }
     else
@@ -127,7 +127,7 @@
                                 {
                                     <tr>
                                         <td class="p-0">
-                                            <ScrapKitMan ParentKit="item"></ScrapKitMan>
+                                            <ScrapKitMan ParentKit="item" E_Updated="ForceReload"></ScrapKitMan>
                                         </td>
                                     </tr>
                                 }
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor.cs b/MP-TAB-SERV/Components/ScrapMan.razor.cs
index e2df7839..9040d15d 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapMan.razor.cs
@@ -21,7 +21,7 @@ namespace MP_TAB_SERV.Components
         /// Aggiorno valori produzione alla data richiesta...
         /// </summary>
         /// <param name="newDate"></param>
-        public async Task doUpdate()
+        protected async Task ReloadData()
         {
             isProcessing = true;
             await Task.Delay(1);
@@ -36,6 +36,15 @@ namespace MP_TAB_SERV.Components
             await Task.Delay(1);
         }
 
+        protected async Task ForceReload(bool DoClose)
+        {
+            if (DoClose)
+            {
+                selItem = null;
+            }
+            await ReloadData();
+        }
+
         #endregion Public Methods
 
         #region Protected Properties
@@ -67,7 +76,7 @@ namespace MP_TAB_SERV.Components
                 DateTime fine = DateTime.Today.AddDays(1);
                 DateTime inizio = fine.AddDays(-8);
                 CurrPeriodo = new Periodo(inizio, fine);
-                await doUpdate();
+                await ReloadData();
             }
         }
 
@@ -93,7 +102,7 @@ namespace MP_TAB_SERV.Components
             isProcessing = true;
             await Task.Delay(1);
             IdxMaccSel = selIdxMacc;
-            await doUpdate();
+            await ReloadData();
             isProcessing = false;
             await Task.Delay(1);
         }
@@ -103,7 +112,7 @@ namespace MP_TAB_SERV.Components
             isProcessing = true;
             await Task.Delay(1);
             IdxOdl = selIdxOdl;
-            await doUpdate();
+            await ReloadData();
             isProcessing = false;
             await Task.Delay(1);
         }
@@ -111,7 +120,7 @@ namespace MP_TAB_SERV.Components
         protected async Task SetPeriodo(Periodo newPeriodo)
         {
             CurrPeriodo = newPeriodo;
-            await doUpdate();
+            await ReloadData();
         }
 
         protected async Task ShowKitDetail(RegistroScartiModel currItem)

From fb4754f8aca5d8fca15f5d6fff720a080c34ec30 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 13:11:40 +0100
Subject: [PATCH 33/69] Modifica qty inserita: non va da provare...

---
 MP-TAB-SERV/Components/ScrapKitMan.razor    | 20 ++++++++++++++++++++
 MP-TAB-SERV/Components/ScrapKitMan.razor.cs | 11 +++++++++++
 MP-TAB-SERV/Components/ScrapMan.razor       | 20 +++++++++++---------
 MP-TAB-SERV/Components/ScrapMan.razor.cs    |  1 +
 MP-TAB-SERV/MP-TAB-SERV.csproj              |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html        |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt           |  2 +-
 MP-TAB-SERV/Resources/manifest.xml          |  2 +-
 8 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index 638ca44f..ccc9be39 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -41,12 +41,32 @@
                                             </div>
                                         </div>
                                         <div class="col-2 px-0 text-center text-nowrap d-flex justify-content-center">
+                                            <div class="px-2">
+                                                @if (item.Qta <= 0)
+                                                {
+                                                    <button class="btn btn-secondary">&minus;</button>
+                                                }
+                                                else
+                                                {
+                                                    <button class="btn btn-warning" @onclick="() => modQty(item, -1)">&minus;</button>
+                                                }
+                                            </div>
                                             <div>
                                                 <b class="fs-2">@item.Qta</b>
                                             </div>
                                             <div class="ps-1 fs-4">
                                                 &times;<span>pz</span>
                                             </div>
+                                            <div class="px-2">
+                                                @if (item.Qta >= item.QtaMax)
+                                                {
+                                                    <button class="btn btn-secondary">&plus;</button>
+                                                }
+                                                else
+                                                {
+                                                    <button class="btn btn-success" @onclick="() => modQty(item, 1)">&plus;</button>
+                                                }
+                                            </div>
                                         </div>
                                         <div class="col-5 text-end small">
                                             <div class="text-truncate">
diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor.cs b/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
index a5dceec4..6d554b82 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor.cs
@@ -64,6 +64,17 @@ namespace MP_TAB_SERV.Components
                 ListPaged = ListComplete;
             }
         }
+        /// <summary>
+        /// Modifica qty del record
+        /// </summary>
+        /// <param name="currItem"></param>
+        /// <param name="delta"></param>
+        /// <returns></returns>
+        protected async Task modQty(RegistroScartiKitModel currItem,  int delta)
+        {
+            currItem.Qta += delta;
+            await TabDServ.RegScartiKitUpdateQty(currItem);
+        }
 
         #endregion Protected Methods
 
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index 15404ad7..ba4c722d 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -77,21 +77,23 @@
                                                     <b class="fs-2">@item.Qta</b>
                                                 </div>
                                                 <div class="ps-1 fs-4">
-                                                    
+
                                                     @if (item.Tipo == "KIT")
                                                     {
                                                         <div class="d-flex justify-content-center align-items-center flex-wrap h-100">
                                                             <sub class="pe-1">&times;</sub>
-                                                            <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT">
-                                                                @if (item.KitSplit)
-                                                                {
+                                                            @if (item.KitSplit)
+                                                            {
+                                                                <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT esploso">
                                                                     <i class="fa-solid fa-box-open"></i>
-                                                                }
-                                                                else
-                                                                {
+                                                                </button>
+                                                            }
+                                                            else
+                                                            {
+                                                                <button class="btn btn-secondary" @onclick="()=>ShowKitDetail(item)" title="KIT non esploso">
                                                                     <i class="fa-solid fa-box"></i>
-                                                                }
-                                                            </button>
+                                                                </button>
+                                                            }
                                                         </div>
                                                     }
                                                     else
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor.cs b/MP-TAB-SERV/Components/ScrapMan.razor.cs
index 9040d15d..6128ee3c 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor.cs
+++ b/MP-TAB-SERV/Components/ScrapMan.razor.cs
@@ -144,6 +144,7 @@ namespace MP_TAB_SERV.Components
                     selItem = null;
                 }
             }
+            await ReloadData();
             isProcessing = false;
         }
 
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 9e717cc6..752a02b0 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1412</Version>
+      <Version>6.16.2312.1413</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index fe09f92f..a1d18744 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1412</h4>
+    <h4>Versione: 6.16.2312.1413</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 7c19e07a..098ff125 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1412
+6.16.2312.1413
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 0f924aed..eaa29062 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1412</version>
+  <version>6.16.2312.1413</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 1a4c05264cb17b67f09e952f3950837b47457245 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 13:12:11 +0100
Subject: [PATCH 34/69] fix grafico dettaglio kit

---
 MP-TAB-SERV/Components/ScrapKitMan.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index f52bad9a..aa8b9644 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -40,7 +40,7 @@
                                                 <b class="fs-2">@item.Qta</b>
                                             </div>
                                             <div class="ps-1 fs-4">
-                                                &times;<span>pz</span>
+                                                <sub> &times;<span>pz</span></sub>
                                             </div>
                                         </div>
                                         <div class="col-5 text-end small">

From 71d986583baff025a6eed09a4d0da2cf5ba015a3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 14:55:43 +0100
Subject: [PATCH 35/69] Fix update qty

---
 MP-TAB-SERV/MP-TAB-SERV.csproj                |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html          |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt             |  2 +-
 MP-TAB-SERV/Resources/manifest.xml            |  2 +-
 MP.Data/Controllers/MpTabController.cs        | 29 +++++++++----------
 .../DatabaseModels/RegistroScartiKitModel.cs  |  1 +
 MP.Data/Services/TabDataService.cs            |  5 ++--
 7 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 752a02b0..44ab1251 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1413</Version>
+      <Version>6.16.2312.1414</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index a1d18744..c4b2ccc1 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1413</h4>
+    <h4>Versione: 6.16.2312.1414</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 098ff125..e8a51188 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1413
+6.16.2312.1414
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index eaa29062..c52ac7f7 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1413</version>
+  <version>6.16.2312.1414</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index f04927a0..21a00bca 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -1578,9 +1578,8 @@ namespace MP.Data.Controllers
         /// </summary>
         /// <param name="newRec"></param>
         /// <returns></returns>
-        public async Task<bool> RegScartiInsert(RegistroScartiModel newRec)
+        public bool RegScartiInsert(RegistroScartiModel newRec)
         {
-            await Task.Delay(1);
             bool fatto = false;
             using (var dbCtx = new MoonProContext(_configuration))
             {
@@ -1630,25 +1629,23 @@ namespace MP.Data.Controllers
         /// </summary>
         /// <param name="currRec"></param>
         /// <returns></returns>
-        public RegistroScartiKitModel RegScartiKitUpdateQty(RegistroScartiKitModel currRec)
+        public bool RegScartiKitUpdateQty(RegistroScartiKitModel currRec)
         {
-            RegistroScartiKitModel dbResult = new RegistroScartiKitModel();
+            bool answ = false;
             using (var dbCtx = new MoonProContext(_configuration))
             {
-                dbResult = dbCtx
-                            .DbSetRegScartiKit
-                            .Where(x => x.IdxMacchina == currRec.IdxMacchina && x.DataOra == currRec.DataOra && x.Causale == currRec.Causale && x.CodArticolo == currRec.CodArticolo)
-                            .FirstOrDefault();
+                var IdxMacc = new SqlParameter("@IdxMacchina", currRec.IdxMacchina);
+                var DtRif = new SqlParameter("@DataOra", currRec.DataOra);
+                var Causale = new SqlParameter("@Causale", currRec.Causale);
+                var Qty = new SqlParameter("@Qty", currRec.Qta);
 
-                // aggiorno solo QTY
-                if (dbResult != null)
-                {
-                    dbResult.Qta = currRec.Qta;
-                    dbCtx.Entry(dbResult).State = EntityState.Modified;
-                    dbCtx.SaveChanges();
-                }
+                var dbResult = dbCtx
+                              .Database
+                              .ExecuteSqlRaw("EXEC stp_RSK_UpdateQty @IdxMacchina, @DataOra, @Causale, @Qty", IdxMacc, DtRif, Causale, Qty);
+
+                answ = dbResult != 0;
             }
-            return dbResult;
+            return answ;
         }
 
         /// <summary>
diff --git a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
index 1980ca3a..14dc8de3 100644
--- a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
+++ b/MP.Data/DatabaseModels/RegistroScartiKitModel.cs
@@ -10,6 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // </Auto-Generated>
 namespace MP.Data.DatabaseModels
 {
+    [Table("RegistroScartiKit")]
     public partial class RegistroScartiKitModel
     {
         #region Public Properties
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 4132f126..94cf1b64 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -2133,7 +2133,7 @@ namespace MP.Data.Services
             try
             {
                 // inserisco evento
-                answ = await dbTabController.RegScartiInsert(newRec);
+                answ = dbTabController.RegScartiInsert(newRec);
                 // reset cache eventi/commenti
                 await FlushCache("RegScarti");
                 await FlushCache("RegScartiKit");
@@ -2241,8 +2241,7 @@ namespace MP.Data.Services
             try
             {
                 // aggiorno record
-                var updRec = dbTabController.RegScartiKitUpdateQty(editRec);
-                answ = updRec.Qta == editRec.Qta;
+                answ = dbTabController.RegScartiKitUpdateQty(editRec);
                 // reset cache eventi/commenti
                 await FlushCache("RegScarti");
                 await FlushCache("RegScartiKit");

From 65d1d49d0455771fc4265657a8a98a18f034b1c6 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 14:58:10 +0100
Subject: [PATCH 36/69] Correzione stored fix qty

---
 MP.Data/Controllers/MpTabController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 21a00bca..fd04d925 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -1637,11 +1637,12 @@ namespace MP.Data.Controllers
                 var IdxMacc = new SqlParameter("@IdxMacchina", currRec.IdxMacchina);
                 var DtRif = new SqlParameter("@DataOra", currRec.DataOra);
                 var Causale = new SqlParameter("@Causale", currRec.Causale);
+                var CodArticolo = new SqlParameter("@CodArticolo", currRec.CodArticolo);
                 var Qty = new SqlParameter("@Qty", currRec.Qta);
 
                 var dbResult = dbCtx
                               .Database
-                              .ExecuteSqlRaw("EXEC stp_RSK_UpdateQty @IdxMacchina, @DataOra, @Causale, @Qty", IdxMacc, DtRif, Causale, Qty);
+                              .ExecuteSqlRaw("EXEC stp_RSK_UpdateQty @IdxMacchina, @DataOra, @Causale, @CodArticolo, @Qty", IdxMacc, DtRif, Causale, CodArticolo, Qty);
 
                 answ = dbResult != 0;
             }

From 131ac9a127ad13b63d317718a39a0f1f3c916735 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 15:00:27 +0100
Subject: [PATCH 37/69] Fix grafico btn

---
 MP-TAB-SERV/Components/ScrapKitMan.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index b7138a10..eff52f38 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -44,7 +44,7 @@
                                             <div class="px-2">
                                                 @if (item.Qta <= 0)
                                                 {
-                                                    <button class="btn btn-secondary">&minus;</button>
+                                                    <button class="btn btn-secondary" disabled>&equiv;</button>
                                                 }
                                                 else
                                                 {
@@ -60,7 +60,7 @@
                                             <div class="px-2">
                                                 @if (item.Qta >= item.QtaMax)
                                                 {
-                                                    <button class="btn btn-secondary">&plus;</button>
+                                                    <button class="btn btn-secondary" disabled>&equiv;</button>
                                                 }
                                                 else
                                                 {

From 924eda2b87a5c84902f213acab66f09274471a74 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 15:02:20 +0100
Subject: [PATCH 38/69] rimesso controllo per operatore (da sistemare)

---
 MP-TAB-SERV/MP-TAB-SERV.csproj       | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt    | 2 +-
 MP-TAB-SERV/Resources/manifest.xml   | 2 +-
 MP-TAB-SERV/Shared/MainLayout.razor  | 3 +++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 752a02b0..44ab1251 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1413</Version>
+      <Version>6.16.2312.1414</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index a1d18744..c4b2ccc1 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1413</h4>
+    <h4>Versione: 6.16.2312.1414</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 098ff125..e8a51188 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1413
+6.16.2312.1414
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index eaa29062..c52ac7f7 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1413</version>
+  <version>6.16.2312.1414</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor
index 43b7f5e9..df3d355f 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor
+++ b/MP-TAB-SERV/Shared/MainLayout.razor
@@ -7,6 +7,8 @@
 <div class="page" @onclick="()=>handleBodyClick()">
     <main>
         <CmpTop CurrMenuItems="@CurrMenuItems"></CmpTop>
+        @if (MsgServ.RigaOper != null || NavMan.Uri.Contains("reg-new-device"))
+        {
             <article class="content pt-1 d-flex mb-5">
                 <div class="" id="@bodyTipe">
                     @Body
@@ -18,6 +20,7 @@
                     </div>
                 }
             </article>
+        }
     </main>
 </div>
 <div class="fixed-bottom">

From 757ed2b585d6c2a8aa23dbf16c241093fdd4b7be Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 16:05:12 +0100
Subject: [PATCH 39/69] fix CmpTop

---
 MP-TAB-SERV/Components/CmpTop.razor | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpTop.razor b/MP-TAB-SERV/Components/CmpTop.razor
index bde404e3..d9c9f8af 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor
+++ b/MP-TAB-SERV/Components/CmpTop.razor
@@ -1,17 +1,18 @@
 ﻿<div class="top-row d-flex justify-content-between text-light">
-    <div class="col-4">
-        <span>
+    <div class="col-4 d-flex">
+        <div class="pe-1">
             <button class="btn btn-sm @ResetClass" @onclick="() => ForceReload()" title="Update"><i class="fa-solid fa-rotate"></i></button>
-            @UserName
-        </span>
-        <sub>[@MatrOpr]</sub>
+        </div>
+        <div class="small fw-light lh-sm">
+            <div class="small">@UserName</div>
+            <small>@MatrOpr</small>
+        </div>
     </div>
-    <div class="col-4 text-center d-flex justify-content-center">
-        <div class="text-decoration-none text-light" @onclick="()=>backToSM()">
-            <i class="fa-solid fa-house"></i> &nbsp;
+    <div class="col-4 text-center d-flex justify-content-center px-0">
+        <div class="btn btn-outline-info p-1 text-decoration-none text-light" @onclick="()=>backToSM()">
+            <i class="fa-solid fa-house"></i>
             MapoTAB2
-            &nbsp;
-            <img src="images/LogoSteamware.png" style="height: 1rem" />
+            <img src="images/LogoSteamware.png" style="height: 1.3rem" />
         </div>
     </div>
     <div class="col-4 text-end">

From b4b08d1c1acf7eb39b1c980a38dc04563d54be08 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 16:07:17 +0100
Subject: [PATCH 40/69] ok sistema di refresh login post F5

---
 MP-TAB-SERV/Components/CmpTop.razor.cs | 14 +++++++-------
 MP-TAB-SERV/Components/ScrapMan.razor  |  2 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 MP-TAB-SERV/Shared/MainLayout.razor    |  4 ++--
 MP-TAB-SERV/Shared/MainLayout.razor.cs |  7 +++++++
 8 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index 8453c92b..08dfd29e 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -15,6 +15,8 @@ namespace MP_TAB_SERV.Components
 
         [Parameter]
         public List<LinkMenu> CurrMenuItems { get; set; } = new List<LinkMenu>();
+        [Parameter]
+        public EventCallback<bool> EA_UserIsOk { get; set; }
 
         #endregion Public Properties
 
@@ -125,7 +127,7 @@ namespace MP_TAB_SERV.Components
             int expDays = SMServ.GetConfInt("cookieDayExpire");
             expDT = DateTime.Now.AddDays(expDays);
             var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
-             
+
             //if (string.IsNullOrEmpty(CurrDevGuid.ToString()))
             if (CurrDevGuid == Guid.Empty)
             {
@@ -144,13 +146,13 @@ namespace MP_TAB_SERV.Components
                 if (!string.IsNullOrEmpty(decryptedData))
                 {
                     var oprObj = JsonConvert.DeserializeObject<userTknDTO>(decryptedData);
-                    if(oprObj != null)
+                    if (oprObj != null)
                     {
                         MsgServ.RigaOper = oprObj.currOpr;
                     }
                 }
             }
-            
+
 
             CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr, CurrDevGuid);
 
@@ -164,10 +166,8 @@ namespace MP_TAB_SERV.Components
             }
             else if (!string.IsNullOrEmpty(CurrOprTknRedis) && CurrOprTknRedis == CurrOprTknLS)
             {
-                if (MsgServ.RigaOper == null)
-                {
-                    await RefreshLogIn(decodedUrl);
-                }
+                await RefreshLogIn(decodedUrl);
+                await EA_UserIsOk.InvokeAsync(true);
             }
         }
 
diff --git a/MP-TAB-SERV/Components/ScrapMan.razor b/MP-TAB-SERV/Components/ScrapMan.razor
index ba4c722d..8b27c012 100644
--- a/MP-TAB-SERV/Components/ScrapMan.razor
+++ b/MP-TAB-SERV/Components/ScrapMan.razor
@@ -84,7 +84,7 @@
                                                             <sub class="pe-1">&times;</sub>
                                                             @if (item.KitSplit)
                                                             {
-                                                                <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT esploso">
+                                                                <button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT esploso" style="max-width: 2.5rem;display: flex;justify-content: center;min-height: 2.375rem;align-items: center;">
                                                                     <i class="fa-solid fa-box-open"></i>
                                                                 </button>
                                                             }
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 44ab1251..a661d908 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1414</Version>
+      <Version>6.16.2312.1416</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index c4b2ccc1..16d6d30f 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1414</h4>
+    <h4>Versione: 6.16.2312.1416</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index e8a51188..4ed19b58 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1414
+6.16.2312.1416
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index c52ac7f7..54d87b0d 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1414</version>
+  <version>6.16.2312.1416</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor
index df3d355f..13589b1e 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor
+++ b/MP-TAB-SERV/Shared/MainLayout.razor
@@ -6,8 +6,8 @@
 
 <div class="page" @onclick="()=>handleBodyClick()">
     <main>
-        <CmpTop CurrMenuItems="@CurrMenuItems"></CmpTop>
-        @if (MsgServ.RigaOper != null || NavMan.Uri.Contains("reg-new-device"))
+        <CmpTop CurrMenuItems="@CurrMenuItems" EA_UserIsOk="checkIfUserOk"></CmpTop>
+        @if (userIsOk || NavMan.Uri.Contains("reg-new-device"))
         {
             <article class="content pt-1 d-flex mb-5">
                 <div class="" id="@bodyTipe">
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 2d993db9..c702c78c 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -169,6 +169,13 @@ namespace MP_TAB_SERV.Shared
             await Task.Delay(1);
         }
 
+        protected bool userIsOk { get; set; } = false;
+        protected async Task checkIfUserOk(bool isOk)
+        {
+            await Task.Delay(1);
+            userIsOk = isOk;
+        }
+
         protected async Task ReloadMemStor()
         {
             // in primis svuoto...

From d4f84f4226868f130c9c4d0d8adc0bd5cc666c4b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 16:16:56 +0100
Subject: [PATCH 41/69] Fix display post conferma prod

---
 MP-TAB-SERV/Components/ProdConfirm.razor    |   1 -
 MP-TAB-SERV/Components/ProdConfirm.razor.cs | 443 +-------------------
 MP-TAB-SERV/MP-TAB-SERV.csproj              |   2 +-
 MP-TAB-SERV/Resources/ChangeLog.html        |   2 +-
 MP-TAB-SERV/Resources/VersNum.txt           |   2 +-
 MP-TAB-SERV/Resources/manifest.xml          |   2 +-
 6 files changed, 5 insertions(+), 447 deletions(-)

diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index d98992c6..33f11295 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -30,7 +30,6 @@
 
 @if (showInnov)
 {
-    @*class="d-flex justify-content-between"*@
     <div class="cardBg p-2 mt-2">
         <div class="d-flex justify-content-between">
             <div class="col-6">
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
index 50763870..15d8818a 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
@@ -170,9 +170,9 @@ namespace MP_TAB_SERV.Components
         protected async Task SalvaConfPz()
         {
             isProcessing = true;
-            await Task.Delay(1);
             // effettua conferma con conf da DB del tipo (giorni / turni / periodo
             bool fatto = effettuaConfermaProd();
+            await TabDServ.FlushCache("StatoProd");
             // refresh tabella dati tablet...
             await TabDServ.RicalcMse(IdxMaccSel, 0);
             // rileggo e salvo..
@@ -188,8 +188,6 @@ namespace MP_TAB_SERV.Components
             lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}";
             // cambio button conferma...
             showInnov = false;
-            // sollevo evento!
-            //dtReqUpdate = DateTime.Now;
             numPzLasciati = 0;
             await DoUpdate();
             await Task.Delay(1);
@@ -291,445 +289,6 @@ namespace MP_TAB_SERV.Components
 
         #endregion Private Methods
 
-#if false
 
-        /// <summary>
-        /// restituisce css disabled SE odl NON OK...
-        /// </summary>
-        public string cssBtnConf
-        {
-            get
-            {
-                return odlOk ? "" : "disabled";
-            }
-        }
-
-        /// <summary>
-        /// Data-Ora ultimo update valori produzione
-        /// </summary>
-        public DateTime dtReqUpdate
-        {
-            get
-            {
-                DateTime answ = DateTime.Now;
-                DateTime.TryParse(hfDtReqUpdate.Value, out answ);
-                return answ;
-            }
-            set
-            {
-                hfDtReqUpdate.Value = $"{value}";
-            }
-        }
-
-        protected DateTime dtFine
-        {
-            set
-            {
-                lblFine.Text = value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi PRODOTTI da ultima conferma
-        /// </summary>
-        protected DateTime dtInizio
-        {
-            set
-            {
-                lblInizio.Text = value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi PRODOTTI da ultima conferma
-        /// </summary>
-        protected int numPz2Rec
-        {
-            set
-            {
-                lblPz2RecTot.Text = value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi BUONI gi� confermati
-        /// </summary>
-        protected int numPzBuoniConf
-        {
-            set
-            {
-                lblPzConfBuoni.Text = value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi confermati (buoni - scarto)
-        /// </summary>
-        protected int numPzConfermati
-        {
-            get
-            {
-                return numPzProdotti2Rec - numPzScarto2Rec;
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi da LASCIARE non dichiarati
-        /// </summary>
-        protected int numPzLasciati
-        {
-            set
-            {
-                txtNumLasciati.Text = value.ToString();
-            }
-            get
-            {
-                int answ = 0;
-                try
-                {
-                    answ = Convert.ToInt32(txtNumLasciati.Text);
-                }
-                catch
-                { }
-                return answ;
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi PRODOTTI GLOBALI
-        /// </summary>
-        protected int numPzProdotti
-        {
-            set
-            {
-                lblPzTotODL.Text = value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi PRODOTTI da registrare
-        /// </summary>
-        /// da ultima conferma
-        protected int numPzProdotti2Rec
-        {
-            set
-            {
-                txtNumPezzi.Text = value.ToString();
-            }
-            get
-            {
-                int answ = 0;
-                try
-                {
-                    answ = Convert.ToInt32(txtNumPezzi.Text);
-                }
-                catch
-                { }
-                return answ;
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi SCARTO gi� confermati
-        /// </summary>
-        protected int numPzScaConf
-        {
-            set
-            {
-                lblPzConfScarto.Text = value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Numero pezzi SCARTATI da registrare
-        /// </summary>
-        protected int numPzScarto2Rec
-        {
-            set
-            {
-                lblPz2RecScarto.Text = value.ToString();
-                memLayer.ML.setSessionVal("lblPz2RecScarto", value);
-            }
-            get
-            {
-                int answ = 0;
-                try
-                {
-                    answ = memLayer.ML.IntSessionObj("lblPz2RecScarto");
-                }
-                catch
-                { }
-                return answ;
-            }
-        }
-
-        protected void ddlSubMacc_DataBound(object sender, EventArgs e)
-        {
-            // se ho in memoria un valore LO REIMPOSTO...
-            if (!string.IsNullOrEmpty(subMaccSel))
-            {
-                // se � una SUB machcina (contiene "#")
-                if (subMaccSel.Contains("#"))
-                {
-                    // provo a preselezionare...
-                    try
-                    {
-                        ddlSubMacc.SelectedValue = subMaccSel;
-                    }
-                    catch
-                    { }
-                }
-                // altrimenti salvo!
-                else
-                {
-                    subMaccSel = ddlSubMacc.SelectedValue;
-                }
-            }
-        }
-
-        protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            subMaccSel = ddlSubMacc.SelectedValue;
-            // salvo ODL
-            DataLayerObj.taMSE.getByIdxMaccAndSub(idxMacchinaSel, subMaccSel);
-            //altri controlli
-            checkAll();
-        }
-
-        /// <summary>
-        /// salvo produzione
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void lbtSalva_Click(object sender, EventArgs e)
-        {
-            // effettua conferma con conf da DB del tipo (giorni / turni / periodo
-            bool fatto = effettuaConfermaProd();
-            // refresh tabella dati tablet...
-            DataLayerObj.taMSE.forceRecalc(0, idxMacchinaSel);
-            // mostro output
-            lblOut.Text = string.Format("Confermata la produzione per {0} pezzi! (+{1} pz scarto) alle {2:yyyy-MM-dd HH:mm:ss}", numPzConfermati, numPzScarto2Rec, dtReqUpdate);
-            // cambio button conferma...
-            switchBtnConferma(!txtNumPezzi.Enabled);
-            // sollevo evento!
-            if (eh_newVal != null)
-            {
-                eh_newVal(this, new EventArgs());
-            }
-            dtReqUpdate = DateTime.Now;
-            doUpdate();
-        }
-
-        /// <summary>
-        /// caricamento pagina
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!Page.IsPostBack)
-            {
-                checkAll();
-                if (isMulti)
-                {
-                    // sollevo evento!
-                    if (eh_reset != null)
-                    {
-                        eh_reset(this, new EventArgs());
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Update pz lasciati --&gt; aggiorno!
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void txtNumLasciati_TextChanged(object sender, EventArgs e)
-        {
-            lblOut.Text = "";
-            updatePzBuoni();
-        }
-
-        /// <summary>
-        /// update post modifica pz buoni
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void txtNumPezzi_TextChanged(object sender, EventArgs e)
-        {
-            lblOut.Text = "";
-            updatePzBuoni();
-        }
-
-        /// <summary>
-        /// ODL correntemente sulla macchina
-        /// - cerca in Redis (TTL 5 sec)
-        /// - altrimenti recupera da DB...
-        /// </summary>
-        protected void updateOdl()
-        {
-            // user� ODL del turno
-            int answ = 0;
-            // cerco da redis...
-            int.TryParse(DataLayerObj.currODL(idxMacchinaSel, true), out answ);
-            // salvo!
-            idxOdl = answ;
-        }
-
-        private void checkAll()
-        {
-            updateOdl();
-            checkConfig();
-            fixSelMacc();
-            checkOdl();
-            lblOut.Text = "";
-            switchBtnConferma(false);
-            lbtShowConfProd.Visible = odlOk;
-            lblConfProd.Visible = !odlOk;
-        }
-
-        /// <summary>
-        /// verifica config x modalit� permesse
-        /// </summary>
-        private void checkConfig()
-        {
-            // verifico SE sia permesso gestire i "Pezzi lasciati" in macchina...
-            lblNumLasciati.Visible = enablePzProdLasciati;
-            txtNumLasciati.Visible = enablePzProdLasciati;
-            lblEmptyNumLasciati.Visible = !enablePzProdLasciati;
-        }
-
-        /// <summary>
-        /// Verifica se abbia un ODL ATTIVO
-        /// </summary>
-        private void checkOdl()
-        {
-            lbtShowConfProd.Visible = odlOk;
-            lblConfProd.Visible = !odlOk;
-            lblMancaODL.Visible = !odlOk;
-        }
-
-        /// <summary>
-        /// Registra conferma produzione in modalit� nuova (con rettifica pezzi lasciati) o legacy
-        /// (con anticipo periodo)
-        /// </summary>
-        private bool effettuaConfermaProd()
-        {
-            bool fatto = false;
-            if (confRett)
-            {
-                // confermo al netto dei pezzi lasciati...
-                fatto = DataLayerObj.confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), numPzConfermati - numPzLasciati, numPzLasciati, numPzScarto2Rec, dtReqUpdate);
-            }
-            else
-            {
-                fatto = DataLayerObj.confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), numPzConfermati, numPzScarto2Rec, dtReqUpdate);
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Se la machcina � MULTI --&gt; mostro selettore
-        /// </summary>
-        private void fixSelMacc()
-        {
-            divSelMacc.Visible = isMulti;
-            if (isMulti)
-            {
-                try
-                {
-                    // salvo selezione submacc
-                    ddlSubMacc.DataBind();
-                    subMaccSel = ddlSubMacc.SelectedValue;
-                }
-                catch
-                { }
-            }
-            updateOdl();
-        }
-
-        /// <summary>
-        /// Reset parametri x calcolo pezzi (no pezzi lasciati, dataora attuale...)
-        /// </summary>
-        private void resetParam()
-        {
-            dtReqUpdate = DateTime.Now;
-            numPzLasciati = 0;
-        }
-
-        /// <summary>
-        /// determina comportamento btn conferma
-        /// </summary>
-        private void switchBtnConferma(bool showConf)
-        {
-            // aggiorno valori rilevati
-            resetParam();
-            doUpdate();
-            divInnovazioni.Visible = showConf;
-            if (showConf)
-            {
-                try
-                {
-                    updatePzBuoni();
-                    // sollevo evento!
-                    if (eh_inserting != null)
-                    {
-                        eh_inserting(this, new EventArgs());
-                    }
-                }
-                catch
-                {
-                    txtNumPezzi.Text = "0";
-                    logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}", idxMacchinaSel), tipoLog.ERROR);
-                }
-            }
-            if (showConf)
-            {
-                lblShowConfProd.Text = "Nascondi Conferma";
-            }
-            else
-            {
-                lblShowConfProd.Text = "Mostra Conferma";
-                // sollevo evento!
-                if (eh_reset != null)
-                {
-                    eh_reset(this, new EventArgs());
-                }
-            }
-        }
-
-        /// <summary>
-        /// aggiorna visualizzazione pz buoni /prodotti - scarti)
-        /// </summary>
-        private void updatePzBuoni()
-        {
-            if (confRett)
-            {
-                // cambio le qta di pezzi confermati...
-                lblPz2RecBuoni.Text = (numPzConfermati - numPzLasciati).ToString();
-            }
-            else
-            {
-                // se ho dei pezzi lasciati RICALCOLO la data...
-                if (numPzLasciati > 0)
-                {
-                    // calcolo la data..
-                    DS_ProdTempi.TempiCicloRilevatiDataTable tab = DataLayerObj.taTempiCicloRilevati.getLastPzByMaccQta(idxMacchinaSel, DateTime.Now, numPzLasciati);
-                    if (tab.Rows.Count > 0)
-                    {
-                        dtReqUpdate = tab[0].DataOraRif.AddSeconds(1);
-                    }
-                    // aggiorno
-                    doUpdate();
-                }
-                lblPz2RecBuoni.Text = numPzConfermati.ToString();
-            }
-            // aggiorno la data calcolo + pezzi buoni...
-            lblDtRec.Text = dtReqUpdate.ToString();
-        }
-
-#endif
     }
 }
\ No newline at end of file
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 44ab1251..a661d908 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1414</Version>
+      <Version>6.16.2312.1416</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index c4b2ccc1..16d6d30f 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1414</h4>
+    <h4>Versione: 6.16.2312.1416</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index e8a51188..4ed19b58 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1414
+6.16.2312.1416
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index c52ac7f7..54d87b0d 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1414</version>
+  <version>6.16.2312.1416</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From f1c5f547b86bcc2c2d3bfceb4a2a945dd9bafb02 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 16:23:08 +0100
Subject: [PATCH 42/69] ok larghezza componenti pagina dettaglio macchina

---
 MP-TAB-SERV/Components/ProdConfirm.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index d98992c6..a341424a 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -8,13 +8,13 @@
     <div class="col-12 d-flex justify-content-between">
         @if (enableMagPrint)
         {
-            <div class="px-1 col-6">
+            <div class="col-6">
                 <PrintMag RecMSE="RecMSE"></PrintMag>
             </div>
         }
         @if (odlOk)
         {
-            <div class="px-1 @ConfCssWidth">
+            <div class="@ConfCssWidth">
                 <button class="btn btn-sm @ConfBg py-2 px-4" style="width: 100%" @onclick="()=>ToggleConfProd()">
                     <i class="fa-solid fa-check pe-1"></i><span>@ConfTitle</span>
                 </button>

From c94742b7df490b9e10a99be982d9b26d171a2f96 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 14 Dec 2023 16:56:53 +0100
Subject: [PATCH 43/69] fix redirect post primo login

---
 MP-TAB-SERV/Pages/RegNewDevice.razor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MP-TAB-SERV/Pages/RegNewDevice.razor.cs b/MP-TAB-SERV/Pages/RegNewDevice.razor.cs
index a42d0b2d..1f8d1cde 100644
--- a/MP-TAB-SERV/Pages/RegNewDevice.razor.cs
+++ b/MP-TAB-SERV/Pages/RegNewDevice.razor.cs
@@ -108,7 +108,7 @@ namespace MP_TAB_SERV.Pages
                 await MsgServ.SetCurrOperDtoLSAsync(hash);
                 await MsgServ.SetLastMatrOprAsync(rigaOpr.MatrOpr);
                 await TDService.OperatoreSetRedis(matrOpr, hash, devGuid);
-                NavMan.NavigateTo("status-map");
+                NavMan.NavigateTo("status-map", true);
             }
             else
             {

From 180b177ab234943d2de180ae39dd0488f77e64bb Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 16:58:26 +0100
Subject: [PATCH 44/69] update small su footer

---
 MP-TAB-SERV/Components/CmpFooter.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index a2a15e70..2411d848 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -1,9 +1,9 @@
-﻿<div class="row bg-dark text-light px-2">
+﻿<div class="row bg-dark text-light px-2 small">
     <div class="col-6 text-left">
         <b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
     </div>
     <div class="col-6 text-end">
-        <span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
+        <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>
 

From a939079cee0ee0f6e5fc9c0aca96de58ab7afabb Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 17:12:48 +0100
Subject: [PATCH 45/69] Fix chiamate multiple x check controlli (ogni 15 sec
 minimo)

---
 MP-TAB-SERV/Components/CheckControls.razor.cs | 79 +++++++++++--------
 MP-TAB-SERV/MP-TAB-SERV.csproj                |  2 +-
 MP-TAB-SERV/Pages/MachineDetail.razor.cs      |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html          |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt             |  2 +-
 MP-TAB-SERV/Resources/manifest.xml            |  2 +-
 6 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/MP-TAB-SERV/Components/CheckControls.razor.cs b/MP-TAB-SERV/Components/CheckControls.razor.cs
index cf2c1fda..0019ed32 100644
--- a/MP-TAB-SERV/Components/CheckControls.razor.cs
+++ b/MP-TAB-SERV/Components/CheckControls.razor.cs
@@ -16,15 +16,12 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Properties
 
-        [Inject]
-        protected NavigationManager NavMan { get; set; } = null!;
-
         /// <summary>
         /// Determina se dato lo stato dell'impianto si debba mostrare btn fermata perch�
         /// - fermo &gt; xx min (da web.config, es 20')
         /// - impianto fermo (controllando idxStato: priorit� &gt; 1)
         /// </summary>
-        protected bool ShowInsFermata
+        protected bool CheckShowInsFermata
         {
             get
             {
@@ -55,55 +52,56 @@ namespace MP_TAB_SERV.Components
         /// <summary>
         /// Verifica necessit� visualizzare il check controlli
         /// </summary>
-        protected bool ShowReqControls
+        protected async Task<bool> CheckShowReqControls()
         {
-            get
+            bool answ = false;
+            if (RecMSE != null)
             {
-                bool answ = false;
-                if (RecMSE != null)
+                // SE abilitata gestione controlli...
+                bool enableCtrl = SMServ.GetConfBool("enableControlli");
+                if (enableCtrl)
                 {
-                    // SE abilitata gestione controlli...
-                    bool enableCtrl = SMServ.GetConfBool("enableControlli");
-                    if (enableCtrl)
+                    int intervalloControlli = SMServ.GetConfInt("intervalloControlli");
+                    // cerco ultimo controllo fatto
+                    DateTime lastControl = DateTime.Now.AddYears(-1);
+                    try
                     {
-                        int intervalloControlli = SMServ.GetConfInt("intervalloControlli");
-                        // cerco ultimo controllo fatto
-                        DateTime lastControl = DateTime.Now.AddYears(-1);
-                        try
+                        var tabCtrls = await TabDServ.RegControlliLast(RecMSE.IdxMacchina);
+                        if (tabCtrls != null && tabCtrls.Count > 0)
                         {
-                            var pUpd = Task.Run(async () =>
+                            var thisRec = tabCtrls.FirstOrDefault();
+                            if (thisRec != null)
                             {
-                                await Task.Delay(1);
-                                var tabCtrls = await TabDServ.RegControlliLast(RecMSE.IdxMacchina);
-                                if (tabCtrls != null && tabCtrls.Count > 0)
+                                lastControl = thisRec.DataOra;
+                                if (Math.Abs(DateTime.Now.Subtract(lastControl).TotalMinutes) >= intervalloControlli)
                                 {
-                                    var thisRec = tabCtrls.FirstOrDefault();
-                                    if (thisRec != null)
-                                    {
-                                        lastControl = thisRec.DataOra;
-                                        if (Math.Abs(DateTime.Now.Subtract(lastControl).TotalMinutes) >= intervalloControlli)
-                                        {
-                                            answ = true;
-                                        }
-                                    }
+                                    answ = true;
                                 }
-                            });
-                            pUpd.Wait();
+                            }
                         }
-                        catch
-                        { }
                     }
+                    catch
+                    { }
                 }
-                return answ;
             }
+            return answ;
         }
 
+        [Inject]
+        protected NavigationManager NavMan { get; set; } = null!;
+
+        protected bool ShowInsFermata { get; set; } = false;
+
+        protected bool ShowReqControls { get; set; } = false;
+
         [Inject]
         protected SharedMemService SMServ { get; set; } = null!;
 
         [Inject]
         protected TabDataService TabDServ { get; set; } = null!;
 
+        protected DateTime lastCheck = DateTime.Today;
+        protected string lastIdxMacc = "";
         #endregion Protected Properties
 
         #region Protected Methods
@@ -118,6 +116,21 @@ namespace MP_TAB_SERV.Components
             NavMan.NavigateTo("prod-stop");
         }
 
+        protected override async Task OnParametersSetAsync()
+        {
+            if (RecMSE != null)
+            {
+                DateTime adesso = DateTime.Now;
+                if (adesso.Subtract(lastCheck).TotalSeconds > 15 || lastIdxMacc != RecMSE.IdxMacchina)
+                {
+                    ShowInsFermata = CheckShowInsFermata;
+                    ShowReqControls = await CheckShowReqControls();
+                    lastIdxMacc = RecMSE.IdxMacchina;
+                    lastCheck = adesso;
+                }
+            }
+        }
+
         #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index a661d908..d37767e8 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1416</Version>
+      <Version>6.16.2312.1417</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor.cs b/MP-TAB-SERV/Pages/MachineDetail.razor.cs
index 67275899..883ccf3d 100644
--- a/MP-TAB-SERV/Pages/MachineDetail.razor.cs
+++ b/MP-TAB-SERV/Pages/MachineDetail.razor.cs
@@ -49,7 +49,7 @@ namespace MP_TAB_SERV.Pages
                     await RefreshMBlock();
                 }
             }
-            await InvokeAsync(StateHasChanged);
+            //await InvokeAsync(StateHasChanged);
         }
 
         protected async Task RefreshMBlock()
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 16d6d30f..08b10a53 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1416</h4>
+    <h4>Versione: 6.16.2312.1417</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 4ed19b58..258cb1a0 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1416
+6.16.2312.1417
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 54d87b0d..c6c9e138 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1416</version>
+  <version>6.16.2312.1417</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 375609126db572713fc60b33a2b6b7195afc7dde Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 17:20:07 +0100
Subject: [PATCH 46/69] Fix errore apertura fermate a loop

---
 MP-TAB-SERV/Pages/ProdStop.razor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MP-TAB-SERV/Pages/ProdStop.razor.cs b/MP-TAB-SERV/Pages/ProdStop.razor.cs
index dc3019d3..66c8a6bb 100644
--- a/MP-TAB-SERV/Pages/ProdStop.razor.cs
+++ b/MP-TAB-SERV/Pages/ProdStop.razor.cs
@@ -211,7 +211,7 @@ namespace MP_TAB_SERV.Pages
             rdm_nEvCheck = SMServ.GetConfInt("rdm_nEvCheck");
             rdm_ChkOnly = SMServ.GetConfBool("rdm_ChkOnly");
             // leggo gli altri dati
-            await ReloadData();
+            await ReloadData(); 
         }
 
         protected async Task RefreshData(List<MappaStatoExpl> newList)
@@ -229,7 +229,6 @@ namespace MP_TAB_SERV.Pages
                     await ReloadData();
                 }
             }
-            await InvokeAsync(StateHasChanged);
         }
 
         protected void SetDate(DateTime newDate)
@@ -274,9 +273,10 @@ namespace MP_TAB_SERV.Pages
                         events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.label).ToList();
                     }
                 }
-                catch
+                catch(Exception exc)
                 {
-                    NavMan.NavigateTo("/", true);
+                    Log.Error($"ProdStop: Eccezione in reloadData {Environment.NewLine}{exc}");
+                    await MServ.LastOpenedPageSet("/");
                 }
             }
         }

From 7acc75c19472db56d910d58644b5474a9017f6ac Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 17:28:23 +0100
Subject: [PATCH 47/69] update refresh footer

---
 MP-TAB-SERV/Components/CmpFooter.razor.cs | 66 ++++++++++++-----------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index da0756bb..bde5944f 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -6,13 +6,6 @@ namespace MP_TAB_SERV.Components
 {
     public partial class CmpFooter : IDisposable
     {
-        [Inject]
-        protected SharedMemService SMServ { get; set; } = null!;
-        [Inject]
-        protected MessageService MsgServ { get; set; } = null!;
-        [Inject]
-        protected NavigationManager NavMan { get; set; } = null!;
-
         #region Public Methods
 
         public void Dispose()
@@ -30,21 +23,24 @@ namespace MP_TAB_SERV.Components
             var diffOfTime = DateTime.Now - MsgServ.dtLastAction;
 
             var pUpd = Task.Run(async () =>
-                {
-                    await Task.Delay(1);
-                    await InvokeAsync(() => StateHasChanged());
-                    if(diffOfTime.Minutes >= dtTimerScadenzaLogin)
-                    {
-                        NavMan.NavigateTo("logout");
-                    }
-                    //Log.Trace("CmpFooter Timer elapsed");
-                });
+                   {
+                       await InvokeAsync(() => StateHasChanged());
+#if false
+                       await Task.Delay(1);
+                       if (diffOfTime.Minutes >= dtTimerScadenzaLogin)
+                       {
+                           NavMan.NavigateTo("logout");
+                       }
+                       //Log.Trace("CmpFooter Timer elapsed");
+
+#endif
+                   });
             pUpd.Wait();
         }
 
         public void StartTimer()
         {
-            int tOutPeriod = dtTimerScadenzaLogin * 60000;
+            int tOutPeriod = 1000;
             aTimer = new System.Timers.Timer(tOutPeriod);
             aTimer.Elapsed += ElapsedTimer;
             aTimer.Enabled = true;
@@ -53,37 +49,43 @@ namespace MP_TAB_SERV.Components
 
         #endregion Public Methods
 
-        #region Protected Methods
+        #region Protected Properties
 
-        int dtTimerScadenzaLogin { get; set; } = 0;
+        [Inject]
+        protected MessageService MsgServ { get; set; } = null!;
+
+        [Inject]
+        protected NavigationManager NavMan { get; set; } = null!;
+
+        [Inject]
+        protected SharedMemService SMServ { get; set; } = null!;
+
+        #endregion Protected Properties
+
+        #region Protected Methods
 
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
             var rawVers = typeof(Program).Assembly.GetName().Version;
             version = rawVers != null ? rawVers : new Version("0.0.0.0");
-            //dtTimerScadenzaLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin");
-            //dtTimerScadenzaLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin");
-            
-            //if (dtTimerScadenzaLogin > 0)
-            //{
-            //    //StartTimer();
-            //}
-
+            StartTimer();
         }
-        //protected override void OnInitialized()
-        //{
-
-        //}
 
         #endregion Protected Methods
 
         #region Private Fields
 
-        private System.Timers.Timer aTimer = null!;
         private static Logger Log = LogManager.GetCurrentClassLogger();
+        private System.Timers.Timer aTimer = null!;
         private Version version = null!;
 
         #endregion Private Fields
+
+        #region Private Properties
+
+        private int dtTimerScadenzaLogin { get; set; } = 0;
+
+        #endregion Private Properties
     }
 }
\ No newline at end of file

From 6e09b879b7d84bc35beb0a05dcbec1569925fc4f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 18:59:02 +0100
Subject: [PATCH 48/69] Minor fix pagina dettaglio conf prod

---
 MP-TAB-SERV/Components/CmpFooter.razor.cs |   9 --
 MP-TAB-SERV/Components/ProdConfirm.razor  | 156 +++++++++++-----------
 MP-TAB-SERV/Components/ProdStat.razor     |   6 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj            |   2 +-
 MP-TAB-SERV/Pages/Scrap.razor             |   2 +-
 MP-TAB-SERV/Resources/ChangeLog.html      |   2 +-
 MP-TAB-SERV/Resources/VersNum.txt         |   2 +-
 MP-TAB-SERV/Resources/manifest.xml        |   2 +-
 8 files changed, 84 insertions(+), 97 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index bde5944f..33884c6e 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -25,15 +25,6 @@ namespace MP_TAB_SERV.Components
             var pUpd = Task.Run(async () =>
                    {
                        await InvokeAsync(() => StateHasChanged());
-#if false
-                       await Task.Delay(1);
-                       if (diffOfTime.Minutes >= dtTimerScadenzaLogin)
-                       {
-                           NavMan.NavigateTo("logout");
-                       }
-                       //Log.Trace("CmpFooter Timer elapsed");
-
-#endif
                    });
             pUpd.Wait();
         }
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index 1276a223..ee24ec5a 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -79,11 +79,11 @@
                         }
                         else if (showConfirm && lblPz2RecBuoni < 0 && chkPzBuoniNeg)
                         {
-                            <div class="alert bg-danger text-light fw-bold text-center">Pezzi buoni negativi!</div>
+                            <div class="btn btn-danger btn-lg text-light fw-bold text-center w-100 h-100">Pezzi buoni negativi!</div>
                         }
                         else
                         {
-                            <div class="alert bg-info text-dark fw-bold text-center">Completare le modifiche!</div>
+                            <btn class="btn btn-info btn-lg w-100 h-100" disabled>Completare le modifiche!</btn>
                         }
                     </div>
                 </div>
@@ -94,91 +94,87 @@
     </div>
 }
 <div class="row textCondens mt-2">
-    <div class="col-4 py-1 text-start text-uppercase">
-        <b>Dati Globali ODL</b>
+    <div class="col-12 py-0 text-start text-uppercase lh-1 fw-bold">
+        Dati Globali ODL
     </div>
-
-    <div class="d-flex justify-content-between flex-wrap mt-2">
-
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">[A] NUOVI Pz.Prod</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzProdotti2Rec</span>
-                    }
-                </div>
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">[A] NUOVI Pz.Prod</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzProdotti2Rec</span>
+                }
             </div>
         </div>
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzProdotti</span>
-                    }
-                </div>
-            </div>
-        </div>
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">[B] Scarti VERS.</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzScaConf</span>
-                    }
-                </div>
-            </div>
-        </div>
-        <div class="col-6 col-sm-3 p-1">
-            <div class="text-center h-100 w-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
-                <div class="text-truncate">
-                    <span class="text-dark small">[C] Pz Buoni VERS.</span>
-                </div>
-                <div class="text-dark d-flex align-items-center text-center justify-content-center">
-                    @if (isProcessing)
-                    {
-                        <i class="fa-solid fa-spinner span"></i>
-                    }
-                    else
-                    {
-                        <span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf</span>
-                    }
-                </div>
-            </div>
-        </div>
-
-
     </div>
-    <div class="d-flex justify-content-between p-3 pe-4">
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzProdotti</span>
+                }
+            </div>
+        </div>
+    </div>
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">[B] Scarti VERS.</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzScaConf</span>
+                }
+            </div>
+        </div>
+    </div>
+    <div class="col-6 col-sm-3 py-1">
+        <div class="text-center h-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
+            <div class="text-truncate">
+                <span class="text-dark small">[C] Pz Buoni VERS.</span>
+            </div>
+            <div class="text-dark d-flex align-items-center text-center justify-content-center">
+                @if (isProcessing)
+                {
+                    <i class="fa-solid fa-spinner span"></i>
+                }
+                else
+                {
+                    <span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf</span>
+                }
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row textCondens mt-1 bg-secondary py-2">
         <div class="col-6">
-            <a class="btn btn-info btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="scrap"><i class="fa fa-bug"></i>  Reg. SCARTI</a>
+            <a class="btn btn-info btn-sm w-100 py-2 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i>  Reg. SCARTI</a>
         </div>
-        <div class="ms-2 col-6">
-            <a class="btn btn-primary btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
+        <div class=" col-6">
+            <a class="btn btn-primary btn-sm w-100 py-2" style="min-width: 6rem;" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
         </div>
-    </div>
+    @* <div class="d-flex justify-content-between p-3 pe-4">
+    </div> *@
 </div>
 @if (!string.IsNullOrEmpty(lblOut))
 {
diff --git a/MP-TAB-SERV/Components/ProdStat.razor b/MP-TAB-SERV/Components/ProdStat.razor
index 90b8fd52..e8e36b83 100644
--- a/MP-TAB-SERV/Components/ProdStat.razor
+++ b/MP-TAB-SERV/Components/ProdStat.razor
@@ -1,9 +1,9 @@
 ﻿
-<div class="d-flex justify-content-between">
-    <div class="col-6 py-1 text-start text-uppercase">
+<div class="d-flex justify-content-between mt-2">
+    <div class="col-6 lh-1 text-start text-uppercase">
         <b>Statistiche di produzione</b>
     </div>
-    <div class="col-6 text-end pe-2">
+    <div class="col-6 lh-1 text-end pe-2">
         @if (RecMSE != null)
         {
             <span>@($"ODL: {RecMSE.IdxOdl}")</span>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index d37767e8..f65311d0 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1417</Version>
+      <Version>6.16.2312.1418</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Scrap.razor b/MP-TAB-SERV/Pages/Scrap.razor
index ef0f6528..65c20614 100644
--- a/MP-TAB-SERV/Pages/Scrap.razor
+++ b/MP-TAB-SERV/Pages/Scrap.razor
@@ -1,6 +1,6 @@
 ﻿@page "/scrap"
 
-<MseSampler SampleMult="0.5" E_Updated="RefreshData"></MseSampler>
+<MseSampler SampleMult="0.25" E_Updated="RefreshData"></MseSampler>
 @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null)
 {
     <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 08b10a53..66555095 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1417</h4>
+    <h4>Versione: 6.16.2312.1418</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 258cb1a0..bc8f1f5b 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1417
+6.16.2312.1418
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index c6c9e138..f6a7bf8d 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1417</version>
+  <version>6.16.2312.1418</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From d0490aca4ee1273bc8f54263e6f9dc6ef0058b2b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 19:06:16 +0100
Subject: [PATCH 49/69] Fix display KIT x mod +1

---
 MP-TAB-SERV/Components/ScrapKitMan.razor | 23 +++--------------------
 MP-TAB-SERV/MP-TAB-SERV.csproj           |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html     |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt        |  2 +-
 MP-TAB-SERV/Resources/manifest.xml       |  2 +-
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/MP-TAB-SERV/Components/ScrapKitMan.razor b/MP-TAB-SERV/Components/ScrapKitMan.razor
index eff52f38..2fe85349 100644
--- a/MP-TAB-SERV/Components/ScrapKitMan.razor
+++ b/MP-TAB-SERV/Components/ScrapKitMan.razor
@@ -32,15 +32,12 @@
                             <tr>
                                 <td>
                                     <div class="row">
-                                        <div class="col-5 small">
+                                        <div class="col-4 fs-3">
                                             <div>
                                                 Art: <b>@item.CodArticolo</b>
                                             </div>
-                                            <div class="@($"text-{item.cssClass}")">
-                                                <i class="@item.icona"></i> @item.Descrizione
-                                            </div>
                                         </div>
-                                        <div class="col-2 px-0 text-center text-nowrap d-flex justify-content-center">
+                                        <div class="col-4 px-0 text-center text-nowrap d-flex justify-content-center">
                                             <div class="px-2">
                                                 @if (item.Qta <= 0)
                                                 {
@@ -68,21 +65,7 @@
                                                 }
                                             </div>
                                         </div>
-                                        <div class="col-5 text-end small">
-                                            <div class="text-truncate">
-                                                @($"{item.DataOra:ddd dd.MM.yy HH:mm:ss}")
-                                                <i class="fa fa-clock-o" aria-hidden="true"></i>
-                                            </div>
-                                            <div class="text-truncate">
-                                                <b>@item.Operatore</b>
-                                                <i class="fa fa-user" aria-hidden="true"></i>
-                                            </div>
-                                        </div>
-                                        <div class="col-12 small text-secondary">
-                                            @if (!string.IsNullOrEmpty(item.Note))
-                                            {
-                                                <span>Nota: <b>@item.Note</b></span>
-                                            }
+                                        <div class="col-4 text-end small">
                                         </div>
                                     </div>
                                 </td>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index f65311d0..45e60950 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1418</Version>
+      <Version>6.16.2312.1419</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 66555095..89167b64 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1418</h4>
+    <h4>Versione: 6.16.2312.1419</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index bc8f1f5b..b3b5d175 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1418
+6.16.2312.1419
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index f6a7bf8d..6bfa14b6 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1418</version>
+  <version>6.16.2312.1419</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 782dc7a67dd66bf487f0de161e45f7af407ee3a1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Dec 2023 19:18:08 +0100
Subject: [PATCH 50/69] =?UTF-8?q?Abbassata=20velocit=C3=A0=20rilettura=20x?=
 =?UTF-8?q?=20rebalance?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP-TAB-SERV/appsettings.json   |  2 +-
 MP.Data/Services/StatusData.cs | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/MP-TAB-SERV/appsettings.json b/MP-TAB-SERV/appsettings.json
index 57300304..1878bfb3 100644
--- a/MP-TAB-SERV/appsettings.json
+++ b/MP-TAB-SERV/appsettings.json
@@ -17,7 +17,7 @@
     "MP.Mag": "Server=SQL2016DEV;Database=MoonPro_MAG; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;"
   },
   "OptConf": {
-    "msRefresh": "2000",
+    "msRefresh": "4000",
     "BaseAddr": "https://localhost:7295/MP/TAB3/",
     "BaseUrl": "/MP/TAB3",
     "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/",
diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs
index caed4352..3ac19b84 100644
--- a/MP.Data/Services/StatusData.cs
+++ b/MP.Data/Services/StatusData.cs
@@ -35,7 +35,7 @@ namespace MP.Data.Services
             }
             else
             {
-                dbController = new MP.Data.Controllers.MpMonController(configuration);
+                dbController = new Controllers.MpMonController(configuration);
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine($"StatusData | MpMonController OK");
                 Log.Info(sb.ToString());
@@ -59,7 +59,7 @@ namespace MP.Data.Services
 
         #region Public Properties
 
-        public static MP.Data.Controllers.MpMonController dbController { get; set; } = null!;
+        public static Controllers.MpMonController dbController { get; set; } = null!;
 
         /// <summary>
         /// Dizionario dei tag configurati per IOB
@@ -114,17 +114,16 @@ namespace MP.Data.Services
 
         public async Task<List<MappaStatoExpl>> MseGetAll(bool forceDb = false)
         {
-            Stopwatch stopWatch = new Stopwatch();
-            stopWatch.Start();
+            Stopwatch sw = new Stopwatch();
+            string source = "DB";
+            sw.Start();
             List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
             // cerco in redis...
             RedisValue rawData = redisDb.StringGet(Constants.redisMseKey);
             if (rawData.HasValue && !forceDb)
             {
                 result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
-                stopWatch.Stop();
-                TimeSpan ts = stopWatch.Elapsed;
-                Log.Debug($"Read from REDIS: {ts.TotalMilliseconds}ms");
+                source = "REDIS";
             }
             else
             {
@@ -132,14 +131,13 @@ namespace MP.Data.Services
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
                 await redisDb.StringSetAsync(Constants.redisMseKey, rawData, TimeSpan.FromMilliseconds(maxAge));
-                stopWatch.Stop();
-                TimeSpan ts = stopWatch.Elapsed;
-                Log.Debug($"Read from DB: {ts.TotalMilliseconds}ms");
             }
             if (result == null)
             {
                 result = new List<MappaStatoExpl>();
             }
+            sw.Stop();
+            Log.Debug($"MseGetAll | {source} | {sw.Elapsed.TotalMilliseconds}ms");
             return result;
         }
 

From 95f9b03c3efb1981456be5a16774df307d24b82d Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 09:10:41 +0100
Subject: [PATCH 51/69] Fix conferma x doppia tavola (se ferma)

---
 MP-TAB-SERV/Components/MachSel.razor.cs     |  8 ++--
 MP-TAB-SERV/Components/ProdConfirm.razor.cs | 41 +++++++++++++++------
 MP-TAB-SERV/MP-TAB-SERV.csproj              |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html        |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt           |  2 +-
 MP-TAB-SERV/Resources/manifest.xml          |  2 +-
 MP.Data/Services/TabDataService.cs          |  1 +
 7 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/MP-TAB-SERV/Components/MachSel.razor.cs b/MP-TAB-SERV/Components/MachSel.razor.cs
index 761ef777..2c154c7a 100644
--- a/MP-TAB-SERV/Components/MachSel.razor.cs
+++ b/MP-TAB-SERV/Components/MachSel.razor.cs
@@ -42,7 +42,7 @@ namespace MP_TAB_SERV.Components
         protected Dictionary<string, string>? ListMacchine { get; set; } = null;
 
         [Inject]
-        protected SharedMemService MServ { get; set; } = null!;
+        protected SharedMemService SMServ { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -67,16 +67,16 @@ namespace MP_TAB_SERV.Components
             if (RecMSE != null)
             {
                 // verifico se la macchina sia configurata tra le MSFD...
-                if (MServ.DictMacchMulti.ContainsKey(RecMSE?.IdxMacchina))
+                if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina))
                 {
-                    isMulti = MServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1;
+                    isMulti = SMServ.DictMacchMulti[RecMSE.IdxMacchina] == 1;
                 }
                 if (isMulti)
                 {
 
                     var listMulti = await TDataService.VMSFDGetAll();
                     ListMacchine = listMulti
-                                    .Where(x => x.IdxMacchina.Contains($"{RecMSE?.IdxMacchina}#"))
+                                    .Where(x => x.IdxMacchina.Contains($"{RecMSE.IdxMacchina}#"))
                                     .ToDictionary(x => x.IdxMacchina, x => x.CodMaccArticolo);
 
                     if (ListMacchine.Count > 0 && string.IsNullOrEmpty(idxMaccSel))
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
index 15d8818a..7009a18b 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
@@ -82,7 +82,7 @@ namespace MP_TAB_SERV.Components
         protected StatusData MDataService { get; set; } = null!;
 
         [Inject]
-        protected MessageService MServ { get; set; } = null!;
+        protected MessageService MsgServ { get; set; } = null!;
 
         protected int numPz2Rec { get; set; } = 0;
 
@@ -151,18 +151,37 @@ namespace MP_TAB_SERV.Components
             await Task.Delay(1);
         }
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
+        {
+            enablePzProdLasciati = SMServ.GetConfBool("enablePzProdLasciati");
+            chkPzBuoniNeg = SMServ.GetConfBool("TAB_ChkConfPz");
+            confRett = SMServ.GetConfBool("confRett");
+            enableMagPrint = SMServ.GetConfBool("enableMagPrint");
+            modoConfProd = SMServ.GetConfInt("modoConfProd");
+        }
+
+        protected override async Task OnParametersSetAsync()
         {
             lblOut = "";
             numPzLasciati = 0;
-            if (RecMSE != null)
+            if (RecMSE != null && string.IsNullOrEmpty(IdxMaccSel))
             {
+                // verifico SE fosse doppia...
+                bool isMulti = false;
+                // verifico se la macchina sia configurata tra le MSFD...
+                if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina))
+                {
+                    isMulti = SMServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1;
+                }
                 IdxMaccSel = RecMSE.IdxMacchina;
-                enablePzProdLasciati = SMServ.GetConfBool("enablePzProdLasciati");
-                chkPzBuoniNeg = SMServ.GetConfBool("TAB_ChkConfPz");
-                confRett = SMServ.GetConfBool("confRett");
-                enableMagPrint = SMServ.GetConfBool("enableMagPrint");
-                modoConfProd = SMServ.GetConfInt("modoConfProd");
+                if (isMulti)
+                {
+                    var idxMSel = MsgServ.UserPrefGet(IdxMaccSel);
+                    if (!string.IsNullOrEmpty(idxMSel))
+                    {
+                        IdxMaccSel = idxMSel;
+                    }
+                }
                 await DoUpdate();
             }
         }
@@ -180,7 +199,7 @@ namespace MP_TAB_SERV.Components
             if (ListMSE != null)
             {
                 // salvo in LocalStorage...
-                await MServ.SaveMse(ListMSE);
+                await MsgServ.SaveMse(ListMSE);
                 // aggiorno MSE attuale
                 RecMSE = ListMSE.Find(x => x.IdxMacchina == IdxMaccSel);
             }
@@ -248,7 +267,7 @@ namespace MP_TAB_SERV.Components
 
         private int MatrOpr
         {
-            get => MServ.MatrOpr;
+            get => MsgServ.MatrOpr;
         }
 
         private int numPzLasc { get; set; } = 0;
@@ -283,7 +302,7 @@ namespace MP_TAB_SERV.Components
         private async Task RefreshData()
         {
             List<MappaStatoExpl> ListMSE = await MDataService.MseGetAll(true);
-            await MServ.SaveMse(ListMSE);
+            await MsgServ.SaveMse(ListMSE);
             await E_Updated.InvokeAsync(ListMSE);
         }
 
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 45e60950..9d7e0b1c 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1419</Version>
+      <Version>6.16.2312.1509</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 89167b64..169afd73 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1419</h4>
+    <h4>Versione: 6.16.2312.1509</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index b3b5d175..db4d26fc 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1419
+6.16.2312.1509
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 6bfa14b6..86d22056 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1419</version>
+  <version>6.16.2312.1509</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 94cf1b64..3f774d04 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -852,6 +852,7 @@ namespace MP.Data.Services
             await FlushCache("PODL");
             await FlushCache("VSODL");
             await FlushCache("StatoMacc");
+            await FlushCache("MSFD");            
         }
 
         /// <summary>

From 4d16ca1543cd4b699402eec9786f0ddd33082734 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 10:21:22 +0100
Subject: [PATCH 52/69] Fix attrezzaggio DP

---
 MP-TAB-SERV/Components/OdlMan.razor.cs      | 17 ++++++++++++++---
 MP-TAB-SERV/Components/ProdConfirm.razor.cs |  2 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj              |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html        |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt           |  2 +-
 MP-TAB-SERV/Resources/manifest.xml          |  2 +-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index c47869cd..ec768e88 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -669,8 +669,20 @@ namespace MP_TAB_SERV.Components
             emailAdmDest = rawEmailDest.Split(',').ToList();
             if (RecMSE != null)
             {
-                IdxMaccSel = RecMSE.IdxMacchina;
-                IdxMaccParent = getIdxMaccParent();
+                if (string.IsNullOrEmpty(IdxMaccSel))
+                {
+                    IdxMaccSel = RecMSE.IdxMacchina;
+                }
+                isMulti = SMServ.DictMacchMulti[RecMSE.IdxMacchina] == 1;
+                if (isMulti)
+                {
+                    var idxMSel = MServ.UserPrefGet(IdxMaccSel);
+                    if (!string.IsNullOrEmpty(idxMSel))
+                    {
+                        IdxMaccSel = idxMSel;
+                    }
+                    IdxMaccParent = getIdxMaccParent();
+                }
                 // verifica stato inAttr
                 await CheckAttr();
                 await ReloadData(true);
@@ -680,7 +692,6 @@ namespace MP_TAB_SERV.Components
 
         protected override async Task OnParametersSetAsync()
         {
-            isMulti = SMServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1;
             await ReloadData(false);
         }
 
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
index 7009a18b..b2e7cc9c 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs
@@ -171,7 +171,7 @@ namespace MP_TAB_SERV.Components
                 // verifico se la macchina sia configurata tra le MSFD...
                 if (SMServ.DictMacchMulti.ContainsKey(RecMSE.IdxMacchina))
                 {
-                    isMulti = SMServ.DictMacchMulti[RecMSE?.IdxMacchina] == 1;
+                    isMulti = SMServ.DictMacchMulti[RecMSE.IdxMacchina] == 1;
                 }
                 IdxMaccSel = RecMSE.IdxMacchina;
                 if (isMulti)
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 9d7e0b1c..bea92305 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1509</Version>
+      <Version>6.16.2312.1510</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 169afd73..a5d4db60 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1509</h4>
+    <h4>Versione: 6.16.2312.1510</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index db4d26fc..43572b34 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1509
+6.16.2312.1510
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 86d22056..bddbcbb7 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1509</version>
+  <version>6.16.2312.1510</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

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 53/69] 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)

From 515e06f853f465612cbcdf6fdb48c7c28b00fcff Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 11:09:34 +0100
Subject: [PATCH 54/69] Fix display progressbar

---
 MP-TAB-SERV/Components/CmpFooter.razor    |  4 +---
 MP-TAB-SERV/Components/CmpFooter.razor.cs | 19 +++++++++++++------
 MP-TAB-SERV/MP-TAB-SERV.csproj            |  6 +++---
 MP-TAB-SERV/Resources/ChangeLog.html      |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt         |  2 +-
 MP-TAB-SERV/Resources/manifest.xml        |  2 +-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index 25b798f0..b433d9e4 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -3,9 +3,7 @@
         <b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
     </div>
     <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>
+        <ProgBar currVal="@CurrExpVal" maxVal="@MaxExpVal" singleLine="true" baseUM="m" yelLim="@yLimit" redLim="@rLimit"></ProgBar>
     </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>
diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index cfaecd10..57939cca 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -18,17 +18,21 @@ namespace MP_TAB_SERV.Components
             }
         }
 
-        protected string dtScadProg { get; set; } = "";
+        public double CurrExpVal { get; set; } = 50;
+        public double MaxExpVal { get; set; } = 100;
+        public double yLimit { get; set; } = 30;
+        public double rLimit { get; set; } = 10;
+
 
         public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
 
             var pUpd = Task.Run(async () =>
-                   {
-                       var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction);
-                       dtScadProg = $"{((int)diffOfTime.TotalMinutes * 100) / dtScadLogin}%";
-                       await InvokeAsync(() => StateHasChanged());
-                   }); 
+            {
+                var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction);
+                CurrExpVal = MaxExpVal - diffOfTime.TotalMinutes;
+                await InvokeAsync(() => StateHasChanged());
+            });
             pUpd.Wait();
         }
 
@@ -66,6 +70,9 @@ namespace MP_TAB_SERV.Components
             var rawVers = typeof(Program).Assembly.GetName().Version;
             version = rawVers != null ? rawVers : new Version("0.0.0.0");
             dtScadLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin");
+            MaxExpVal = dtScadLogin;
+            yLimit = MaxExpVal * 0.3;
+            rLimit = MaxExpVal * 0.1;
             StartTimer();
         }
 
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index bea92305..a6bea2e8 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1510</Version>
+      <Version>6.16.2312.1511</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2311.1612" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2311.1612" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2312.1510" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2312.1510" />
     <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
   </ItemGroup>
 
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index a5d4db60..26129563 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1510</h4>
+    <h4>Versione: 6.16.2312.1511</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 43572b34..b832418b 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1510
+6.16.2312.1511
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index bddbcbb7..2c6c8f38 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1510</version>
+  <version>6.16.2312.1511</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 5e2f3e7379ff173b307d8793ebf1c9ed3fbe47ab Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 15 Dec 2023 11:33:12 +0100
Subject: [PATCH 55/69] fix barra per cookie

---
 MP-TAB-SERV/Components/CmpFooter.razor    | 5 ++++-
 MP-TAB-SERV/Components/CmpFooter.razor.cs | 9 +++++++--
 MP-TAB-SERV/Shared/MainLayout.razor.cs    | 5 -----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index b433d9e4..c702cf34 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -3,7 +3,10 @@
         <b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
     </div>
     <div class="col-4 d-flex flex-column justify-content-center">
-        <ProgBar currVal="@CurrExpVal" maxVal="@MaxExpVal" singleLine="true" baseUM="m" yelLim="@yLimit" redLim="@rLimit"></ProgBar>
+        @if (typeScadLogin > 0)
+        {
+            <ProgBar currVal="@CurrExpVal" maxVal="@MaxExpVal" singleLine="true" baseUM="m" yelLim="@yLimit" redLim="@rLimit"></ProgBar>
+        }
     </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>
diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index 57939cca..fa976f2a 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -29,8 +29,11 @@ namespace MP_TAB_SERV.Components
 
             var pUpd = Task.Run(async () =>
             {
-                var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction);
-                CurrExpVal = MaxExpVal - diffOfTime.TotalMinutes;
+                if (typeScadLogin > 0)
+                {
+                    var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction);
+                    CurrExpVal = MaxExpVal - diffOfTime.TotalMinutes;
+                }
                 await InvokeAsync(() => StateHasChanged());
             });
             pUpd.Wait();
@@ -64,11 +67,13 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Methods
 
+        protected int typeScadLogin { get; set; } = 0;
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
             var rawVers = typeof(Program).Assembly.GetName().Version;
             version = rawVers != null ? rawVers : new Version("0.0.0.0");
+            typeScadLogin = SMServ.GetConfInt("TAB_TypeScadLogin");
             dtScadLogin = SMServ.GetConfInt("TAB_dtTimerScadLogin");
             MaxExpVal = dtScadLogin;
             yLimit = MaxExpVal * 0.3;
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index fe4593a8..c702c78c 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -107,11 +107,6 @@ namespace MP_TAB_SERV.Shared
                     {
                         NavMan.NavigateTo("logout");
                     }
-                    else
-                    {
-                        MsgServ.dtLastAction = DateTime.Now;
-                        MsgServ.dtLastSave = DateTime.Now;
-                    }
                     break;
                 case 1:
                     if (tsDeltaAct.Minutes >= dtScadLogin)

From 0eab822c444945da071134a450a2f097462fa896 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 14:38:30 +0100
Subject: [PATCH 56/69] Fix setup ODL 1 macchine standard (no tavole)

---
 MP-TAB-SERV/Components/OdlMan.razor.cs | 60 ++++++++++++++++++++++----
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 5 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index ec768e88..67dc94fa 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -150,14 +150,39 @@ namespace MP_TAB_SERV.Components
             // verifico attrezzaggio su macchina corrente o se multi su parent
             string idxMacc2check = isMulti ? IdxMaccParent : IdxMaccSel;
             StatoMacchineModel rigaStato = TabDServ.StatoMacchina(idxMacc2check);
-            //calcolo stato attrezzaggio, hard coded!!!
-            inAttr = (rigaStato.IdxStato == 2);
+            // calcolo stato attrezzaggio, hard coded!!!
+            if (isMulti)
+            {
+                inAttr = (rigaStato.IdxStato == 2 && tavHasOdl);
+            }
+            else
+            {
+                inAttr = rigaStato.IdxStato == 2;
+            }
             // se in attr --> carico podlCurr...
             if (inAttr && RecMSE != null)
             {
                 await ReloadXDL(false);
             }
         }
+        /// <summary>
+        /// Verifica se la tavola SIA in fase di attrezzaggio, ovvero SE:
+        /// - sia un impianto MULTI (= con + tavole)
+        /// - sia già attrezzata
+        /// </summary>
+        protected bool tavHasOdl
+        {
+            get
+            {
+                bool answ = false;
+                // se è multi controllo
+                if (isMulti)
+                {
+                    answ = !emptyOdlMacc;
+                }
+                return answ;
+            }
+        }
 
         /// <summary>
         /// Aggiorno...
@@ -255,10 +280,6 @@ namespace MP_TAB_SERV.Components
             await advStep(currStep++);
             isProcessing = false;
             await InvokeAsync(StateHasChanged);
-#if false
-            await Task.Delay(50);
-            NavMan.NavigateTo(NavMan.Uri, true); 
-#endif
         }
 
         /// <summary>
@@ -681,8 +702,8 @@ namespace MP_TAB_SERV.Components
                     {
                         IdxMaccSel = idxMSel;
                     }
-                    IdxMaccParent = getIdxMaccParent();
                 }
+                IdxMaccParent = getIdxMaccParent();
                 // verifica stato inAttr
                 await CheckAttr();
                 await ReloadData(true);
@@ -690,10 +711,18 @@ namespace MP_TAB_SERV.Components
             checkAll();
         }
 
+#if false
         protected override async Task OnParametersSetAsync()
         {
-            await ReloadData(false);
+            // verifica stato inAttr
+            if (!string.IsNullOrEmpty(IdxMaccSel) && IdxMaccSelLast != IdxMaccSel)
+            {
+                await CheckAttr();
+                await ReloadData(false);
+                IdxMaccSelLast = IdxMaccSel;
+            } 
         }
+#endif
 
         protected async Task ProdEnd()
         {
@@ -896,6 +925,7 @@ namespace MP_TAB_SERV.Components
             IdxMaccSel = selIdxMacc;
             // recupero dati
             RecMSE = TabDServ.MseGetSub(IdxMaccParent, selIdxMacc, true);
+            await CheckAttr();
             await ReloadData(true);
             await DoUpdate();
             if (showOdlDetail || inAttr)
@@ -950,6 +980,9 @@ namespace MP_TAB_SERV.Components
         private int gPeriodReopenOdlTav = 1;
 
         private string IdxMaccSel = "";
+#if false
+        private string IdxMaccSelLast = ""; 
+#endif
 
         private int idxPOdlSel = 0;
 
@@ -1223,6 +1256,17 @@ namespace MP_TAB_SERV.Components
 
         private void checkAll()
         {
+            if (string.IsNullOrEmpty(IdxMaccParent))
+            {
+                if (isMulti)
+                {
+                    IdxMaccParent = getIdxMaccParent();
+                }
+                else
+                {
+                    IdxMaccParent = IdxMaccSel;
+                }
+            }
             checkConfProd();
         }
 
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index a6bea2e8..75865b1f 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1511</Version>
+      <Version>6.16.2312.1514</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 26129563..bb9afe0d 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1511</h4>
+    <h4>Versione: 6.16.2312.1514</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index b832418b..9d5cb7cb 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1511
+6.16.2312.1514
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 2c6c8f38..8acc08a0 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1511</version>
+  <version>6.16.2312.1514</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 91a20b55562bd84cc7850d36d731719fef5e6917 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 15 Dec 2023 15:09:14 +0100
Subject: [PATCH 57/69] fix gestione logout

---
 MP-TAB-SERV/Components/CmpFooter.razor    |  4 ++++
 MP-TAB-SERV/Components/CmpFooter.razor.cs | 17 +++++++++++++++++
 MP-TAB-SERV/Components/CmpTop.razor.cs    |  4 ++--
 MP-TAB-SERV/MP-TAB-SERV.csproj            |  2 +-
 MP-TAB-SERV/Pages/Logout.razor.cs         | 18 ++++++++++++++++--
 MP-TAB-SERV/Pages/User.razor              | 21 ++++++++++++++++++++-
 MP-TAB-SERV/Resources/ChangeLog.html      |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt         |  2 +-
 MP-TAB-SERV/Resources/manifest.xml        |  2 +-
 MP.Data/Services/TabDataService.cs        |  4 ++--
 10 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index c702cf34..bfefb5f5 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -7,6 +7,10 @@
         {
             <ProgBar currVal="@CurrExpVal" maxVal="@MaxExpVal" singleLine="true" baseUM="m" yelLim="@yLimit" redLim="@rLimit"></ProgBar>
         }
+        else if(CurrExpVal == 0)
+        {
+            <div class="text-danger">TIMER SCADUTO!</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>
diff --git a/MP-TAB-SERV/Components/CmpFooter.razor.cs b/MP-TAB-SERV/Components/CmpFooter.razor.cs
index fa976f2a..9dea76d4 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor.cs
+++ b/MP-TAB-SERV/Components/CmpFooter.razor.cs
@@ -23,6 +23,22 @@ namespace MP_TAB_SERV.Components
         public double yLimit { get; set; } = 30;
         public double rLimit { get; set; } = 10;
 
+        public string timeUm
+        {
+            get
+            {
+                string answ = "m";
+                if (CurrExpVal > 60)
+                {
+                    answ = "h";
+                }
+                else if (CurrExpVal > 1440)
+                {
+                    answ = "gg";
+                }
+                return answ;
+            }
+        }
 
         public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
@@ -33,6 +49,7 @@ namespace MP_TAB_SERV.Components
                 {
                     var diffOfTime = DateTime.Now.Subtract(MsgServ.dtLastAction);
                     CurrExpVal = MaxExpVal - diffOfTime.TotalMinutes;
+                    
                 }
                 await InvokeAsync(() => StateHasChanged());
             });
diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index afd3f049..3f0abd3b 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -142,11 +142,11 @@ namespace MP_TAB_SERV.Components
                 await MsgServ.SetCurrDevGuidLSAsync(CurrDevGuid);
             }
 
-            CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
             LastOpenedPage = await MsgServ.LastOpenedPageGet();
             CurrMacc = await MsgServ.IdxMaccGet();
-            var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
 
+            CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
+            var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
             if (!string.IsNullOrEmpty(CurrOprTknLS))
             {
                 var decryptedData = MsgServ.DecryptData(CurrOprTknLS);
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index a6bea2e8..75865b1f 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1511</Version>
+      <Version>6.16.2312.1514</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Logout.razor.cs b/MP-TAB-SERV/Pages/Logout.razor.cs
index b35a8819..9c404b20 100644
--- a/MP-TAB-SERV/Pages/Logout.razor.cs
+++ b/MP-TAB-SERV/Pages/Logout.razor.cs
@@ -39,8 +39,22 @@ namespace MP_TAB_SERV.Pages
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
-            await localStorage.SetItemAsync("currTkn", "");
-            await TDService.OperatoreDeleteRedis(MsgServ.MatrOpr);
+            await localStorage.SetItemAsync("currTkn", ""); 
+            var CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
+            var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
+            if (!string.IsNullOrEmpty(CurrOprTknLS))
+            {
+                var decryptedData = MsgServ.DecryptData(CurrOprTknLS);
+                if (!string.IsNullOrEmpty(decryptedData))
+                {
+                    var oprObj = JsonConvert.DeserializeObject<userTknDTO>(decryptedData);
+                    if (oprObj != null)
+                    {
+                        MsgServ.RigaOper = oprObj.currOpr;
+                    }
+                }
+            }
+            await TDService.OperatoreDeleteRedis(MsgServ.MatrOpr, CurrDevGuid);
             MsgServ.RigaOper = null;
             NavMan.NavigateTo("reg-new-device", true);
         }
diff --git a/MP-TAB-SERV/Pages/User.razor b/MP-TAB-SERV/Pages/User.razor
index c475e85f..370ef7a8 100644
--- a/MP-TAB-SERV/Pages/User.razor
+++ b/MP-TAB-SERV/Pages/User.razor
@@ -60,9 +60,13 @@
             </div>
             <div>
                 <ul class="list-group">
+                    <li class="list-group-item d-flex justify-content-between">
+                        <div class="text-start">Prossima disconnessione:</div>
+                        <div class="text-end"><b> @($"{DateTime.Now.AddMinutes(dtScadLogin)}")</b></div>
+                    </li>
                     <li class="list-group-item d-flex justify-content-between">
                         <div class="text-start">User</div>
-                        <div class="text-end"><b>USERNAME[999]</b></div>
+                        <div class="text-end"><b> @($"{UserName}[{MatrOpr}]")</b></div>
                     </li>
                     <li class="list-group-item d-flex justify-content-between">
                         <div class="text-start">Server Time</div>
@@ -116,6 +120,16 @@
         defCardModeIns = defCardMode;
     }
 
+    private int MatrOpr
+    {
+        get => MsgServ.MatrOpr;
+    }
+
+    private string UserName
+    {
+        get => MsgServ.CognomeNome;
+    }
+
     protected string btnMsStyle
     {
         get
@@ -244,11 +258,16 @@
             Log.Debug($"Dimensioni schermo: {Width}x{Height}");
         }
     }
+
+    [Inject]
+    protected SharedMemService MStor { get; set; } = null!;
+    protected int dtScadLogin { get; set; } = 0;
     protected async override Task OnInitializedAsync()
     {
         tcModIns = MsgServ.UserPrefSetup("TcMode", "ms");
         langIns = MsgServ.UserPrefSetup("Lang", "IT");
         defCardModeIns = MsgServ.UserPrefSetup("DefCardMode", "full");
+        dtScadLogin = MStor.GetConfInt("TAB_dtTimerScadLogin");
         await Task.Delay(1);
         if (string.IsNullOrEmpty(currIpv4))
         {
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 26129563..bb9afe0d 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1511</h4>
+    <h4>Versione: 6.16.2312.1514</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index b832418b..9d5cb7cb 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1511
+6.16.2312.1514
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 2c6c8f38..8acc08a0 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1511</version>
+  <version>6.16.2312.1514</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 3f774d04..fc1d6702 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1594,14 +1594,14 @@ namespace MP.Data.Services
         /// </summary>
         /// <param name="matrOpr"></param>
         /// <returns></returns>
-        public async Task<bool> OperatoreDeleteRedis(int matrOpr)
+        public async Task<bool> OperatoreDeleteRedis(int matrOpr, Guid DevGuid)
         {
             string source = "REDIS";
             Stopwatch sw = new Stopwatch();
             sw.Start();
             bool answ = false;
             // cerco in redis...
-            string currKey = $"{redisUserDataKey}:CurrOpr:{matrOpr}";
+            string currKey = $"{redisUserDataKey}:CurrOpr:{matrOpr}:CurrDevGuid:{DevGuid}";
             RedisValue rawData = await redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {

From 015903f899fd3024aac3a271fc36462cc9b3be02 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 15:21:40 +0100
Subject: [PATCH 58/69] DoppiaTavola: - ok ma va riattrezzata la seconda...

---
 MP-TAB-SERV/Components/OdlMan.razor.cs | 24 ++++++++++++++++--------
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index 67dc94fa..a16de7cf 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -1186,14 +1186,18 @@ namespace MP_TAB_SERV.Components
                         { }
 
                         // ora verifico SE E SOLO SE è ANCORA in attrezzaggio
+#if false
                         if (inAttr)
+                        { 
+#endif
+                        // ora verifico SE ALTRA TAVOLA ha ODL...
+                        if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
                         {
-                            // ora verifico SE ALTRA TAVOLA ha ODL...
-                            if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
-                            {
-                                answ = showReopenOdlTav;
-                            }
+                            answ = showReopenOdlTav;
                         }
+#if false
+                    } 
+#endif
                     }
                 }
                 return answ;
@@ -1221,11 +1225,15 @@ namespace MP_TAB_SERV.Components
                         // ora verifico SE ALTRA TAVOLA ha ODL...
                         if (!emptyOdlAltraMacc)
                         {
+#if false
                             // ora verifico SE E SOLO SE è ANCORA in attrezzaggio
                             if (inAttr)
-                            {
-                                answ = showSplitOdlOnTav;
-                            }
+                            { 
+#endif
+                            answ = showSplitOdlOnTav;
+#if false
+                        } 
+#endif
                         }
                     }
                 }
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 75865b1f..930c8c60 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1514</Version>
+      <Version>6.16.2312.1515</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index bb9afe0d..3607a83f 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1514</h4>
+    <h4>Versione: 6.16.2312.1515</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 9d5cb7cb..512631ec 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1514
+6.16.2312.1515
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 8acc08a0..bde11afb 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1514</version>
+  <version>6.16.2312.1515</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 5aee1ab5a1f0e6411c550ae436368cdc920d8f3c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 15:45:56 +0100
Subject: [PATCH 59/69] OK riattrezzaggio 2 tav

---
 MP-TAB-SERV/Components/OdlMan.razor.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index a16de7cf..4cfa3ace 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -480,6 +480,18 @@ namespace MP_TAB_SERV.Components
             // preparo gestione progress display
             MaxVal = 11;
             int currStep = 0;
+
+            if (isMulti)
+            {
+                try
+                {
+                    StatoMacchineModel rigaStato = TabDServ.StatoMacchina(IdxMaccParent);
+                    // controllo se NON SONO già in attrezzaggio...
+                    inAttr = (rigaStato.IdxStato == 2);
+                }
+                catch
+                { }
+            }
             await advStep(currStep);
             isProcessing = true;
             DateTime adesso = DateTime.Now;
@@ -519,13 +531,6 @@ namespace MP_TAB_SERV.Components
                     }
                 }
                 await advStep(currStep++);
-#if false
-                // se fosse multi cambio dati di promODL x successivo setup...
-                if (isMulti)
-                {
-                    currPodl.IdxMacchina = IdxMaccSel;
-                }
-#endif
                 // fix idxmacchina selezionata (x ogni macchina, singola o multi...)
                 currPodl.IdxMacchina = IdxMaccSel;
                 // 2018.07.24 verifico se devo lavorare come ODL classico o come RPO (Richiesta /

From 1500b183f0b8bea1aa9bb070c7c056bf6f65a464 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 16:11:37 +0100
Subject: [PATCH 60/69] Fix update cerca podl

---
 MP-TAB-SERV/Components/OdlMan.razor    |  2 +-
 MP-TAB-SERV/Components/OdlMan.razor.cs | 34 ++++++++++++++++++++++++--
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor
index b3ce4602..beba95da 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor
+++ b/MP-TAB-SERV/Components/OdlMan.razor
@@ -225,7 +225,7 @@
                     </div>
                     <div class="col-12 col-md-6 mb-2 mt-2">
                         <div class="input-group input-group-lg">
-                            <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca">
+                            <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca" @bind="@cercaPodl">
                             <select class="form-select w-50" @bind="IdxPOdlSel">
                                 @foreach (var item in ListODL)
                                 {
diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index 4cfa3ace..c588b4af 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -86,6 +86,7 @@ namespace MP_TAB_SERV.Components
         protected IJSRuntime JSRuntime { get; set; } = null!;
 
         protected List<vSelOdlModel> ListODL { get; set; } = new List<vSelOdlModel>();
+        protected List<vSelOdlModel> ListODLAll { get; set; } = new List<vSelOdlModel>();
 
         [Inject]
         protected MailService MailServ { get; set; } = null!;
@@ -1044,7 +1045,7 @@ namespace MP_TAB_SERV.Components
 
         private string cssDetailOdl
         {
-            get => IdxPOdlSel > 0 ? "bg-primary text-light" : "bg-warning";
+            get => IdxPOdlSel > 0 ? "bg-info text-light" : "bg-warning";
         }
 
         private ODLExpModel currOdl { get; set; } = new ODLExpModel();
@@ -1613,6 +1614,27 @@ namespace MP_TAB_SERV.Components
             checkBtnStatus();
         }
 
+        protected string cercaPodl
+        {
+            get => _cercaPodl;
+            set
+            {
+                if (_cercaPodl != value)
+                {
+                    _cercaPodl = value;
+                    if (string.IsNullOrEmpty(_cercaPodl))
+                    {
+                        ListODL = ListODLAll;
+                    }
+                    else
+                    {
+                        ListODL = ListODLAll.Where(x => x.label.Contains(cercaPodl)).ToList();
+                    }
+                }
+            }
+        }
+        private string _cercaPodl = "";
+
         private async Task ReloadData(bool forceReload)
         {
             Log.Trace("OdlMan.ReloadData");
@@ -1627,7 +1649,15 @@ namespace MP_TAB_SERV.Components
             }
             if (!string.IsNullOrEmpty(IdxMaccSel))
             {
-                ListODL = await TabDServ.VSOdlGetUnused(IdxMaccParent, ShowAll, numDayOdl);
+                ListODLAll = await TabDServ.VSOdlGetUnused(IdxMaccParent, ShowAll, numDayOdl);
+                if (string.IsNullOrEmpty(cercaPodl))
+                {
+                    ListODL = ListODLAll;
+                }
+                else
+                {
+                    ListODL = ListODLAll.Where(x => x.label.Contains(cercaPodl)).ToList();
+                }
                 Log.Trace($"found {ListODL.Count} rec");
                 if (forceReload)
                 {
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 930c8c60..386870b1 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1515</Version>
+      <Version>6.16.2312.1516</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 3607a83f..609d187c 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1515</h4>
+    <h4>Versione: 6.16.2312.1516</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 512631ec..47b1933a 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1515
+6.16.2312.1516
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index bde11afb..83f1220d 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1515</version>
+  <version>6.16.2312.1516</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 45e6d71da1e2559ac6f0739fd2b9bf8f9affc7ce Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 15 Dec 2023 16:12:28 +0100
Subject: [PATCH 61/69] fix scritta tempo scaduto

---
 MP-TAB-SERV/Components/CmpFooter.razor | 14 +++++++++-----
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index bfefb5f5..bb526379 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -5,12 +5,16 @@
     <div class="col-4 d-flex flex-column justify-content-center">
         @if (typeScadLogin > 0)
         {
-            <ProgBar currVal="@CurrExpVal" maxVal="@MaxExpVal" singleLine="true" baseUM="m" yelLim="@yLimit" redLim="@rLimit"></ProgBar>
-        }
-        else if(CurrExpVal == 0)
-        {
-            <div class="text-danger">TIMER SCADUTO!</div>
+            @if (CurrExpVal < 0)
+            {
+                <div class="text-danger">TIMER SCADUTO!</div>
+            }
+            else
+            {
+                <ProgBar currVal="@CurrExpVal" maxVal="@MaxExpVal" singleLine="true" baseUM="m" yelLim="@yLimit" redLim="@rLimit"></ProgBar>
+            }
         }
+
     </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>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 75865b1f..930c8c60 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1514</Version>
+      <Version>6.16.2312.1515</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index bb9afe0d..3607a83f 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1514</h4>
+    <h4>Versione: 6.16.2312.1515</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 9d5cb7cb..512631ec 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1514
+6.16.2312.1515
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 8acc08a0..bde11afb 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1514</version>
+  <version>6.16.2312.1515</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 29268b7cd272e3b7ad687e189e9498e777143e76 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 16:38:36 +0100
Subject: [PATCH 62/69] Fix search podl

---
 MP-TAB-SERV/Components/OdlMan.razor    |   3 +-
 MP-TAB-SERV/Components/OdlMan.razor.cs | 110 +++++++++++--------------
 2 files changed, 51 insertions(+), 62 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor
index beba95da..1878169c 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor
+++ b/MP-TAB-SERV/Components/OdlMan.razor
@@ -225,7 +225,8 @@
                     </div>
                     <div class="col-12 col-md-6 mb-2 mt-2">
                         <div class="input-group input-group-lg">
-                            <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca" @bind="@cercaPodl">
+                            <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca" @bind="@SearchPodl">
+                            <button class="btn btn-secondary" @onclick="SearchPodlReset"><i class="fa-solid fa-xmark"></i></button>
                             <select class="form-select w-50" @bind="IdxPOdlSel">
                                 @foreach (var item in ListODL)
                                 {
diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index c588b4af..6d9e0ea9 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -108,6 +108,23 @@ namespace MP_TAB_SERV.Components
             get => IdxOdl > 0;
         }
 
+        protected string SearchPodl
+        {
+            get => searchPodl;
+            set
+            {
+                if (searchPodl != value)
+                {
+                    searchPodl = value;
+                    var pUpd = Task.Run(async () =>
+                    {
+                        await ReloadData(true);
+                    });
+                    pUpd.Wait();
+                }
+            }
+        }
+
         protected bool ShowAll
         {
             get => showAll;
@@ -131,6 +148,25 @@ namespace MP_TAB_SERV.Components
         [Inject]
         protected TabDataService TabDServ { get; set; } = null!;
 
+        /// <summary>
+        /// Verifica se la tavola SIA in fase di attrezzaggio, ovvero SE:
+        /// - sia un impianto MULTI (= con + tavole)
+        /// - sia già attrezzata
+        /// </summary>
+        protected bool tavHasOdl
+        {
+            get
+            {
+                bool answ = false;
+                // se è multi controllo
+                if (isMulti)
+                {
+                    answ = !emptyOdlMacc;
+                }
+                return answ;
+            }
+        }
+
         #endregion Protected Properties
 
         #region Protected Methods
@@ -166,24 +202,6 @@ namespace MP_TAB_SERV.Components
                 await ReloadXDL(false);
             }
         }
-        /// <summary>
-        /// Verifica se la tavola SIA in fase di attrezzaggio, ovvero SE:
-        /// - sia un impianto MULTI (= con + tavole)
-        /// - sia già attrezzata
-        /// </summary>
-        protected bool tavHasOdl
-        {
-            get
-            {
-                bool answ = false;
-                // se è multi controllo
-                if (isMulti)
-                {
-                    answ = !emptyOdlMacc;
-                }
-                return answ;
-            }
-        }
 
         /// <summary>
         /// Aggiorno...
@@ -440,7 +458,6 @@ namespace MP_TAB_SERV.Components
             }
             await advStep(currStep++);
 
-
             // riporto stringa
             lblOut = sb.ToString().Replace("---", "<br/>");
             // update buttons...
@@ -657,7 +674,6 @@ namespace MP_TAB_SERV.Components
                 lblOut = "Selezionare un ORDINE valido!";
             }
 
-
             // refresh finale
             var tmpTCR = tcRichAttr;
             checkBtnStatus();
@@ -717,19 +733,6 @@ namespace MP_TAB_SERV.Components
             checkAll();
         }
 
-#if false
-        protected override async Task OnParametersSetAsync()
-        {
-            // verifica stato inAttr
-            if (!string.IsNullOrEmpty(IdxMaccSel) && IdxMaccSelLast != IdxMaccSel)
-            {
-                await CheckAttr();
-                await ReloadData(false);
-                IdxMaccSelLast = IdxMaccSel;
-            } 
-        }
-#endif
-
         protected async Task ProdEnd()
         {
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi fine produzione?"))
@@ -869,6 +872,11 @@ namespace MP_TAB_SERV.Components
             tcRichAttr = newTCRich;
         }
 
+        protected void SearchPodlReset()
+        {
+            SearchPodl = "";
+        }
+
         protected async Task SendFixEndSetup()
         {
             if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi invio FIX chiusura attrezzaggio ad impianto?"))
@@ -987,7 +995,7 @@ namespace MP_TAB_SERV.Components
 
         private string IdxMaccSel = "";
 #if false
-        private string IdxMaccSelLast = ""; 
+        private string IdxMaccSelLast = "";
 #endif
 
         private int idxPOdlSel = 0;
@@ -1020,6 +1028,7 @@ namespace MP_TAB_SERV.Components
 
         private int PzPallet = 1;
 
+        private string searchPodl = "";
         private bool showAll = false;
 
         private bool showChkCloseOdlVal = false;
@@ -1194,7 +1203,7 @@ namespace MP_TAB_SERV.Components
                         // ora verifico SE E SOLO SE è ANCORA in attrezzaggio
 #if false
                         if (inAttr)
-                        { 
+                        {
 #endif
                         // ora verifico SE ALTRA TAVOLA ha ODL...
                         if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
@@ -1202,7 +1211,7 @@ namespace MP_TAB_SERV.Components
                             answ = showReopenOdlTav;
                         }
 #if false
-                    } 
+                    }
 #endif
                     }
                 }
@@ -1234,11 +1243,11 @@ namespace MP_TAB_SERV.Components
 #if false
                             // ora verifico SE E SOLO SE è ANCORA in attrezzaggio
                             if (inAttr)
-                            { 
+                            {
 #endif
                             answ = showSplitOdlOnTav;
 #if false
-                        } 
+                        }
 #endif
                         }
                     }
@@ -1614,27 +1623,6 @@ namespace MP_TAB_SERV.Components
             checkBtnStatus();
         }
 
-        protected string cercaPodl
-        {
-            get => _cercaPodl;
-            set
-            {
-                if (_cercaPodl != value)
-                {
-                    _cercaPodl = value;
-                    if (string.IsNullOrEmpty(_cercaPodl))
-                    {
-                        ListODL = ListODLAll;
-                    }
-                    else
-                    {
-                        ListODL = ListODLAll.Where(x => x.label.Contains(cercaPodl)).ToList();
-                    }
-                }
-            }
-        }
-        private string _cercaPodl = "";
-
         private async Task ReloadData(bool forceReload)
         {
             Log.Trace("OdlMan.ReloadData");
@@ -1650,13 +1638,13 @@ namespace MP_TAB_SERV.Components
             if (!string.IsNullOrEmpty(IdxMaccSel))
             {
                 ListODLAll = await TabDServ.VSOdlGetUnused(IdxMaccParent, ShowAll, numDayOdl);
-                if (string.IsNullOrEmpty(cercaPodl))
+                if (string.IsNullOrEmpty(SearchPodl))
                 {
                     ListODL = ListODLAll;
                 }
                 else
                 {
-                    ListODL = ListODLAll.Where(x => x.label.Contains(cercaPodl)).ToList();
+                    ListODL = ListODLAll.Where(x => x.label.Contains(SearchPodl, StringComparison.InvariantCultureIgnoreCase)).ToList();
                 }
                 Log.Trace($"found {ListODL.Count} rec");
                 if (forceReload)

From b4c9a024a483ee02d5e398a2f25b38af2959a0a1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 16:45:03 +0100
Subject: [PATCH 63/69] Fix btn search

---
 MP-TAB-SERV/Components/OdlMan.razor    | 2 +-
 MP-TAB-SERV/Components/OdlMan.razor.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor
index 1878169c..4e335ee1 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor
+++ b/MP-TAB-SERV/Components/OdlMan.razor
@@ -225,8 +225,8 @@
                     </div>
                     <div class="col-12 col-md-6 mb-2 mt-2">
                         <div class="input-group input-group-lg">
+                            <button class="btn btn-outline-secondary px-2" @onclick="SearchPodlReset"><i class="fa-solid fa-magnifying-glass"></i></button>
                             <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca" @bind="@SearchPodl">
-                            <button class="btn btn-secondary" @onclick="SearchPodlReset"><i class="fa-solid fa-xmark"></i></button>
                             <select class="form-select w-50" @bind="IdxPOdlSel">
                                 @foreach (var item in ListODL)
                                 {
diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs
index 6d9e0ea9..b39e23e5 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor.cs
+++ b/MP-TAB-SERV/Components/OdlMan.razor.cs
@@ -1644,7 +1644,7 @@ namespace MP_TAB_SERV.Components
                 }
                 else
                 {
-                    ListODL = ListODLAll.Where(x => x.label.Contains(SearchPodl, StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    ListODL = ListODLAll.Where(x => x.label.Contains(SearchPodl, StringComparison.InvariantCultureIgnoreCase) || x.value == 0).ToList();
                 }
                 Log.Trace($"found {ListODL.Count} rec");
                 if (forceReload)

From aa6f1f8fc1becbf71703b788966fb9c67c57f6c9 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 17:02:18 +0100
Subject: [PATCH 64/69] ix display version

---
 MP-TAB-SERV/Components/CmpFooter.razor    |  4 ++--
 MP-TAB-SERV/Components/OdlMan.razor       | 10 +++++-----
 MP-TAB-SERV/Components/SlideMenu.razor    |  7 ++++---
 MP-TAB-SERV/Components/SlideMenu.razor.cs | 17 +++++++++++++++--
 MP-TAB-SERV/MP-TAB-SERV.csproj            |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html      |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt         |  2 +-
 MP-TAB-SERV/Resources/manifest.xml        |  2 +-
 8 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/MP-TAB-SERV/Components/CmpFooter.razor b/MP-TAB-SERV/Components/CmpFooter.razor
index bb526379..f9c7b5a6 100644
--- a/MP-TAB-SERV/Components/CmpFooter.razor
+++ b/MP-TAB-SERV/Components/CmpFooter.razor
@@ -1,6 +1,6 @@
 ﻿<div class="row bg-dark text-light px-2 small">
-    <div class="col-4 text-left">
-        <b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
+    <div class="col-4 text-left text-nowrap pe-0">
+        <b>MP-TAB2 @(DateTime.Today.Year)</b> <span class="small" style="font-size:0.6rem;">v.@version</span>
     </div>
     <div class="col-4 d-flex flex-column justify-content-center">
         @if (typeScadLogin > 0)
diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor
index 4e335ee1..37d69700 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor
+++ b/MP-TAB-SERV/Components/OdlMan.razor
@@ -225,18 +225,18 @@
                     </div>
                     <div class="col-12 col-md-6 mb-2 mt-2">
                         <div class="input-group input-group-lg">
-                            <button class="btn btn-outline-secondary px-2" @onclick="SearchPodlReset"><i class="fa-solid fa-magnifying-glass"></i></button>
-                            <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca" @bind="@SearchPodl">
+                            <button class="btn btn-outline-secondary px-2" @onclick="SearchPodlReset"><i class="fa-solid fa-x"></i></button>
+                            <input type="text" class="form-control w-25 small" placeholder="Cerca" aria-label="Cerca" @bind="@SearchPodl">
                             <select class="form-select w-50" @bind="IdxPOdlSel">
                                 @foreach (var item in ListODL)
                                 {
                                     <option value="@item.value">@item.label</option>
                                 }
                             </select>
-                            <div class="input-group-text">
+                            <div class="input-group-text px-1">
                                 <input class="form-check-input mt-0 me-1" id="chk_all" type="checkbox" @bind="ShowAll">
-                                <label class="form-check-label" for="" chk_all">
-                                    Tutti
+                                <label class="form-check-label form-check-label-sm" for="chk_all">
+                                    tutti
                                 </label>
                             </div>
                         </div>
diff --git a/MP-TAB-SERV/Components/SlideMenu.razor b/MP-TAB-SERV/Components/SlideMenu.razor
index 356d9208..2cadef9a 100644
--- a/MP-TAB-SERV/Components/SlideMenu.razor
+++ b/MP-TAB-SERV/Components/SlideMenu.razor
@@ -37,12 +37,13 @@
         </div>
         <div class="my-4">
             <div class="d-flex justify-content-center">
-                <div class="py-0 px-2">
-                    <img src="images/LogoSteamware.png" class="img-fluid" width="60" />
+                <div class="py-0 px-3">
+                    <img src="images/LogoSteamware.png" class="img-fluid" width="80" />
                 </div>
-                <div class="p-0 pl-1">
+                <div class="py-1 px-0 lh-sm">
                     <div class="flex-row">
                         <b class="modal-title fs-1">MAPO MES</b>
+                        <div class="small" style="font-size:0.8rem;">v.@version</div>
                     </div>
                     <div class="flex-row">
                         <small>TAB Controller - MES Suite</small>
diff --git a/MP-TAB-SERV/Components/SlideMenu.razor.cs b/MP-TAB-SERV/Components/SlideMenu.razor.cs
index 0e102d29..860e420b 100644
--- a/MP-TAB-SERV/Components/SlideMenu.razor.cs
+++ b/MP-TAB-SERV/Components/SlideMenu.razor.cs
@@ -15,11 +15,12 @@ namespace MP_TAB_SERV.Components
 
         #region Protected Properties
 
-        [Inject]
-        protected NavigationManager navManager { get; set; } = null!;
         [Inject]
         protected MessageService MsgServ { get; set; } = null!;
 
+        [Inject]
+        protected NavigationManager navManager { get; set; } = null!;
+
         #endregion Protected Properties
 
         #region Protected Methods
@@ -29,6 +30,12 @@ namespace MP_TAB_SERV.Components
             return navManager.Uri.Contains(currUri) ? "bg-dark text-light" : "";
         }
 
+        protected override void OnInitialized()
+        {
+            var rawVers = typeof(Program).Assembly.GetName().Version;
+            version = rawVers != null ? rawVers : new Version("0.0.0.0");
+        }
+
         protected async Task SetPage(string tgtUrl)
         {
             await Task.Delay(1);
@@ -41,5 +48,11 @@ namespace MP_TAB_SERV.Components
         }
 
         #endregion Protected Methods
+
+        #region Private Fields
+
+        private Version version = null!;
+
+        #endregion Private Fields
     }
 }
\ No newline at end of file
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 386870b1..7249a7c3 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1516</Version>
+      <Version>6.16.2312.1517</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 609d187c..9cec7c03 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1516</h4>
+    <h4>Versione: 6.16.2312.1517</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 47b1933a..d23b973d 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1516
+6.16.2312.1517
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 83f1220d..e0f5eac4 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1516</version>
+  <version>6.16.2312.1517</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 476c61cc571d64fecb3cd0306d696d9548de83bc Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 17:13:04 +0100
Subject: [PATCH 65/69] Fix card qta prod

---
 MP-TAB-SERV/Components/ProdConfirm.razor | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index ee24ec5a..f342fc33 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -98,8 +98,8 @@
         Dati Globali ODL
     </div>
     <div class="col-6 col-sm-3 py-1">
-        <div class="text-center h-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
-            <div class="text-truncate">
+        <div class="text-center h-100 px-2" style=" background-color: #fff3cd; border-radius: .5rem;">
+            <div class="text-truncate lh-sm pt-1">
                 <span class="text-dark small">[A] NUOVI Pz.Prod</span>
             </div>
             <div class="text-dark d-flex align-items-center text-center justify-content-center">
@@ -109,14 +109,14 @@
                 }
                 else
                 {
-                    <span class="fw-bold" style="font-size: 3vh">@numPzProdotti2Rec</span>
+                    <span class="fw-bold fs-3">@numPzProdotti2Rec</span>
                 }
             </div>
         </div>
     </div>
     <div class="col-6 col-sm-3 py-1">
-        <div class="text-center h-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
-            <div class="text-truncate">
+        <div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
+            <div class="text-truncate lh-sm pt-1">
                 <span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
             </div>
             <div class="text-dark d-flex align-items-center text-center justify-content-center">
@@ -126,14 +126,14 @@
                 }
                 else
                 {
-                    <span class="fw-bold" style="font-size: 3vh">@numPzProdotti</span>
+                    <span class="fw-bold fs-3">@numPzProdotti</span>
                 }
             </div>
         </div>
     </div>
     <div class="col-6 col-sm-3 py-1">
-        <div class="text-center h-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
-            <div class="text-truncate">
+        <div class="text-center h-100 px-2" style=" background-color: #f8d7da; border-radius: .5rem;">
+            <div class="text-truncate lh-sm pt-1">
                 <span class="text-dark small">[B] Scarti VERS.</span>
             </div>
             <div class="text-dark d-flex align-items-center text-center justify-content-center">
@@ -143,14 +143,14 @@
                 }
                 else
                 {
-                    <span class="fw-bold" style="font-size: 3vh">@numPzScaConf</span>
+                    <span class="fw-bold fs-3">@numPzScaConf</span>
                 }
             </div>
         </div>
     </div>
     <div class="col-6 col-sm-3 py-1">
-        <div class="text-center h-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
-            <div class="text-truncate">
+        <div class="text-center h-100 px-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
+            <div class="text-truncate lh-sm pt-1">
                 <span class="text-dark small">[C] Pz Buoni VERS.</span>
             </div>
             <div class="text-dark d-flex align-items-center text-center justify-content-center">
@@ -160,7 +160,7 @@
                 }
                 else
                 {
-                    <span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf</span>
+                    <span class="fw-bold fs-3">@numPzBuoniConf</span>
                 }
             </div>
         </div>

From 102bef155277898a88320eac362b477277d86d3f Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Fri, 15 Dec 2023 17:14:23 +0100
Subject: [PATCH 66/69] aggiunto svuotamento chiavi locali ultima pagina aperta
 e ultima macchina aperta

---
 MP-TAB-SERV/MP-TAB-SERV.csproj       | 2 +-
 MP-TAB-SERV/Pages/Logout.razor.cs    | 2 ++
 MP-TAB-SERV/Resources/ChangeLog.html | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt    | 2 +-
 MP-TAB-SERV/Resources/manifest.xml   | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 930c8c60..7249a7c3 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1515</Version>
+      <Version>6.16.2312.1517</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/Logout.razor.cs b/MP-TAB-SERV/Pages/Logout.razor.cs
index 9c404b20..97d3b851 100644
--- a/MP-TAB-SERV/Pages/Logout.razor.cs
+++ b/MP-TAB-SERV/Pages/Logout.razor.cs
@@ -40,6 +40,8 @@ namespace MP_TAB_SERV.Pages
         {
             await Task.Delay(1);
             await localStorage.SetItemAsync("currTkn", ""); 
+            await localStorage.SetItemAsync("CurrMach", ""); 
+            await localStorage.SetItemAsync("LastPage", ""); 
             var CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
             var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
             if (!string.IsNullOrEmpty(CurrOprTknLS))
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 3607a83f..9cec7c03 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1515</h4>
+    <h4>Versione: 6.16.2312.1517</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 512631ec..d23b973d 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1515
+6.16.2312.1517
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index bde11afb..e0f5eac4 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1515</version>
+  <version>6.16.2312.1517</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From ed82ba37b200ff56a8214566011e936f35870102 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 15 Dec 2023 18:53:02 +0100
Subject: [PATCH 67/69] Fix spazi buttons

---
 MP-TAB-SERV/Components/PrintMag.razor    | 9 +--------
 MP-TAB-SERV/Components/ProdConfirm.razor | 9 ++++-----
 MP-TAB-SERV/MP-TAB-SERV.csproj           | 2 +-
 MP-TAB-SERV/Resources/ChangeLog.html     | 2 +-
 MP-TAB-SERV/Resources/VersNum.txt        | 2 +-
 MP-TAB-SERV/Resources/manifest.xml       | 2 +-
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/MP-TAB-SERV/Components/PrintMag.razor b/MP-TAB-SERV/Components/PrintMag.razor
index b86176d8..cc5f06db 100644
--- a/MP-TAB-SERV/Components/PrintMag.razor
+++ b/MP-TAB-SERV/Components/PrintMag.razor
@@ -1,12 +1,5 @@
 ﻿<div class="textCondens mb-1">
-    @*<div class="col-6 text-end">
-        <b>Gestione stampa etichette <i class="fa fa-long-arrow-right" aria-hidden="true"></i></b>
-        <br />
-        Gestione etichette per l'ODL con modulo MAG
-    </div>*@
-    @*<div class="col-6">
-    </div>*@
-    <a runat="server" href="@navUrl" target="_blank" class="btn btn-primary btn-sm w-100 py-2 px-4">MAG &nbsp; <i class="fa-solid fa-print"></i></a>
+    <a runat="server" href="@navUrl" target="_blank" class="btn btn-primary btn-sm w-100 py-2 px-4">MAG &nbsp;<i class="fa-solid fa-print"></i></a>
 </div>
 
 
diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor
index f342fc33..a3252d8b 100644
--- a/MP-TAB-SERV/Components/ProdConfirm.razor
+++ b/MP-TAB-SERV/Components/ProdConfirm.razor
@@ -3,9 +3,8 @@
 <div class="col-12 mt-1">
     <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
 </div>
-<div class="d-flex justify-content-between mt-2">
-
-    <div class="col-12 d-flex justify-content-between">
+<div class="col-12 mt-2">
+    <div class="row">
         @if (enableMagPrint)
         {
             <div class="col-6">
@@ -98,7 +97,7 @@
         Dati Globali ODL
     </div>
     <div class="col-6 col-sm-3 py-1">
-        <div class="text-center h-100 px-2" style=" background-color: #fff3cd; border-radius: .5rem;">
+        <div class="text-center h-100 px-2 shadows" style=" background-color: #fff3cd; border-radius: .5rem;">
             <div class="text-truncate lh-sm pt-1">
                 <span class="text-dark small">[A] NUOVI Pz.Prod</span>
             </div>
@@ -166,7 +165,7 @@
         </div>
     </div>
 </div>
-<div class="row textCondens mt-1 bg-secondary py-2">
+<div class="row textCondens mt-1 py-1">
         <div class="col-6">
             <a class="btn btn-info btn-sm w-100 py-2 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i>  Reg. SCARTI</a>
         </div>
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 7249a7c3..9dfbe789 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1517</Version>
+      <Version>6.16.2312.1518</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 9cec7c03..14c95041 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1517</h4>
+    <h4>Versione: 6.16.2312.1518</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index d23b973d..b4e8e737 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1517
+6.16.2312.1518
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index e0f5eac4..167757b9 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1517</version>
+  <version>6.16.2312.1518</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 7c2d8cb887983dc8bb97890bfb9c563905630092 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 18 Dec 2023 10:35:28 +0100
Subject: [PATCH 68/69] Aggiunta pubxml x TAB3 + modifica CI/CD

---
 .../PublishProfiles/IISProfile.pubxml         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml

diff --git a/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml b/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml
new file mode 100644
index 00000000..ed89c11d
--- /dev/null
+++ b/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml
@@ -0,0 +1,26 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis01.egalware.com/MP/TAB3</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>e7a7c262-7807-4503-949d-5a6fe3df4400</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis01.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/MP/TAB3</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

From 994e7ed028714428a4735a440d90edb47db11681 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 18 Dec 2023 10:35:36 +0100
Subject: [PATCH 69/69] refresh

---
 .gitlab-ci.yml                                | 22 ++++++++++++
 MP-TAB-SERV/MP-TAB-SERV.csproj                |  3 +-
 .../PublishProfiles/IISProfile.pubxml         | 34 ++++++++-----------
 MP-TAB-SERV/Resources/ChangeLog.html          |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt             |  2 +-
 MP-TAB-SERV/Resources/manifest.xml            |  2 +-
 6 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 783b7936..72610636 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -699,6 +699,28 @@ INVE:installer:
     - *hashBuild
     - *nexusUpload
 
+TAB3:installer:
+  stage: installer
+  tags:
+    - win
+  variables:
+    APP_NAME: MP-TAB-SERV
+    SOL_NAME: MP-TAB3
+    NEXUS_PATH: MP-TAB3
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH == 'develop'
+  needs: ["TAB3:build"]
+  script: 
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet
+    # qui il deploy su nexus...
+    - *hashBuild
+    - *nexusUpload
+
 # CONF:installer:
 #   stage: installer
 #   tags:
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 9dfbe789..3bba47c7 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2312.1518</Version>
+      <Version>6.16.2312.1810</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml b/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml
index ed89c11d..1e9feb4c 100644
--- a/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml
+++ b/MP-TAB-SERV/Properties/PublishProfiles/IISProfile.pubxml
@@ -3,24 +3,18 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-  <PropertyGroup>
-    <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish>https://iis01.egalware.com/MP/TAB3</SiteUrlToLaunchAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <ProjectGuid>e7a7c262-7807-4503-949d-5a6fe3df4400</ProjectGuid>
-    <SelfContained>false</SelfContained>
-    <MSDeployServiceURL>https://iis01.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
-    <DeployIisAppPath>Default Web Site/MP/TAB3</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
-    <SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
-    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
-    <EnableMSDeployBackup>true</EnableMSDeployBackup>
-    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
-    <UserName>jenkins</UserName>
-    <_SavePWD>true</_SavePWD>
-    <_TargetId>IISWebDeploy</_TargetId>
-  </PropertyGroup>
+    <PropertyGroup>
+        <WebPublishMethod>Package</WebPublishMethod>
+        <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+        <LastUsedPlatform>Any CPU</LastUsedPlatform>
+        <SiteUrlToLaunchAfterPublish />
+        <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+        <ExcludeApp_Data>False</ExcludeApp_Data>
+        <ProjectGuid>e7a7c262-7807-4503-949d-5a6fe3df4400</ProjectGuid>
+        <DesktopBuildPackageLocation>bin\publish\MP.TAB3.zip</DesktopBuildPackageLocation>
+        <PackageAsSingleFile>true</PackageAsSingleFile>
+        <DeployIisAppPath>Default Web Site/MP/TAB3</DeployIisAppPath>
+        <TargetFramework>net6.0</TargetFramework>
+        <SelfContained>false</SelfContained>
+    </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 14c95041..aa583c30 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2312.1518</h4>
+    <h4>Versione: 6.16.2312.1810</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index b4e8e737..77bd36bf 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.1518
+6.16.2312.1810
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 167757b9..b19da4d0 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2312.1518</version>
+  <version>6.16.2312.1810</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

No record found