diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 6c5e01a..93772a6 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index c420178..b2dc936 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/Bootstrap.Master.cs b/Projects/WebGIM/GIM_site/Bootstrap.Master.cs index 7b54354..1aa8a85 100644 --- a/Projects/WebGIM/GIM_site/Bootstrap.Master.cs +++ b/Projects/WebGIM/GIM_site/Bootstrap.Master.cs @@ -10,6 +10,7 @@ namespace GIM_site { public partial class Bootstrap : System.Web.UI.MasterPage { + public event EventHandler eh_Search_Submit; protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -18,7 +19,17 @@ namespace GIM_site setTimer(); updateLabels(); } + mod_testata.eh_nuovaRicerca += Mod_testata_eh_nuovaRicerca; } + + private void Mod_testata_eh_nuovaRicerca(object sender, EventArgs e) + { + if (eh_Search_Submit != null) + { + eh_Search_Submit(this, new EventArgs()); + } + } + /// /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada /// diff --git a/Projects/WebGIM/GIM_site/FullPage.master.cs b/Projects/WebGIM/GIM_site/FullPage.master.cs index bba9014..9ab9ab9 100644 --- a/Projects/WebGIM/GIM_site/FullPage.master.cs +++ b/Projects/WebGIM/GIM_site/FullPage.master.cs @@ -10,6 +10,7 @@ namespace GIM_site { public partial class FullPage : System.Web.UI.MasterPage { + public event EventHandler eh_Search_Submit; protected void Page_Load(object sender, EventArgs e) { } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs index a67ec22..9b655d4 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.cs @@ -198,6 +198,11 @@ namespace GIM_site.WebUserControls { // salvo in sessione memLayer.ML.setSessionVal("valoreCercato", txtSearch.Text.Trim()); + // raise dell'evento + if (eh_nuovaRicerca != null) + { + eh_nuovaRicerca(this, new EventArgs()); + } } /// /// valore ricerca @@ -214,5 +219,7 @@ namespace GIM_site.WebUserControls memLayer.ML.setSessionVal("valoreCercato", value); } } + + public event EventHandler eh_nuovaRicerca; } } \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 6c5e01a..93772a6 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index e8c4c9a..442aa03 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/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index c420178..b2dc936 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index e0df17a..03507de 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/magRic.aspx b/Projects/WebGIM/GIM_site/magRic.aspx index d119b36..fd287d3 100644 --- a/Projects/WebGIM/GIM_site/magRic.aspx +++ b/Projects/WebGIM/GIM_site/magRic.aspx @@ -1,5 +1,23 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" CodeBehind="magRic.aspx.cs" Inherits="GIM_site.magRic" %> -<%@ Register src="WebUserControls/mod_magRic.ascx" tagname="mod_magRic" tagprefix="uc1" %> - - +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="magRic.aspx.cs" Inherits="GIM_site.magRic" %> + +<%@ Register Src="WebUserControls/mod_magRic.ascx" TagName="mod_magRic" TagPrefix="uc1" %> + + + + + +
+
+
+
+

<%: traduci("ADV_MTZ_MagRicLong") %>

+
+
+
+ +
+
+
+
+ diff --git a/Projects/WebGIM/GIM_site/magRic.aspx.cs b/Projects/WebGIM/GIM_site/magRic.aspx.cs index 1efbc5a..3adc073 100644 --- a/Projects/WebGIM/GIM_site/magRic.aspx.cs +++ b/Projects/WebGIM/GIM_site/magRic.aspx.cs @@ -4,10 +4,11 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GIM_site { - public partial class magRic : System.Web.UI.Page + public partial class magRic : UserPage { protected void Page_Load(object sender, EventArgs e) { diff --git a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll index e0df17a..03507de 100644 Binary files a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll differ