From 17a767b535bfbf7edcc60958d358277dcadb6e91 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 10 Aug 2020 17:37:29 +0200
Subject: [PATCH] Fiox refresh machine LOAD

---
 NKC_WF/site/MachineLoad.aspx                  |  6 +----
 NKC_WF/site/MachineLoad.aspx.cs               |  1 +
 NKC_WF/site/MachineLoad.aspx.designer.cs      | 27 +++++++------------
 NKC_WF/site/MachineLoadSmart.aspx             | 25 ++++++++---------
 NKC_WF/site/MachineLoadSmart.aspx.cs          | 11 ++++----
 NKC_WF/site/MachineLoadSmart.aspx.designer.cs |  9 +++++++
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/NKC_WF/site/MachineLoad.aspx b/NKC_WF/site/MachineLoad.aspx
index c867a0c..8049e10 100644
--- a/NKC_WF/site/MachineLoad.aspx
+++ b/NKC_WF/site/MachineLoad.aspx
@@ -5,21 +5,17 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
     <div class="container2 px-1 textBig">
-        <asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
         <div class="card text-center" style="width: 100%;">
             <h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoad") %></h4>
             <div class="card-body py-1">
                 <asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
                     <ContentTemplate>
+                        <asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
                         <div class="row">
                             <div class="col-12 mb-2">
                                 <uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="false" />
                             </div>
                         </div>
-                    </ContentTemplate>
-                </asp:UpdatePanel>
-                <asp:UpdatePanel runat="server" ID="upnlLoad" UpdateMode="Always">
-                    <ContentTemplate>
                         <div class="row">
                             <div class="col-3">
                                 <uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet" StatusReqStart="0" StatusReqEnd="0" />
diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs
index 80060be..a0e1a2e 100644
--- a/NKC_WF/site/MachineLoad.aspx.cs
+++ b/NKC_WF/site/MachineLoad.aspx.cs
@@ -21,6 +21,7 @@ namespace NKC_WF
 
         private void forceRefresh()
         {
+            cmp_stackLoading.doUpdate();
             cmp_ML_ShDet.BatchId = cmp_stackLoading.BatchIdCurr;
             cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr;
             cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr;
diff --git a/NKC_WF/site/MachineLoad.aspx.designer.cs b/NKC_WF/site/MachineLoad.aspx.designer.cs
index 1a4afa6..be820d3 100644
--- a/NKC_WF/site/MachineLoad.aspx.designer.cs
+++ b/NKC_WF/site/MachineLoad.aspx.designer.cs
@@ -14,15 +14,6 @@ namespace NKC_WF
     public partial class MachineLoad
     {
 
-        /// <summary>
-        /// Controllo timerLoad.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.Timer timerLoad;
-
         /// <summary>
         /// Controllo upnlBCode.
         /// </summary>
@@ -32,6 +23,15 @@ namespace NKC_WF
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upnlBCode;
 
+        /// <summary>
+        /// Controllo timerLoad.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.Timer timerLoad;
+
         /// <summary>
         /// Controllo cmp_stackLoading.
         /// </summary>
@@ -41,15 +41,6 @@ namespace NKC_WF
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_stackLoading cmp_stackLoading;
 
-        /// <summary>
-        /// Controllo upnlLoad.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.UpdatePanel upnlLoad;
-
         /// <summary>
         /// Controllo cmp_ML_ShDet.
         /// </summary>
diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx
index 3065dd5..f50d47c 100644
--- a/NKC_WF/site/MachineLoadSmart.aspx
+++ b/NKC_WF/site/MachineLoadSmart.aspx
@@ -4,19 +4,20 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
     <div class="container px-1">
-    <div class="card text-center" style="width: 100%;">
-        <h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoad") %></h4>
-        <div class="card-body py-1">
-            <asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
-                <ContentTemplate>
-                    <div class="row">
-                        <div class="col-12 mb-2">
-                            <uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="true" />
+        <div class="card text-center" style="width: 100%;">
+            <h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoad") %></h4>
+            <div class="card-body py-1">
+                <asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
+                    <ContentTemplate>
+                        <asp:Timer ID="timerLoad" runat="server" Interval="30000" OnTick="timerLoad_Tick"></asp:Timer>
+                        <div class="row">
+                            <div class="col-12 mb-2">
+                                <uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="true" />
+                            </div>
                         </div>
-                    </div>
-                </ContentTemplate>
-            </asp:UpdatePanel>
+                    </ContentTemplate>
+                </asp:UpdatePanel>
+            </div>
         </div>
     </div>
-    </div>
 </asp:Content>
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.cs b/NKC_WF/site/MachineLoadSmart.aspx.cs
index c293753..a60db68 100644
--- a/NKC_WF/site/MachineLoadSmart.aspx.cs
+++ b/NKC_WF/site/MachineLoadSmart.aspx.cs
@@ -16,18 +16,17 @@ namespace NKC_WF.site
                 ((SiteMaster)this.Master).showSearch = false;
                 forceRefresh();
             }
-            cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
         }
 
-        private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e)
-        {
-            forceRefresh();
-        }
 
         private void forceRefresh()
         {
-
+            cmp_stackLoading.doUpdate();
         }
 
+        protected void timerLoad_Tick(object sender, EventArgs e)
+        {
+            forceRefresh();
+        }
     }
 }
\ No newline at end of file
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs
index 4493031..3727818 100644
--- a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs
+++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs
@@ -23,6 +23,15 @@ namespace NKC_WF.site
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upnlBCode;
 
+        /// <summary>
+        /// Controllo timerLoad.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.Timer timerLoad;
+
         /// <summary>
         /// Controllo cmp_stackLoading.
         /// </summary>