diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip index 51d9a17..1221614 100644 Binary files a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 800bffe..9d4f41d 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 ae281b6..a513f40 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/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 3b9e9e5..bf80902 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -397,7 +397,6 @@ public partial class mod_elencoRichieste : ApplicationUserControl break; case "All": default: - //ods.FilterExpression = ""; break; } if (!chkMostraIntChiusi.Checked) @@ -417,45 +416,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl { addToOdsFilter("(idxMacchina = {2})"); } - -#if false - // controllo SE il ddl indica TUTTI gli interventi, solo Mtz Prog o Mtz Prog Esclusa - switch (ddlFiltAmbito.SelectedValue) - { - case "MtzPre": - ods.FilterExpression = "(idxAmbito = 7)"; - break; - case "NoMtzPre": - ods.FilterExpression = "(idxAmbito <> 7)"; - break; - case "All": - default: - ods.FilterExpression = ""; - break; - } - if (!chkMostraIntChiusi.Checked) - { - if (ods.FilterExpression != "") - { - - ods.FilterExpression += " AND "; - } - ods.FilterExpression += "(idxStato < 3)"; - } - - if (memLayer.ML.isInSessionObject("idxTipo_filt")) - { - ods.FilterExpression += " AND (idxTipo = {1})"; - } - if (memLayer.ML.isInSessionObject("idxImpianto_filt")) - { - ods.FilterExpression += " AND (idxImpianto = {2})"; - } - if (memLayer.ML.isInSessionObject("idxMacchina_filt")) - { - ods.FilterExpression += " AND (idxMacchina = {3})"; - } -#endif + // bind dati! ods.DataBind(); } diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 800bffe..9d4f41d 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 0fbe619..298599f 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 ae281b6..a513f40 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ