diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs b/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs index c06e787..4e6cc85 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -5154,7 +5154,7 @@ namespace GIM_data { this.columnidxIntPro.ReadOnly = true; this.columnidxIntPro.Unique = true; this.columncodFrequenza.MaxLength = 2; - this.columndescrizione.MaxLength = 500; + this.columndescrizione.MaxLength = 2500; this.columncodMacchina.MaxLength = 50; this.columnnomeMacchina.MaxLength = 250; this.columnfrequenza.MaxLength = 50; @@ -5524,7 +5524,7 @@ namespace GIM_data { this.columnidxPending.ReadOnly = true; this.columnidxPending.Unique = true; this.columnidxIntPro.AllowDBNull = false; - this.columndescrizione.MaxLength = 500; + this.columndescrizione.MaxLength = 2500; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5900,7 +5900,7 @@ namespace GIM_data { this.columnidxIntPro.ReadOnly = true; this.columnidxIntPro.Unique = true; this.columncodFrequenza.MaxLength = 2; - this.columndescrizione.MaxLength = 500; + this.columndescrizione.MaxLength = 2500; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16308,39 +16308,6 @@ ORDER BY numIntMtz DESC"; tableMapping.ColumnMappings.Add("descrPriorita", "descrPriorita"); tableMapping.ColumnMappings.Add("descrTipo", "descrTipo"); this._adapter.TableMappings.Add(tableMapping); - this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[MtzProgrammata] WHERE (([idxIntPro] = @Original_idxIntPro))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxIntPro", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxIntPro", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[MtzProgrammata] ([idxMacchina], [inizio], [codFrequenza], [cad" + - "enza], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxMacchina," + - " @inizio, @codFrequenza, @cadenza, @descrizione, @idxPriorita, @isFermo, @idxTip" + - "o)"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inizio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codFrequenza", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codFrequenza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cadenza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cadenza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxPriorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxPriorita", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isFermo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxTipo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[MtzProgrammata] SET [idxMacchina] = @idxMacchina, [inizio] = @inizio, [codFrequenza] = @codFrequenza, [cadenza] = @cadenza, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxIntPro] = @Original_idxIntPro))"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inizio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codFrequenza", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "codFrequenza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cadenza", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cadenza", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxPriorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxPriorita", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isFermo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxTipo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxIntPro", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxIntPro", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16353,13 +16320,26 @@ ORDER BY numIntMtz DESC"; [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[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idxIntPro, idxMacchina, codMacchina, nomeMacchina, inizio, codFrequenz" + "a, frequenza, cadenza, descrizione, idxPriorita, descrPriorita, isFermo, idxTipo" + ", \r\n descrTipo\r\nFROM v_mtzProgExp"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_MtzProg_insert"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codFrequenza", global::System.Data.SqlDbType.NChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cadenza", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxPriorita", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16389,191 +16369,71 @@ ORDER BY numIntMtz DESC"; [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")] - public virtual int Update(DS_applicazione.v_mtzProgExpDataTable dataTable) { - return this.Adapter.Update(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")] - public virtual int Update(DS_applicazione dataSet) { - return this.Adapter.Update(dataSet, "v_mtzProgExp"); - } - - [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")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [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")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [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.Delete, true)] - public virtual int Delete(int Original_idxIntPro) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idxIntPro)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [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.Insert, true)] - public virtual int Insert(global::System.Nullable idxMacchina, global::System.Nullable inizio, string codFrequenza, global::System.Nullable cadenza, string descrizione, global::System.Nullable idxPriorita, global::System.Nullable isFermo, global::System.Nullable idxTipo) { + public virtual int insertQuery(global::System.Nullable idxMacchina, global::System.Nullable inizio, string codFrequenza, global::System.Nullable cadenza, string descrizione, global::System.Nullable idxPriorita, global::System.Nullable isFermo, global::System.Nullable idxTipo) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; if ((idxMacchina.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(idxMacchina.Value)); + command.Parameters[1].Value = ((int)(idxMacchina.Value)); } else { - this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; + command.Parameters[1].Value = global::System.DBNull.Value; } if ((inizio.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); + command.Parameters[2].Value = ((System.DateTime)(inizio.Value)); } else { - this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; + command.Parameters[2].Value = global::System.DBNull.Value; } if ((codFrequenza == null)) { - this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + command.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(codFrequenza)); + command.Parameters[3].Value = ((string)(codFrequenza)); } if ((cadenza.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[3].Value = ((int)(cadenza.Value)); + command.Parameters[4].Value = ((int)(cadenza.Value)); } else { - this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; + command.Parameters[4].Value = global::System.DBNull.Value; } if ((descrizione == null)) { - this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; + command.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(descrizione)); + command.Parameters[5].Value = ((string)(descrizione)); } if ((idxPriorita.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[5].Value = ((int)(idxPriorita.Value)); + command.Parameters[6].Value = ((int)(idxPriorita.Value)); } else { - this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; + command.Parameters[6].Value = global::System.DBNull.Value; } if ((isFermo.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[6].Value = ((bool)(isFermo.Value)); + command.Parameters[7].Value = ((bool)(isFermo.Value)); } else { - this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; + command.Parameters[7].Value = global::System.DBNull.Value; } if ((idxTipo.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[7].Value = ((int)(idxTipo.Value)); + command.Parameters[8].Value = ((int)(idxTipo.Value)); } else { - this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + command.Parameters[8].Value = global::System.DBNull.Value; } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; - if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { - this.Adapter.InsertCommand.Connection.Open(); + command.Connection.Open(); } + int returnValue; try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; + returnValue = command.ExecuteNonQuery(); } finally { if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update(global::System.Nullable idxMacchina, global::System.Nullable inizio, string codFrequenza, global::System.Nullable cadenza, string descrizione, global::System.Nullable idxPriorita, global::System.Nullable isFermo, global::System.Nullable idxTipo, int Original_idxIntPro) { - if ((idxMacchina.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(idxMacchina.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; - } - if ((inizio.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; - } - if ((codFrequenza == null)) { - this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(codFrequenza)); - } - if ((cadenza.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(cadenza.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; - } - if ((descrizione == null)) { - this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(descrizione)); - } - if ((idxPriorita.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(idxPriorita.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; - } - if ((isFermo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[6].Value = ((bool)(isFermo.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; - } - if ((idxTipo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(idxTipo.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idxIntPro)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; - if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); + command.Connection.Close(); } } + return returnValue; } } @@ -16681,14 +16541,14 @@ ORDER BY numIntMtz DESC"; this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[MtzProgPending] WHERE (([idxPending] = @Original_idxPending))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [MtzProgPending] WHERE (([idxPending] = @Original_idxPending))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxPending", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxPending", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[MtzProgPending] ([idxIntPro], [idxMacchina], [data], [descrizi" + - "one], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxIntPro, @idxMacchina, @da" + - "ta, @descrizione, @idxPriorita, @isFermo, @idxTipo)"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [MtzProgPending] ([idxIntPro], [idxMacchina], [data], [descrizione], " + + "[idxPriorita], [isFermo], [idxTipo]) VALUES (@idxIntPro, @idxMacchina, @data, @d" + + "escrizione, @idxPriorita, @isFermo, @idxTipo)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxIntPro", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxIntPro", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -16699,10 +16559,10 @@ ORDER BY numIntMtz DESC"; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxTipo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[MtzProgPending] SET [idxIntPro] = @idxIntPro, [idxMacchina] = @idxM" + - "acchina, [data] = @data, [descrizione] = @descrizione, [idxPriorita] = @idxPrior" + - "ita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxPending] = @Original" + - "_idxPending))"; + this._adapter.UpdateCommand.CommandText = "UPDATE [MtzProgPending] SET [idxIntPro] = @idxIntPro, [idxMacchina] = @idxMacchin" + + "a, [data] = @data, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [" + + "isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxPending] = @Original_idxPe" + + "nding))"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxIntPro", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxIntPro", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -16727,13 +16587,13 @@ ORDER BY numIntMtz DESC"; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idxPending, idxIntPro, idxMacchina, data, descrizione, idxPriorita, isFerm" + - "o, idxTipo FROM dbo.MtzProgPending"; + this._commandCollection[0].CommandText = "SELECT idxPending, idxIntPro, idxMacchina, data, descrizione, idxPriorita," + + " isFermo, idxTipo\r\nFROM MtzProgPending"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT idxPending, idxIntPro, idxMacchina, data, descrizione, idxPriorita, isFerm" + - "o, idxTipo FROM dbo.MtzProgPending WHERE data < @dataScadenza"; + this._commandCollection[1].CommandText = "SELECT data, descrizione, idxIntPro, idxMacchina, idxPending, idxPriorita, idxTip" + + "o, isFermo FROM MtzProgPending WHERE (data < @dataScadenza)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataScadenza", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "data", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -17053,15 +16913,14 @@ ORDER BY numIntMtz DESC"; this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[MtzProgrammata] WHERE (([idxIntPro] = @Original_idxIntPro))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [MtzProgrammata] WHERE (([idxIntPro] = @Original_idxIntPro))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxIntPro", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxIntPro", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[MtzProgrammata] ([idxMacchina], [inizio], [codFrequenza], [cad" + - "enza], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxMacchina," + - " @inizio, @codFrequenza, @cadenza, @descrizione, @idxPriorita, @isFermo, @idxTip" + - "o)"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [MtzProgrammata] ([idxMacchina], [inizio], [codFrequenza], [cadenza]," + + " [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxMacchina, @iniz" + + "io, @codFrequenza, @cadenza, @descrizione, @idxPriorita, @isFermo, @idxTipo)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inizio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17073,7 +16932,7 @@ ORDER BY numIntMtz DESC"; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxTipo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[MtzProgrammata] SET [idxMacchina] = @idxMacchina, [inizio] = @inizio, [codFrequenza] = @codFrequenza, [cadenza] = @cadenza, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxIntPro] = @Original_idxIntPro))"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [MtzProgrammata] SET [idxMacchina] = @idxMacchina, [inizio] = @inizio, [codFrequenza] = @codFrequenza, [cadenza] = @cadenza, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxIntPro] = @Original_idxIntPro))"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "inizio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17099,8 +16958,8 @@ ORDER BY numIntMtz DESC"; 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 idxIntPro, idxMacchina, inizio, codFrequenza, cadenza, descrizione, idxPri" + - "orita, isFermo, idxTipo FROM dbo.MtzProgrammata"; + this._commandCollection[0].CommandText = "SELECT idxIntPro, idxMacchina, inizio, codFrequenza, cadenza, descrizione," + + " idxPriorita, isFermo, idxTipo\r\nFROM MtzProgrammata"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -17110,11 +16969,7 @@ ORDER BY numIntMtz DESC"; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxIntPro", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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 MtzProgrammata.idxIntPro, MtzProgrammata.idxMacchina, MtzProgrammata.inizio, MtzProgrammata.codFrequenza, MtzProgrammata.cadenza, - MtzProgrammata.descrizione, MtzProgrammata.idxPriorita, MtzProgrammata.isFermo, MtzProgrammata.idxTipo -FROM MtzProgrammata LEFT OUTER JOIN - MtzProgPending ON MtzProgrammata.idxIntPro = MtzProgPending.idxIntPro -WHERE (MtzProgPending.idxPending IS NULL)"; + this._commandCollection[2].CommandText = @"SELECT MtzProgrammata.cadenza, MtzProgrammata.codFrequenza, MtzProgrammata.descrizione, MtzProgrammata.idxIntPro, MtzProgrammata.idxMacchina, MtzProgrammata.idxPriorita, MtzProgrammata.idxTipo, MtzProgrammata.inizio, MtzProgrammata.isFermo FROM MtzProgrammata LEFT OUTER JOIN MtzProgPending ON MtzProgrammata.idxIntPro = MtzProgPending.idxIntPro WHERE (MtzProgPending.idxPending IS NULL)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; @@ -17125,7 +16980,7 @@ WHERE (MtzProgPending.idxPending IS NULL)"; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codFrequenza", global::System.Data.SqlDbType.NChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cadenza", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxPriorita", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xsd b/Projects/WebGIM/GIM_data/DS_applicazione.xsd index e80e3e3..742eba5 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xsd +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xsd @@ -933,54 +933,15 @@ WHERE (numIntMtz = @Original_numIntMtz) AND (matrOp = @Original_matrOp) - - - - DELETE FROM [dbo].[MtzProgrammata] WHERE (([idxIntPro] = @Original_idxIntPro)) - - - - - - - - INSERT INTO [dbo].[MtzProgrammata] ([idxMacchina], [inizio], [codFrequenza], [cadenza], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxMacchina, @inizio, @codFrequenza, @cadenza, @descrizione, @idxPriorita, @isFermo, @idxTipo) - - - - - - - - - - - - + - + SELECT idxIntPro, idxMacchina, codMacchina, nomeMacchina, inizio, codFrequenza, frequenza, cadenza, descrizione, idxPriorita, descrPriorita, isFermo, idxTipo, descrTipo FROM v_mtzProgExp - - - UPDATE [dbo].[MtzProgrammata] SET [idxMacchina] = @idxMacchina, [inizio] = @inizio, [codFrequenza] = @codFrequenza, [cadenza] = @cadenza, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxIntPro] = @Original_idxIntPro)) - - - - - - - - - - - - - @@ -999,14 +960,33 @@ FROM v_mtzProgExp - + + + + + dbo.stp_MtzProg_insert + + + + + + + + + + + + + + + - DELETE FROM [dbo].[MtzProgPending] WHERE (([idxPending] = @Original_idxPending)) + DELETE FROM [MtzProgPending] WHERE (([idxPending] = @Original_idxPending)) @@ -1014,7 +994,7 @@ FROM v_mtzProgExp - INSERT INTO [dbo].[MtzProgPending] ([idxIntPro], [idxMacchina], [data], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxIntPro, @idxMacchina, @data, @descrizione, @idxPriorita, @isFermo, @idxTipo) + INSERT INTO [MtzProgPending] ([idxIntPro], [idxMacchina], [data], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxIntPro, @idxMacchina, @data, @descrizione, @idxPriorita, @isFermo, @idxTipo) @@ -1028,13 +1008,14 @@ FROM v_mtzProgExp - SELECT idxPending, idxIntPro, idxMacchina, data, descrizione, idxPriorita, isFermo, idxTipo FROM dbo.MtzProgPending + SELECT idxPending, idxIntPro, idxMacchina, data, descrizione, idxPriorita, isFermo, idxTipo +FROM MtzProgPending - UPDATE [dbo].[MtzProgPending] SET [idxIntPro] = @idxIntPro, [idxMacchina] = @idxMacchina, [data] = @data, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxPending] = @Original_idxPending)) + UPDATE [MtzProgPending] SET [idxIntPro] = @idxIntPro, [idxMacchina] = @idxMacchina, [data] = @data, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxPending] = @Original_idxPending)) @@ -1063,7 +1044,7 @@ FROM v_mtzProgExp - SELECT idxPending, idxIntPro, idxMacchina, data, descrizione, idxPriorita, isFermo, idxTipo FROM dbo.MtzProgPending WHERE data < @dataScadenza + SELECT data, descrizione, idxIntPro, idxMacchina, idxPending, idxPriorita, idxTipo, isFermo FROM MtzProgPending WHERE (data < @dataScadenza) @@ -1077,7 +1058,7 @@ FROM v_mtzProgExp - DELETE FROM [dbo].[MtzProgrammata] WHERE (([idxIntPro] = @Original_idxIntPro)) + DELETE FROM [MtzProgrammata] WHERE (([idxIntPro] = @Original_idxIntPro)) @@ -1085,7 +1066,7 @@ FROM v_mtzProgExp - INSERT INTO [dbo].[MtzProgrammata] ([idxMacchina], [inizio], [codFrequenza], [cadenza], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxMacchina, @inizio, @codFrequenza, @cadenza, @descrizione, @idxPriorita, @isFermo, @idxTipo) + INSERT INTO [MtzProgrammata] ([idxMacchina], [inizio], [codFrequenza], [cadenza], [descrizione], [idxPriorita], [isFermo], [idxTipo]) VALUES (@idxMacchina, @inizio, @codFrequenza, @cadenza, @descrizione, @idxPriorita, @isFermo, @idxTipo) @@ -1100,13 +1081,14 @@ FROM v_mtzProgExp - SELECT idxIntPro, idxMacchina, inizio, codFrequenza, cadenza, descrizione, idxPriorita, isFermo, idxTipo FROM dbo.MtzProgrammata + SELECT idxIntPro, idxMacchina, inizio, codFrequenza, cadenza, descrizione, idxPriorita, isFermo, idxTipo +FROM MtzProgrammata - UPDATE [dbo].[MtzProgrammata] SET [idxMacchina] = @idxMacchina, [inizio] = @inizio, [codFrequenza] = @codFrequenza, [cadenza] = @cadenza, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxIntPro] = @Original_idxIntPro)) + UPDATE [MtzProgrammata] SET [idxMacchina] = @idxMacchina, [inizio] = @inizio, [codFrequenza] = @codFrequenza, [cadenza] = @cadenza, [descrizione] = @descrizione, [idxPriorita] = @idxPriorita, [isFermo] = @isFermo, [idxTipo] = @idxTipo WHERE (([idxIntPro] = @Original_idxIntPro)) @@ -1148,11 +1130,7 @@ FROM v_mtzProgExp - SELECT MtzProgrammata.idxIntPro, MtzProgrammata.idxMacchina, MtzProgrammata.inizio, MtzProgrammata.codFrequenza, MtzProgrammata.cadenza, - MtzProgrammata.descrizione, MtzProgrammata.idxPriorita, MtzProgrammata.isFermo, MtzProgrammata.idxTipo -FROM MtzProgrammata LEFT OUTER JOIN - MtzProgPending ON MtzProgrammata.idxIntPro = MtzProgPending.idxIntPro -WHERE (MtzProgPending.idxPending IS NULL) + SELECT MtzProgrammata.cadenza, MtzProgrammata.codFrequenza, MtzProgrammata.descrizione, MtzProgrammata.idxIntPro, MtzProgrammata.idxMacchina, MtzProgrammata.idxPriorita, MtzProgrammata.idxTipo, MtzProgrammata.inizio, MtzProgrammata.isFermo FROM MtzProgrammata LEFT OUTER JOIN MtzProgPending ON MtzProgrammata.idxIntPro = MtzProgPending.idxIntPro WHERE (MtzProgPending.idxPending IS NULL) @@ -1167,7 +1145,7 @@ WHERE (MtzProgPending.idxPending IS NULL) - + @@ -1935,7 +1913,7 @@ WHERE (idxCausale = @Original_idxCausale) - + @@ -1990,7 +1968,7 @@ WHERE (idxCausale = @Original_idxCausale) - + @@ -2017,7 +1995,7 @@ WHERE (idxCausale = @Original_idxCausale) - + @@ -2235,20 +2213,20 @@ WHERE (idxCausale = @Original_idxCausale) - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xss b/Projects/WebGIM/GIM_data/DS_applicazione.xss index 9894443..2b3f2be 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xss +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -17,8 +17,8 @@ - - + + diff --git a/Projects/WebGIM/GIM_data/DS_utility.Designer.cs b/Projects/WebGIM/GIM_data/DS_utility.Designer.cs index d04db1f..1b508e5 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_utility.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -5708,7 +5708,7 @@ namespace GIM_data { this.columnnomeImpianto.MaxLength = 50; this.columncodMacchina.MaxLength = 50; this.columnnomeMacchina.MaxLength = 250; - this.columndescrizione.MaxLength = 500; + this.columndescrizione.MaxLength = 2500; this.columndescrPriorita.MaxLength = 50; this.columndescrTipo.MaxLength = 50; this.columnidxTipo.AllowDBNull = false; diff --git a/Projects/WebGIM/GIM_data/DS_utility.xsd b/Projects/WebGIM/GIM_data/DS_utility.xsd index 687b63b..a104ced 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xsd +++ b/Projects/WebGIM/GIM_data/DS_utility.xsd @@ -9,7 +9,7 @@ - + SELECT value, label FROM dbo.v_selImpianti @@ -24,7 +24,7 @@ order by label - + SELECT label, value FROM v_selImpianti WHERE (value > 1) ORDER BY label @@ -36,7 +36,7 @@ order by label - + SELECT * FROM dbo.v_selMacchine @@ -51,7 +51,7 @@ order by label - + SELECT * FROM dbo.v_selMacchine @@ -66,7 +66,7 @@ where conditio=@conditio - + SELECT value, label FROM dbo.v_selPrior @@ -83,7 +83,7 @@ where conditio=@conditio - + SELECT value, label @@ -102,7 +102,7 @@ ORDER BY label - + SELECT value, label, conditio FROM dbo.v_selCausaliMacchine @@ -117,7 +117,7 @@ ORDER BY label - + SELECT value, label, conditio @@ -133,7 +133,7 @@ WHERE (conditio = @conditio) - + SELECT value, label FROM dbo.v_selTipoGuasto @@ -150,7 +150,7 @@ WHERE (conditio = @conditio) - + SELECT value, label FROM dbo.v_selSemafori @@ -167,7 +167,7 @@ WHERE (conditio = @conditio) - + SELECT value, label FROM dbo.v_selFreq @@ -184,7 +184,7 @@ WHERE (conditio = @conditio) - + SELECT value, label FROM dbo.v_selStato @@ -201,7 +201,7 @@ WHERE (conditio = @conditio) - + SELECT value, label, conditio FROM dbo.v_selPeriodiTrad @@ -216,7 +216,7 @@ WHERE (conditio = @conditio) - + SELECT conditio, label, value FROM v_selPeriodiTrad WHERE (conditio = @conditio) ORDER BY value @@ -230,7 +230,7 @@ WHERE (conditio = @conditio) - + SELECT codImpianto, nomeImpianto, tipoImpianto, codMacchina, nomeMacchina, modello, matricola, anno, kgPeso, kwConsumo FROM dbo.v_elencoImpiantiMacchine @@ -255,7 +255,7 @@ WHERE (conditio = @conditio) - + SELECT numIntMtz, richiesta, codImpianto, nomeImpianto, codMacchina, nomeMacchina, descrizione, inizioIntervento, fineIntervento, descrizioneIntervento, descrCausale, guasto, idxStato, idxImpianto, idxMacchina, isFermo, scheduled FROM v_elencoIntervFilt @@ -284,7 +284,7 @@ WHERE (conditio = @conditio) - + dbo.stp_elencoIntByIntervDate @@ -296,7 +296,7 @@ WHERE (conditio = @conditio) - + dbo.stp_elencoIntByIntervDateUserFilt @@ -309,7 +309,7 @@ WHERE (conditio = @conditio) - + dbo.stp_elencoIntByIntervDateUserFilt_fermaPrev @@ -328,7 +328,7 @@ WHERE (conditio = @conditio) - + dbo.sp_elencoIntMTBF_MTTR @@ -352,7 +352,7 @@ WHERE (conditio = @conditio) - + dbo.stp_elencoIntMTBF_MTTR_fermaPrev @@ -371,7 +371,7 @@ WHERE (conditio = @conditio) - + SELECT value, label FROM dbo.v_selFam @@ -388,7 +388,7 @@ WHERE (conditio = @conditio) - + SELECT * FROM v_selOperMtz @@ -402,7 +402,7 @@ WHERE (conditio = @conditio) - + SELECT * FROM v_selOperMtz WHERE (value = @value) @@ -416,7 +416,7 @@ WHERE (conditio = @conditio) - + SELECT idxPending, codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, descrizione, descrPriorita, isFermo, descrTipo, idxTipo, idxMacchina, idxImpianto FROM dbo.v_mtzProgPendingExp @@ -441,7 +441,7 @@ WHERE (conditio = @conditio) - + SELECT codImpianto, codMacchina, data, descrPriorita, descrTipo, descrizione, idxPending, isFermo, nomeImpianto, nomeMacchina FROM v_mtzProgPendingExp WHERE (data <= @dataMax) ORDER BY data @@ -458,14 +458,14 @@ WHERE (conditio = @conditio) - + - + - - + + @@ -475,26 +475,26 @@ WHERE (conditio = @conditio) - + - - + + - + - + - - + + @@ -504,11 +504,11 @@ WHERE (conditio = @conditio) - + - - + + @@ -518,26 +518,26 @@ WHERE (conditio = @conditio) - + - - + + - + - + - - + + @@ -547,17 +547,17 @@ WHERE (conditio = @conditio) - + - + - + @@ -567,17 +567,17 @@ WHERE (conditio = @conditio) - + - + - + @@ -587,11 +587,11 @@ WHERE (conditio = @conditio) - + - - + + @@ -601,24 +601,24 @@ WHERE (conditio = @conditio) - + - + - + - + @@ -628,160 +628,160 @@ WHERE (conditio = @conditio) - + - + - + - + - + - + - + - + - - - + + + - + - - - + + + - + - + - + - + - - - + + + - + - - - - - - - - - + + + + + + + + + - + - - - - + + + + - + - + - + @@ -791,11 +791,11 @@ WHERE (conditio = @conditio) - + - - + + @@ -805,17 +805,17 @@ WHERE (conditio = @conditio) - + - + - + @@ -825,64 +825,64 @@ WHERE (conditio = @conditio) - + - - + + - + - + - + - - + + - + - + - - + + - - - + + + diff --git a/Projects/WebGIM/GIM_data/DS_utility.xss b/Projects/WebGIM/GIM_data/DS_utility.xss index b276841..84946fb 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xss +++ b/Projects/WebGIM/GIM_data/DS_utility.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 38e0a2c..4bf4bd3 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 17dea91..f654dd8 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/Web.config b/Projects/WebGIM/GIM_site/Web.config index 8b459c0..ff16da0 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -103,7 +103,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs index e90b1ed..c9bf472 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs @@ -75,7 +75,7 @@ public partial class mod_dettMtzProg : System.Web.UI.UserControl /// private void creaInterventoMtzPro(int idx) { - TA_app.obj.taMtzPro.Insert(idx, Convert.ToDateTime(txtDataInizio.Text), ddlFreq.SelectedValue, Convert.ToInt32(txtCadenza.Text), txtDescrizione.Text.Trim(), Convert.ToInt32(ddlPrior.SelectedValue), chkImpFermo.Checked, Convert.ToInt32(ddlTipo.SelectedValue)); + TA_app.obj.taMtzPro.insertQuery(idx, Convert.ToDateTime(txtDataInizio.Text), ddlFreq.SelectedValue, Convert.ToInt32(txtCadenza.Text), txtDescrizione.Text.Trim(), Convert.ToInt32(ddlPrior.SelectedValue), chkImpFermo.Checked, Convert.ToInt32(ddlTipo.SelectedValue)); } /// /// aggiorna selezione di default diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx index 9a9bbbb..6705fc2 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx @@ -102,7 +102,7 @@ + PageSize="20" OnRowUpdating="grView_RowUpdating" onpageindexchanged="grView_PageIndexChanged"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs index 45b5ac2..e3abb10 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs @@ -447,5 +447,14 @@ public partial class mod_elencoMtzProg : ApplicationUserControl pnlSetFermo.Visible = false; pnlTipoGuasto.Visible = false; } + /// + /// update post cambio pagina + /// + /// + /// + protected void grView_PageIndexChanged(object sender, EventArgs e) + { + doUpdate(); + } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx index 6c36b54..52b03ca 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"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs index f3b1429..d635737 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs @@ -81,4 +81,13 @@ public partial class mod_mtzPrevPending : ApplicationUserControl } ods.DataBind(); } + /// + /// fix filtro post cambio pagina + /// + /// + /// + protected void grView_PageIndexChanged(object sender, EventArgs e) + { + doUpdate(); + } } \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 38e0a2c..4bf4bd3 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 3365b3e..4ac147a 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 17dea91..f654dd8 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs b/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs index 99ffb06..c497bfe 100644 --- a/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs +++ b/Projects/WebGIM/GIM_site/mtzProg.aspx.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/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Projects/WebGIM/GIM_site/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 87f4747..850e760 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/Projects/WebGIM/GIM_site/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csproj.FileListAbsolute.txt b/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csproj.FileListAbsolute.txt index 2c2a6b6..892c8ed 100644 --- a/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csproj.FileListAbsolute.txt +++ b/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csproj.FileListAbsolute.txt @@ -33,3 +33,34 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\GIM_site\bin\Repor C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\GIM_site\bin\Reports\ReportInterventi.rdlc C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\GIM_site\bin\Reports\Report_MTBF_MTTR.rdlc C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\GIM_site\bin\Reports\RichiestaIntervento.rdlc +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\obj\Release\GIM_site.csprojResolveAssemblyReference.cache +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\obj\Release\RdlCompile.cache +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\obj\Release\RdlCompile.compiled +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\obj\Release\GIM_site.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\GIM_site.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\GIM_site.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\GIM_data.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\SanitizerProviders.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\SteamWare.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\Flesk.ViewState.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\ICSharpCode.SharpZipLib.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\GIM_data.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\ar\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\cs\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\de\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\es\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\fr\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\he\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\hi\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\it\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\ja\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\ko\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\nl\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\pt\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\ru\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\tr-TR\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\zh-CHS\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\bin\zh-CHT\AjaxControlToolkit.resources.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\WebGIM\Projects\WebGIM\GIM_site\obj\Release\GIM_site.pdb diff --git a/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csprojResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csprojResolveAssemblyReference.cache index 470063b..99cc935 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csprojResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_site/obj/Release/GIM_site.csprojResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Release/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Release/GIM_site.dll index 6417804..111ecf6 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Release/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Release/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache b/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache index 9adf17b..cfddf10 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache and b/Projects/WebGIM/GIM_site/obj/Release/RdlCompile.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/original/Web.config b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/original/Web.config index 8490c1c..936596f 100644 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/original/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/original/Web.config @@ -103,7 +103,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/transformed/Web.config b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/transformed/Web.config index 757dafa..7c9dffe 100644 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/transformed/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize/transformed/Web.config @@ -103,7 +103,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/DesignTimeResolveAssemblyReferencesInput.cache b/Projects/WebGIM/GIM_site/obj/Somaschini/DesignTimeResolveAssemblyReferencesInput.cache index 9499f0e..df3bd2c 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Somaschini/DesignTimeResolveAssemblyReferencesInput.cache and b/Projects/WebGIM/GIM_site/obj/Somaschini/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.csprojResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.csprojResolveAssemblyReference.cache index 83af116..b625da2 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.csprojResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.csprojResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.dll index 3365b3e..4ac147a 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Somaschini/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/Package/WebGIM.zip b/Projects/WebGIM/GIM_site/obj/Somaschini/Package/WebGIM.zip index a115f9b..f38bfe8 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Somaschini/Package/WebGIM.zip and b/Projects/WebGIM/GIM_site/obj/Somaschini/Package/WebGIM.zip differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/original/Web.config b/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/original/Web.config index b6d4a29..c985a39 100644 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/original/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/original/Web.config @@ -103,7 +103,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/transformed/Web.config b/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/transformed/Web.config index 8490c1c..936596f 100644 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/transformed/Web.config +++ b/Projects/WebGIM/GIM_site/obj/Somaschini/TransformWebConfig/transformed/Web.config @@ -103,7 +103,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/sql/Applicazione/GIM_0210.sql b/Projects/WebGIM/GIM_site/sql/Applicazione/GIM_0210.sql new file mode 100644 index 0000000..4f3ced4 --- /dev/null +++ b/Projects/WebGIM/GIM_site/sql/Applicazione/GIM_0210.sql @@ -0,0 +1,150 @@ +set xact_abort on; +go + +begin transaction; +go + +alter table MtzProgPending alter column + descrizione nvarchar(2500); +go + +alter table MtzProgrammata alter column + descrizione nvarchar(2500); +go + +set ANSI_NULLS on; +go + +/********************************************************************************* +* STORED stp_MtzProg_insert +* +* insert riga MtzProg +* +**********************************************************************************/ +create PROCEDURE stp_MtzProg_insert +( + @idxMacchina INT, + @inizio DATETIME, + @codFrequenza NCHAR(2), + @cadenza INT, + @descrizione NVARCHAR(2500), + @idxPriorita INT, + @isFermo BIT, + @idxTipo INT +) +AS + +INSERT INTO MtzProgrammata + (idxMacchina, inizio, codFrequenza, cadenza, descrizione, idxPriorita, isFermo, idxTipo) +VALUES (@idxMacchina,@inizio,@codFrequenza,@cadenza,@descrizione,@idxPriorita,@isFermo,@idxTipo) + +RETURN +go + +/********************************************************************************* +* STORED stp_MtzProg_update +* +* aggiorna riga MtzProg +* +**********************************************************************************/ +alter PROCEDURE stp_MtzProg_update +( + @idxIntPro INT, + @inizio DATETIME, + @codFrequenza NCHAR(2), + @cadenza INT, + @descrizione NVARCHAR(2500), + @idxPriorita INT, + @isFermo BIT, + @idxTipo INT +) +AS + +UPDATE MtzProgrammata +SET inizio = @inizio, + codFrequenza= @codFrequenza, + cadenza = @cadenza, + descrizione = @descrizione, + idxPriorita = @idxPriorita, + isFermo = @isFermo, + idxTipo = @idxTipo +WHERE idxIntPro = @idxIntPro + +RETURN +go + +commit; +go + + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/*********************************************************************************** +* FUNCTION f_padLeft +* +* restituisce una stringa con padding del carattere desiderato per la lunghezza totale desiderata +* +***********************************************************************************/ +alter FUNCTION f_padLeft (@string VARCHAR(255), @desired_length INTEGER, @pad_character CHAR(1)) +RETURNS VARCHAR(255) AS +BEGIN + + -- Prefix the required number of spaces to bulk up the string and then replace the spaces with the desired character + RETURN CASE + WHEN LEN(@string) < @desired_length + THEN REPLACE(SPACE(@desired_length - LEN(@string)), ' ', @pad_character) + @string + ELSE @string + END + +END +go + +/*********************************************************************************** +* FUNCTION rightDivision +* +* calcola la divisione altrimenti mostra errore -1 se dividendo/divisore < 0 +* +***********************************************************************************/ +alter FUNCTION rightDivision +( + @dividendo float, + @divisore float +) +RETURNS float +AS + BEGIN + + declare @errore as int + declare @risultato as float + + set @errore =0 + + set @errore = case when (isnull(@dividendo,0))<=0 then 1 end + + set @errore = case when (isnull(@divisore,0)) <=0 then 1 end + + set @risultato= case when (@errore=1) then -1 else @dividendo/@divisore end + + RETURN @risultato + + END +go + +commit; +go + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(20510, GETDATE()) +GO \ No newline at end of file diff --git a/Projects/WebGIM/WebGIM.suo b/Projects/WebGIM/WebGIM.suo index 9145fb3..2bdefcb 100644 Binary files a/Projects/WebGIM/WebGIM.suo and b/Projects/WebGIM/WebGIM.suo differ