diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 0ddcb91..8d57c1b 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -1893,6 +1893,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnNomePar; + private global::System.Data.DataColumn columnCodVisib; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public DettSchedaDataTable() { @@ -1974,6 +1976,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn CodVisibColumn { + get { + return this.columnCodVisib; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2011,7 +2021,7 @@ namespace CMS_SC_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public DettSchedaRow AddDettSchedaRow(string CodScheda, int Vers, string CodMisura, string NomeMisura, string TipoValMisura, string NomePar) { + public DettSchedaRow AddDettSchedaRow(string CodScheda, int Vers, string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string CodVisib) { DettSchedaRow rowDettSchedaRow = ((DettSchedaRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodScheda, @@ -2019,7 +2029,8 @@ namespace CMS_SC_Data { CodMisura, NomeMisura, TipoValMisura, - NomePar}; + NomePar, + CodVisib}; rowDettSchedaRow.ItemArray = columnValuesArray; this.Rows.Add(rowDettSchedaRow); return rowDettSchedaRow; @@ -2057,6 +2068,7 @@ namespace CMS_SC_Data { this.columnNomeMisura = base.Columns["NomeMisura"]; this.columnTipoValMisura = base.Columns["TipoValMisura"]; this.columnNomePar = base.Columns["NomePar"]; + this.columnCodVisib = base.Columns["CodVisib"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2074,6 +2086,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnTipoValMisura); this.columnNomePar = new global::System.Data.DataColumn("NomePar", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNomePar); + this.columnCodVisib = new global::System.Data.DataColumn("CodVisib", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodVisib); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodScheda, this.columnVers, @@ -2089,6 +2103,8 @@ namespace CMS_SC_Data { this.columnTipoValMisura.MaxLength = 50; this.columnNomePar.AllowDBNull = false; this.columnNomePar.MaxLength = 50; + this.columnCodVisib.AllowDBNull = false; + this.columnCodVisib.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2593,6 +2609,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnDescrizione; + private global::System.Data.DataColumn columnopz; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public SchemaCollFamMaccDataTable() { @@ -2690,6 +2708,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn opzColumn { + get { + return this.columnopz; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2727,7 +2753,7 @@ namespace CMS_SC_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public SchemaCollFamMaccRow AddSchemaCollFamMaccRow(ElencoFamMaccRow parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc, string CodScheda, int Vers, string CodSchedaVers, string DescrScheda, string Path, int NumSchede, string Descrizione) { + public SchemaCollFamMaccRow AddSchemaCollFamMaccRow(ElencoFamMaccRow parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc, string CodScheda, int Vers, string CodSchedaVers, string DescrScheda, string Path, int NumSchede, string Descrizione, string opz) { SchemaCollFamMaccRow rowSchemaCollFamMaccRow = ((SchemaCollFamMaccRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2737,7 +2763,8 @@ namespace CMS_SC_Data { DescrScheda, Path, NumSchede, - Descrizione}; + Descrizione, + opz}; if ((parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc != null)) { columnValuesArray[0] = parentElencoFamMaccRowByFK_SchemaCollFamMacc_ElencoFamMacc[0]; } @@ -2780,6 +2807,7 @@ namespace CMS_SC_Data { this.columnPath = base.Columns["Path"]; this.columnNumSchede = base.Columns["NumSchede"]; this.columnDescrizione = base.Columns["Descrizione"]; + this.columnopz = base.Columns["opz"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2801,6 +2829,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnNumSchede); this.columnDescrizione = new global::System.Data.DataColumn("Descrizione", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescrizione); + this.columnopz = new global::System.Data.DataColumn("opz", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnopz); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodFam, this.columnCodScheda, @@ -2818,6 +2848,8 @@ namespace CMS_SC_Data { this.columnPath.MaxLength = 2147483647; this.columnNumSchede.AllowDBNull = false; this.columnDescrizione.MaxLength = 250; + this.columnopz.AllowDBNull = false; + this.columnopz.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3348,6 +3380,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnDescrizione; + private global::System.Data.DataColumn columnopz; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public SchemaCollMaccDataTable() { @@ -3421,6 +3455,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn opzColumn { + get { + return this.columnopz; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3458,14 +3500,15 @@ namespace CMS_SC_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public SchemaCollMaccRow AddSchemaCollMaccRow(ElencoDossierRow parentElencoDossierRowByFK_SchemaCollMacc_ElencoDossier, string CodScheda, int Vers, int NumScheda, string Descrizione) { + public SchemaCollMaccRow AddSchemaCollMaccRow(ElencoDossierRow parentElencoDossierRowByFK_SchemaCollMacc_ElencoDossier, string CodScheda, int Vers, int NumScheda, string Descrizione, string opz) { SchemaCollMaccRow rowSchemaCollMaccRow = ((SchemaCollMaccRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, CodScheda, Vers, NumScheda, - Descrizione}; + Descrizione, + opz}; if ((parentElencoDossierRowByFK_SchemaCollMacc_ElencoDossier != null)) { columnValuesArray[0] = parentElencoDossierRowByFK_SchemaCollMacc_ElencoDossier[0]; } @@ -3506,6 +3549,7 @@ namespace CMS_SC_Data { this.columnVers = base.Columns["Vers"]; this.columnNumScheda = base.Columns["NumScheda"]; this.columnDescrizione = base.Columns["Descrizione"]; + this.columnopz = base.Columns["opz"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3521,6 +3565,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnNumScheda); this.columnDescrizione = new global::System.Data.DataColumn("Descrizione", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescrizione); + this.columnopz = new global::System.Data.DataColumn("opz", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnopz); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxDossier, this.columnCodScheda, @@ -3532,6 +3578,8 @@ namespace CMS_SC_Data { this.columnVers.AllowDBNull = false; this.columnNumScheda.AllowDBNull = false; this.columnDescrizione.MaxLength = 250; + this.columnopz.AllowDBNull = false; + this.columnopz.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3705,6 +3753,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnCodSchedaVersNum; + private global::System.Data.DataColumn columnCodVisib; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public MisureDataTable() { @@ -3898,6 +3948,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn CodVisibColumn { + get { + return this.columnCodVisib; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3955,7 +4013,8 @@ namespace CMS_SC_Data { double MaxPar, double LIVal, double LSVal, - string CodSchedaVersNum) { + string CodSchedaVersNum, + string CodVisib) { MisureRow rowMisureRow = ((MisureRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxDossier, @@ -3977,7 +4036,8 @@ namespace CMS_SC_Data { MaxPar, LIVal, LSVal, - CodSchedaVersNum}; + CodSchedaVersNum, + CodVisib}; if ((parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1 != null)) { columnValuesArray[5] = parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1[0]; } @@ -4035,6 +4095,7 @@ namespace CMS_SC_Data { this.columnLIVal = base.Columns["LIVal"]; this.columnLSVal = base.Columns["LSVal"]; this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"]; + this.columnCodVisib = base.Columns["CodVisib"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4080,6 +4141,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnLSVal); this.columnCodSchedaVersNum = new global::System.Data.DataColumn("CodSchedaVersNum", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodSchedaVersNum); + this.columnCodVisib = new global::System.Data.DataColumn("CodVisib", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodVisib); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxDossier, this.columnCodScheda, @@ -4113,6 +4176,8 @@ namespace CMS_SC_Data { this.columnNomePar.MaxLength = 50; this.columnCodSchedaVersNum.ReadOnly = true; this.columnCodSchedaVersNum.MaxLength = 152; + this.columnCodVisib.AllowDBNull = false; + this.columnCodVisib.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5242,6 +5307,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string CodVisib { + get { + return ((string)(this[this.tableDettScheda.CodVisibColumn])); + } + set { + this[this.tableDettScheda.CodVisibColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagSchedeRow AnagSchedeRowParent { @@ -5480,6 +5556,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string opz { + get { + return ((string)(this[this.tableSchemaCollFamMacc.opzColumn])); + } + set { + this[this.tableSchemaCollFamMacc.opzColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagSchedeRow AnagSchedeRowParent { @@ -5839,6 +5926,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string opz { + get { + return ((string)(this[this.tableSchemaCollMacc.opzColumn])); + } + set { + this[this.tableSchemaCollMacc.opzColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagSchedeRow AnagSchedeRowParent { @@ -6144,6 +6242,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string CodVisib { + get { + return ((string)(this[this.tableMisure.CodVisibColumn])); + } + set { + this[this.tableMisure.CodVisibColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagFasiRow AnagFasiRow { @@ -9160,10 +9269,11 @@ SELECT CodScheda, Vers, Descrizione, Path FROM AnagSchede WHERE (CodScheda = @Co tableMapping.ColumnMappings.Add("NomeMisura", "NomeMisura"); tableMapping.ColumnMappings.Add("TipoValMisura", "TipoValMisura"); tableMapping.ColumnMappings.Add("NomePar", "NomePar"); + tableMapping.ColumnMappings.Add("CodVisib", "CodVisib"); 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 [DettScheda] WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [DettScheda] WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar) AND ([CodVisib] = @Original_CodVisib))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -9171,10 +9281,11 @@ SELECT CodScheda, Vers, Descrizione, Path FROM AnagSchede WHERE (CodScheda = @Co this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NomeMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomeMisura", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_TipoValMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TipoValMisura", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NomePar", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomePar", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodVisib", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodVisib", 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 [DettScheda] ([CodScheda], [Vers], [CodMisura], [NomeMisura], [TipoValMisura], [NomePar]) VALUES (@CodScheda, @Vers, @CodMisura, @NomeMisura, @TipoValMisura, @NomePar); -SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [DettScheda] ([CodScheda], [Vers], [CodMisura], [NomeMisura], [TipoValMisura], [NomePar], [CodVisib]) VALUES (@CodScheda, @Vers, @CodMisura, @NomeMisura, @TipoValMisura, @NomePar, @CodVisib); +SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar, CodVisib FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9182,10 +9293,11 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomeMisura", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoValMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TipoValMisura", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomePar", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomePar", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodVisib", 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 [DettScheda] SET [CodScheda] = @CodScheda, [Vers] = @Vers, [CodMisura] = @CodMisura, [NomeMisura] = @NomeMisura, [TipoValMisura] = @TipoValMisura, [NomePar] = @NomePar WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar)); -SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [DettScheda] SET [CodScheda] = @CodScheda, [Vers] = @Vers, [CodMisura] = @CodMisura, [NomeMisura] = @NomeMisura, [TipoValMisura] = @TipoValMisura, [NomePar] = @NomePar, [CodVisib] = @CodVisib WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar) AND ([CodVisib] = @Original_CodVisib)); +SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar, CodVisib FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9193,12 +9305,14 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomeMisura", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoValMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TipoValMisura", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomePar", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomePar", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodVisib", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodMisura", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NomeMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomeMisura", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_TipoValMisura", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TipoValMisura", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NomePar", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomePar", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodVisib", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodVisib", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9211,54 +9325,61 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [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[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettSc" + - "heda"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM DettScheda"; 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_DS_deleteQuery"; + this._commandCollection[1].CommandText = "dbo.stp_DS_clone"; 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("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, 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("@Original_Vers", 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("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, 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("@CodSchedaVers", global::System.Data.SqlDbType.NVarChar, 100, 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("@CodMisura", 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 = "dbo.stp_DS_getByCodScheda"; + this._commandCollection[2].CommandText = "dbo.stp_DS_deleteQuery"; 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("@CodSchedaVers", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_DS_insertNew"; + this._commandCollection[3].CommandText = "dbo.stp_DS_getByCodScheda"; 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, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSchedaVers", global::System.Data.SqlDbType.NVarChar, 100, 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("@NomeMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_DS_moveUpDown"; + this._commandCollection[4].CommandText = "dbo.stp_DS_insertNew"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MovType", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSchedaVers", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_DS_updateQuery"; + this._commandCollection[5].CommandText = "dbo.stp_DS_moveUpDown"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MovType", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoValMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomePar", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "dbo.stp_DS_updateQuery"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoValMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomePar", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9290,7 +9411,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Applicazione.DettSchedaDataTable getByScheda(string CodSchedaVers) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((CodSchedaVers == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -9335,7 +9456,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [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(string Original_CodScheda, int Original_Vers, string Original_CodMisura, string Original_NomeMisura, string Original_TipoValMisura, string Original_NomePar) { + public virtual int Delete(string Original_CodScheda, int Original_Vers, string Original_CodMisura, string Original_NomeMisura, string Original_TipoValMisura, string Original_NomePar, string Original_CodVisib) { if ((Original_CodScheda == null)) { throw new global::System.ArgumentNullException("Original_CodScheda"); } @@ -9367,6 +9488,12 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS else { this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_NomePar)); } + if ((Original_CodVisib == null)) { + throw new global::System.ArgumentNullException("Original_CodVisib"); + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_CodVisib)); + } 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)) { @@ -9387,7 +9514,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [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(string CodScheda, int Vers, string CodMisura, string NomeMisura, string TipoValMisura, string NomePar) { + public virtual int Insert(string CodScheda, int Vers, string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string CodVisib) { if ((CodScheda == null)) { throw new global::System.ArgumentNullException("CodScheda"); } @@ -9419,6 +9546,12 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS else { this.Adapter.InsertCommand.Parameters[5].Value = ((string)(NomePar)); } + if ((CodVisib == null)) { + throw new global::System.ArgumentNullException("CodVisib"); + } + else { + this.Adapter.InsertCommand.Parameters[6].Value = ((string)(CodVisib)); + } 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.Open)) { @@ -9439,7 +9572,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [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(string CodScheda, int Vers, string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string Original_CodScheda, int Original_Vers, string Original_CodMisura, string Original_NomeMisura, string Original_TipoValMisura, string Original_NomePar) { + public virtual int Update(string CodScheda, int Vers, string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string CodVisib, string Original_CodScheda, int Original_Vers, string Original_CodMisura, string Original_NomeMisura, string Original_TipoValMisura, string Original_NomePar, string Original_CodVisib) { if ((CodScheda == null)) { throw new global::System.ArgumentNullException("CodScheda"); } @@ -9471,36 +9604,48 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS else { this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(NomePar)); } + if ((CodVisib == null)) { + throw new global::System.ArgumentNullException("CodVisib"); + } + else { + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(CodVisib)); + } if ((Original_CodScheda == null)) { throw new global::System.ArgumentNullException("Original_CodScheda"); } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_CodScheda)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_CodScheda)); } - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_Vers)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_Vers)); if ((Original_CodMisura == null)) { throw new global::System.ArgumentNullException("Original_CodMisura"); } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_CodMisura)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_CodMisura)); } if ((Original_NomeMisura == null)) { throw new global::System.ArgumentNullException("Original_NomeMisura"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_NomeMisura)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_NomeMisura)); } if ((Original_TipoValMisura == null)) { throw new global::System.ArgumentNullException("Original_TipoValMisura"); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_TipoValMisura)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_TipoValMisura)); } if ((Original_NomePar == null)) { throw new global::System.ArgumentNullException("Original_NomePar"); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_NomePar)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_NomePar)); + } + if ((Original_CodVisib == null)) { + throw new global::System.ArgumentNullException("Original_CodVisib"); + } + else { + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_CodVisib)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -9522,8 +9667,42 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [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(string NomeMisura, string TipoValMisura, string NomePar, string Original_CodScheda, int Original_Vers, string Original_CodMisura, string Original_NomeMisura, string Original_TipoValMisura, string Original_NomePar) { - return this.Update(Original_CodScheda, Original_Vers, Original_CodMisura, NomeMisura, TipoValMisura, NomePar, Original_CodScheda, Original_Vers, Original_CodMisura, Original_NomeMisura, Original_TipoValMisura, Original_NomePar); + public virtual int Update(string NomeMisura, string TipoValMisura, string NomePar, string CodVisib, string Original_CodScheda, int Original_Vers, string Original_CodMisura, string Original_NomeMisura, string Original_TipoValMisura, string Original_NomePar, string Original_CodVisib) { + return this.Update(Original_CodScheda, Original_Vers, Original_CodMisura, NomeMisura, TipoValMisura, NomePar, CodVisib, Original_CodScheda, Original_Vers, Original_CodMisura, Original_NomeMisura, Original_TipoValMisura, Original_NomePar, Original_CodVisib); + } + + [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 clone(string CodSchedaVers, string CodMisura) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((CodSchedaVers == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodSchedaVers)); + } + if ((CodMisura == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(CodMisura)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9531,7 +9710,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, false)] public virtual int deleteQuery(string Original_CodScheda, global::System.Nullable Original_Vers, string Original_CodMisura) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; if ((Original_CodScheda == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9571,7 +9750,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int insertNew(string CodSchedaVers, string NomeMisura) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((CodSchedaVers == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9605,7 +9784,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int moveUpDown(string MovType, string CodScheda, global::System.Nullable Vers, string CodMisura) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((MovType == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9651,8 +9830,8 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS [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, false)] - public virtual int updateQuery(string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string Original_CodScheda, global::System.Nullable Original_Vers, string Original_CodMisura) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + public virtual int updateQuery(string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string CodVisib, string Original_CodScheda, global::System.Nullable Original_Vers, string Original_CodMisura) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((CodMisura == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9677,23 +9856,29 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS else { command.Parameters[4].Value = ((string)(NomePar)); } - if ((Original_CodScheda == null)) { + if ((CodVisib == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(Original_CodScheda)); + command.Parameters[5].Value = ((string)(CodVisib)); } - if ((Original_Vers.HasValue == true)) { - command.Parameters[6].Value = ((int)(Original_Vers.Value)); - } - else { + if ((Original_CodScheda == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } - if ((Original_CodMisura == null)) { - command.Parameters[7].Value = global::System.DBNull.Value; + else { + command.Parameters[6].Value = ((string)(Original_CodScheda)); + } + if ((Original_Vers.HasValue == true)) { + command.Parameters[7].Value = ((int)(Original_Vers.Value)); } else { - command.Parameters[7].Value = ((string)(Original_CodMisura)); + command.Parameters[7].Value = global::System.DBNull.Value; + } + if ((Original_CodMisura == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(Original_CodMisura)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -10436,6 +10621,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH tableMapping.ColumnMappings.Add("Path", "Path"); tableMapping.ColumnMappings.Add("NumSchede", "NumSchede"); tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); + tableMapping.ColumnMappings.Add("opz", "opz"); this._adapter.TableMappings.Add(tableMapping); } @@ -10452,7 +10638,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM v_SchemaCollFamMacc"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_SchemaCollFamMacc"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -10497,6 +10683,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSchedaVers", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFam", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumSchede", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@opz", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSchedaVers", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodFam", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10666,7 +10853,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH [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 updateQuery(string CodSchedaVers, string CodFam, global::System.Nullable NumSchede, string Descrizione, string Original_CodSchedaVers, string Original_CodFam) { + public virtual int updateQuery(string CodSchedaVers, string CodFam, global::System.Nullable NumSchede, string opz, string Descrizione, string Original_CodSchedaVers, string Original_CodFam) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((CodSchedaVers == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -10686,23 +10873,29 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH else { command.Parameters[3].Value = global::System.DBNull.Value; } - if ((Descrizione == null)) { + if ((opz == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(Descrizione)); + command.Parameters[4].Value = ((string)(opz)); } - if ((Original_CodSchedaVers == null)) { + if ((Descrizione == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(Original_CodSchedaVers)); + command.Parameters[5].Value = ((string)(Descrizione)); } - if ((Original_CodFam == null)) { + if ((Original_CodSchedaVers == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } else { - command.Parameters[6].Value = ((string)(Original_CodFam)); + command.Parameters[6].Value = ((string)(Original_CodSchedaVers)); + } + if ((Original_CodFam == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(Original_CodFam)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -11064,43 +11257,48 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH tableMapping.ColumnMappings.Add("Vers", "Vers"); tableMapping.ColumnMappings.Add("NumScheda", "NumScheda"); tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); + tableMapping.ColumnMappings.Add("opz", "opz"); 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].[SchemaCollMacc] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[SchemaCollMacc] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ([opz] = @Original_opz))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumScheda", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumScheda", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Descrizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Descrizione", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_opz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "opz", 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].[SchemaCollMacc] ([IdxDossier], [CodScheda], [Vers], [NumScheda], [Descrizione]) VALUES (@IdxDossier, @CodScheda, @Vers, @NumScheda, @Descrizione); -SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[SchemaCollMacc] ([IdxDossier], [CodScheda], [Vers], [NumScheda], [Descrizione], [opz]) VALUES (@IdxDossier, @CodScheda, @Vers, @NumScheda, @Descrizione, @opz); +SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxDossier", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumScheda", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumScheda", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NChar, 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("@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("@opz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "opz", 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].[SchemaCollMacc] SET [IdxDossier] = @IdxDossier, [CodScheda] = @CodScheda, [Vers] = @Vers, [NumScheda] = @NumScheda, [Descrizione] = @Descrizione WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione))); -SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[SchemaCollMacc] SET [IdxDossier] = @IdxDossier, [CodScheda] = @CodScheda, [Vers] = @Vers, [NumScheda] = @NumScheda, [Descrizione] = @Descrizione, [opz] = @opz WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ([opz] = @Original_opz)); +SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxDossier", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumScheda", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumScheda", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NChar, 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("@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("@opz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "opz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodScheda", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Vers", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumScheda", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumScheda", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Descrizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Descrizione", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_opz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "opz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11116,8 +11314,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM dbo.SchemaCollMac" + - "c"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.SchemaCollMacc"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -11224,7 +11421,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W [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_IdxDossier, string Original_CodScheda, int Original_Vers, int Original_NumScheda, string Original_Descrizione) { + public virtual int Delete(int Original_IdxDossier, string Original_CodScheda, int Original_Vers, int Original_NumScheda, string Original_Descrizione, string Original_opz) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_IdxDossier)); if ((Original_CodScheda == null)) { throw new global::System.ArgumentNullException("Original_CodScheda"); @@ -11242,6 +11439,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_Descrizione)); } + if ((Original_opz == null)) { + throw new global::System.ArgumentNullException("Original_opz"); + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_opz)); + } 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)) { @@ -11262,7 +11465,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W [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(int IdxDossier, string CodScheda, int Vers, int NumScheda, string Descrizione) { + public virtual int Insert(int IdxDossier, string CodScheda, int Vers, int NumScheda, string Descrizione, string opz) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(IdxDossier)); if ((CodScheda == null)) { throw new global::System.ArgumentNullException("CodScheda"); @@ -11278,6 +11481,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W else { this.Adapter.InsertCommand.Parameters[4].Value = ((string)(Descrizione)); } + if ((opz == null)) { + throw new global::System.ArgumentNullException("opz"); + } + else { + this.Adapter.InsertCommand.Parameters[5].Value = ((string)(opz)); + } 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.Open)) { @@ -11298,7 +11507,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W [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(int IdxDossier, string CodScheda, int Vers, int NumScheda, string Descrizione, int Original_IdxDossier, string Original_CodScheda, int Original_Vers, int Original_NumScheda, string Original_Descrizione) { + public virtual int Update(int IdxDossier, string CodScheda, int Vers, int NumScheda, string Descrizione, string opz, int Original_IdxDossier, string Original_CodScheda, int Original_Vers, int Original_NumScheda, string Original_Descrizione, string Original_opz) { this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(IdxDossier)); if ((CodScheda == null)) { throw new global::System.ArgumentNullException("CodScheda"); @@ -11314,22 +11523,34 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W else { this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Descrizione)); } - this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(Original_IdxDossier)); + if ((opz == null)) { + throw new global::System.ArgumentNullException("opz"); + } + else { + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(opz)); + } + this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_IdxDossier)); if ((Original_CodScheda == null)) { throw new global::System.ArgumentNullException("Original_CodScheda"); } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_CodScheda)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_CodScheda)); } - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_Vers)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_NumScheda)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_Vers)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_NumScheda)); if ((Original_Descrizione == null)) { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_Descrizione)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_Descrizione)); + } + if ((Original_opz == null)) { + throw new global::System.ArgumentNullException("Original_opz"); + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_opz)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -11351,8 +11572,8 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W [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(string Descrizione, int Original_IdxDossier, string Original_CodScheda, int Original_Vers, int Original_NumScheda, string Original_Descrizione) { - return this.Update(Original_IdxDossier, Original_CodScheda, Original_Vers, Original_NumScheda, Descrizione, Original_IdxDossier, Original_CodScheda, Original_Vers, Original_NumScheda, Original_Descrizione); + public virtual int Update(string Descrizione, string opz, int Original_IdxDossier, string Original_CodScheda, int Original_Vers, int Original_NumScheda, string Original_Descrizione, string Original_opz) { + return this.Update(Original_IdxDossier, Original_CodScheda, Original_Vers, Original_NumScheda, Descrizione, opz, Original_IdxDossier, Original_CodScheda, Original_Vers, Original_NumScheda, Original_Descrizione, Original_opz); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11611,6 +11832,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W tableMapping.ColumnMappings.Add("LIVal", "LIVal"); tableMapping.ColumnMappings.Add("LSVal", "LSVal"); tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum"); + tableMapping.ColumnMappings.Add("CodVisib", "CodVisib"); this._adapter.TableMappings.Add(tableMapping); } @@ -11679,6 +11901,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Operatore", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValorePar", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValoreMis", global::System.Data.SqlDbType.NVarChar, 4000, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11870,7 +12093,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W [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 updateMis(global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda, string Original_CodMisura, string Original_Fase, string Operatore, global::System.Nullable ValorePar, string ValoreMis) { + public virtual int updateMis(global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda, string Original_CodMisura, string Original_Fase, string Operatore, global::System.Nullable ValorePar, string ValoreMis, string CodVisib) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((Original_IdxDossier.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxDossier.Value)); @@ -11926,6 +12149,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W else { command.Parameters[9].Value = ((string)(ValoreMis)); } + if ((CodVisib == null)) { + command.Parameters[10].Value = global::System.DBNull.Value; + } + else { + command.Parameters[10].Value = ((string)(CodVisib)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 886cb02..bc136d2 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -393,7 +393,7 @@ SELECT CodScheda, Vers, Descrizione, Path FROM AnagSchede WHERE (CodScheda = @Co - DELETE FROM [DettScheda] WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar)) + DELETE FROM [DettScheda] WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar) AND ([CodVisib] = @Original_CodVisib)) @@ -401,13 +401,14 @@ SELECT CodScheda, Vers, Descrizione, Path FROM AnagSchede WHERE (CodScheda = @Co + - INSERT INTO [DettScheda] ([CodScheda], [Vers], [CodMisura], [NomeMisura], [TipoValMisura], [NomePar]) VALUES (@CodScheda, @Vers, @CodMisura, @NomeMisura, @TipoValMisura, @NomePar); -SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers) + INSERT INTO [DettScheda] ([CodScheda], [Vers], [CodMisura], [NomeMisura], [TipoValMisura], [NomePar], [CodVisib]) VALUES (@CodScheda, @Vers, @CodMisura, @NomeMisura, @TipoValMisura, @NomePar, @CodVisib); +SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar, CodVisib FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers) @@ -415,19 +416,21 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS + - SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettScheda + SELECT * +FROM DettScheda - UPDATE [DettScheda] SET [CodScheda] = @CodScheda, [Vers] = @Vers, [CodMisura] = @CodMisura, [NomeMisura] = @NomeMisura, [TipoValMisura] = @TipoValMisura, [NomePar] = @NomePar WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar)); -SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers) + UPDATE [DettScheda] SET [CodScheda] = @CodScheda, [Vers] = @Vers, [CodMisura] = @CodMisura, [NomeMisura] = @NomeMisura, [TipoValMisura] = @TipoValMisura, [NomePar] = @NomePar, [CodVisib] = @CodVisib WHERE (([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([CodMisura] = @Original_CodMisura) AND ([NomeMisura] = @Original_NomeMisura) AND ([TipoValMisura] = @Original_TipoValMisura) AND ([NomePar] = @Original_NomePar) AND ([CodVisib] = @Original_CodVisib)); +SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar, CodVisib FROM DettScheda WHERE (CodMisura = @CodMisura) AND (CodScheda = @CodScheda) AND (Vers = @Vers) @@ -435,12 +438,14 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS + + @@ -453,8 +458,21 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS + + + + + dbo.stp_DS_clone + + + + + + + + @@ -515,6 +533,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS + @@ -659,7 +678,8 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - SELECT * FROM v_SchemaCollFamMacc + SELECT * +FROM v_SchemaCollFamMacc @@ -674,6 +694,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH + @@ -745,6 +766,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH + @@ -797,52 +819,57 @@ FROM v_ElencoDossier - DELETE FROM [dbo].[SchemaCollMacc] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione))) + DELETE FROM [dbo].[SchemaCollMacc] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ([opz] = @Original_opz)) - + + - INSERT INTO [dbo].[SchemaCollMacc] ([IdxDossier], [CodScheda], [Vers], [NumScheda], [Descrizione]) VALUES (@IdxDossier, @CodScheda, @Vers, @NumScheda, @Descrizione); -SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers) + INSERT INTO [dbo].[SchemaCollMacc] ([IdxDossier], [CodScheda], [Vers], [NumScheda], [Descrizione], [opz]) VALUES (@IdxDossier, @CodScheda, @Vers, @NumScheda, @Descrizione, @opz); +SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers) - + + - - SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM dbo.SchemaCollMacc + + SELECT * +FROM dbo.SchemaCollMacc - UPDATE [dbo].[SchemaCollMacc] SET [IdxDossier] = @IdxDossier, [CodScheda] = @CodScheda, [Vers] = @Vers, [NumScheda] = @NumScheda, [Descrizione] = @Descrizione WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione))); -SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers) + UPDATE [dbo].[SchemaCollMacc] SET [IdxDossier] = @IdxDossier, [CodScheda] = @CodScheda, [Vers] = @Vers, [NumScheda] = @NumScheda, [Descrizione] = @Descrizione, [opz] = @opz WHERE (([IdxDossier] = @Original_IdxDossier) AND ([CodScheda] = @Original_CodScheda) AND ([Vers] = @Original_Vers) AND ([NumScheda] = @Original_NumScheda) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ([opz] = @Original_opz)); +SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz FROM SchemaCollMacc WHERE (CodScheda = @CodScheda) AND (IdxDossier = @IdxDossier) AND (NumScheda = @NumScheda) AND (Vers = @Vers) - + + - + + @@ -854,6 +881,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W + @@ -940,6 +968,7 @@ FROM v_Misure + @@ -1013,6 +1042,7 @@ FROM v_Misure + @@ -1070,7 +1100,7 @@ FROM v_Misure - + @@ -1090,7 +1120,7 @@ FROM v_Misure - + @@ -1124,7 +1154,7 @@ FROM v_Misure - + @@ -1144,7 +1174,7 @@ FROM v_Misure - + @@ -1172,7 +1202,7 @@ FROM v_Misure - + @@ -1211,10 +1241,17 @@ FROM v_Misure + + + + + + + - + @@ -1239,7 +1276,7 @@ FROM v_Misure - + @@ -1286,10 +1323,17 @@ FROM v_Misure + + + + + + + - + @@ -1328,7 +1372,7 @@ FROM v_Misure - + @@ -1348,10 +1392,17 @@ FROM v_Misure + + + + + + + - + @@ -1434,10 +1485,17 @@ FROM v_Misure + + + + + + + - + @@ -1612,16 +1670,16 @@ FROM v_Misure - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index bfb36b1..64374eb 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -4,34 +4,34 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - + + + + + + + + + + + - + - 359 - 493 + 350 + 515 401 - 493 + 515 - + 902 @@ -43,7 +43,7 @@ - + 401 @@ -55,19 +55,19 @@ - + - 219 - 300 + 210 + 322 - 219 - 250 + 210 + 288 - + 602 @@ -79,7 +79,7 @@ - + 1126 @@ -91,31 +91,31 @@ - + - 359 - 332 + 350 + 346 - 744 - 332 + 745 + 346 - + 1068 - 282 + 274 - 977 - 282 + 981 + 274 - + 1100 @@ -127,14 +127,14 @@ - + - 813 - 497 + 814 + 508 - 813 + 814 562 diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index 8aa2f3b..47dccad 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index 8aa2f3b..47dccad 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index df4a4cd..197f6ff 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 00c2e7d..0ac5fd1 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -289,9 +289,9 @@ - - - + + + Always @@ -782,9 +782,9 @@ - - - + + + 10.0 diff --git a/CMS_SC/ReportCliente.aspx b/CMS_SC/ReportCliente.aspx index 0be816c..a12b40e 100644 --- a/CMS_SC/ReportCliente.aspx +++ b/CMS_SC/ReportCliente.aspx @@ -30,7 +30,7 @@
- +
diff --git a/CMS_SC/ReportCompatto.aspx b/CMS_SC/ReportCompatto.aspx index 9e3396b..c37c4ab 100644 --- a/CMS_SC/ReportCompatto.aspx +++ b/CMS_SC/ReportCompatto.aspx @@ -29,7 +29,7 @@
- +
diff --git a/CMS_SC/ReportCompleto.aspx b/CMS_SC/ReportCompleto.aspx index cbe1f2d..b85a337 100644 --- a/CMS_SC/ReportCompleto.aspx +++ b/CMS_SC/ReportCompleto.aspx @@ -29,7 +29,7 @@
- +
diff --git a/CMS_SC/Reports/ReportCli.rdl b/CMS_SC/Reports/Report_C.rdl similarity index 100% rename from CMS_SC/Reports/ReportCli.rdl rename to CMS_SC/Reports/Report_C.rdl diff --git a/CMS_SC/Reports/ReportCli.rdlc b/CMS_SC/Reports/Report_C.rdlc similarity index 100% rename from CMS_SC/Reports/ReportCli.rdlc rename to CMS_SC/Reports/Report_C.rdlc diff --git a/CMS_SC/Reports/ReportComp.rdl b/CMS_SC/Reports/Report_F.rdl similarity index 100% rename from CMS_SC/Reports/ReportComp.rdl rename to CMS_SC/Reports/Report_F.rdl diff --git a/CMS_SC/Reports/ReportComp.rdlc b/CMS_SC/Reports/Report_F.rdlc similarity index 100% rename from CMS_SC/Reports/ReportComp.rdlc rename to CMS_SC/Reports/Report_F.rdlc diff --git a/CMS_SC/Reports/ReportFull.rdl b/CMS_SC/Reports/Report_S.rdl similarity index 100% rename from CMS_SC/Reports/ReportFull.rdl rename to CMS_SC/Reports/Report_S.rdl diff --git a/CMS_SC/Reports/ReportFull.rdlc b/CMS_SC/Reports/Report_S.rdlc similarity index 100% rename from CMS_SC/Reports/ReportFull.rdlc rename to CMS_SC/Reports/Report_S.rdlc diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index 64539c5..4fff1bc 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -49,6 +49,15 @@ + + + + + + + + + diff --git a/CMS_SC/WebUserControls/mod_AnagFamMacc.ascx.cs b/CMS_SC/WebUserControls/mod_AnagFamMacc.ascx.cs index d77f82f..64c8fa4 100644 --- a/CMS_SC/WebUserControls/mod_AnagFamMacc.ascx.cs +++ b/CMS_SC/WebUserControls/mod_AnagFamMacc.ascx.cs @@ -1,4 +1,5 @@ using CMS_SC_Data; +using SteamWare; using System; using System.Collections.Generic; using System.Linq; @@ -37,7 +38,7 @@ namespace CMS_SC.WebUserControls protected void lbAddNew_Click(object sender, EventArgs e) { // inserisco nuovo record - DtProxy.man.taEFM.insertQuery("00", "00 Nuova FAMIGLIA"); + DtProxy.man.taEFM.insertQuery(memLayer.ML.CRS("defEFM01"), memLayer.ML.CRS("defEFM02")); // update! grView.DataBind(); } diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx b/CMS_SC/WebUserControls/mod_DettScheda.ascx index 85d9c7f..a27a2ed 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx @@ -20,10 +20,8 @@ - <%-- - --%> - - + + <%# traduci("moveMis") %> @@ -31,22 +29,15 @@
- +
- +
- - - - - - - - - + + @@ -55,14 +46,8 @@ - - - - - - - - + + @@ -72,6 +57,7 @@   + @@ -98,6 +84,7 @@ + diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs index 5c25daf..de0ed07 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs @@ -144,7 +144,7 @@ namespace CMS_SC.WebUserControls /// /// /// - protected void lbUpDown_Click(object sender, EventArgs e) + protected void lb_Click(object sender, EventArgs e) { SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument); } @@ -162,10 +162,21 @@ namespace CMS_SC.WebUserControls _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand"); SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); } - // SE c'era comando eseguo move... if (_comando != "") { - DtProxy.man.taDS.moveUpDown(_comando, CodSchedaSel, VersSel, CodMisuraSel); + // SE c'era comando eseguo move... + switch (_comando) + { + case "moveUp": + case "moveDown": + DtProxy.man.taDS.moveUpDown(_comando, CodSchedaSel, VersSel, CodMisuraSel); + break; + case "clone": + DtProxy.man.taDS.clone(memLayer.ML.QSS("CodSchedaVers"), grView.SelectedDataKey["CodMisura"].ToString()); + break; + default: + break; + } resetSelezione(); } else diff --git a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx index 4600c32..0a3addd 100644 --- a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx +++ b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx @@ -21,7 +21,7 @@ - + @@ -29,21 +29,23 @@ - + - - + + + + <%-- - + --%> <%----%> @@ -78,6 +80,7 @@ + diff --git a/CMS_SC/WebUserControls/mod_anagFasi.ascx.cs b/CMS_SC/WebUserControls/mod_anagFasi.ascx.cs index a274cf9..f1e533b 100644 --- a/CMS_SC/WebUserControls/mod_anagFasi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_anagFasi.ascx.cs @@ -6,6 +6,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using CMS_SC_Data; +using SteamWare; namespace CMS_SC.WebUserControls { @@ -37,7 +38,7 @@ namespace CMS_SC.WebUserControls protected void lbAddNew_Click(object sender, EventArgs e) { // inserisco nuovo record - DtProxy.man.taAF.insertQuery("000000", "000000 Nuova Fase"); + DtProxy.man.taAF.insertQuery(memLayer.ML.CRS("defAF01"), memLayer.ML.CRS("defAF02")); // update! grView.DataBind(); } diff --git a/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs b/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs index 04da549..561f315 100644 --- a/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs +++ b/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs @@ -1,4 +1,5 @@ using CMS_SC_Data; +using SteamWare; using System; using System.Collections.Generic; using System.Linq; @@ -37,7 +38,7 @@ namespace CMS_SC.WebUserControls protected void lbAddNew_Click(object sender, EventArgs e) { // inserisco nuovo record - DtProxy.man.taEM.insertQuery("000000", "000000 Nuova Macchina", "ND", "ND"); + DtProxy.man.taEM.insertQuery(memLayer.ML.CRS("defEM01"), memLayer.ML.CRS("defEM02"), "ND", "ND"); // update! grView.DataBind(); } diff --git a/CMS_SC/WebUserControls/mod_anagSchedeColl.ascx.cs b/CMS_SC/WebUserControls/mod_anagSchedeColl.ascx.cs index 28af305..c4b1220 100644 --- a/CMS_SC/WebUserControls/mod_anagSchedeColl.ascx.cs +++ b/CMS_SC/WebUserControls/mod_anagSchedeColl.ascx.cs @@ -37,7 +37,7 @@ namespace CMS_SC.WebUserControls protected void lbAddNew_Click(object sender, EventArgs e) { // inserisco nuovo record - DtProxy.man.taASC.insertQuery("_CG00000", 0, "000000 Nuova Scheda", ""); + DtProxy.man.taASC.insertQuery(memLayer.ML.CRS("defASC01"), 0, memLayer.ML.CRS("defASC02"), ""); // update! grView.DataBind(); } diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx index d3acbae..f8d3ee3 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx @@ -23,7 +23,7 @@
- + @@ -41,9 +41,10 @@
- + + @@ -96,6 +97,7 @@ + diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx index 0a6606e..7cc943f 100644 --- a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx +++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx @@ -7,6 +7,7 @@ <%----%> + diff --git a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs index 5b234dc..927e036 100644 --- a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs +++ b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs @@ -14,7 +14,7 @@ namespace CMS_SC.WebUserControls public partial class mod_reportCompleto : System.Web.UI.UserControl { /// - /// Tipo di report richiesto (da URL): Full / Comp / Cli + /// Tipo di report richiesto (da URL): Full / Cli / Short /// public string TipoReport { get; set; } /// @@ -57,7 +57,7 @@ namespace CMS_SC.WebUserControls { // 1) impostazione file report - localReport.ReportPath = string.Format(@".\Reports\Report{0}.rdlc", TipoReport); + localReport.ReportPath = string.Format(@".\Reports\Report_{0}.rdlc", TipoReport); // 2) caricamento tab dati DataTable tabDati = new DataTable(); diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 8aa2f3b..47dccad 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index d24fb5f..7cd6b1e 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ