diff --git a/GIM_data/DS_utility.Designer.cs b/GIM_data/DS_utility.Designer.cs index ceba2e8..f698f13 100644 --- a/GIM_data/DS_utility.Designer.cs +++ b/GIM_data/DS_utility.Designer.cs @@ -10772,7 +10772,7 @@ namespace GIM_data.DS_utilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.v_selMacchine"; @@ -10785,9 +10785,15 @@ namespace GIM_data.DS_utilityTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TagCode", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "SELECT * FROM dbo.v_selMacchine\r\nwhere conditio=@conditio"; - this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conditio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conditio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].CommandText = "dbo.stp_VSM_getByConditio"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conditio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_VSM_getFull"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10838,15 +10844,26 @@ namespace GIM_data.DS_utilityTableAdapters { public virtual DS_utility.v_selMacchineDataTable getByConditio(global::System.Nullable conditio) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((conditio.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[0].Value = ((int)(conditio.Value)); + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(conditio.Value)); } else { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } DS_utility.v_selMacchineDataTable dataTable = new DS_utility.v_selMacchineDataTable(); this.Adapter.Fill(dataTable); return dataTable; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_utility.v_selMacchineDataTable getFull() { + this.Adapter.SelectCommand = this.CommandCollection[3]; + DS_utility.v_selMacchineDataTable dataTable = new DS_utility.v_selMacchineDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/GIM_data/DS_utility.xsd b/GIM_data/DS_utility.xsd index 2ef4474..350b215 100644 --- a/GIM_data/DS_utility.xsd +++ b/GIM_data/DS_utility.xsd @@ -62,13 +62,23 @@ order by label - + - - SELECT * FROM dbo.v_selMacchine -where conditio=@conditio + + dbo.stp_VSM_getByConditio - + + + + + + + + + + dbo.stp_VSM_getFull + + diff --git a/GIM_data/DS_utility.xss b/GIM_data/DS_utility.xss index 6f93068..c79a517 100644 --- a/GIM_data/DS_utility.xss +++ b/GIM_data/DS_utility.xss @@ -4,29 +4,29 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + + - + - + - - - + + + \ No newline at end of file diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index 90565bf..33b0aec 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 cf6fba9..d39048d 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 afc999d..ab26c53 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_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll b/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll index f58b5e9..008487a 100644 Binary files a/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll and b/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll differ diff --git a/GIM_site/WebUserControls/mod_dettInt_full.ascx b/GIM_site/WebUserControls/mod_dettInt_full.ascx index 43de633..0d8724b 100644 --- a/GIM_site/WebUserControls/mod_dettInt_full.ascx +++ b/GIM_site/WebUserControls/mod_dettInt_full.ascx @@ -84,7 +84,7 @@
- +
diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index cf6fba9..d39048d 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 6fdb93b..a03a80c 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ diff --git a/GIM_site/obj/Debug/RdlCompile.cache b/GIM_site/obj/Debug/RdlCompile.cache index ba1f9b4..134cd5a 100644 Binary files a/GIM_site/obj/Debug/RdlCompile.cache and b/GIM_site/obj/Debug/RdlCompile.cache differ