From bd275bf3858ea18d8a98a5c6a3680e2b10326b63 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 11 Sep 2020 15:35:06 +0200 Subject: [PATCH] inizio fix area WebUserControls --- MP-SITE/BaseUserControl.cs | 139 --------------------- MP-Site/MP-Site.csproj | 3 - MP-Site/WebUserControls/baseProdControl.cs | 106 ++++++++-------- 3 files changed, 56 insertions(+), 192 deletions(-) delete mode 100644 MP-SITE/BaseUserControl.cs diff --git a/MP-SITE/BaseUserControl.cs b/MP-SITE/BaseUserControl.cs deleted file mode 100644 index 203a07ea..00000000 --- a/MP-SITE/BaseUserControl.cs +++ /dev/null @@ -1,139 +0,0 @@ -using MapoDb; -using SteamWare; -using System; - -namespace MP_SITE -{ - public class BaseUserControl : System.Web.UI.UserControl - { - #region gestione eventi - - public event EventHandler eh_nuovoValore; - - public event EventHandler eh_resetSelezione; - - public event EventHandler eh_selValore; - - /// - /// Solleva evento nuovo valore - /// - public void raiseNewVal() - { - // evento come nuovo... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } - } - - public void raiseSelNew() - { - // sollevo evento nuovo valore... - if (eh_selValore != null) - { - eh_selValore(this, new EventArgs()); - } - } - - /// - /// Solleva evento reset - /// - public void raiseReset() - { - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } - } - - #endregion gestione eventi - - /// - /// Oggetto datalayer specifico NON singleton x scalare - /// - internal DataLayer DataLayerObj = new DataLayer(); - - /// - /// UID formattato con "_" - /// - public string uid - { - get - { - return this.UniqueID.Replace("$", "_").Replace("-", "_"); - } - } - - /// - /// titolo pagina - /// - public string titolo - { - get - { - return devicesAuthProxy.getPage(Request.Url).Replace(".aspx", ""); - } - } - - #region utils - - /// - /// effettua traduzione del lemma - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - - /// - /// effettua traduzione in inglese del lemma - /// - /// - /// - public string traduciEn(string lemma) - { - return user_std.UtSn.TraduciEn(lemma); - } - - /// - /// formatta in minuti/sec partendo da min.cent - /// - /// - /// - public string minSec(object minCent) - { - string answ = ""; - if (minCent != null) - { - try - { - answ = string.Format("{0:mm}:{0:ss}", minCent2Sec(Convert.ToDecimal(minCent.ToString().Replace(".", ",")))); - } - catch - { } - } - return answ; - } - - /// - /// conversione da tempo minuti centesimali a minuti/secondi - /// - /// - /// - protected TimeSpan minCent2Sec(decimal valore) - { - TimeSpan answ = new TimeSpan(0, 0, 1); - try - { - answ = new TimeSpan(0, Convert.ToInt32(valore), Convert.ToInt32((valore - Convert.ToInt32(valore)) * 60)); - } - catch - { } - return answ; - } - - #endregion utils - } -} \ No newline at end of file diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index dc3f6c84..e0b1fad6 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -522,9 +522,6 @@ ASPXCodeBehind - - ASPXCodeBehind - Default.aspx ASPXCodeBehind diff --git a/MP-Site/WebUserControls/baseProdControl.cs b/MP-Site/WebUserControls/baseProdControl.cs index 761ee2a2..b5736ab8 100644 --- a/MP-Site/WebUserControls/baseProdControl.cs +++ b/MP-Site/WebUserControls/baseProdControl.cs @@ -3,58 +3,64 @@ using System; namespace MP_SITE.WebUserControls { - public class baseProdControl : System.Web.UI.UserControl - { - /// - /// Oggetto datalayer specifico - /// - DataLayer DataLayerObj = new DataLayer(); - /// - /// evento update - /// - public event EventHandler eh_doUpdate; - protected resoconti _resoconti; - protected int _numRighe = 17; - protected void Page_Load(object sender, EventArgs e) - { - _resoconti = new resoconti(); - if (!Page.IsPostBack) - { - aggiornamento(); - } - } - public virtual void aggiornamento() + public class baseProdControl : System.Web.UI.UserControl { + protected int _numRighe = 17; - } - public int numRighe - { - get - { - return _numRighe; - } - set - { - _numRighe = value; - } - } - public void reportUpdate() - { - // alzo l'evento d update/inserimento e ricarico cache... - if (eh_doUpdate != null) - { - eh_doUpdate(this, new EventArgs()); - } - } + protected resoconti _resoconti; - /// - /// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...) - /// - /// - /// - protected bool isMulti(string idxMacchina) - { - return DataLayerObj.isMulti(idxMacchina); + /// + /// Oggetto datalayer specifico + /// + private DataLayer DataLayerObj = new DataLayer(); + + /// + /// evento update + /// + public event EventHandler eh_doUpdate; + + public int numRighe + { + get + { + return _numRighe; + } + set + { + _numRighe = value; + } + } + + public virtual void aggiornamento() + { + } + + public void reportUpdate() + { + // alzo l'evento d update/inserimento e ricarico cache... + if (eh_doUpdate != null) + { + eh_doUpdate(this, new EventArgs()); + } + } + + /// + /// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...) + /// + /// + /// + protected bool isMulti(string idxMacchina) + { + return DataLayerObj.isMulti(idxMacchina); + } + + protected void Page_Load(object sender, EventArgs e) + { + _resoconti = new resoconti(); + if (!Page.IsPostBack) + { + aggiornamento(); + } + } } - } } \ No newline at end of file