diff --git a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip index b6547b3..f6d943a 100644 Binary files a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index d3274ac..69a9d70 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -1447,7 +1447,7 @@ False True - 51111 + 59788 / http://localhost/GIM_site False diff --git a/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config b/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config index ac4847e..b270d58 100644 --- a/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config +++ b/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config @@ -28,7 +28,7 @@ value="../ExportPdf.aspx?tipo={0}&idx={1}" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs index 4c3de9b..7f1a24e 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master.cs @@ -23,6 +23,17 @@ public partial class AjaxSearch : System.Web.UI.MasterPage base.OnInit(e); Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); + Mod_ricercaGenerica1.eh_nuovaRicerca += Mod_ricercaGenerica1_eh_nuovaRicerca; + } + + public event EventHandler eh_Search_Submit; + + public void Mod_ricercaGenerica1_eh_nuovaRicerca(object sender, EventArgs e) + { + if (eh_Search_Submit != null) + { + eh_Search_Submit(this, new EventArgs()); + } } void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 7d7c4f0..3a58e98 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -144,6 +144,8 @@ public partial class mod_elencoRichieste : ApplicationUserControl /// public void doUpdate() { + fixBtnCheck(); + checkFixOds(); resetSelezione(); } @@ -349,6 +351,11 @@ public partial class mod_elencoRichieste : ApplicationUserControl protected void chkMostraIntChiusi_CheckedChanged(object sender, EventArgs e) { checkFixOds(); + fixBtnCheck(); + } + + private void fixBtnCheck() + { if (chkMostraIntChiusi.Checked == false) { chkMostraIntChiusi.Text = traduci("chkMostraIntChiusi_mostra"); diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx index 2ed4236..aea4d42 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx @@ -1,4 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuTop" CodeBehind="mod_menuTop.ascx.cs" %> + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs index 45ef02b..31cec1b 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs @@ -76,6 +76,7 @@ public partial class mod_ricercaGenerica : ApplicationUserControl protected void salvaCerca() { + SteamWare.memLayer.ML.setSessionVal("valoreCercatoPrev", SteamWare.memLayer.ML.StringSessionObj("valoreCercato")); if (testoRicerca == "") { SteamWare.memLayer.ML.emptySessionVal("valoreCercato"); diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 39c7da6..2a466af 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs b/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs index 896d30a..d8db0fa 100644 --- a/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs +++ b/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs @@ -9,6 +9,12 @@ public partial class elencoRichieste : System.Web.UI.Page protected void Page_Load(object sender, EventArgs e) { mod_elencoRichieste1.eh_selValore += new EventHandler(mod_elencoRichieste1_eh_selValore); + ((AjaxSearch)Master).eh_Search_Submit += elencoRichieste_eh_Search_Submit; + } + + void elencoRichieste_eh_Search_Submit(object sender, EventArgs e) + { + mod_elencoRichieste1.doUpdate(); } /// /// selezione effettuata, mostro dettaglio @@ -19,4 +25,6 @@ public partial class elencoRichieste : System.Web.UI.Page { Response.Redirect("dettaglioIntervento.aspx"); } + + } diff --git a/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache b/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache index 4a93ac8..eff345f 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache and b/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll index 39c7da6..2a466af 100644 Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll differ