Fix problema sel PODL

2024-03-22 14:42:50 +01:00
parent 491498cb63
commit 1bdbadf61e
6 changed files with 20 additions and 28 deletions
@@ -13,7 +13,7 @@
                <span class="placeholder col-7 mb-1"></span>
                <span class="placeholder col-3"></span>
                <span class="placeholder col-8 mb-1"></span>
-                
+
            </div>
        </div>
    </div>
@@ -282,5 +282,7 @@ else
@if (enableDisegno && showDraw && RecMSE != null)
 {
    string docUrl = string.IsNullOrEmpty(RecMSE.Disegno) ? $"disegni/{RecMSE.CodArticolo}.pdf" : $"disegni/{RecMSE.Disegno}.pdf";
-    <PdfDisplay Width="100%" PdfUrl="@docUrl" HeightList="@heightList"></PdfDisplay>
+    <div class="bg-light p-1">
+        <PdfDisplay Width="100%" PdfUrl="@docUrl" HeightList="@heightList"></PdfDisplay>
+    </div>
 }
@@ -195,8 +195,10 @@ namespace MP_TAB3.Components

        protected async Task CheckAttr()
        {
+#if false
            // rileggo ODL
-            await updateIdxOdl();
+            await updateIdxOdl(); 
+#endif
            // verifico attrezzaggio su macchina corrente o se multi su parent
            string idxMacc2check = isMulti ? IdxMaccParent : IdxMaccSel;
            StatoMacchineModel rigaStato = TabDServ.StatoMacchina(idxMacc2check);
@@ -214,19 +216,13 @@ namespace MP_TAB3.Components
            {
                await ReloadXDL(true);
            }
+            else
+            {
+                // rileggo ODL
+                await updateIdxOdl();
+            }
        }

-        /// <summary>
-        /// Aggiorno...
-        /// </summary>
-        /// <param name="newDate"></param>
-        protected async Task DoUpdate()
-        {
-            isProcessing = true;
-            await Task.Delay(1);
-            isProcessing = false;
-            await Task.Delay(1);
-        }

        /// <summary>
        /// Restituisce il codice IdxMacchina dell'impianto PARENT (se multi) altrimenti la stessa macchina...
@@ -984,12 +980,13 @@ namespace MP_TAB3.Components
            IdxMaccSel = selIdxMacc;
            // recupero dati
            RecMSE = TabDServ.MseGetSub(IdxMaccParent, selIdxMacc, true);
-            await CheckAttr();
            await ReloadData(true);
-            await DoUpdate();
+            await CheckAttr();
            if (showOdlDetail || inAttr)
            {
+                isProcessing = true;
                await ReloadXDL(true);
+                isProcessing = false;
            }
            await E_MachSel.InvokeAsync(selIdxMacc);
        }
@@ -1096,7 +1093,7 @@ namespace MP_TAB3.Components
        private int expTimeMsec = 500;
        private bool forceCloseOdl = true;
        private int gPeriodReopenOdlTav = 1;
-        private string IdxMaccSel = "";
+        private string IdxMaccSel { get; set; } = "";
        private int idxPOdlSel = 0;
        private bool isMaster = false;
        private bool isMulti = false;
@@ -1337,13 +1334,6 @@ namespace MP_TAB3.Components
        private void checkConfProd()
        {
            // calcolo conferma prod...
-#if false
-            needConfProd = RecMSE != null && prodMacchina != null;
-            if (prodMacchina != null)
-            {
-                needConfProd = prodMacchina.pezziNonConfermati > 0 && !isSlave;
-            }
-#endif
            needConfProd = RecMSE != null && datiProdAct != null;
            if (datiProdAct != null)
            {
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
-      <Version>6.16.2403.2211</Version>
+      <Version>6.16.2403.2214</Version>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP_TAB3</RootNamespace>
  </PropertyGroup>
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2403.2211</h4>
+    <h4>Versione: 6.16.2403.2214</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2403.2211
+6.16.2403.2214
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2403.2211</version>
+  <version>6.16.2403.2214</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>