diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 5ded782..51c755c 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 0733f2a..84c09e9 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 0733f2a..84c09e9 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 0b752a3..8071040 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Upload/Document.aspx.cs b/WebSCR/Upload/Document.aspx.cs index b230bc6..a815e8a 100644 --- a/WebSCR/Upload/Document.aspx.cs +++ b/WebSCR/Upload/Document.aspx.cs @@ -46,6 +46,7 @@ namespace WebSCR.Upload string LOCAL_DEST = ""; string CAP_DEST = ""; string ULT_AGG = ""; + string ANNOTAZION = ""; try { TIPOPROTOC = qsVal("TIPOPROTOC"); @@ -67,9 +68,10 @@ namespace WebSCR.Upload LOCAL_DEST = qsVal("LOCAL_DEST"); CAP_DEST = qsVal("CAP_DEST"); ULT_AGG = qsVal("ULT_AGG"); + ANNOTAZION = qsVal("ANNOTAZION"); if (memLayer.ML.CRI("_logLevel") > 6) { - logger.lg.scriviLog(string.Format("Valori letti:{0}TIPOPROTOC: {1}{0}NUMERO: {2}{0}ESERPROTOC: {3}{0}NUMEPROTOC: {4}{0}DATAPROTOC: {5}{0}ESERRIFERI: {6}{0}NUMERIFERI: {7}{0}TIPORIFERI: {8}{0}DATARIFERI: {9}{0}NUMEDOCRIF: {10}{0}DATADOCRIF: {11}{0}ESERCOLLEG: {12}{0}CLI_FOR: {12}{0}DESTINATAR: {12}{0}RGSOC_DEST: {12}{0}INDIR_DEST: {12}{0}LOCAL_DEST: {12}{0}CAP_DEST: {12}{0}ULT_AGG: {12}", Environment.NewLine, TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG), tipoLog.INFO); + logger.lg.scriviLog(string.Format("Valori letti:{0}TIPOPROTOC: {1}{0}NUMERO: {2}{0}ESERPROTOC: {3}{0}NUMEPROTOC: {4}{0}DATAPROTOC: {5}{0}ESERRIFERI: {6}{0}NUMERIFERI: {7}{0}TIPORIFERI: {8}{0}DATARIFERI: {9}{0}NUMEDOCRIF: {10}{0}DATADOCRIF: {11}{0}ESERCOLLEG: {12}{0}CLI_FOR: {12}{0}DESTINATAR: {12}{0}RGSOC_DEST: {12}{0}INDIR_DEST: {12}{0}LOCAL_DEST: {12}{0}CAP_DEST: {12}{0}ULT_AGG: {12}{0}ANNOTAZION: {13}", Environment.NewLine, TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG, ANNOTAZION), tipoLog.INFO); } } catch @@ -82,7 +84,7 @@ namespace WebSCR.Upload try { // ora processo UPSERT... - DtProxy.man.taDocs.upsert(TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG); + DtProxy.man.taDocs.upsert(TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG, ANNOTAZION); answ = "OK"; // registro in risposta che รจ andato tutto bene... } catch (Exception exc) diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 30a77f2..08e4330 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 369a00a..9353439 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 1769ee4..c7a411d 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index 99e67e8..0a304ed 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -5042,6 +5042,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnULT_AGG; + private global::System.Data.DataColumn columnANNOTAZION; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public DB2_DOCSDataTable() { @@ -5227,6 +5229,14 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn ANNOTAZIONColumn { + get { + return this.columnANNOTAZION; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -5283,7 +5293,8 @@ namespace WebSCR_data { string INDIR_DEST, string LOCAL_DEST, string CAP_DEST, - string ULT_AGG) { + string ULT_AGG, + string ANNOTAZION) { DB2_DOCSRow rowDB2_DOCSRow = ((DB2_DOCSRow)(this.NewRow())); object[] columnValuesArray = new object[] { TIPOPROTOC, @@ -5304,7 +5315,8 @@ namespace WebSCR_data { INDIR_DEST, LOCAL_DEST, CAP_DEST, - ULT_AGG}; + ULT_AGG, + ANNOTAZION}; rowDB2_DOCSRow.ItemArray = columnValuesArray; this.Rows.Add(rowDB2_DOCSRow); return rowDB2_DOCSRow; @@ -5353,6 +5365,7 @@ namespace WebSCR_data { this.columnLOCAL_DEST = base.Columns["LOCAL_DEST"]; this.columnCAP_DEST = base.Columns["CAP_DEST"]; this.columnULT_AGG = base.Columns["ULT_AGG"]; + this.columnANNOTAZION = base.Columns["ANNOTAZION"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5396,6 +5409,8 @@ namespace WebSCR_data { base.Columns.Add(this.columnCAP_DEST); this.columnULT_AGG = new global::System.Data.DataColumn("ULT_AGG", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnULT_AGG); + this.columnANNOTAZION = new global::System.Data.DataColumn("ANNOTAZION", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnANNOTAZION); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnNUMERO}, true)); this.columnTIPOPROTOC.MaxLength = 2; @@ -5419,6 +5434,8 @@ namespace WebSCR_data { this.columnLOCAL_DEST.MaxLength = 35; this.columnCAP_DEST.MaxLength = 5; this.columnULT_AGG.MaxLength = 8; + this.columnANNOTAZION.AllowDBNull = false; + this.columnANNOTAZION.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7789,6 +7806,17 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string ANNOTAZION { + get { + return ((string)(this[this.tableDB2_DOCS.ANNOTAZIONColumn])); + } + set { + this[this.tableDB2_DOCS.ANNOTAZIONColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsTIPOPROTOCNull() { @@ -13530,30 +13558,8 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq tableMapping.ColumnMappings.Add("LOCAL_DEST", "LOCAL_DEST"); tableMapping.ColumnMappings.Add("CAP_DEST", "CAP_DEST"); tableMapping.ColumnMappings.Add("ULT_AGG", "ULT_AGG"); + tableMapping.ColumnMappings.Add("ANNOTAZION", "ANNOTAZION"); this._adapter.TableMappings.Add(tableMapping); - this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [raw].[DB2_DOCS] ([TIPOPROTOC], [NUMERO], [ESERPROTOC], [NUMEPROTOC], [DATAPROTOC], [ESERRIFERI], [NUMERIFERI], [TIPORIFERI], [DATARIFERI], [NUMEDOCRIF], [DATADOCRIF], [ESERCOLLEG], [CLI_FOR], [DESTINATAR], [RGSOC_DEST], [INDIR_DEST], [LOCAL_DEST], [CAP_DEST], [ULT_AGG]) VALUES (@TIPOPROTOC, @NUMERO, @ESERPROTOC, @NUMEPROTOC, @DATAPROTOC, @ESERRIFERI, @NUMERIFERI, @TIPORIFERI, @DATARIFERI, @NUMEDOCRIF, @DATADOCRIF, @ESERCOLLEG, @CLI_FOR, @DESTINATAR, @RGSOC_DEST, @INDIR_DEST, @LOCAL_DEST, @CAP_DEST, @ULT_AGG)"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TIPOPROTOC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TIPOPROTOC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NUMERO", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NUMERO", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ESERPROTOC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ESERPROTOC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NUMEPROTOC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NUMEPROTOC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DATAPROTOC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DATAPROTOC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ESERRIFERI", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ESERRIFERI", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NUMERIFERI", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NUMERIFERI", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TIPORIFERI", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TIPORIFERI", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DATARIFERI", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DATARIFERI", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NUMEDOCRIF", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NUMEDOCRIF", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DATADOCRIF", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DATADOCRIF", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ESERCOLLEG", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ESERCOLLEG", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CLI_FOR", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CLI_FOR", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DESTINATAR", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DESTINATAR", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RGSOC_DEST", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "RGSOC_DEST", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@INDIR_DEST", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "INDIR_DEST", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LOCAL_DEST", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LOCAL_DEST", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CAP_DEST", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CAP_DEST", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ULT_AGG", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ULT_AGG", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13569,9 +13575,9 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERI" + - "FERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTI" + - "NATAR, RGSOC_DEST, INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG FROM raw.DB2_DOCS"; + this._commandCollection[0].CommandText = @"SELECT TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, + INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG, ANNOTAZION +FROM raw.DB2_DOCS"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -13608,6 +13614,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LOCAL_DEST", global::System.Data.SqlDbType.NVarChar, 35, 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("@CAP_DEST", global::System.Data.SqlDbType.NVarChar, 5, 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("@ULT_AGG", global::System.Data.SqlDbType.NVarChar, 8, 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("@ANNOTAZION", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13662,189 +13669,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq return dataTable; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_Applicazione.DB2_DOCSDataTable dataTable) { - return this.Adapter.Update(dataTable); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_Applicazione dataSet) { - return this.Adapter.Update(dataSet, "DB2_DOCS"); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert( - string TIPOPROTOC, - string NUMERO, - string ESERPROTOC, - string NUMEPROTOC, - string DATAPROTOC, - string ESERRIFERI, - string NUMERIFERI, - string TIPORIFERI, - string DATARIFERI, - string NUMEDOCRIF, - string DATADOCRIF, - string ESERCOLLEG, - string CLI_FOR, - string DESTINATAR, - string RGSOC_DEST, - string INDIR_DEST, - string LOCAL_DEST, - string CAP_DEST, - string ULT_AGG) { - if ((TIPOPROTOC == null)) { - this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[0].Value = ((string)(TIPOPROTOC)); - } - if ((NUMERO == null)) { - throw new global::System.ArgumentNullException("NUMERO"); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(NUMERO)); - } - if ((ESERPROTOC == null)) { - this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(ESERPROTOC)); - } - if ((NUMEPROTOC == null)) { - this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(NUMEPROTOC)); - } - if ((DATAPROTOC == null)) { - this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(DATAPROTOC)); - } - if ((ESERRIFERI == null)) { - this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[5].Value = ((string)(ESERRIFERI)); - } - if ((NUMERIFERI == null)) { - this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[6].Value = ((string)(NUMERIFERI)); - } - if ((TIPORIFERI == null)) { - this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[7].Value = ((string)(TIPORIFERI)); - } - if ((DATARIFERI == null)) { - this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[8].Value = ((string)(DATARIFERI)); - } - if ((NUMEDOCRIF == null)) { - this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[9].Value = ((string)(NUMEDOCRIF)); - } - if ((DATADOCRIF == null)) { - this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[10].Value = ((string)(DATADOCRIF)); - } - if ((ESERCOLLEG == null)) { - this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[11].Value = ((string)(ESERCOLLEG)); - } - if ((CLI_FOR == null)) { - this.Adapter.InsertCommand.Parameters[12].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[12].Value = ((string)(CLI_FOR)); - } - if ((DESTINATAR == null)) { - this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[13].Value = ((string)(DESTINATAR)); - } - if ((RGSOC_DEST == null)) { - this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[14].Value = ((string)(RGSOC_DEST)); - } - if ((INDIR_DEST == null)) { - this.Adapter.InsertCommand.Parameters[15].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[15].Value = ((string)(INDIR_DEST)); - } - if ((LOCAL_DEST == null)) { - this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[16].Value = ((string)(LOCAL_DEST)); - } - if ((CAP_DEST == null)) { - this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[17].Value = ((string)(CAP_DEST)); - } - if ((ULT_AGG == null)) { - this.Adapter.InsertCommand.Parameters[18].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[18].Value = ((string)(ULT_AGG)); - } - 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)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -13867,7 +13691,8 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq string INDIR_DEST, string LOCAL_DEST, string CAP_DEST, - string ULT_AGG) { + string ULT_AGG, + string ANNOTAZION) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((TIPOPROTOC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -13983,6 +13808,12 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq else { command.Parameters[19].Value = ((string)(ULT_AGG)); } + if ((ANNOTAZION == null)) { + command.Parameters[20].Value = global::System.DBNull.Value; + } + else { + command.Parameters[20].Value = ((string)(ANNOTAZION)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -14023,8 +13854,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq private DisponibilitaTableAdapter _disponibilitaTableAdapter; - private DB2_DOCSTableAdapter _dB2_DOCSTableAdapter; - private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -14110,20 +13939,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public DB2_DOCSTableAdapter DB2_DOCSTableAdapter { - get { - return this._dB2_DOCSTableAdapter; - } - set { - this._dB2_DOCSTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -14163,10 +13978,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq && (this._disponibilitaTableAdapter.Connection != null))) { return this._disponibilitaTableAdapter.Connection; } - if (((this._dB2_DOCSTableAdapter != null) - && (this._dB2_DOCSTableAdapter.Connection != null))) { - return this._dB2_DOCSTableAdapter.Connection; - } return null; } set { @@ -14195,9 +14006,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq if ((this._disponibilitaTableAdapter != null)) { count = (count + 1); } - if ((this._dB2_DOCSTableAdapter != null)) { - count = (count + 1); - } return count; } } @@ -14254,15 +14062,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq allChangedRows.AddRange(updatedRows); } } - if ((this._dB2_DOCSTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.DB2_DOCS.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._dB2_DOCSTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } return result; } @@ -14313,14 +14112,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq allAddedRows.AddRange(addedRows); } } - if ((this._dB2_DOCSTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.DB2_DOCS.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._dB2_DOCSTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } return result; } @@ -14331,14 +14122,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateDeletedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._dB2_DOCSTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.DB2_DOCS.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._dB2_DOCSTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._disponibilitaTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Disponibilita.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -14443,11 +14226,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } - if (((this._dB2_DOCSTableAdapter != null) - && (this.MatchTableAdapterConnection(this._dB2_DOCSTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + - "tring."); - } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + @@ -14525,15 +14303,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq adaptersWithAcceptChangesDuringUpdate.Add(this._disponibilitaTableAdapter.Adapter); } } - if ((this._dB2_DOCSTableAdapter != null)) { - revertConnections.Add(this._dB2_DOCSTableAdapter, this._dB2_DOCSTableAdapter.Connection); - this._dB2_DOCSTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._dB2_DOCSTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._dB2_DOCSTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._dB2_DOCSTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._dB2_DOCSTableAdapter.Adapter); - } - } // //---- Perform updates ----------- // @@ -14612,10 +14381,6 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq this._disponibilitaTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._disponibilitaTableAdapter])); this._disponibilitaTableAdapter.Transaction = null; } - if ((this._dB2_DOCSTableAdapter != null)) { - this._dB2_DOCSTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._dB2_DOCSTableAdapter])); - this._dB2_DOCSTableAdapter.Transaction = null; - } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 852f327..251d23e 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -1035,36 +1035,12 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - - - - INSERT INTO [raw].[DB2_DOCS] ([TIPOPROTOC], [NUMERO], [ESERPROTOC], [NUMEPROTOC], [DATAPROTOC], [ESERRIFERI], [NUMERIFERI], [TIPORIFERI], [DATARIFERI], [NUMEDOCRIF], [DATADOCRIF], [ESERCOLLEG], [CLI_FOR], [DESTINATAR], [RGSOC_DEST], [INDIR_DEST], [LOCAL_DEST], [CAP_DEST], [ULT_AGG]) VALUES (@TIPOPROTOC, @NUMERO, @ESERPROTOC, @NUMEPROTOC, @DATAPROTOC, @ESERRIFERI, @NUMERIFERI, @TIPORIFERI, @DATARIFERI, @NUMEDOCRIF, @DATADOCRIF, @ESERCOLLEG, @CLI_FOR, @DESTINATAR, @RGSOC_DEST, @INDIR_DEST, @LOCAL_DEST, @CAP_DEST, @ULT_AGG) - - - - - - - - - - - - - - - - - - - - - - - + - - SELECT TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG FROM raw.DB2_DOCS + + SELECT TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERIFERI, TIPORIFERI, DATARIFERI, NUMEDOCRIF, DATADOCRIF, ESERCOLLEG, CLI_FOR, DESTINATAR, RGSOC_DEST, + INDIR_DEST, LOCAL_DEST, CAP_DEST, ULT_AGG, ANNOTAZION +FROM raw.DB2_DOCS @@ -1090,6 +1066,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + @@ -1138,6 +1115,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + @@ -1152,7 +1130,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1184,7 +1162,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1220,7 +1198,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1245,7 +1223,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1329,7 +1307,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1467,7 +1445,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1477,7 +1455,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1493,7 +1471,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1523,7 +1501,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1540,7 +1518,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1575,7 +1553,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1630,7 +1608,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1766,6 +1744,13 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + + + + + + @@ -1821,7 +1806,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + \ No newline at end of file diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index b4354ce..08f6ccb 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,20 +4,20 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - - + + diff --git a/WebSCR_data/app.config b/WebSCR_data/app.config index 03566b4..01ecf2d 100644 --- a/WebSCR_data/app.config +++ b/WebSCR_data/app.config @@ -3,8 +3,6 @@ - + \ No newline at end of file diff --git a/WebSCR_data/bin/Release/SteamWare.dll b/WebSCR_data/bin/Release/SteamWare.dll index 30a77f2..08e4330 100644 Binary files a/WebSCR_data/bin/Release/SteamWare.dll and b/WebSCR_data/bin/Release/SteamWare.dll differ diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index 1769ee4..c7a411d 100644 Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll.config b/WebSCR_data/bin/Release/WebSCR_data.dll.config index 03566b4..01ecf2d 100644 --- a/WebSCR_data/bin/Release/WebSCR_data.dll.config +++ b/WebSCR_data/bin/Release/WebSCR_data.dll.config @@ -3,8 +3,6 @@ - + \ No newline at end of file diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 16e02a9..6440eef 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache index 5b0155a..036285d 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index 1769ee4..c7a411d 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ