diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index 6fa9706..2f2973a 100644 Binary files a/GIM_data/bin/GIM_data.dll and b/GIM_data/bin/GIM_data.dll differ diff --git a/GIM_data/bin/SteamWare.dll b/GIM_data/bin/SteamWare.dll index a69ea70..533ceab 100644 Binary files a/GIM_data/bin/SteamWare.dll and b/GIM_data/bin/SteamWare.dll differ diff --git a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache index 5ed95aa..0340a1d 100644 Binary files a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache and b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache differ diff --git a/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/GIM_site/WebUserControls/mod_elencoRichieste.ascx index f3c02da..ca256eb 100644 --- a/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -2,26 +2,26 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc1" %> -
-
- -
-
- - - - - - - - -
-
- +<%--
--%> +
+
+
+ +
+
+ + + + + + + + +
-
+
diff --git a/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 329c40d..edd6ed0 100644 --- a/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -177,7 +177,6 @@ public partial class mod_elencoRichieste : ApplicationUserControl doUpdate(); } _idxGridView = "numIntMtz"; - mod_periodoAnalisi1.eh_doUpdate += new EventHandler(mod_periodoAnalisi1_eh_doUpdate); hfValoreCercato.Value = memLayer.ML.StringSessionObj("valoreCercato"); ((GIM_site.FullPage)this.Page.Master).eh_Search_Submit += Mod_magRic_eh_Search_Submit; } @@ -186,11 +185,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl { hfValoreCercato.Value = memLayer.ML.StringSessionObj("valoreCercato"); } - - void mod_periodoAnalisi1_eh_doUpdate(object sender, EventArgs e) - { - checkFixOds(); - } + /// /// setta selected alla riga il cui valore key รจ in session /// diff --git a/GIM_site/WebUserControls/mod_elencoRichieste.ascx.designer.cs b/GIM_site/WebUserControls/mod_elencoRichieste.ascx.designer.cs index 91968c0..307ffa2 100644 --- a/GIM_site/WebUserControls/mod_elencoRichieste.ascx.designer.cs +++ b/GIM_site/WebUserControls/mod_elencoRichieste.ascx.designer.cs @@ -38,15 +38,6 @@ public partial class mod_elencoRichieste { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsAmbito; - /// - /// mod_periodoAnalisi1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_periodoAnalisi mod_periodoAnalisi1; - /// /// grView control. /// diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index a69ea70..533ceab 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/elencoRichieste.aspx.cs b/GIM_site/elencoRichieste.aspx.cs index f784584..0e54d75 100644 --- a/GIM_site/elencoRichieste.aspx.cs +++ b/GIM_site/elencoRichieste.aspx.cs @@ -9,8 +9,12 @@ public partial class elencoRichieste : UserPage { protected void Page_Load(object sender, EventArgs e) { - mod_filtraMtzProg.showPeriodo = false; - //mod_filtraMtzProg.periodo = datario.periodo.all; + if (!Page.IsPostBack) + { + mod_filtraMtzProg.showPeriodo = true; + mod_filtraMtzProg.periodo = datario.periodo.past; + } + mod_filtraMtzProg.eh_newFiltroSel += new EventHandler(mod_filtraMtzProg1_eh_newFiltroSel); mod_elencoRichieste1.eh_selValore += new EventHandler(mod_elencoRichieste1_eh_selValore); ((GIM_site.FullPage)Master).eh_Search_Submit += elencoRichieste_eh_Search_Submit; diff --git a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache index 9a62747..6fdb93b 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ