diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs
index 53de72d..a62ea7c 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
index 52b03ca..719e9e5 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
@@ -5,7 +5,7 @@
+ DataKeyNames="idxPending" DataSourceID="ods" OnDataBound="grView_DataBound" EnableModelValidation="True" OnPageIndexChanged="grView_PageIndexChanged">
@@ -24,14 +24,16 @@
-
+
+
-
+
-
+
+
@@ -47,6 +49,8 @@
+
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
index 784371e..2c9738f 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
@@ -76,9 +76,13 @@ public partial class mod_mtzPrevPending : ApplicationUserControl
{
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 = {2})";
+ ods.FilterExpression += " AND (idxMacchina = {3})";
}
ods.DataBind();
}
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll
index e69e7b4..f98d70c 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/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs
index 2e35ccc..10d4b9e 100644
--- a/Projects/WebGIM/VersGen/WebGIM.cs
+++ b/Projects/WebGIM/VersGen/WebGIM.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.4.247.484")]
-[assembly: AssemblyFileVersion("1.4.247.484")]
+[assembly: AssemblyVersion("1.4.249.510")]
+[assembly: AssemblyFileVersion("1.4.249.510")]
[assembly: AssemblyCopyright("Steamware © 2006-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt
index b983e0a..5ae8897 100644
--- a/Projects/WebGIM/VersGen/WebGIM.tt
+++ b/Projects/WebGIM/VersGen/WebGIM.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.4.247.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.4.247.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.4.249.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.4.249.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+