diff --git a/GMW/GMW.suo b/GMW/GMW.suo index a830ca21..27f18df3 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs index ef67d1dc..9fa030bc 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs @@ -134,8 +134,7 @@ namespace GMW.WebUserControls if (!Page.IsPostBack) { traduzione(); - //pnlQta.Visible = false; - //pnlSposta.Visible = false; + azzeraPostUpdate(); } _idxGridView = "UDC2edit"; } diff --git a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx index 1755cb9d..34ead920 100644 --- a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx +++ b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx @@ -1,3 +1,6 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettCelleBlocco.ascx.cs" Inherits="GMW.WebUserControls.mod_dettCelleBlocco" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettCelleBlocco.ascx.cs" + Inherits="GMW.WebUserControls.mod_dettCelleBlocco" %> - \ No newline at end of file + + \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs index 4fdc5b29..d3e98495 100644 --- a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs @@ -163,8 +163,21 @@ namespace GMW.WebUserControls /// private void disegnaTabella() { - tblBlocco.Rows.Clear(); bool tabPresente = tblBlocco.Rows.Count > 0; + if (tabPresente) + { + //foreach (TableRow riga in tblBlocco.Rows) + //{ + // foreach (TableCell cella in riga.Cells) + // { + // foreach (LinkButton lnkb in cella.Controls) + // { + // lnkb.Click -= new EventHandler(lnkb_Click); + // } + // } + //} + tblBlocco.Rows.Clear(); + } // metto prima riga con indicazione valori NUMERICI delle colonne setupRigaConteggioX(); // ciclo nel mio array e creo di conseguenza le celle di tabella @@ -219,7 +232,7 @@ namespace GMW.WebUserControls { eh_selValore(this, new EventArgs()); } - disegnaTabella(); + Response.Redirect("~/DettaglioBlocco.aspx"); } /// /// crea una cella per il numero dei livelli @@ -262,6 +275,17 @@ namespace GMW.WebUserControls // aggiungo riga! tblBlocco.Rows.Add(riga); } + /// + /// resetta disegno + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + memLayer.ML.emptySessionVal("IdxCellaMag"); + memLayer.ML.emptySessionVal("CodCellaMag"); + Response.Redirect("~/DettaglioBlocco.aspx"); + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.designer.cs index b69150df..8fac2de2 100644 --- a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.designer.cs @@ -21,5 +21,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Table tblBlocco; + + /// + /// btnReset control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnReset; } } diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs index f7f09d85..b4faad91 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs @@ -66,6 +66,10 @@ namespace GMW.WebUserControls mod_operazioniUdc1.Visible = false; updateControlli(); } + if (memLayer.ML.isInSessionObject("IdxCellaMag")) + { + mostraOperazioniUdc(); + } } /// /// nascondo dettagli UDC @@ -74,9 +78,11 @@ namespace GMW.WebUserControls /// void mod_operazioniUdc1_eh_hidden(object sender, EventArgs e) { - mod_operazioniUdc1.Visible = false; - mod_dettCelleBlocco1.doUpdate(); - updateControlli(); + //mod_operazioniUdc1.Visible = false; + //mod_dettCelleBlocco1.doUpdate(); + //updateControlli(); + memLayer.ML.emptySessionVal("IdxCellaMag"); + Response.Redirect("~/DettaglioBlocco.aspx"); } /// /// eseguito all'evento update modulo operazioni UDC @@ -85,8 +91,9 @@ namespace GMW.WebUserControls /// void mod_operazioniUdc1_eh_updated(object sender, EventArgs e) { - mod_dettCelleBlocco1.doUpdate(); - mod_operazioniUdc1.doUpdate(); + //mod_dettCelleBlocco1.doUpdate(); + //mod_operazioniUdc1.doUpdate(); + Response.Redirect("~/DettaglioBlocco.aspx"); } /// @@ -95,6 +102,11 @@ namespace GMW.WebUserControls /// /// void mod_dettCelleBlocco1_eh_selValore(object sender, EventArgs e) + { + mostraOperazioniUdc(); + } + + private void mostraOperazioniUdc() { // mostro operazioni mod_operazioniUdc1.Visible = true; diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 9a446839..e7128c1d 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 9a446839..e7128c1d 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index 05a91394..83726586 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ