diff --git a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll index 3ad1900..29ef77d 100644 Binary files a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll and b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll differ diff --git a/GIM_dataLayer/bin/Release/SteamWare.dll b/GIM_dataLayer/bin/Release/SteamWare.dll index 3dbfeb4..f5ab401 100644 Binary files a/GIM_dataLayer/bin/Release/SteamWare.dll and b/GIM_dataLayer/bin/Release/SteamWare.dll differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache index b4503a8..aaff0c9 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache and b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll index 3ad1900..29ef77d 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll and b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll differ diff --git a/GIM_site/Reports/WebGIM_PivotExcel.xlsx b/GIM_site/Reports/WebGIM_PivotExcel.xlsx index 6350e35..9659965 100644 Binary files a/GIM_site/Reports/WebGIM_PivotExcel.xlsx and b/GIM_site/Reports/WebGIM_PivotExcel.xlsx differ diff --git a/GIM_site/Reports/WebGIM_PowerPivot.xlsx b/GIM_site/Reports/WebGIM_PowerPivot.xlsx index 0e8288b..fbda89f 100644 Binary files a/GIM_site/Reports/WebGIM_PowerPivot.xlsx and b/GIM_site/Reports/WebGIM_PowerPivot.xlsx differ diff --git a/GIM_site/WebUserControls/mod_reportInterventi.ascx b/GIM_site/WebUserControls/mod_reportInterventi.ascx index 4ec36c4..cbe242c 100644 --- a/GIM_site/WebUserControls/mod_reportInterventi.ascx +++ b/GIM_site/WebUserControls/mod_reportInterventi.ascx @@ -18,10 +18,7 @@
- + @@ -40,10 +37,7 @@
- + @@ -70,9 +64,12 @@
+
+ +
-
+
diff --git a/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs b/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs index c916a45..e718bbb 100644 --- a/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs +++ b/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs @@ -227,6 +227,17 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl #endregion + /// + /// salva filtro impianti/macchine + /// + /// + /// + protected void btnSaveFiltro_Click(object sender, EventArgs e) + { + generaFiltroImpianti(); + generaFiltroMacchine(); + } + #region checkbox /// /// evento check mtz pre @@ -261,7 +272,7 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl } } + #endregion - } diff --git a/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs b/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs index f9b87a9..9f64109 100644 --- a/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs +++ b/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs @@ -137,6 +137,15 @@ public partial class mod_reportInterventi { /// protected global::System.Web.UI.WebControls.CheckBox chkShowMtzPrev; + /// + /// btnSaveFiltro control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSaveFiltro; + /// /// lblReportInterventi control. /// diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 8d2aae9..f5ab401 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 39d089a..488f4a0 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 6853d57..ca9a692 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ