From cd98a6a6a2de5a53d25bf396dc5263fc9443ac40 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 4 Sep 2018 10:34:34 +0200 Subject: [PATCH] paginazione con card delel 3 pagine main --- AppData/DS_App.Designer.cs | 511 ++++++------------ AppData/DS_App.xsd | 101 ++-- AppData/DS_App.xss | 6 +- C-TRACK/C-TRACK.csproj | 8 + C-TRACK/WebUserControls/mod_addTask.ascx.cs | 24 +- C-TRACK/WebUserControls/mod_taskList.ascx | 10 +- C-TRACK/WebUserControls/mod_taskList.ascx.cs | 18 + .../mod_taskList.ascx.designer.cs | 4 +- C-TRACK/WebUserControls/mod_taskRec.ascx | 29 + C-TRACK/WebUserControls/mod_taskRec.ascx.cs | 26 + .../mod_taskRec.ascx.designer.cs | 42 ++ C-TRACK/barcode.aspx | 15 +- C-TRACK/postazioni.aspx | 14 +- C-TRACK/task.aspx | 20 +- C-TRACK/task.aspx.designer.cs | 9 + 15 files changed, 382 insertions(+), 455 deletions(-) create mode 100644 C-TRACK/WebUserControls/mod_taskRec.ascx create mode 100644 C-TRACK/WebUserControls/mod_taskRec.ascx.cs create mode 100644 C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 9e3d595..9cb40ec 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -1544,6 +1544,12 @@ namespace AppData { private global::System.Data.DataColumn columnQtaEv; + private global::System.Data.DataColumn columnNomeOpr; + + private global::System.Data.DataColumn columnDescrizione; + + private global::System.Data.DataColumn columnDescrFase; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public TaskRecDataTable() { @@ -1641,6 +1647,30 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn NomeOprColumn { + get { + return this.columnNomeOpr; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn DescrizioneColumn { + get { + return this.columnDescrizione; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn DescrFaseColumn { + get { + return this.columnDescrFase; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1678,7 +1708,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public TaskRecRow AddTaskRecRow(AnagOprRow parentAnagOprRowByFK_TaskRec_AnagOpr, AnagPostRow parentAnagPostRowByFK_TaskRec_AnagPost, string NumTask, AnagFasiRow parentAnagFasiRowByFK_TaskRec_AnagFasi, System.DateTime DtStart, System.DateTime DtEnd, int QtaEv) { + public TaskRecRow AddTaskRecRow(AnagOprRow parentAnagOprRowByFK_TaskRec_AnagOpr, AnagPostRow parentAnagPostRowByFK_TaskRec_AnagPost, string NumTask, AnagFasiRow parentAnagFasiRowByFK_TaskRec_AnagFasi, System.DateTime DtStart, System.DateTime DtEnd, int QtaEv, string NomeOpr, string Descrizione, string DescrFase) { TaskRecRow rowTaskRecRow = ((TaskRecRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1688,7 +1718,10 @@ namespace AppData { null, DtStart, DtEnd, - QtaEv}; + QtaEv, + NomeOpr, + Descrizione, + DescrFase}; if ((parentAnagOprRowByFK_TaskRec_AnagOpr != null)) { columnValuesArray[1] = parentAnagOprRowByFK_TaskRec_AnagOpr[0]; } @@ -1735,6 +1768,9 @@ namespace AppData { this.columnDtStart = base.Columns["DtStart"]; this.columnDtEnd = base.Columns["DtEnd"]; this.columnQtaEv = base.Columns["QtaEv"]; + this.columnNomeOpr = base.Columns["NomeOpr"]; + this.columnDescrizione = base.Columns["Descrizione"]; + this.columnDescrFase = base.Columns["DescrFase"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1756,6 +1792,12 @@ namespace AppData { base.Columns.Add(this.columnDtEnd); this.columnQtaEv = new global::System.Data.DataColumn("QtaEv", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnQtaEv); + this.columnNomeOpr = new global::System.Data.DataColumn("NomeOpr", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNomeOpr); + this.columnDescrizione = new global::System.Data.DataColumn("Descrizione", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrizione); + this.columnDescrFase = new global::System.Data.DataColumn("DescrFase", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrFase); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxRec}, true)); this.columnIdxRec.AutoIncrement = true; @@ -1774,6 +1816,10 @@ namespace AppData { this.columnCodFase.MaxLength = 50; this.columnDtStart.AllowDBNull = false; this.columnQtaEv.AllowDBNull = false; + this.columnNomeOpr.ReadOnly = true; + this.columnNomeOpr.MaxLength = 101; + this.columnDescrizione.MaxLength = 50; + this.columnDescrFase.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3717,6 +3763,54 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string NomeOpr { + get { + try { + return ((string)(this[this.tableTaskRec.NomeOprColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NomeOpr\' nella tabella \'TaskRec\' è DBNull.", e); + } + } + set { + this[this.tableTaskRec.NomeOprColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string Descrizione { + get { + try { + return ((string)(this[this.tableTaskRec.DescrizioneColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'Descrizione\' nella tabella \'TaskRec\' è DBNull.", e); + } + } + set { + this[this.tableTaskRec.DescrizioneColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string DescrFase { + get { + try { + return ((string)(this[this.tableTaskRec.DescrFaseColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'DescrFase\' nella tabella \'TaskRec\' è DBNull.", e); + } + } + set { + this[this.tableTaskRec.DescrFaseColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagFasiRow AnagFasiRow { @@ -3762,6 +3856,42 @@ namespace AppData { this[this.tableTaskRec.DtEndColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsNomeOprNull() { + return this.IsNull(this.tableTaskRec.NomeOprColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetNomeOprNull() { + this[this.tableTaskRec.NomeOprColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsDescrizioneNull() { + return this.IsNull(this.tableTaskRec.DescrizioneColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetDescrizioneNull() { + this[this.tableTaskRec.DescrizioneColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsDescrFaseNull() { + return this.IsNull(this.tableTaskRec.DescrFaseColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetDescrFaseNull() { + this[this.tableTaskRec.DescrFaseColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public TaskListRow[] GetTaskListRows() { @@ -6046,54 +6176,10 @@ SELECT CodOpr, Cognome, Nome FROM AnagOpr WHERE (CodOpr = @CodOpr)"; tableMapping.ColumnMappings.Add("DtStart", "DtStart"); tableMapping.ColumnMappings.Add("DtEnd", "DtEnd"); tableMapping.ColumnMappings.Add("QtaEv", "QtaEv"); + tableMapping.ColumnMappings.Add("NomeOpr", "NomeOpr"); + tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); + tableMapping.ColumnMappings.Add("DescrFase", "DescrFase"); 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].[TaskRec] WHERE (([IdxRec] = @Original_IdxRec) AND ([CodOpr] = @Original_CodOpr) AND ([CodPost] = @Original_CodPost) AND ([NumTask] = @Original_NumTask) AND ([CodFase] = @Original_CodFase) AND ([DtStart] = @Original_DtStart) AND ((@IsNull_DtEnd = 1 AND [DtEnd] IS NULL) OR ([DtEnd] = @Original_DtEnd)) AND ([QtaEv] = @Original_QtaEv))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxRec", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxRec", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodOpr", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodOpr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodPost", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodPost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumTask", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumTask", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodFase", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFase", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DtEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QtaEv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaEv", 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].[TaskRec] ([CodOpr], [CodPost], [NumTask], [CodFase], [DtStart], [DtEnd], [QtaEv]) VALUES (@CodOpr, @CodPost, @NumTask, @CodFase, @DtStart, @DtEnd, @QtaEv); -SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM TaskRec WHERE (IdxRec = SCOPE_IDENTITY())"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodOpr", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodOpr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPost", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodPost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTask", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumTask", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFase", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFase", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaEv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaEv", 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].[TaskRec] SET [CodOpr] = @CodOpr, [CodPost] = @CodPost, [NumTask] = @NumTask, [CodFase] = @CodFase, [DtStart] = @DtStart, [DtEnd] = @DtEnd, [QtaEv] = @QtaEv WHERE (([IdxRec] = @Original_IdxRec) AND ([CodOpr] = @Original_CodOpr) AND ([CodPost] = @Original_CodPost) AND ([NumTask] = @Original_NumTask) AND ([CodFase] = @Original_CodFase) AND ([DtStart] = @Original_DtStart) AND ((@IsNull_DtEnd = 1 AND [DtEnd] IS NULL) OR ([DtEnd] = @Original_DtEnd)) AND ([QtaEv] = @Original_QtaEv)); -SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM TaskRec WHERE (IdxRec = @IdxRec)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodOpr", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodOpr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPost", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodPost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumTask", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumTask", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFase", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFase", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaEv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaEv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxRec", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxRec", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodOpr", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodOpr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodPost", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodPost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumTask", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumTask", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodFase", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFase", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DtEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QtaEv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaEv", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxRec", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "IdxRec", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6106,12 +6192,17 @@ SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM Tas [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM dbo." + - "TaskRec"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_TaskRec"; 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_TR_GetByNumTask"; + 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("@NumTask", 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()] @@ -6141,252 +6232,18 @@ SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM Tas [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_App.TaskRecDataTable dataTable) { - return this.Adapter.Update(dataTable); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_App dataSet) { - return this.Adapter.Update(dataSet, "TaskRec"); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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", "15.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", "15.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_IdxRec, string Original_CodOpr, string Original_CodPost, string Original_NumTask, string Original_CodFase, System.DateTime Original_DtStart, global::System.Nullable Original_DtEnd, int Original_QtaEv) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_IdxRec)); - if ((Original_CodOpr == null)) { - throw new global::System.ArgumentNullException("Original_CodOpr"); - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_CodOpr)); - } - if ((Original_CodPost == null)) { - throw new global::System.ArgumentNullException("Original_CodPost"); - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_CodPost)); - } - if ((Original_NumTask == null)) { - throw new global::System.ArgumentNullException("Original_NumTask"); - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_NumTask)); - } - if ((Original_CodFase == null)) { - throw new global::System.ArgumentNullException("Original_CodFase"); - } - else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_CodFase)); - } - this.Adapter.DeleteCommand.Parameters[5].Value = ((System.DateTime)(Original_DtStart)); - if ((Original_DtEnd.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[7].Value = ((System.DateTime)(Original_DtEnd.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[7].Value = global::System.DBNull.Value; - } - this.Adapter.DeleteCommand.Parameters[8].Value = ((int)(Original_QtaEv)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 CodOpr, string CodPost, string NumTask, string CodFase, System.DateTime DtStart, global::System.Nullable DtEnd, int QtaEv) { - if ((CodOpr == null)) { - throw new global::System.ArgumentNullException("CodOpr"); - } - else { - this.Adapter.InsertCommand.Parameters[0].Value = ((string)(CodOpr)); - } - if ((CodPost == null)) { - throw new global::System.ArgumentNullException("CodPost"); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(CodPost)); - } + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_App.TaskRecDataTable getByNumTask(string NumTask) { + this.Adapter.SelectCommand = this.CommandCollection[1]; if ((NumTask == null)) { - throw new global::System.ArgumentNullException("NumTask"); + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(NumTask)); + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(NumTask)); } - if ((CodFase == null)) { - throw new global::System.ArgumentNullException("CodFase"); - } - else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(CodFase)); - } - this.Adapter.InsertCommand.Parameters[4].Value = ((System.DateTime)(DtStart)); - if ((DtEnd.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[5].Value = ((System.DateTime)(DtEnd.Value)); - } - else { - this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; - } - this.Adapter.InsertCommand.Parameters[6].Value = ((int)(QtaEv)); - 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", "15.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 CodOpr, - string CodPost, - string NumTask, - string CodFase, - System.DateTime DtStart, - global::System.Nullable DtEnd, - int QtaEv, - int Original_IdxRec, - string Original_CodOpr, - string Original_CodPost, - string Original_NumTask, - string Original_CodFase, - System.DateTime Original_DtStart, - global::System.Nullable Original_DtEnd, - int Original_QtaEv, - int IdxRec) { - if ((CodOpr == null)) { - throw new global::System.ArgumentNullException("CodOpr"); - } - else { - this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(CodOpr)); - } - if ((CodPost == null)) { - throw new global::System.ArgumentNullException("CodPost"); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(CodPost)); - } - if ((NumTask == null)) { - throw new global::System.ArgumentNullException("NumTask"); - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(NumTask)); - } - if ((CodFase == null)) { - throw new global::System.ArgumentNullException("CodFase"); - } - else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(CodFase)); - } - this.Adapter.UpdateCommand.Parameters[4].Value = ((System.DateTime)(DtStart)); - if ((DtEnd.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[5].Value = ((System.DateTime)(DtEnd.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(QtaEv)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_IdxRec)); - if ((Original_CodOpr == null)) { - throw new global::System.ArgumentNullException("Original_CodOpr"); - } - else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_CodOpr)); - } - if ((Original_CodPost == null)) { - throw new global::System.ArgumentNullException("Original_CodPost"); - } - else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_CodPost)); - } - if ((Original_NumTask == null)) { - throw new global::System.ArgumentNullException("Original_NumTask"); - } - else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_NumTask)); - } - if ((Original_CodFase == null)) { - throw new global::System.ArgumentNullException("Original_CodFase"); - } - else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_CodFase)); - } - this.Adapter.UpdateCommand.Parameters[12].Value = ((System.DateTime)(Original_DtStart)); - if ((Original_DtEnd.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((System.DateTime)(Original_DtEnd.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_QtaEv)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(IdxRec)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; - if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 CodOpr, string CodPost, string NumTask, string CodFase, System.DateTime DtStart, global::System.Nullable DtEnd, int QtaEv, int Original_IdxRec, string Original_CodOpr, string Original_CodPost, string Original_NumTask, string Original_CodFase, System.DateTime Original_DtStart, global::System.Nullable Original_DtEnd, int Original_QtaEv) { - return this.Update(CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv, Original_IdxRec, Original_CodOpr, Original_CodPost, Original_NumTask, Original_CodFase, Original_DtStart, Original_DtEnd, Original_QtaEv, Original_IdxRec); + DS_App.TaskRecDataTable dataTable = new DS_App.TaskRecDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; } } @@ -8474,8 +8331,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show private AnagOprTableAdapter _anagOprTableAdapter; - private TaskRecTableAdapter _taskRecTableAdapter; - private AnagPostTableAdapter _anagPostTableAdapter; private TraEv2StatiTableAdapter _traEv2StatiTableAdapter; @@ -8541,20 +8396,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 TaskRecTableAdapter TaskRecTableAdapter { - get { - return this._taskRecTableAdapter; - } - set { - this._taskRecTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -8642,10 +8483,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show && (this._anagOprTableAdapter.Connection != null))) { return this._anagOprTableAdapter.Connection; } - if (((this._taskRecTableAdapter != null) - && (this._taskRecTableAdapter.Connection != null))) { - return this._taskRecTableAdapter.Connection; - } if (((this._anagPostTableAdapter != null) && (this._anagPostTableAdapter.Connection != null))) { return this._anagPostTableAdapter.Connection; @@ -8684,9 +8521,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show if ((this._anagOprTableAdapter != null)) { count = (count + 1); } - if ((this._taskRecTableAdapter != null)) { - count = (count + 1); - } if ((this._anagPostTableAdapter != null)) { count = (count + 1); } @@ -8737,15 +8571,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show allChangedRows.AddRange(updatedRows); } } - if ((this._taskRecTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.TaskRec.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._taskRecTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._taskListTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.TaskList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -8816,14 +8641,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show allAddedRows.AddRange(addedRows); } } - if ((this._taskRecTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.TaskRec.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._taskRecTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._taskListTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.TaskList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -8898,14 +8715,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show allChangedRows.AddRange(deletedRows); } } - if ((this._taskRecTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.TaskRec.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._taskRecTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._anagPostTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.AnagPost.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -8984,11 +8793,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + "a stessa stringa di connessione."); } - if (((this._taskRecTableAdapter != null) - && (this.MatchTableAdapterConnection(this._taskRecTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); - } if (((this._anagPostTableAdapter != null) && (this.MatchTableAdapterConnection(this._anagPostTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + @@ -9069,15 +8873,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show adaptersWithAcceptChangesDuringUpdate.Add(this._anagOprTableAdapter.Adapter); } } - if ((this._taskRecTableAdapter != null)) { - revertConnections.Add(this._taskRecTableAdapter, this._taskRecTableAdapter.Connection); - this._taskRecTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._taskRecTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._taskRecTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._taskRecTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._taskRecTableAdapter.Adapter); - } - } if ((this._anagPostTableAdapter != null)) { revertConnections.Add(this._anagPostTableAdapter, this._anagPostTableAdapter.Connection); this._anagPostTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -9184,10 +8979,6 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show this._anagOprTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._anagOprTableAdapter])); this._anagOprTableAdapter.Transaction = null; } - if ((this._taskRecTableAdapter != null)) { - this._taskRecTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._taskRecTableAdapter])); - this._taskRecTableAdapter.Transaction = null; - } if ((this._anagPostTableAdapter != null)) { this._anagPostTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._anagPostTableAdapter])); this._anagPostTableAdapter.Transaction = null; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index aed6e1b..a959e9c 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -261,69 +261,14 @@ SELECT CodOpr, Cognome, Nome FROM AnagOpr WHERE (CodOpr = @CodOpr) - - - - DELETE FROM [dbo].[TaskRec] WHERE (([IdxRec] = @Original_IdxRec) AND ([CodOpr] = @Original_CodOpr) AND ([CodPost] = @Original_CodPost) AND ([NumTask] = @Original_NumTask) AND ([CodFase] = @Original_CodFase) AND ([DtStart] = @Original_DtStart) AND ((@IsNull_DtEnd = 1 AND [DtEnd] IS NULL) OR ([DtEnd] = @Original_DtEnd)) AND ([QtaEv] = @Original_QtaEv)) - - - - - - - - - - - - - - - - INSERT INTO [dbo].[TaskRec] ([CodOpr], [CodPost], [NumTask], [CodFase], [DtStart], [DtEnd], [QtaEv]) VALUES (@CodOpr, @CodPost, @NumTask, @CodFase, @DtStart, @DtEnd, @QtaEv); -SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM TaskRec WHERE (IdxRec = SCOPE_IDENTITY()) - - - - - - - - - - - + - - SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM dbo.TaskRec + + SELECT * +FROM v_TaskRec - - - UPDATE [dbo].[TaskRec] SET [CodOpr] = @CodOpr, [CodPost] = @CodPost, [NumTask] = @NumTask, [CodFase] = @CodFase, [DtStart] = @DtStart, [DtEnd] = @DtEnd, [QtaEv] = @QtaEv WHERE (([IdxRec] = @Original_IdxRec) AND ([CodOpr] = @Original_CodOpr) AND ([CodPost] = @Original_CodPost) AND ([NumTask] = @Original_NumTask) AND ([CodFase] = @Original_CodFase) AND ([DtStart] = @Original_DtStart) AND ((@IsNull_DtEnd = 1 AND [DtEnd] IS NULL) OR ([DtEnd] = @Original_DtEnd)) AND ([QtaEv] = @Original_QtaEv)); -SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM TaskRec WHERE (IdxRec = @IdxRec) - - - - - - - - - - - - - - - - - - - - - @@ -335,8 +280,23 @@ SELECT IdxRec, CodOpr, CodPost, NumTask, CodFase, DtStart, DtEnd, QtaEv FROM Tas + + + - + + + + + dbo.stp_TR_GetByNumTask + + + + + + + + @@ -812,6 +772,27 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show + + + + + + + + + + + + + + + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 6f4913a..1ff0b0c 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -9,7 +9,7 @@ - + @@ -23,7 +23,7 @@ 548 - 705 + 716 548 @@ -35,7 +35,7 @@ 747 - 705 + 716 747 diff --git a/C-TRACK/C-TRACK.csproj b/C-TRACK/C-TRACK.csproj index 8364912..138a1da 100644 --- a/C-TRACK/C-TRACK.csproj +++ b/C-TRACK/C-TRACK.csproj @@ -275,6 +275,7 @@ + compilerconfig.json @@ -539,6 +540,13 @@ mod_taskList.ascx + + mod_taskRec.ascx + ASPXCodeBehind + + + mod_taskRec.ascx + diff --git a/C-TRACK/WebUserControls/mod_addTask.ascx.cs b/C-TRACK/WebUserControls/mod_addTask.ascx.cs index 4dbae5e..a5aeb4d 100644 --- a/C-TRACK/WebUserControls/mod_addTask.ascx.cs +++ b/C-TRACK/WebUserControls/mod_addTask.ascx.cs @@ -60,7 +60,7 @@ namespace C_TRACK.WebUserControls /// /// RegExp x CONFERMA /// - protected string reAddNew = memLayer.ML.cdv("regExp_OK"); + protected string reAddNew = memLayer.ML.cdv("regExp_AddNew"); /// /// RegExp x CONFERMA /// @@ -111,16 +111,20 @@ namespace C_TRACK.WebUserControls } else if (testAddNew.Success) { - // creo... - dataLayer.man.taTL.insertQuery(NumTask, CodArticolo, Quantita); - // resetto! - CodArticolo = ""; - NumTask = ""; - Quantita = 0; - // invoco update... - if (eh_created != null) + // se qta > 0 ed ho articolo e commessa... + if (Quantita > 0 && CodArticolo != "" && NumTask != "") { - eh_created(this, new EventArgs()); + // creo... + dataLayer.man.taTL.insertQuery(NumTask, CodArticolo, Quantita); + // resetto! + CodArticolo = ""; + NumTask = ""; + Quantita = 0; + // invoco update... + if (eh_created != null) + { + eh_created(this, new EventArgs()); + } } } else if (testCodArt.Success) diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx b/C-TRACK/WebUserControls/mod_taskList.ascx index 94f4700..d9b8001 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx +++ b/C-TRACK/WebUserControls/mod_taskList.ascx @@ -1,5 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_taskList.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_taskList" %> <%@ Register Src="~/WebUserControls/mod_barcode.ascx" TagPrefix="uc1" TagName="mod_barcode" %> +<%@ Register Src="~/WebUserControls/mod_taskRec.ascx" TagPrefix="uc1" TagName="mod_taskRec" %> +
@@ -18,9 +20,8 @@
- - - + + @@ -41,9 +42,6 @@ - <%-- - - --%> diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx.cs b/C-TRACK/WebUserControls/mod_taskList.ascx.cs index 591708a..fe1bc93 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx.cs +++ b/C-TRACK/WebUserControls/mod_taskList.ascx.cs @@ -101,6 +101,17 @@ namespace C_TRACK.WebUserControls { grView.SelectedIndex = -1; grView.DataBind(); + mod_taskRec.NumTask = ""; + showDetail(false); + } + /// + /// Gestione visibilità dettalgior ecord x task + /// + /// + private void showDetail(bool showDetail) + { + // mostro/nascondo dettaglio REC + mod_taskRec.Visible = showDetail; } protected void lbCaricati_Click(object sender, EventArgs e) @@ -127,5 +138,12 @@ namespace C_TRACK.WebUserControls { grView.DataBind(); } + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // mostro dettaglio... + mod_taskRec.NumTask = grView.SelectedValue.ToString(); + showDetail(true); + } } } \ No newline at end of file diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs b/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs index 7275f63..05671ef 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs +++ b/C-TRACK/WebUserControls/mod_taskList.ascx.designer.cs @@ -49,13 +49,13 @@ namespace C_TRACK.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbTutti; /// - /// Controllo frmView. + /// Controllo mod_taskRec. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.FormView frmView; + protected global::C_TRACK.WebUserControls.mod_taskRec mod_taskRec; /// /// Controllo grView. diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx b/C-TRACK/WebUserControls/mod_taskRec.ascx new file mode 100644 index 0000000..7cd1a1f --- /dev/null +++ b/C-TRACK/WebUserControls/mod_taskRec.ascx @@ -0,0 +1,29 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_taskRec.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_taskRec" %> + + + + + + + Nessun Risultato + + + + + + + + + + + + + + + + + + + + + diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx.cs b/C-TRACK/WebUserControls/mod_taskRec.ascx.cs new file mode 100644 index 0000000..d096a7b --- /dev/null +++ b/C-TRACK/WebUserControls/mod_taskRec.ascx.cs @@ -0,0 +1,26 @@ +using System; + +namespace C_TRACK.WebUserControls +{ + public partial class mod_taskRec : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Filtro task + /// + public string NumTask + { + get + { + return hfNumTask.Value; + } + set + { + hfNumTask.Value = value; + } + } + } +} \ No newline at end of file diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs b/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs new file mode 100644 index 0000000..974574e --- /dev/null +++ b/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace C_TRACK.WebUserControls { + + + public partial class mod_taskRec { + + /// + /// Controllo grView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// Controllo hfNumTask. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfNumTask; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/C-TRACK/barcode.aspx b/C-TRACK/barcode.aspx index ffcf06d..907a8d0 100644 --- a/C-TRACK/barcode.aspx +++ b/C-TRACK/barcode.aspx @@ -5,9 +5,16 @@ <%@ Register Src="~/WebUserControls/mod_checkOpr.ascx" TagPrefix="uc1" TagName="mod_checkOpr" %> - - - +
+
+

Gestione Dichiarazioni

+
+
+ + + +
+
@@ -22,7 +29,7 @@
- <%: string.Format("DB ReLoadTime {0:N3}sec ", lastUpdDuration.TotalSeconds) %> | + <%: string.Format("DB ReLoadTime {0:N3}sec ", lastUpdDuration.TotalSeconds) %> | <%: string.Format("Caricati {0} Comandi", nComandi) %> | <%: string.Format("{0} Record BCode", nBCodeRec) %>
diff --git a/C-TRACK/postazioni.aspx b/C-TRACK/postazioni.aspx index 79c85c7..e28a211 100644 --- a/C-TRACK/postazioni.aspx +++ b/C-TRACK/postazioni.aspx @@ -8,9 +8,13 @@ - elenco postazioni in cui selezionare -
- ...le postazioni devono essere "unicamente occupabili"?!? - - +
+
+

Gestione Postazioni

+
+
+ + +
+
diff --git a/C-TRACK/task.aspx b/C-TRACK/task.aspx index bb54b2d..e6905f7 100644 --- a/C-TRACK/task.aspx +++ b/C-TRACK/task.aspx @@ -3,13 +3,23 @@ <%@ Register Src="~/WebUserControls/mod_taskList.ascx" TagPrefix="uc1" TagName="mod_taskList" %> <%@ Register Src="~/WebUserControls/mod_barcode.ascx" TagPrefix="uc1" TagName="mod_barcode" %> <%@ Register Src="~/WebUserControls/mod_addTask.ascx" TagPrefix="uc1" TagName="mod_addTask" %> - - +<%@ Register Src="~/WebUserControls/mod_checkOpr.ascx" TagPrefix="uc1" TagName="mod_checkOpr" %> - - - +
+
+

Gestione Commesse

+
+
+ <%--
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere--%> + + + + +
+
diff --git a/C-TRACK/task.aspx.designer.cs b/C-TRACK/task.aspx.designer.cs index 4c6e962..2c7d51c 100644 --- a/C-TRACK/task.aspx.designer.cs +++ b/C-TRACK/task.aspx.designer.cs @@ -12,6 +12,15 @@ namespace C_TRACK { public partial class task { + /// + /// Controllo mod_checkOpr. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::C_TRACK.WebUserControls.mod_checkOpr mod_checkOpr; + /// /// Controllo mod_barcode. ///