diff --git a/C2P/WebUserControls/mod_PackageMan.ascx b/C2P/WebUserControls/mod_PackageMan.ascx index 3377e67..3c3b4b1 100644 --- a/C2P/WebUserControls/mod_PackageMan.ascx +++ b/C2P/WebUserControls/mod_PackageMan.ascx @@ -1,41 +1,35 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_PackageMan.ascx.cs" Inherits="C2P.WebUserControls.mod_PackageMan" %>
- - + <%: traduci("btnNewRawMat") %> +
- + - - <%: traduci("Reset") %> - - <%----%> - + - - - - - - - - + + + + + + + + - + @@ -44,10 +38,7 @@ - + diff --git a/C2P/WebUserControls/mod_PackageMan.ascx.cs b/C2P/WebUserControls/mod_PackageMan.ascx.cs index 0392a1f..bf5733a 100644 --- a/C2P/WebUserControls/mod_PackageMan.ascx.cs +++ b/C2P/WebUserControls/mod_PackageMan.ascx.cs @@ -12,16 +12,6 @@ namespace C2P.WebUserControls { public partial class mod_PackageMan : SteamWare.UserControl { - - #region gestione eventi - - public event EventHandler eh_selezioneValore; - public event EventHandler eh_resetSelezione; - - #endregion - - #region protected - /// /// caricamento pagina /// @@ -29,8 +19,7 @@ namespace C2P.WebUserControls { if (!Page.IsPostBack) { - btnNewRawMat.Text = user_std.UtSn.Traduci("btnNewRawMat"); - txtRawMat.Text = ""; + txtNewVal.Text = ""; } } @@ -39,23 +28,23 @@ namespace C2P.WebUserControls /// /// /// - protected void btnNewRawMat_Click(object sender, EventArgs e) + protected void lbtNew_Click(object sender, EventArgs e) { - creaNuovoRawMat(); + creaNuovo(); } /// /// creazione nuovo lemma /// - private void creaNuovoRawMat() + private void creaNuovo() { - if (txtRawMat.Text != "") + if (txtNewVal.Text != "") { // inserisco - DtProxy.man.taRMD.insertQuery(txtRawMat.Text.Trim()); + DtProxy.man.taRMD.insertQuery(txtNewVal.Text.Trim()); // metto in campo ricerca... - memLayer.ML.setSessionVal("valoreCercato", txtRawMat.Text.Trim()); + memLayer.ML.setSessionVal("valoreCercato", txtNewVal.Text.Trim()); // svuoto campo text - txtRawMat.Text = ""; + txtNewVal.Text = ""; // riparto... Response.Redirect(user_std.pagCorrente); } @@ -75,7 +64,11 @@ namespace C2P.WebUserControls grView.PageSize = value; } } - + /// + /// post bind grView + /// + /// + /// protected void grView_DataBound(object sender, EventArgs e) { if (grView.Rows.Count > 0) @@ -100,69 +93,24 @@ namespace C2P.WebUserControls lblNumRec.Text = ""; } } - - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } - - protected void grView_SelectedIndexChanged(object sender, EventArgs e) - { - selezionatoValore(); - } - - private void selezionatoValore() - { -#if false - SteamWare.memLayer.ML.setSessionVal("lemma_sel", grView.SelectedDataKey.Values[1]); - if (eh_selezioneValore != null) - { - eh_selezioneValore(this, new EventArgs()); - } -#endif - } - + /// + /// editing riga + /// + /// + /// protected void grView_RowEditing(object sender, GridViewEditEventArgs e) { // seleziono la riga corrente... grView.SelectedIndex = e.NewEditIndex; - selezionatoValore(); } - protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e) - { - DataWrap.DW.resetVocabolario(); - selezionatoValore(); - } - - #endregion - - #region area public - /// /// resetta la selezione dei valori in caso di modifiche su altri controlli /// public void resetSelezione() { -#if false - SteamWare.memLayer.ML.emptySessionVal("lemma_sel"); -#endif grView.SelectedIndex = -1; grView.DataBind(); - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } - } - - #endregion - - protected void ods_Inserted(object sender, ObjectDataSourceStatusEventArgs e) - { -#if false - DataWrap.DW.resetVocabolario(); - selezionatoValore(); -#endif } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_PackageMan.ascx.designer.cs b/C2P/WebUserControls/mod_PackageMan.ascx.designer.cs index 4fb26c3..929532e 100644 --- a/C2P/WebUserControls/mod_PackageMan.ascx.designer.cs +++ b/C2P/WebUserControls/mod_PackageMan.ascx.designer.cs @@ -13,22 +13,22 @@ namespace C2P.WebUserControls { public partial class mod_PackageMan { /// - /// btnNewRawMat control. + /// lbtNew control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button btnNewRawMat; + protected global::System.Web.UI.WebControls.LinkButton lbtNew; /// - /// txtRawMat control. + /// txtNewVal control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtRawMat; + protected global::System.Web.UI.WebControls.TextBox txtNewVal; /// /// grView control. diff --git a/C2P/WebUserControls/mod_RawMatMan.ascx b/C2P/WebUserControls/mod_RawMatMan.ascx index 68ed984..9efe39f 100644 --- a/C2P/WebUserControls/mod_RawMatMan.ascx +++ b/C2P/WebUserControls/mod_RawMatMan.ascx @@ -1,41 +1,35 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_RawMatMan.ascx.cs" Inherits="C2P.WebUserControls.mod_RawMatMan" %>
- - + <%: traduci("btnNewRawMat") %> +
- + - - <%: traduci("Reset") %> - - <%----%> - + - - - - - - - - + + + + + + + + - + @@ -44,10 +38,7 @@ - + diff --git a/C2P/WebUserControls/mod_RawMatMan.ascx.cs b/C2P/WebUserControls/mod_RawMatMan.ascx.cs index 9d0c900..0cb315f 100644 --- a/C2P/WebUserControls/mod_RawMatMan.ascx.cs +++ b/C2P/WebUserControls/mod_RawMatMan.ascx.cs @@ -11,16 +11,6 @@ namespace C2P.WebUserControls { public partial class mod_RawMatMan : SteamWare.UserControl { - - #region gestione eventi - - public event EventHandler eh_selezioneValore; - public event EventHandler eh_resetSelezione; - - #endregion - - #region protected - /// /// caricamento pagina /// @@ -28,8 +18,7 @@ namespace C2P.WebUserControls { if (!Page.IsPostBack) { - btnNewRawMat.Text = user_std.UtSn.Traduci("btnNewRawMat"); - txtRawMat.Text = ""; + txtNewVal.Text = ""; } } @@ -38,23 +27,23 @@ namespace C2P.WebUserControls ///
/// /// - protected void btnNewRawMat_Click(object sender, EventArgs e) + protected void lbtNew_Click(object sender, EventArgs e) { - creaNuovoRawMat(); + creaNuovo(); } /// /// creazione nuovo lemma /// - private void creaNuovoRawMat() + private void creaNuovo() { - if (txtRawMat.Text != "") + if (txtNewVal.Text != "") { // inserisco - DtProxy.man.taRMD.insertQuery(txtRawMat.Text.Trim()); + DtProxy.man.taRMD.insertQuery(txtNewVal.Text.Trim()); // metto in campo ricerca... - memLayer.ML.setSessionVal("valoreCercato", txtRawMat.Text.Trim()); + memLayer.ML.setSessionVal("valoreCercato", txtNewVal.Text.Trim()); // svuoto campo text - txtRawMat.Text = ""; + txtNewVal.Text = ""; // riparto... Response.Redirect(user_std.pagCorrente); } @@ -74,7 +63,11 @@ namespace C2P.WebUserControls grView.PageSize = value; } } - + /// + /// post bind grView + /// + /// + /// protected void grView_DataBound(object sender, EventArgs e) { if (grView.Rows.Count > 0) @@ -99,69 +92,25 @@ namespace C2P.WebUserControls lblNumRec.Text = ""; } } - - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } - - protected void grView_SelectedIndexChanged(object sender, EventArgs e) - { - selezionatoValore(); - } - - private void selezionatoValore() - { -#if false - SteamWare.memLayer.ML.setSessionVal("lemma_sel", grView.SelectedDataKey.Values[1]); - if (eh_selezioneValore != null) - { - eh_selezioneValore(this, new EventArgs()); - } -#endif - } - + /// + /// editing riga + /// + /// + /// protected void grView_RowEditing(object sender, GridViewEditEventArgs e) { // seleziono la riga corrente... grView.SelectedIndex = e.NewEditIndex; - selezionatoValore(); } - - protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e) - { - DataWrap.DW.resetVocabolario(); - selezionatoValore(); - } - - #endregion - - #region area public - + /// /// resetta la selezione dei valori in caso di modifiche su altri controlli /// public void resetSelezione() { -#if false - SteamWare.memLayer.ML.emptySessionVal("lemma_sel"); -#endif grView.SelectedIndex = -1; grView.DataBind(); - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } - } - - #endregion - - protected void ods_Inserted(object sender, ObjectDataSourceStatusEventArgs e) - { -#if false - DataWrap.DW.resetVocabolario(); - selezionatoValore(); -#endif } + } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_RawMatMan.ascx.designer.cs b/C2P/WebUserControls/mod_RawMatMan.ascx.designer.cs index 9a05eee..f957db2 100644 --- a/C2P/WebUserControls/mod_RawMatMan.ascx.designer.cs +++ b/C2P/WebUserControls/mod_RawMatMan.ascx.designer.cs @@ -13,22 +13,22 @@ namespace C2P.WebUserControls { public partial class mod_RawMatMan { /// - /// btnNewRawMat control. + /// lbtNew control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button btnNewRawMat; + protected global::System.Web.UI.WebControls.LinkButton lbtNew; /// - /// txtRawMat control. + /// txtNewVal control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtRawMat; + protected global::System.Web.UI.WebControls.TextBox txtNewVal; /// /// grView control. diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 6ea46f4..6202d78 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 023d77f..404546b 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 5892f25..ebfc6dd 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 023d77f..404546b 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index b56b8f8..9b8671e 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 5892f25..ebfc6dd 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ