diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index 238e578..abec614 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 5b10de5..7ac5b98 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 16e64c2..88aeab6 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 9fb7564..c5d7740 100644 --- a/GIM_site/ExcelExportMtzPrevPending.aspx +++ b/GIM_site/ExcelExportMtzPrevPending.aspx @@ -28,7 +28,7 @@ - @@ -37,7 +37,17 @@ - + --%> + + + + + + + + + + diff --git a/GIM_site/ExcelExportMtzPrevPending.aspx.cs b/GIM_site/ExcelExportMtzPrevPending.aspx.cs index 70b6116..dea40ab 100644 --- a/GIM_site/ExcelExportMtzPrevPending.aspx.cs +++ b/GIM_site/ExcelExportMtzPrevPending.aspx.cs @@ -94,14 +94,14 @@ public partial class ExcelExportMtzPrevPending : System.Web.UI.Page /// 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})"; - } + //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/WebUserControls/mod_mtzPrevPending.ascx b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx index 9c8cd29..a949a4d 100644 --- a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx +++ b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx @@ -14,7 +14,7 @@ - +
@@ -22,7 +22,7 @@
- +
@@ -37,8 +37,7 @@
- + diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 5b10de5..7ac5b98 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/imagecache/07/0f61c44b1366d2cf3ee4e178238a0f941ad669ed8cfb603e75ad89705150cb3e.png b/GIM_site/imagecache/07/0f61c44b1366d2cf3ee4e178238a0f941ad669ed8cfb603e75ad89705150cb3e.png new file mode 100644 index 0000000..2c052ed Binary files /dev/null and b/GIM_site/imagecache/07/0f61c44b1366d2cf3ee4e178238a0f941ad669ed8cfb603e75ad89705150cb3e.png differ diff --git a/GIM_site/imagecache/1d/a4065a691219d4a1071b317ccf5e7f3b26a3e47bc7bd3991c15ddba9fcf972ef.png b/GIM_site/imagecache/1d/a4065a691219d4a1071b317ccf5e7f3b26a3e47bc7bd3991c15ddba9fcf972ef.png new file mode 100644 index 0000000..3da84f0 Binary files /dev/null and b/GIM_site/imagecache/1d/a4065a691219d4a1071b317ccf5e7f3b26a3e47bc7bd3991c15ddba9fcf972ef.png differ diff --git a/GIM_site/mtzProg.aspx b/GIM_site/mtzProg.aspx index f2802f1..67d10f2 100644 --- a/GIM_site/mtzProg.aspx +++ b/GIM_site/mtzProg.aspx @@ -14,7 +14,7 @@ -
+
diff --git a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache index 9c19d6d..8b67425 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ