From c8a343bb19f321c3012748e96fce778b405aa1db Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 7 Aug 2020 13:00:11 +0200
Subject: [PATCH] Fix for reload pages

---
 NKC_WF/WebUserControls/cmp_menuTop.ascx       |  9 +-
 NKC_WF/WebUserControls/cmp_menuTop.ascx.cs    | 27 +-----
 .../cmp_menuTop.ascx.designer.cs              | 95 +++++++++----------
 NKC_WF/site/ForceReload.aspx                  | 16 ++++
 NKC_WF/site/ForceReload.aspx.cs               | 29 ++++++
 NKC_WF/site/ForceReload.aspx.designer.cs      | 26 +++++
 NKC_WF/site/UpdateVoc.aspx.cs                 |  9 +-
 7 files changed, 129 insertions(+), 82 deletions(-)
 create mode 100644 NKC_WF/site/ForceReload.aspx
 create mode 100644 NKC_WF/site/ForceReload.aspx.cs
 create mode 100644 NKC_WF/site/ForceReload.aspx.designer.cs

diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx b/NKC_WF/WebUserControls/cmp_menuTop.ascx
index 9efb3b1..ff55cb8 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx
@@ -1,8 +1,8 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_menuTop" %>
 
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light py-1 mb-1">
-  <asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="Update + HOME">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></asp:LinkButton>
-  <%--<a class="navbar-brand" href="#">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></a>--%>
+  <%--<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="HOME">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></asp:LinkButton>--%>
+  <a class="navbar-brand" href="../">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
@@ -32,7 +32,10 @@
         <SeparatorTemplate>
         </SeparatorTemplate>
       </asp:Repeater>
-      <asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="true" CacheDuration="5"></asp:XmlDataSource>
+      <asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="true" CacheDuration="600"></asp:XmlDataSource>
+      <%--<li class="nav-item">
+        <a class="nav-link text-light" href="ForceReload"><i class="fa fa-retweet shortcut-icon"></i> <%: traduci("ForceReload") %></a>
+      </li>--%>
       <li class="nav-item">
         <a class="nav-link" href="About">About</a>
       </li>
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
index d697cd7..ac713ca 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
@@ -5,7 +5,7 @@ using System.Web.UI;
 
 namespace NKC_WF.WebUserControls
 {
-    public partial class cmp_menuTop : System.Web.UI.UserControl
+    public partial class cmp_menuTop : BaseUserControl
     {
         public event EventHandler eh_doRefresh;
         protected void Page_Load(object sender, EventArgs e)
@@ -96,30 +96,7 @@ namespace NKC_WF.WebUserControls
         /// <param name="e"></param>
         protected void lbnUpdate_Click(object sender, EventArgs e)
         {
-            doDataUpdate(true);
-        }
-        /// <summary>
-        /// effettua un update completo dei valori in sessione
-        /// </summary>
-        private void doDataUpdate(bool doFullReset)
-        {
-            if (doFullReset)
-            {
-                // reset REDIS x css
-                ComLib.man.resetSheetUnload();
-                // aggiorno vocabolario
-                DataWrap.DW.resetVocabolario();
-                // reset dati in cache x DbConfig...
-                memLayer.ML.resetAppConf();
-                // svuoto session e cache per rileggere i dati da Db
-                Session.RemoveAll();
-                memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
-                Response.Redirect("login");
-            }
-            else
-            {
-                Response.Redirect(user_std.pagCorrente);
-            }
+            Response.Redirect("default");
         }
         protected void lbtSearch_Click(object sender, EventArgs e)
         {
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
index 895e6d3..7125897 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
@@ -11,61 +11,52 @@ namespace NKC_WF.WebUserControls
 {
 
 
-  public partial class cmp_menuTop
-  {
+    public partial class cmp_menuTop
+    {
 
-    /// <summary>
-    /// Controllo lbnUpdate.
-    /// </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.LinkButton lbnUpdate;
+        /// <summary>
+        /// Controllo menu.
+        /// </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.Repeater menu;
 
-    /// <summary>
-    /// Controllo menu.
-    /// </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.Repeater menu;
+        /// <summary>
+        /// Controllo XmlMenu.
+        /// </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.XmlDataSource XmlMenu;
 
-    /// <summary>
-    /// Controllo XmlMenu.
-    /// </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.XmlDataSource XmlMenu;
+        /// <summary>
+        /// Controllo divSearch.
+        /// </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 divSearch;
 
-    /// <summary>
-    /// Controllo divSearch.
-    /// </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 divSearch;
+        /// <summary>
+        /// Controllo txtSearch.
+        /// </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.TextBox txtSearch;
 
-    /// <summary>
-    /// Controllo txtSearch.
-    /// </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.TextBox txtSearch;
-
-    /// <summary>
-    /// Controllo lbtSearch.
-    /// </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.LinkButton lbtSearch;
-  }
+        /// <summary>
+        /// Controllo lbtSearch.
+        /// </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.LinkButton lbtSearch;
+    }
 }
diff --git a/NKC_WF/site/ForceReload.aspx b/NKC_WF/site/ForceReload.aspx
new file mode 100644
index 0000000..8ea62ca
--- /dev/null
+++ b/NKC_WF/site/ForceReload.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ForceReload.aspx.cs" Inherits="NKC_WF.site.ForceReload1" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/NKC_WF/site/ForceReload.aspx.cs b/NKC_WF/site/ForceReload.aspx.cs
new file mode 100644
index 0000000..4a565f3
--- /dev/null
+++ b/NKC_WF/site/ForceReload.aspx.cs
@@ -0,0 +1,29 @@
+using AppData;
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace NKC_WF.site
+{
+    public partial class ForceReload1 : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+            // reset REDIS x css
+            ComLib.man.resetSheetUnload();
+            // aggiorno vocabolario
+            DataWrap.DW.resetVocabolario();
+            // reset dati in cache x DbConfig...
+            memLayer.ML.resetAppConf();
+            // svuoto session e cache per rileggere i dati da Db
+            Session.RemoveAll();
+            memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
+            Response.Redirect("default");
+        }
+    }
+}
\ No newline at end of file
diff --git a/NKC_WF/site/ForceReload.aspx.designer.cs b/NKC_WF/site/ForceReload.aspx.designer.cs
new file mode 100644
index 0000000..afb6c2f
--- /dev/null
+++ b/NKC_WF/site/ForceReload.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace NKC_WF.site
+{
+
+
+    public partial class ForceReload1
+    {
+
+        /// <summary>
+        /// Controllo form1.
+        /// </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.HtmlForm form1;
+    }
+}
diff --git a/NKC_WF/site/UpdateVoc.aspx.cs b/NKC_WF/site/UpdateVoc.aspx.cs
index 3b3e7de..41d1a01 100644
--- a/NKC_WF/site/UpdateVoc.aspx.cs
+++ b/NKC_WF/site/UpdateVoc.aspx.cs
@@ -1,4 +1,5 @@
-using SteamWare;
+using AppData;
+using SteamWare;
 using System;
 
 namespace NKC_WF
@@ -7,11 +8,15 @@ namespace NKC_WF
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            // reset REDIS x css
+            ComLib.man.resetSheetUnload();
             // aggiorno vocabolario
             DataWrap.DW.resetVocabolario();
             // reset dati in cache x DbConfig...
             memLayer.ML.resetAppConf();
-            // torno a menu...
+            // svuoto session e cache per rileggere i dati da Db
+            Session.RemoveAll();
+            memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
             Response.Redirect("default");
         }
     }