diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master index d3efc922..24675925 100644 --- a/MP-TAB/WebMasterPages/Bootstrap.Master +++ b/MP-TAB/WebMasterPages/Bootstrap.Master @@ -64,7 +64,7 @@ - + diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master.designer.cs b/MP-TAB/WebMasterPages/Bootstrap.Master.designer.cs index f0d022f5..82322987 100644 --- a/MP-TAB/WebMasterPages/Bootstrap.Master.designer.cs +++ b/MP-TAB/WebMasterPages/Bootstrap.Master.designer.cs @@ -1,122 +1,124 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace WebMasterPages { - - - public partial class Bootstrap { - +namespace WebMasterPages +{ + + + public partial class Bootstrap + { + /// - /// Controllo PlaceHolder1. + /// PlaceHolder1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; - + /// - /// Controllo BundleReference1. + /// BundleReference1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - + /// - /// Controllo BundleReference2. + /// BundleReference2 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; - + /// - /// Controllo HeadContent. + /// HeadContent control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; - + /// - /// Controllo form1. + /// form1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// - /// Controllo ScriptManager1. + /// ScriptManager1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.ScriptManager ScriptManager1; - + /// - /// Controllo mod_title. + /// mod_title control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_title mod_title; - + /// - /// Controllo uppContainer. + /// uppContainer control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdatePanel uppContainer; - + /// - /// Controllo MainContent. + /// MainContent control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; - + /// - /// Controllo uppFooter. + /// uppFooter control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdatePanel uppFooter; - + /// - /// Controllo mod_footer. + /// mod_footer control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_footer mod_footer; - + /// - /// Controllo PlaceHolder2. + /// PlaceHolder2 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2; } diff --git a/MP-TAB/WebUserControls/mod_footer.ascx b/MP-TAB/WebUserControls/mod_footer.ascx index 80bbb02c..8231b8cc 100644 --- a/MP-TAB/WebUserControls/mod_footer.ascx +++ b/MP-TAB/WebUserControls/mod_footer.ascx @@ -1,9 +1,11 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %> +
-
- <%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] -
-
- Steamware © <%: DateTime.Now.Year %> -
-
+
+ <%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] | <%: DateTime.Now %> +
+
+ + Steamware © <%: DateTime.Now.Year %> +
+ \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_footer.ascx.cs b/MP-TAB/WebUserControls/mod_footer.ascx.cs index 41702556..f7548460 100644 --- a/MP-TAB/WebUserControls/mod_footer.ascx.cs +++ b/MP-TAB/WebUserControls/mod_footer.ascx.cs @@ -4,13 +4,8 @@ namespace MoonProTablet.WebUserControls { public partial class mod_footer : BaseUserControl { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - updateLabels(); - } - } + #region Public Properties + /// /// Versione corrente sw /// @@ -21,9 +16,7 @@ namespace MoonProTablet.WebUserControls return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; } } - private void updateLabels() - { - } + /// /// Dimensione schermata video attuale /// @@ -39,5 +32,27 @@ namespace MoonProTablet.WebUserControls return answ; } } + + #endregion Public Properties + + #region Private Methods + + private void updateLabels() + { + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + updateLabels(); + } + } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_footer.ascx.designer.cs b/MP-TAB/WebUserControls/mod_footer.ascx.designer.cs index 62ae223e..2af30767 100644 --- a/MP-TAB/WebUserControls/mod_footer.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_footer.ascx.designer.cs @@ -1,15 +1,17 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls { - - - public partial class mod_footer { +namespace MoonProTablet.WebUserControls +{ + + + public partial class mod_footer + { } } diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index bcf32896..b5fd940f 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -162,42 +162,6 @@ namespace MapoDb } } - /// - /// Dati deroga SchedaTecnica serializzati in REDIS (get/set) - /// - public StCheckOverride getDerogaSt(int idxST) - { - StCheckOverride answ = new StCheckOverride() { IdxST = idxST }; - string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{idxST:000}"); - string rawData = memLayer.ML.getRSV(keyDerogaST); - if (!string.IsNullOrEmpty(rawData)) - { - try - { - answ = JsonConvert.DeserializeObject(rawData); - } - catch - { } - } - return answ; - } - - public bool setDerogaSt(StCheckOverride deroga) - { - bool fatto = false; - try - { - string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{deroga.IdxST:000}"); - string rawData = JsonConvert.SerializeObject(deroga); - memLayer.ML.setRSV(keyDerogaST, rawData, 60*2); - fatto = true; - } - catch - { } - return fatto; - } - - /// /// MatrOpr in sessione /// @@ -1707,7 +1671,11 @@ namespace MapoDb UsrName = memLayer.ML.CRS("user"); } string cookieName = memLayer.ML.CRS("cookieName"); - DateTime expDate = DateTime.Now.AddDays(memLayer.ML.CRI("cookieDayExpire")); + //DateTime expDate = DateTime.Now.AddDays(memLayer.ML.CRI("cookieDayExpire")); + string cookieDayExpire = memLayer.ML.CRS("cookieDayExpire"); + double dayExp = 1; + double.TryParse(cookieDayExpire, out dayExp); + DateTime expDate = DateTime.Now.AddDays(dayExp); string Secret = authProxy.getSecret(Dominio, UsrName, matricola, DeviceName, adesso); string devSecret = SteamCrypto.EncryptString(Secret, cookieName); try @@ -1817,6 +1785,26 @@ namespace MapoDb return answ; } + /// + /// Dati deroga SchedaTecnica serializzati in REDIS (get/set) + /// + public StCheckOverride getDerogaSt(int idxST) + { + StCheckOverride answ = new StCheckOverride() { IdxST = idxST }; + string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{idxST:000}"); + string rawData = memLayer.ML.getRSV(keyDerogaST); + if (!string.IsNullOrEmpty(rawData)) + { + try + { + answ = JsonConvert.DeserializeObject(rawData); + } + catch + { } + } + return answ; + } + /// /// restituisce una tabella con tutte le transizioni degli ingressi per una data macchina /// @@ -3515,6 +3503,21 @@ namespace MapoDb return answ; } + public bool setDerogaSt(StCheckOverride deroga) + { + bool fatto = false; + try + { + string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{deroga.IdxST:000}"); + string rawData = JsonConvert.SerializeObject(deroga); + memLayer.ML.setRSV(keyDerogaST, rawData, 60 * 2); + fatto = true; + } + catch + { } + return fatto; + } + /// /// Salvataggio su della mappa di memoria dell'IOB x ulteriori impieghi ///