From 6751d4f8430be411a51710ec66a51a71fc044e01 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 12 Apr 2024 10:28:02 +0200
Subject: [PATCH 1/3] Fix taskresult: - da keyless a NotMapped x evitare
 oggetti sul db

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

diff --git a/MP.Data/DatabaseModels/TaskResultModel.cs b/MP.Data/DatabaseModels/TaskResultModel.cs
index 881fe60d..28a4941d 100644
--- a/MP.Data/DatabaseModels/TaskResultModel.cs
+++ b/MP.Data/DatabaseModels/TaskResultModel.cs
@@ -11,7 +11,7 @@ using static MP.Data.Objects.Enums;
 // </Auto-Generated>
 namespace MP.Data.DatabaseModels
 {
-    [Keyless]
+    [NotMapped]
     public partial class TaskResultModel
     {
         #region Public Properties

From f5640359317c13b5a5b1b89132916874997dda4b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 12 Apr 2024 10:55:03 +0200
Subject: [PATCH 2/3] TAB3: - update refresh articolo

---
 MP-TAB3/Components/MachSel.razor.cs |  6 ++++-
 MP-TAB3/Components/OdlMan.razor.cs  | 39 ++++++++++++++++-------------
 MP-TAB3/MP-TAB3.csproj              |  2 +-
 MP-TAB3/Resources/ChangeLog.html    |  2 +-
 MP-TAB3/Resources/VersNum.txt       |  2 +-
 MP-TAB3/Resources/manifest.xml      |  2 +-
 6 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/MP-TAB3/Components/MachSel.razor.cs b/MP-TAB3/Components/MachSel.razor.cs
index 55576af5..77659a86 100644
--- a/MP-TAB3/Components/MachSel.razor.cs
+++ b/MP-TAB3/Components/MachSel.razor.cs
@@ -65,7 +65,11 @@ namespace MP_TAB3.Components
         protected override async Task OnParametersSetAsync()
         {
             // inizilamente riporto machcina corrente da MSE
-            if (RecMSE != null)
+            if (RecMSE == null)
+            {
+                IdxMaccSel = "";
+            }
+            else
             {
                 if (string.IsNullOrEmpty(idxMaccSel))
                 {
diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs
index ff77bd88..d1409920 100644
--- a/MP-TAB3/Components/OdlMan.razor.cs
+++ b/MP-TAB3/Components/OdlMan.razor.cs
@@ -305,7 +305,8 @@ namespace MP_TAB3.Components
             }
             catch
             { }
-
+            RecMSE = null;
+            await InvokeAsync(StateHasChanged);
             // refresh finale
             checkAll();
             await RefreshData();
@@ -695,6 +696,7 @@ namespace MP_TAB3.Components
             await TabDServ.FlushOdlCache();
             IdxPOdlSel = 0;
             RecMSE = null;
+            await InvokeAsync(StateHasChanged);
             await RefreshData();
             await CheckAttr();
             inAttr = true;
@@ -860,6 +862,7 @@ namespace MP_TAB3.Components
             // faccio refresh e riporto
             IdxPOdlSel = 0;
             RecMSE = null;
+            await InvokeAsync(StateHasChanged);
             currOdl = new ODLExpModel();
             inAttr = false;
             IdxPOdlSel = 0;
@@ -870,7 +873,6 @@ namespace MP_TAB3.Components
             await advStep(currStep++);
             isProcessing = false;
             await InvokeAsync(StateHasChanged);
-            //NavMan.NavigateTo(NavMan.Uri, true);
         }
 
         protected async Task refreshAfterFixOdl(bool has2Refr)
@@ -1287,25 +1289,28 @@ namespace MP_TAB3.Components
                     // verifico se NON HA ODL...
                     if (emptyOdlMacc)
                     {
-                        // verifico SE siamo nel gracePeriod... chiuso da meno di 1h
-                        DateTime adesso = DateTime.Now;
-                        DateTime dtChiusura = DateTime.Now.AddHours(-1);
-                        try
+                        if (!emptyOdlAltraMacc)
                         {
-                            var lastOdl = TabDServ.OdlLastByMacc(IdxMaccSel, true);
-                            if (lastOdl != null)
+                            // verifico SE siamo nel gracePeriod... chiuso da meno di 1h
+                            DateTime adesso = DateTime.Now;
+                            DateTime dtChiusura = DateTime.Now.AddHours(-1);
+                            try
                             {
-                                dtChiusura = lastOdl.DataFine ?? DateTime.Now.AddHours(-1);
+                                var lastOdl = TabDServ.OdlLastByMacc(IdxMaccSel, true);
+                                if (lastOdl != null)
+                                {
+                                    dtChiusura = lastOdl.DataFine ?? DateTime.Now.AddHours(-1);
+                                }
                             }
-                        }
-                        catch
-                        { }
+                            catch
+                            { }
 
-                        // ora verifico SE E SOLO SE è ANCORA in attrezzaggio ora verifico SE ALTRA
-                        // TAVOLA ha ODL...
-                        if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
-                        {
-                            answ = showReopenOdlTav;
+                            // ora verifico SE E SOLO SE è ANCORA in attrezzaggio ora verifico SE ALTRA
+                            // TAVOLA ha ODL...
+                            if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
+                            {
+                                answ = showReopenOdlTav;
+                            }
                         }
                     }
                 }
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index dbb1a7ac..a6e7a1e2 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2404.1117</Version>
+      <Version>6.16.2404.1210</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index de71c3dc..565e3325 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2404.1117</h4>
+    <h4>Versione: 6.16.2404.1210</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index ddb93548..a9eab336 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.1117
+6.16.2404.1210
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index f1eaaee7..e5f6ffdc 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2404.1117</version>
+  <version>6.16.2404.1210</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 8220942ded1c6a22a24f4483b24c968121310b64 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 12 Apr 2024 15:08:01 +0200
Subject: [PATCH 3/3] =?UTF-8?q?TAB=C2=A3:=20-=20Fix=20refresh=20art=20tavo?=
 =?UTF-8?q?la=20-=20fix=20annulla=20su=20entrambe=20tavole?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP-TAB3/Components/OdlMan.razor.cs | 25 ++++++++++++++++++++++++-
 MP-TAB3/MP-TAB3.csproj             |  2 +-
 MP-TAB3/Resources/ChangeLog.html   |  2 +-
 MP-TAB3/Resources/VersNum.txt      |  2 +-
 MP-TAB3/Resources/manifest.xml     |  2 +-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs
index d1409920..d03d34ba 100644
--- a/MP-TAB3/Components/OdlMan.razor.cs
+++ b/MP-TAB3/Components/OdlMan.razor.cs
@@ -260,7 +260,7 @@ namespace MP_TAB3.Components
                 return;
 
             // preparo gestione progress display
-            MaxVal = 9;
+            MaxVal = 10;
             isProcessing = true;
             int currStep = 0;
             await advStep(currStep);
@@ -291,6 +291,24 @@ namespace MP_TAB3.Components
                 await TabDServ.OdlClearSetup(idxODLCurr, IdxMaccSel);
                 await advStep(currStep++);
 
+
+                // se è multi processo ANCHE x altra tavola...
+                if (isMulti)
+                {
+                    sb.AppendLine("---");
+                    var tabOdlAltra = await TabDServ.OdlCurrByMacc(idxMaccAltraTav, true);
+                    int idxOdlAltra = tabOdlAltra.IdxOdl;
+                    await TabDServ.OdlFineProd(idxOdlAltra, idxMaccAltraTav);
+                    sb.AppendLine(String.Format(evText, idxOdlAltra));
+                    await processaEvento(idxMaccAltraTav, idxEvento, String.Format(evText, idxOdlAltra), idxOdlAltra);
+
+                    // resetta PODL e rimuove ODL x poi TOGLIERE info di setup su macchina corrente
+                    await TabDServ.OdlClearSetup(idxOdlAltra, idxMaccAltraTav);
+                    await advStep(currStep++);
+                }
+                await advStep(currStep++);
+
+
                 // se è master --> chiamo update child!
                 if (isMaster)
                 {
@@ -341,6 +359,8 @@ namespace MP_TAB3.Components
                 lblOut = sb.ToString();
             }
             await advStep(currStep++);
+            RecMSE = null;
+            await InvokeAsync(StateHasChanged);
             // update button x setup da altra tavola...
             checkAll();
             // faccio refresh e riporto
@@ -376,6 +396,8 @@ namespace MP_TAB3.Components
                 lblOut = sb.ToString();
             }
             await advStep(currStep++);
+            RecMSE = null;
+            await InvokeAsync(StateHasChanged);
             // update button x setup da altra tavola...
             checkAll();
             // faccio refresh e riporto
@@ -485,6 +507,7 @@ namespace MP_TAB3.Components
             IdxPOdlSel = 0;
             inAttr = false;
             RecMSE = null;
+            await InvokeAsync(StateHasChanged);
             // faccio refresh e riporto
             await RefreshData();
             await CheckAttr();
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index a6e7a1e2..ba819970 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2404.1210</Version>
+      <Version>6.16.2404.1215</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 565e3325..d8ec2594 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2404.1210</h4>
+    <h4>Versione: 6.16.2404.1215</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index a9eab336..416bc5ad 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.1210
+6.16.2404.1215
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index e5f6ffdc..93c29d1b 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2404.1210</version>
+  <version>6.16.2404.1215</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>