diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 9672f985..287320b3 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -511,6 +511,7 @@ Always + diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs index 306212ed..08a4ed69 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs @@ -9,15 +9,6 @@ namespace MP_ADM.WebUserControls { public partial class cmp_planApprove : BaseUserControl { - #region Private Fields - - /// - /// Oggetto datalayer specifico - /// - private DataLayer DataLayerObj = new DataLayer(); - - #endregion Private Fields - #region Protected Properties /// diff --git a/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs b/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs index 3fe7d656..c234d372 100644 --- a/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs +++ b/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs @@ -8,31 +8,12 @@ namespace MP_ADM.WebUserControls { public partial class mod_anagArticoli : BaseUserControl { - #region Private Fields - - /// - /// Oggetto datalayer specifico - /// - private DataLayer DataLayerObj = new DataLayer(); - - #endregion Private Fields - #region Protected Fields protected string _idxGridView; #endregion Protected Fields - #region Public Events - - public event EventHandler eh_nuovoValore; - - public event EventHandler eh_resetSelezione; - - public event EventHandler eh_selValore; - - #endregion Public Events - #region Private Methods /// @@ -125,10 +106,7 @@ namespace MP_ADM.WebUserControls // salvo in session il valore selezionato... memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, false); // sollevo evento nuovo valore... - if (eh_selValore != null) - { - eh_selValore(this, new EventArgs()); - } + raiseSelNew(); } /// @@ -139,10 +117,7 @@ namespace MP_ADM.WebUserControls protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e) { // evento come nuovo... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } + raiseNewVal(); } protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) @@ -266,30 +241,7 @@ namespace MP_ADM.WebUserControls grView.SelectedIndex = -1; grView.DataBind(); lblWarning.Visible = false; - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } - } - - /// - /// 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); + raiseReset(); } #endregion Public Methods diff --git a/MP-ADM/WebUserControls/mod_newOdl.ascx.cs b/MP-ADM/WebUserControls/mod_newOdl.ascx.cs index 0941cab3..ba9ead15 100644 --- a/MP-ADM/WebUserControls/mod_newOdl.ascx.cs +++ b/MP-ADM/WebUserControls/mod_newOdl.ascx.cs @@ -5,15 +5,30 @@ namespace MP_ADM.WebUserControls { public partial class mod_newOdl : BaseUserControl { - protected void Page_Load(object sender, EventArgs e) + #region Private Methods + + /// + /// mostro elenco ultimi 5 tempi e note... + /// + private void showLastTimeAndNote() { + // update tempi ciclo! + grViewTempi.DataBind(); } - #region gestione eventi + #endregion Private Methods - public event EventHandler eh_nuovoValore; + #region Protected Methods - #endregion gestione eventi + /// + /// annullamento inserimento + /// + /// + /// + protected void btnCancel_Click(object sender, EventArgs e) + { + raiseNewVal(); + } /// /// conferma inserimento TC @@ -48,24 +63,63 @@ namespace MP_ADM.WebUserControls { logger.lg.scriviLog(string.Format("Non sono riuscito ad inserire l'ODL con i seguenti parametri: {0} | {1} | {2} | {3} | {4}", CodArticolo, IdxMacchina, numPezzi, TCiclo, pzPallet), tipoLog.ERROR); } - // segnalo update - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } + raiseNewVal(); } /// - /// annullamento inserimento + /// reset della selezione /// /// /// - protected void btnCancel_Click(object sender, EventArgs e) + protected void btnReset_Click(object sender, EventArgs e) { - if (eh_nuovoValore != null) + resetSelezione(); + } + + /// + /// selezione articolo + /// + /// + /// + protected void ddlArticolo_SelectedIndexChanged(object sender, EventArgs e) + { + showLastTimeAndNote(); + } + + /// + /// selezione impianto + /// + /// + /// + protected void ddlMacchine_SelectedIndexChanged(object sender, EventArgs e) + { + showLastTimeAndNote(); + } + + /// + /// evento selezione riga: salvo tempo e qta nei campi input... + /// + /// + /// + protected void grViewTempi_SelectedIndexChanged(object sender, EventArgs e) + { + // ricavo i dati selezionati + int idxOdl = 0; + try { - eh_nuovoValore(this, new EventArgs()); + idxOdl = Convert.ToInt32(grViewTempi.SelectedValue); } + catch + { } + MapoDb.DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxOdl, false)[0]; + // precompilo dati pezzi/tempi + txtPezzi.Text = rigaOdl.NumPezzi.ToString(); + txtTempoCiclo.Text = rigaOdl.TCAssegnato.ToString("0.00"); + txtPzPallet.Text = rigaOdl.PzPallet.ToString(); + } + + protected void Page_Load(object sender, EventArgs e) + { } /// @@ -91,44 +145,9 @@ namespace MP_ADM.WebUserControls lblMinSec.Text = text; } - /// - /// selezione articolo - /// - /// - /// - protected void ddlArticolo_SelectedIndexChanged(object sender, EventArgs e) - { - showLastTimeAndNote(); - } + #endregion Protected Methods - /// - /// mostro elenco ultimi 5 tempi e note... - /// - private void showLastTimeAndNote() - { - // update tempi ciclo! - grViewTempi.DataBind(); - } - - /// - /// selezione impianto - /// - /// - /// - protected void ddlMacchine_SelectedIndexChanged(object sender, EventArgs e) - { - showLastTimeAndNote(); - } - - /// - /// reset della selezione - /// - /// - /// - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } + #region Public Methods /// /// resetta la selezione dei valori in caso di modifiche su altri controlli @@ -139,26 +158,6 @@ namespace MP_ADM.WebUserControls grViewTempi.DataBind(); } - /// - /// evento selezione riga: salvo tempo e qta nei campi input... - /// - /// - /// - protected void grViewTempi_SelectedIndexChanged(object sender, EventArgs e) - { - // ricavo i dati selezionati - int idxOdl = 0; - try - { - idxOdl = Convert.ToInt32(grViewTempi.SelectedValue); - } - catch - { } - MapoDb.DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxOdl, false)[0]; - // precompilo dati pezzi/tempi - txtPezzi.Text = rigaOdl.NumPezzi.ToString(); - txtTempoCiclo.Text = rigaOdl.TCAssegnato.ToString("0.00"); - txtPzPallet.Text = rigaOdl.PzPallet.ToString(); - } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs b/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs index 38b289fc..ae035621 100644 --- a/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs +++ b/MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs @@ -7,12 +7,6 @@ namespace MP_ADM.WebUserControls { public partial class mod_newPromessaODL : BaseUserControl { - #region Public Events - - public event EventHandler eh_nuovoValore; - - #endregion Public Events - #region Public Properties /// @@ -83,10 +77,7 @@ namespace MP_ADM.WebUserControls { memLayer.ML.emptySessionVal("idxProm2Clone"); memLayer.ML.emptySessionVal("idxProm2Edit"); - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } + raiseNewVal(); } /// @@ -158,10 +149,7 @@ namespace MP_ADM.WebUserControls memLayer.ML.emptySessionVal("idxProm2Edit"); } // segnalo update - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } + raiseNewVal(); } /// diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index fe9f8301..af400509 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -365,6 +365,7 @@ + Designer diff --git a/MP-LAND/Controllers/HomeController.cs b/MP-LAND/Controllers/HomeController.cs index 3802e0ab..5a6f298b 100644 --- a/MP-LAND/Controllers/HomeController.cs +++ b/MP-LAND/Controllers/HomeController.cs @@ -37,7 +37,9 @@ namespace MP.Controllers } } catch (Exception exc) - { } + { + SteamWare.Logger.Logging.Instance.Error($"Exception on getAKV:{Environment.NewLine}{exc}"); + } } return answ; } @@ -72,8 +74,10 @@ namespace MP.Controllers string currTgt = getAKV(key); answ = $"{currUrl.Scheme}://{currUrl.Authority}/{currTgt}"; } - catch - { } + catch (Exception exc) + { + SteamWare.Logger.Logging.Instance.Error($"Exception on urlTgt:{Environment.NewLine}{exc}"); + } return answ; } @@ -350,6 +354,7 @@ namespace MP.Controllers } catch (Exception exc) { + SteamWare.Logger.Logging.Instance.Error($"Exception on check auth CTRACK:{Environment.NewLine}{exc}"); ViewBag.CTrack_Enb = false; } // fix visibilità MAG @@ -371,6 +376,7 @@ namespace MP.Controllers } catch (Exception exc) { + SteamWare.Logger.Logging.Instance.Error($"Exception on check auth MAG:{Environment.NewLine}{exc}"); ViewBag.MAG_Enb = false; } } diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index df9625d8..aa8dfd2a 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -372,6 +372,7 @@ +