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] 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>