From 5ac7ea65239cc0afaf7c4879f9c9e8a3bbf0521b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 12 Apr 2017 11:01:18 +0200 Subject: [PATCH] Aggiunta chiave "showRepTimb" x mostrare rep timbrature o meno --- GPW_Commesse/Content/BtnReport.css | 2 +- GPW_Commesse/Web.config | 2 ++ .../WebUserControls/mod_menuTopFull.ascx | 3 +- .../WebUserControls/mod_menuTopFull.ascx.cs | 30 ++++++++----------- .../mod_menuTopFull.ascx.designer.cs | 9 ------ .../WebUserControls/mod_reportUtenteAD.ascx | 2 +- .../mod_reportUtenteAD.ascx.designer.cs | 22 +++++++------- 7 files changed, 29 insertions(+), 41 deletions(-) diff --git a/GPW_Commesse/Content/BtnReport.css b/GPW_Commesse/Content/BtnReport.css index a9d5685..42ad86e 100644 --- a/GPW_Commesse/Content/BtnReport.css +++ b/GPW_Commesse/Content/BtnReport.css @@ -101,7 +101,7 @@ background-repeat: no-repeat; background-position: left top; background-size: 60px 60px; - min-height: 36px; + min-height: 2em; height: 100%; width: 100%; max-width: 100%; diff --git a/GPW_Commesse/Web.config b/GPW_Commesse/Web.config index 68b59e9..50e6764 100644 --- a/GPW_Commesse/Web.config +++ b/GPW_Commesse/Web.config @@ -67,6 +67,8 @@ + + diff --git a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx index 11c1b9e..8017aec 100644 --- a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx +++ b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx @@ -15,8 +15,7 @@
- - + diff --git a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.cs b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.cs index 665c3a3..12f98a1 100644 --- a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using GPW_data; using SteamWare; -using GPW_data; +using System; namespace GPW_Commesse.WebUserControls { @@ -18,6 +13,10 @@ namespace GPW_Commesse.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + mod_reportUtenteAD1.Visible = memLayer.ML.CRB("showRepTimb"); + } checkUser(); setMenuData(); } @@ -45,7 +44,7 @@ namespace GPW_Commesse.WebUserControls if (value != "") { memLayer.ML.setSessionVal("returnUrl", value); - imgReturn.Visible = true; + lbHome.Visible = true; } } } @@ -99,20 +98,17 @@ namespace GPW_Commesse.WebUserControls { } } /// - /// rimanda a pagina precedente + /// redirect /// - /// - /// - protected void imgReturn_Click(object sender, ImageClickEventArgs e) - { - returnHome(); - } - private void returnHome() { Response.Redirect(memLayer.ML.StringSessionObj("returnUrl")); } - + /// + /// rimanda a pagina precedente + /// + /// + /// protected void lbHome_Click(object sender, EventArgs e) { returnHome(); diff --git a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.designer.cs index 9a906b5..f55c5ca 100644 --- a/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.designer.cs @@ -39,15 +39,6 @@ namespace GPW_Commesse.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbHome; - /// - /// Controllo imgReturn. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ImageButton imgReturn; - /// /// Controllo lblCurrentPage. /// diff --git a/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx b/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx index 4f2dfe6..c1bd561 100644 --- a/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx +++ b/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx @@ -12,7 +12,7 @@
-
+
diff --git a/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx.designer.cs index d167e47..8840bce 100644 --- a/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// 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_Commesse.WebUserControls { @@ -13,20 +13,20 @@ namespace GPW_Commesse.WebUserControls { public partial class mod_reportUtenteAD { /// - /// repReports control. + /// Controllo repReports. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Repeater repReports; /// - /// odsReports control. + /// Controllo odsReports. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsReports; }