diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 61de834..7c1b73c 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 a32aac8..8193dcb 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_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache index c448cfc..690b10a 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll index d7ce6a5..7c1b73c 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll and b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index 89f1748..2c37e68 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -116,27 +116,16 @@ - + - - - - <%-- - --%> + + + - - + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index db8dcde..7b8b063 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -173,6 +173,10 @@ public partial class mod_elencoRichieste : ApplicationUserControl protected override void OnInit(EventArgs e) { base.OnInit(e); + if(!Page.IsPostBack) + { + doUpdate(); + } _idxGridView = "numIntMtz"; mod_periodoAnalisi1.eh_doUpdate += new EventHandler(mod_periodoAnalisi1_eh_doUpdate); } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs index eb7aac2..75a0ac6 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs @@ -5,7 +5,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; -public partial class WebUserControls_mod_filtraMtzProg : ApplicationUserControl +public partial class WebUserControls_mod_filtraMtzProg : SteamWare.UserControl { /// /// evento che segnala la disponibilità di un nuovo stato di filtraggio salvato in sessione... @@ -18,27 +18,45 @@ public partial class WebUserControls_mod_filtraMtzProg : ApplicationUserControl /// /// inizializzazione valori di default /// + /// /// - protected override void OnInit(EventArgs e) + protected void Page_Load(object sender, EventArgs e) { - base.OnInit(e); _idxGridView = "idxIntPro"; if (!Page.IsPostBack) { - mod_filtroImpianto.ods = odsImpianti; - mod_filtroImpianto.txtMostraTutti = traduci("MostraTuttiImpianti"); - mod_filtroImpianto.txtMostraSoloSelez= traduci("SelezionaImpianti"); - mod_filtroMacchina.ods = odsMacchine; - mod_filtroMacchina.txtMostraTutti = traduci("MostraTuttiMacchine"); - mod_filtroMacchina.txtMostraSoloSelez = traduci("SelezionaMacchine"); - mod_filtroTipo.ods = odsTipo; - mod_filtroTipo.txtMostraTutti = traduci("MostraTuttiTipo"); - mod_filtroTipo.txtMostraSoloSelez = traduci("SelezionaTipo"); + fixOds(); + checkSelVal(); } mod_filtroTipo.eh_selValore += new EventHandler(mod_filtroTipo_eh_selValore); mod_filtroMacchina.eh_selValore += new EventHandler(mod_filtroMacchina_eh_selValore); mod_filtroImpianto.eh_selValore += new EventHandler(mod_filtroImpianto_eh_selValore); } + /// + /// verifica se sia possibile preimpostare i valori filtrati... + /// + private void checkSelVal() + { + if(memLayer.ML.isInSessionObject("idxMacchina_filt")) + { + mod_filtroMacchina.Visible = true; + } + } + /// + /// imposta ODS dei controlli + /// + private void fixOds() + { + mod_filtroImpianto.ods = odsImpianti; + mod_filtroImpianto.txtMostraTutti = traduci("MostraTuttiImpianti"); + mod_filtroImpianto.txtMostraSoloSelez = traduci("SelezionaImpianti"); + mod_filtroMacchina.ods = odsMacchine; + mod_filtroMacchina.txtMostraTutti = traduci("MostraTuttiMacchine"); + mod_filtroMacchina.txtMostraSoloSelez = traduci("SelezionaMacchine"); + mod_filtroTipo.ods = odsTipo; + mod_filtroTipo.txtMostraTutti = traduci("MostraTuttiTipo"); + mod_filtroTipo.txtMostraSoloSelez = traduci("SelezionaTipo"); + } void mod_filtroImpianto_eh_selValore(object sender, EventArgs e) { diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 61de834..7c1b73c 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 d13f4b0..b6c3dbc 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 a32aac8..8193dcb 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/packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg new file mode 100644 index 0000000..d6b9f38 Binary files /dev/null and b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg differ diff --git a/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform new file mode 100644 index 0000000..5b1b95d --- /dev/null +++ b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll new file mode 100644 index 0000000..378c0f2 Binary files /dev/null and b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll differ diff --git a/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/readme.txt b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/readme.txt new file mode 100644 index 0000000..a1156d2 --- /dev/null +++ b/Projects/WebGIM/packages/AjaxControlToolkit.15.1.3.0/readme.txt @@ -0,0 +1,23 @@ +You have downloaded the ASP.NET AJAX Control Toolkit v15.1.3 nuget package. + +To learn more about this release, please read this post: +https://community.devexpress.com/blogs/aspnet/archive/2015/05/21/asp-net-ajax-control-toolkit-v15-1-2-nuget-bug-fixes-and-more.aspx + + +Getting Started +--------------- +Please see https://www.devexpress.com/go/AjaxControlToolkit_Nuget_TextFile_CodePlex.aspx for more information on using AjaxControlToolkit. + + +Upgrading from earlier version +------------------------------ +Please see https://ajaxcontroltoolkit.codeplex.com/wikipage?title=Upgrade%20your%20project%20to%20AjaxControlToolkit%20v15.1 for more information on how to +upgrade to version 15.1 + + +Maintained by DevExpress +------------------------ + +The ASP.NET AJAX Control Toolkit is now maintained by DevExpress. + +Visit http://devexpress.com/ms-act for more information. diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg new file mode 100644 index 0000000..0e22af9 Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll new file mode 100644 index 0000000..7a7975a Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll new file mode 100644 index 0000000..cada03b Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll new file mode 100644 index 0000000..9c15262 Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll new file mode 100644 index 0000000..cada03b Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets new file mode 100644 index 0000000..ac26647 --- /dev/null +++ b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets @@ -0,0 +1,38 @@ + + + + + + + + + + + $(ProjectDir)Content\ + $(ProjectDir) + + + false + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll new file mode 100644 index 0000000..835aaff Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll new file mode 100644 index 0000000..9c15262 Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll differ diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets new file mode 100644 index 0000000..ac26647 --- /dev/null +++ b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets @@ -0,0 +1,38 @@ + + + + + + + + + + + $(ProjectDir)Content\ + $(ProjectDir) + + + false + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll new file mode 100644 index 0000000..6f33e70 Binary files /dev/null and b/Projects/WebGIM/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll differ