diff --git a/GMW/GMW/WebUserControls/mod_anagMagazzini.ascx.cs b/GMW/GMW/WebUserControls/mod_anagMagazzini.ascx.cs index c29ab7de..70cba3a4 100644 --- a/GMW/GMW/WebUserControls/mod_anagMagazzini.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_anagMagazzini.ascx.cs @@ -306,8 +306,6 @@ namespace GMW.WebUserControls DataColumnCollection colonne = tabella.Columns; return colonne; } -#if false - /// /// inizializzazione valori di default /// @@ -315,29 +313,9 @@ namespace GMW.WebUserControls protected override void OnInit(EventArgs e) { base.OnInit(e); - _idxGridView = "idxMaker"; - _tabCache = "tabMaker"; + _idxGridView = "CodMag"; + //_tabCache = "tabMaker"; } - /// - /// setta selected alla riga il cui valore key è in session - /// - /// - /// - protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) - { - // se riga di dati... - if (e.Row.RowType == DataControlRowType.DataRow) - { - // ottengo la riga tipizzata... - System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem; - GTD_data.DS_applicazione.AnagMakerRow riga = (GTD_data.DS_applicazione.AnagMakerRow)_drv.Row; - if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.idxMaker.ToString()) - { - grView.SelectedIndex = e.Row.RowIndex; - } - } - } -#endif /// /// svuoto da cache post update /// @@ -349,7 +327,6 @@ namespace GMW.WebUserControls //SteamWare.memLayer.ML.emptyCacheVal("_tabAnagMaker"); //SteamWare.memLayer.ML.emptyCacheVal("_tabSelMakers"); } - /// /// determina se sia eliminabile il record (=non usato) /// @@ -365,12 +342,11 @@ namespace GMW.WebUserControls if (MagClass.magazzino.taMappe.getByCodMag(memLayer.ML.StringSessionObj("CodCS"), idxObj.ToString()).Rows.Count > 0) { answ = false; - } + } } return answ; } - #endregion } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_anagMappe.ascx.cs b/GMW/GMW/WebUserControls/mod_anagMappe.ascx.cs index 27b38bce..48c0347b 100644 --- a/GMW/GMW/WebUserControls/mod_anagMappe.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_anagMappe.ascx.cs @@ -313,18 +313,31 @@ namespace GMW.WebUserControls protected override void OnInit(EventArgs e) { base.OnInit(e); + _idxGridView = "IdxMappa"; Mod_filtro1.eh_selValore += new EventHandler(Mod_filtro1_eh_selValore); if (!Page.IsPostBack) { Mod_filtro1.ods = odsFiltro; } + // se ho in cache il valore del CodMag applico filtro... + if (memLayer.ML.isInSessionObject("CodMag_sel")) + { + Mod_filtro1.valore = memLayer.ML.StringSessionObj("CodMag_sel"); + fixCheckOds(); + } } - + /// + /// evento selezione valore su filtro + /// + /// + /// void Mod_filtro1_eh_selValore(object sender, EventArgs e) { fixCheckOds(); } - + /// + /// aggiorna l'ods da filtraggio attivo + /// private void fixCheckOds() { if (Mod_filtro1.valore == "*") @@ -336,8 +349,6 @@ namespace GMW.WebUserControls ods.FilterExpression = "(CodMag LIKE '%{0}%' OR DescMappa LIKE '%{0}%' ) AND CodMag = '{1}'"; } } - - /// /// setta selected alla riga il cui valore key è in session /// @@ -345,20 +356,17 @@ namespace GMW.WebUserControls /// protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) { -#if false // se riga di dati... if (e.Row.RowType == DataControlRowType.DataRow) { // ottengo la riga tipizzata... System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem; - GTD_data.DS_applicazione.AnagMakerRow riga = (GTD_data.DS_applicazione.AnagMakerRow)_drv.Row; - if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.idxMaker.ToString()) + GMW_data.DS_magazzino.MappeRow riga = (GMW_data.DS_magazzino.MappeRow)_drv.Row; + if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.IdxMappa.ToString()) { grView.SelectedIndex = e.Row.RowIndex; } } -#endif - } /// /// svuoto da cache post update @@ -371,7 +379,6 @@ namespace GMW.WebUserControls //SteamWare.memLayer.ML.emptyCacheVal("_tabAnagMaker"); //SteamWare.memLayer.ML.emptyCacheVal("_tabSelMakers"); } - /// /// determina se sia eliminabile il record (=non usato) /// diff --git a/GMW/GMW/anagMagazzini.aspx.cs b/GMW/GMW/anagMagazzini.aspx.cs index 6789831f..2b2615ab 100644 --- a/GMW/GMW/anagMagazzini.aspx.cs +++ b/GMW/GMW/anagMagazzini.aspx.cs @@ -11,7 +11,12 @@ namespace GMW { protected void Page_Load(object sender, EventArgs e) { + mod_anagMagazzini1.eh_selValore += new EventHandler(mod_anagMagazzini1_eh_selValore); + } + void mod_anagMagazzini1_eh_selValore(object sender, EventArgs e) + { + Response.Redirect("anagMappe.aspx"); } } } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 8d5eef25..669a2d80 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 8d5eef25..669a2d80 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ