From e734745569f1dd9eedc0b84922d92190be28ae3c Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 12 Aug 2020 11:38:07 +0200
Subject: [PATCH] Update force reload dati da SMART x UNLOAD

---
 NKC_WF/WebUserControls/cmp_kitImpCheck.ascx   | 14 ++++++++--
 .../WebUserControls/cmp_kitImpCheck.ascx.cs   | 24 +++++++++++++----
 .../cmp_kitImpCheck.ascx.designer.cs          | 18 +++++++++++++
 .../WebUserControls/cmp_stackLoading.ascx.cs  |  1 +
 NKC_WF/site/KitRequestImporter.aspx           | 26 ++++++++++---------
 .../site/KitRequestImporter.aspx.designer.cs  | 13 ++++++++--
 NKC_WF/site/MachineUnload.aspx.cs             |  2 ++
 7 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
index 03d83ac..b2bd055 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
@@ -15,8 +15,18 @@
     </div>
     <div class="col-6">
         <div class="alert alert-primary">
-            <b> # <%: traduci("LastAction") %> </b><br />
-            <asp:Label runat="server" ID="lblOutTask"></asp:Label>
+            <div class="row">
+                <div class="col-12">
+                    <b># <%: traduci("LastAction") %> </b>
+                </div>
+                <asp:Label runat="server" ID="lblOutTask" CssClass="col-12 text-truncate"></asp:Label>
+                <div runat="server" id="divFullMsg" class="col-12 mt-2 bg-light text-secondary text-right" visible="false">
+                    <a href="#fullMessage" class="btn btn-primary btn-sm text-right" data-toggle="collapse"><i class="fa fa-chevron-down" aria-hidden="true"></i> <%: traduci("ShowDetail") %></a>
+                    <div id="fullMessage" class="collapse text-left">
+                        <asp:Label runat="server" ID="lblOutTaskAll"></asp:Label>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="col-3">
diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
index f74a983..6cce228 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
@@ -12,7 +12,10 @@ namespace NKC_WF.WebUserControls
         protected string _SqlImportDir = memLayer.ML.CRS("_SqlImportDir");
         protected void Page_Load(object sender, EventArgs e)
         {
-
+            if (!Page.IsPostBack)
+            {
+                displayMessage("", false);
+            }
         }
         /// <summary>
         /// Nome file caricato
@@ -145,13 +148,13 @@ namespace NKC_WF.WebUserControls
                 imported = checkOk && !testOnly;
                 // ora effettua validazione e mostra eventuale esito...
                 processValidation();
-                lblOutTask.Text = $"Data Import: executed tray, checkOk: {checkOk} | imported: {imported}";
+                displayMessage($"{traduci("KitDataImportExecuted")}: {checkOk} | : {imported}", false);
             }
             catch (Exception exc)
             {
-                string fullMessage = $"KitCsvMan: Eccezione in IMPORT file:{Environment.NewLine}{exc}";
+                string fullMessage = $"{traduci("KitDataImportException")}:{Environment.NewLine}{exc}";
                 logger.lg.scriviLog(fullMessage);
-                lblOutTask.Text = fullMessage;
+                displayMessage(fullMessage, true);
             }
         }
 
@@ -163,10 +166,21 @@ namespace NKC_WF.WebUserControls
                 tryImport(false);
             }
             processValidation();
-            if(imported)
+            if (imported)
             {
                 raiseReset();
             }
         }
+        /// <summary>
+        /// DIsplay message + gest visualizzazione
+        /// </summary>
+        /// <param name="mainMessage"></param>
+        /// <param name="showFull"></param>
+        protected void displayMessage(string mainMessage, bool showFull)
+        {
+            lblOutTask.Text = mainMessage;
+            lblOutTaskAll.Text = mainMessage;
+            divFullMsg.Visible = showFull;
+        }
     }
 }
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs
index 7fb9fc3..89ff21a 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs
@@ -77,6 +77,24 @@ namespace NKC_WF.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblOutTask;
 
+        /// <summary>
+        /// Controllo divFullMsg.
+        /// </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.HtmlControls.HtmlGenericControl divFullMsg;
+
+        /// <summary>
+        /// Controllo lblOutTaskAll.
+        /// </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.WebControls.Label lblOutTaskAll;
+
         /// <summary>
         /// Controllo divStep1.
         /// </summary>
diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
index c903673..5bdb762 100644
--- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
@@ -183,6 +183,7 @@ namespace NKC_WF.WebUserControls
                                             ComLib.updateBatchPositionByBunk(stackId);
                                             doRaiseEv = true;
                                         }
+                                        ComLib.setReloadMU();
                                     }
                                     // altrimenti segnalo NON pronto x caricare prossimo
                                     else
diff --git a/NKC_WF/site/KitRequestImporter.aspx b/NKC_WF/site/KitRequestImporter.aspx
index 51afd0e..c736e8f 100644
--- a/NKC_WF/site/KitRequestImporter.aspx
+++ b/NKC_WF/site/KitRequestImporter.aspx
@@ -17,20 +17,22 @@
                         <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" forceRedirect="false" />
                         <hr />
                     </div>
-                </div>
-                <asp:UpdatePanel ID="UpdatePanel1" runat="server">
-                    <ContentTemplate>
-                        <div class="row">
-                            <div class="col-12">
+                    <div class="col-12">
+                        <asp:UpdatePanel ID="upnlCheck" runat="server" UpdateMode="Conditional">
+                            <ContentTemplate>
                                 <uc1:cmp_kitImpCheck runat="server" ID="cmp_kitImpCheck" />
-                            </div>
-                            <div class="col-12" runat="server" id="divKitList">
+                            </ContentTemplate>
+                        </asp:UpdatePanel>
+                    </div>
+                    <div class="col-12" runat="server" id="divKitList">
+                        <asp:UpdatePanel ID="upnlList" runat="server">
+                            <ContentTemplate>
                                 <uc1:cmp_kitList runat="server" ID="cmp_kitList" />
-                            </div>
-                            <asp:Timer ID="Timer1" runat="server" Interval="2000" OnTick="Timer1_Tick"></asp:Timer>
-                        </div>
-                    </ContentTemplate>
-                </asp:UpdatePanel>
+                                <asp:Timer ID="Timer1" runat="server" Interval="2000" OnTick="Timer1_Tick"></asp:Timer>
+                            </ContentTemplate>
+                        </asp:UpdatePanel>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/NKC_WF/site/KitRequestImporter.aspx.designer.cs b/NKC_WF/site/KitRequestImporter.aspx.designer.cs
index 372ffe6..14918c7 100644
--- a/NKC_WF/site/KitRequestImporter.aspx.designer.cs
+++ b/NKC_WF/site/KitRequestImporter.aspx.designer.cs
@@ -24,13 +24,13 @@ namespace NKC_WF
         protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
 
         /// <summary>
-        /// Controllo UpdatePanel1.
+        /// Controllo upnlCheck.
         /// </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 UpdatePanel1;
+        protected global::System.Web.UI.UpdatePanel upnlCheck;
 
         /// <summary>
         /// Controllo cmp_kitImpCheck.
@@ -50,6 +50,15 @@ namespace NKC_WF
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList;
 
+        /// <summary>
+        /// Controllo upnlList.
+        /// </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 upnlList;
+
         /// <summary>
         /// Controllo cmp_kitList.
         /// </summary>
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs
index f41d7a8..263fed3 100644
--- a/NKC_WF/site/MachineUnload.aspx.cs
+++ b/NKC_WF/site/MachineUnload.aspx.cs
@@ -11,6 +11,8 @@ namespace NKC_WF
             if (!Page.IsPostBack)
             {
                 ((SiteMaster)this.Master).showSearch = false;
+                // svuoto redis...
+                memLayer.ML.redFlushKey(ComLib.redMachUnloadCount);
                 doUpdate();
             }
         }