From 680c3faf73f26d49b80a8909f3a6a02faa4e5686 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 29 Jan 2020 16:57:09 +0100 Subject: [PATCH] FIX: img logo sx WRKLOG e reload barcode a 120sec --- GPW_Barcode/Barcode.aspx.designer.cs | 40 ++--- GPW_Barcode/Web.config | 26 +-- .../mod_menuBottomFullBCode.ascx.cs | 152 +++++++++--------- .../WebUserControls/mod_menuTopFull.ascx | 26 +-- GPW_Data/utils.cs | 6 +- 5 files changed, 128 insertions(+), 122 deletions(-) diff --git a/GPW_Barcode/Barcode.aspx.designer.cs b/GPW_Barcode/Barcode.aspx.designer.cs index d57e428..7948344 100644 --- a/GPW_Barcode/Barcode.aspx.designer.cs +++ b/GPW_Barcode/Barcode.aspx.designer.cs @@ -1,24 +1,26 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace GPW_Barcode { - - - public partial class Barcode { - - /// - /// mod_bCodeTimb1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GPW.WebUserControls.mod_bCodeTimb mod_bCodeTimb1; - } +namespace GPW_Barcode +{ + + + public partial class Barcode + { + + /// + /// Controllo mod_bCodeTimb1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::GPW.WebUserControls.mod_bCodeTimb mod_bCodeTimb1; + } } diff --git a/GPW_Barcode/Web.config b/GPW_Barcode/Web.config index 0e6fa5b..80f6da6 100644 --- a/GPW_Barcode/Web.config +++ b/GPW_Barcode/Web.config @@ -66,7 +66,7 @@ - + @@ -135,18 +135,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs b/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs index 19149e4..ba372c8 100644 --- a/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs +++ b/GPW_Barcode/WebUserControls/mod_menuBottomFullBCode.ascx.cs @@ -10,82 +10,82 @@ using System.Configuration; namespace GPW.WebUserControls { - public partial class mod_menuBottomFullBCode : System.Web.UI.UserControl + public partial class mod_menuBottomFullBCode : System.Web.UI.UserControl + { + + protected void Page_Load(object sender, EventArgs e) { - - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - contatorePag = 0; - // sistemo le stringhe... - //lblApp.Text = string.Format("{0} v.{1}.{2}", ConfigurationManager.AppSettings.Get("appName"), ConfigurationManager.AppSettings.Get("mainRev"), ConfigurationManager.AppSettings.Get("minRev")); - lblApp.Text = string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); - lblCopyRight.Text = string.Format("{0}", ConfigurationManager.AppSettings.Get("copyRight")); - setClock(); - setTimer(); - } - if (licenzeGPW.checkLicenze) - { - pnlCheck.CssClass = "btnVerdeGrad ui-corner-all shadowBox"; - } - else - { - pnlCheck.CssClass = "btnRossoGrad ui-corner-all shadowBox"; - //lblWarning.Text = "Attenzione: numero licenze superato! MR attiva."; - lblWarning.Visible = true; - } - } - /// - /// imposta il tempo di scadenza del timer x il refresh della pagina per refresh orario mostrato - /// - private void setTimer() - { - Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdateFooter_ms"); - } - protected void Timer1_Tick(object sender, EventArgs e) - { - setClock(); - } - protected int contatorePag - { - get - { - return memLayer.ML.IntSessionObj("numChiamatePaginaBCode"); - } - set - { - memLayer.ML.setSessionVal("numChiamatePaginaBCode", value); - } - } - private void setClock() - { - // controllo numero di "ri-chiamate": ogni tot (std = 100, 100sec di default quindi) ricarico pagina - if (contatorePag < memLayer.ML.confReadInt("maxRefreshToReload")) - { - contatorePag++; - } - else - { - contatorePag = 0; - Response.Redirect("Barcode.aspx"); - } - - string postazione_IP = Request.UserHostName; - lblDateTime.Text = DateTime.Now.ToString("HH:mm:ss"); - lblInfo.Text = ""; - try - { - lblInfo.Text += string.Format("{0}", dnsUtils.DetermineCompName(postazione_IP)); - } - catch - { } - try - { - lblInfo.Text += string.Format(" ({0})", postazione_IP); - } - catch - { } - } + if (!Page.IsPostBack) + { + contatorePag = 0; + // sistemo le stringhe... + //lblApp.Text = string.Format("{0} v.{1}.{2}", ConfigurationManager.AppSettings.Get("appName"), ConfigurationManager.AppSettings.Get("mainRev"), ConfigurationManager.AppSettings.Get("minRev")); + lblApp.Text = string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); + lblCopyRight.Text = string.Format("{0}", ConfigurationManager.AppSettings.Get("copyRight")); + setClock(); + setTimer(); + } + if (licenzeGPW.checkLicenze) + { + pnlCheck.CssClass = "btnVerdeGrad ui-corner-all shadowBox"; + } + else + { + pnlCheck.CssClass = "btnRossoGrad ui-corner-all shadowBox"; + //lblWarning.Text = "Attenzione: numero licenze superato! MR attiva."; + lblWarning.Visible = true; + } } + /// + /// imposta il tempo di scadenza del timer x il refresh della pagina per refresh orario mostrato + /// + private void setTimer() + { + Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdateFooter_ms"); + } + protected void Timer1_Tick(object sender, EventArgs e) + { + setClock(); + } + protected int contatorePag + { + get + { + return memLayer.ML.IntSessionObj("numChiamatePaginaBCode"); + } + set + { + memLayer.ML.setSessionVal("numChiamatePaginaBCode", value); + } + } + private void setClock() + { + // controllo numero di "ri-chiamate": ogni tot (std = 100, 100sec di default quindi) ricarico pagina + if (contatorePag < memLayer.ML.confReadInt("maxRefreshToReload")) + { + contatorePag++; + } + else + { + contatorePag = 0; + Response.Redirect("Barcode.aspx"); + } + + string postazione_IP = Request.UserHostName; + lblDateTime.Text = DateTime.Now.ToString("HH:mm:ss"); + lblInfo.Text = ""; + try + { + lblInfo.Text += string.Format("{0}", dnsUtils.DetermineCompName(postazione_IP)); + } + catch + { } + try + { + lblInfo.Text += string.Format(" ({0})", postazione_IP); + } + catch + { } + } + } } \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx index 9f77c01..37e1566 100644 --- a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx +++ b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx @@ -7,28 +7,28 @@
- +
- - -
-
-
- -
- - + + +
+
+
+ +
+ +
- - + +
- +
diff --git a/GPW_Data/utils.cs b/GPW_Data/utils.cs index 7849d6e..e6e4601 100644 --- a/GPW_Data/utils.cs +++ b/GPW_Data/utils.cs @@ -361,9 +361,9 @@ namespace GPW_data public bool dailyDuties() { bool answ = false; - if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("Richiesto Check Daily Duties", tipoLog.INFO); if (memLayer.ML.confReadBool("enableDailyCheck")) { + if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("Richiesto Check Daily Duties", tipoLog.INFO); int firstHour2Check = memLayer.ML.confReadInt("firstHour2Check"); // controllo sfasato di x ore come da we.config se ci sia già stato il check quotidiano anomalie (con relative email) if (DataProxy.DP.taRE.getByDataEv("checkAnomalie", DateTime.Now.AddHours(-firstHour2Check).Date).Rows.Count == 0) @@ -374,6 +374,10 @@ namespace GPW_data DataProxy.DP.taRE.Insert(DateTime.Now.AddHours(-firstHour2Check), "dailyDuties", "-"); } } + else + { + if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("DISABILITATO Check Daily Duties", tipoLog.INFO); + } return answ; } ///