diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index abec614..6fa9706 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 7ac5b98..a69ea70 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 88aeab6..5ed95aa 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/ExcelExportMtzPrevPending.aspx b/GIM_site/ExcelExportMtzPrevPending.aspx index c5d7740..9ba0891 100644 --- a/GIM_site/ExcelExportMtzPrevPending.aspx +++ b/GIM_site/ExcelExportMtzPrevPending.aspx @@ -28,16 +28,6 @@ - <%-- - - - - - - --%> diff --git a/GIM_site/ExcelExportMtzPrevPending.aspx.cs b/GIM_site/ExcelExportMtzPrevPending.aspx.cs index dea40ab..36197b1 100644 --- a/GIM_site/ExcelExportMtzPrevPending.aspx.cs +++ b/GIM_site/ExcelExportMtzPrevPending.aspx.cs @@ -84,24 +84,8 @@ public partial class ExcelExportMtzPrevPending : System.Web.UI.Page public void aggiornamento() { grView.AllowPaging = false; - checkFixOds(); ods.DataBind(); grView.DataBind(); } - - /// - /// sistemo filtraggio con valori selezionati - /// - private void checkFixOds() - { - //ods.FilterExpression = "( (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') )"; - //if (memLayer.ML.isInSessionObject("idxTipo_filt")) - //{ - // ods.FilterExpression += " AND (idxTipo = {1})"; - //} - //if (memLayer.ML.isInSessionObject("idxMacchina_filt")) - //{ - // ods.FilterExpression += " AND (idxMacchina = {2})"; - //} - } + } diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 7ac5b98..a69ea70 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache index 8b67425..9a62747 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ