From da10abdf57a54d59aff0cc773607cfadab954554 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 23 Apr 2021 15:21:30 +0200
Subject: [PATCH] fix controllo chiusura attrezzaggio ODL

---
 MP-MAG/WebUserControls/cmp_OrderList.ascx |  4 ++--
 MP-TAB/WebUserControls/mod_ODL.ascx.cs    | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx b/MP-MAG/WebUserControls/cmp_OrderList.ascx
index 86e6b8d0..049383ec 100644
--- a/MP-MAG/WebUserControls/cmp_OrderList.ascx
+++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx
@@ -62,8 +62,8 @@
                             </div>
                         </div>
                         <div class="d-flex">
-                            <div class="px-1">
-                                <asp:TextBox ID="txtOrdDescr" runat="server" Text='<%# Bind("OrdDescr") %>' />
+                            <div class="px-1 flex-grow-1">
+                                <asp:TextBox ID="txtOrdDescr" runat="server" Text='<%# Bind("OrdDescr") %>' TextMode="MultiLine" CssClass="form-control form-control-sm" />
                             </div>
                         </div>
                         <b>
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index 2b22d945..79fa1d0d 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -68,6 +68,17 @@ namespace MoonProTablet.WebUserControls
             }
         }
 
+        /// <summary>
+        /// Verifica chiave enableSchedaTecn in tab Config
+        /// </summary>
+        protected bool enableSchedaTecnica
+        {
+            get
+            {
+                return memLayer.ML.cdvb("enableSchedaTecnica");
+            }
+        }
+
         /// <summary>
         /// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
         /// </summary>
@@ -500,13 +511,14 @@ namespace MoonProTablet.WebUserControls
 
             // verifico condizioni annullamento setup
             lbtAnnullaSetup.Visible = false;
-            if (isEnabled && enableAnnullaSetup && inAttr)
+            if (isEnabled && enableAnnullaSetup && inAttr && enableSchedaTecnica)
             {
                 // verifico condizione pz da confermare
-                DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd = DataLayerObj.taPzProd2conf.GetData(idxMacchinaFix)[0];
-                if (rigaProd != null)
+                var tabProd = DataLayerObj.taStatoProd.GetData(idxMacchinaSel, DateTime.Now);
+                if (tabProd != null && tabProd.Rows.Count > 0)
                 {
-                    lbtAnnullaSetup.Visible = rigaProd.pezziNonConfermati == 0;
+                    var rigaProd = tabProd[0];
+                    lbtAnnullaSetup.Visible = rigaProd.PzTotODL == 0;
                 }
             }