diff --git a/ETS-DIP/ETS-WS/obj/Debug/ETS-DIP.csproj.AssemblyReference.cache b/ETS-DIP/ETS-WS/obj/Debug/ETS-DIP.csproj.AssemblyReference.cache index 2dc2ab9..02a6d15 100644 Binary files a/ETS-DIP/ETS-WS/obj/Debug/ETS-DIP.csproj.AssemblyReference.cache and b/ETS-DIP/ETS-WS/obj/Debug/ETS-DIP.csproj.AssemblyReference.cache differ diff --git a/ETS_Data/Ds_ProjEts.Designer.cs b/ETS_Data/Ds_ProjEts.Designer.cs index 4b78d56..a32b7a1 100644 --- a/ETS_Data/Ds_ProjEts.Designer.cs +++ b/ETS_Data/Ds_ProjEts.Designer.cs @@ -5390,10 +5390,9 @@ namespace ETS_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public Dip2ATRRow FindByidxDipendenteCodTipoRisorsa(int idxDipendente, string CodTipoRisorsa) { + public Dip2ATRRow FindByidxDipendente(int idxDipendente) { return ((Dip2ATRRow)(this.Rows.Find(new object[] { - idxDipendente, - CodTipoRisorsa}))); + idxDipendente}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5446,9 +5445,9 @@ namespace ETS_Data { this.columnattivo = new global::System.Data.DataColumn("attivo", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnattivo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnidxDipendente, - this.columnCodTipoRisorsa}, true)); + this.columnidxDipendente}, true)); this.columnidxDipendente.AllowDBNull = false; + this.columnidxDipendente.Unique = true; this.columnCodTipoRisorsa.AllowDBNull = false; this.columnCodTipoRisorsa.MaxLength = 50; this.columnGruppo.AllowDBNull = false; @@ -21246,36 +21245,6 @@ SELECT CodTipoRisorsa, DescrTipoRisorsa, costoOrario FROM AnagTipoRisorse WHERE tableMapping.ColumnMappings.Add("SIGLA", "SIGLA"); tableMapping.ColumnMappings.Add("attivo", "attivo"); 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].[Dip2ATR] WHERE (([idxDipendente] = @Original_idxDipendente) AN" + - "D ([CodTipoRisorsa] = @Original_CodTipoRisorsa) AND ((@IsNull_Gruppo = 1 AND [Gr" + - "uppo] IS NULL) OR ([Gruppo] = @Original_Gruppo)))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodTipoRisorsa", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoRisorsa", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Gruppo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Gruppo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Gruppo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Gruppo", 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].[Dip2ATR] ([idxDipendente], [CodTipoRisorsa], [Gruppo]) VALUES (@idxDipendente, @CodTipoRisorsa, @Gruppo); -SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa = @CodTipoRisorsa) AND (idxDipendente = @idxDipendente)"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoRisorsa", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoRisorsa", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Gruppo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Gruppo", 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].[Dip2ATR] SET [idxDipendente] = @idxDipendente, [CodTipoRisorsa] = @CodTipoRisorsa, [Gruppo] = @Gruppo WHERE (([idxDipendente] = @Original_idxDipendente) AND ([CodTipoRisorsa] = @Original_CodTipoRisorsa) AND ((@IsNull_Gruppo = 1 AND [Gruppo] IS NULL) OR ([Gruppo] = @Original_Gruppo))); -SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa = @CodTipoRisorsa) AND (idxDipendente = @idxDipendente)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoRisorsa", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoRisorsa", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Gruppo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Gruppo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodTipoRisorsa", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoRisorsa", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Gruppo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Gruppo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Gruppo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Gruppo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -21288,7 +21257,7 @@ SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + 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 * FROM v_Dip2ATR"; @@ -21304,6 +21273,20 @@ SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa 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("@Gruppo", 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_D2ATR_insertMissing"; + 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[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_D2ATR_updateQuery"; + 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("@Original_idxDipendente", 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("@CodTipoRisorsa", 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("@Gruppo", 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("@GrpOrder", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -21361,157 +21344,58 @@ SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(Ds_ProjEts.Dip2ATRDataTable dataTable) { - return this.Adapter.Update(dataTable); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(Ds_ProjEts dataSet) { - return this.Adapter.Update(dataSet, "Dip2ATR"); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.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", "16.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_idxDipendente, string Original_CodTipoRisorsa, string Original_Gruppo) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idxDipendente)); - if ((Original_CodTipoRisorsa == null)) { - throw new global::System.ArgumentNullException("Original_CodTipoRisorsa"); + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual Ds_ProjEts.Dip2ATRDataTable updateQuery(global::System.Nullable Original_idxDipendente, string CodTipoRisorsa, string Gruppo, global::System.Nullable GrpOrder) { + this.Adapter.SelectCommand = this.CommandCollection[4]; + if ((Original_idxDipendente.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Original_idxDipendente.Value)); } else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_CodTipoRisorsa)); + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - if ((Original_Gruppo == null)) { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_Gruppo)); - } - 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", "16.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 idxDipendente, string CodTipoRisorsa, string Gruppo) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(idxDipendente)); if ((CodTipoRisorsa == null)) { - throw new global::System.ArgumentNullException("CodTipoRisorsa"); + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(CodTipoRisorsa)); + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodTipoRisorsa)); } if ((Gruppo == null)) { - this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(Gruppo)); + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Gruppo)); } - 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(); + if ((GrpOrder.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((int)(GrpOrder.Value)); } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } + Ds_ProjEts.Dip2ATRDataTable dataTable = new Ds_ProjEts.Dip2ATRDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 idxDipendente, string CodTipoRisorsa, string Gruppo, int Original_idxDipendente, string Original_CodTipoRisorsa, string Original_Gruppo) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(idxDipendente)); - if ((CodTipoRisorsa == null)) { - throw new global::System.ArgumentNullException("CodTipoRisorsa"); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(CodTipoRisorsa)); - } - if ((Gruppo == null)) { - this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Gruppo)); - } - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_idxDipendente)); - if ((Original_CodTipoRisorsa == null)) { - throw new global::System.ArgumentNullException("Original_CodTipoRisorsa"); - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_CodTipoRisorsa)); - } - if ((Original_Gruppo == null)) { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_Gruppo)); - } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; - if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) + public virtual int insertMissing() { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { - this.Adapter.UpdateCommand.Connection.Open(); + command.Connection.Open(); } + int returnValue; try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; + returnValue = command.ExecuteNonQuery(); } finally { if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); + command.Connection.Close(); } } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 Gruppo, int Original_idxDipendente, string Original_CodTipoRisorsa, string Original_Gruppo) { - return this.Update(Original_idxDipendente, Original_CodTipoRisorsa, Gruppo, Original_idxDipendente, Original_CodTipoRisorsa, Original_Gruppo); + return returnValue; } } @@ -26041,8 +25925,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND private AnagTipoRisorseTableAdapter _anagTipoRisorseTableAdapter; - private Dip2ATRTableAdapter _dip2ATRTableAdapter; - private BazaarRisorseTableAdapter _bazaarRisorseTableAdapter; private ImpiegoRisorseTableAdapter _impiegoRisorseTableAdapter; @@ -26170,20 +26052,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 Dip2ATRTableAdapter Dip2ATRTableAdapter { - get { - return this._dip2ATRTableAdapter; - } - set { - this._dip2ATRTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -26329,10 +26197,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND && (this._anagTipoRisorseTableAdapter.Connection != null))) { return this._anagTipoRisorseTableAdapter.Connection; } - if (((this._dip2ATRTableAdapter != null) - && (this._dip2ATRTableAdapter.Connection != null))) { - return this._dip2ATRTableAdapter.Connection; - } if (((this._bazaarRisorseTableAdapter != null) && (this._bazaarRisorseTableAdapter.Connection != null))) { return this._bazaarRisorseTableAdapter.Connection; @@ -26395,9 +26259,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND if ((this._anagTipoRisorseTableAdapter != null)) { count = (count + 1); } - if ((this._dip2ATRTableAdapter != null)) { - count = (count + 1); - } if ((this._bazaarRisorseTableAdapter != null)) { count = (count + 1); } @@ -26520,15 +26381,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND allChangedRows.AddRange(updatedRows); } } - if ((this._dip2ATRTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Dip2ATR.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._dip2ATRTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._bdgtRisorseFasiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.BdgtRisorseFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -26655,14 +26507,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND allAddedRows.AddRange(addedRows); } } - if ((this._dip2ATRTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Dip2ATR.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._dip2ATRTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._bdgtRisorseFasiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.BdgtRisorseFasi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -26737,14 +26581,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND allChangedRows.AddRange(deletedRows); } } - if ((this._dip2ATRTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Dip2ATR.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._dip2ATRTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._impiegoRisorseTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.ImpiegoRisorse.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -26899,11 +26735,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } - if (((this._dip2ATRTableAdapter != null) - && (this.MatchTableAdapterConnection(this._dip2ATRTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + - "tring."); - } if (((this._bazaarRisorseTableAdapter != null) && (this.MatchTableAdapterConnection(this._bazaarRisorseTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + @@ -27034,15 +26865,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND adaptersWithAcceptChangesDuringUpdate.Add(this._anagTipoRisorseTableAdapter.Adapter); } } - if ((this._dip2ATRTableAdapter != null)) { - revertConnections.Add(this._dip2ATRTableAdapter, this._dip2ATRTableAdapter.Connection); - this._dip2ATRTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._dip2ATRTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._dip2ATRTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._dip2ATRTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._dip2ATRTableAdapter.Adapter); - } - } if ((this._bazaarRisorseTableAdapter != null)) { revertConnections.Add(this._bazaarRisorseTableAdapter, this._bazaarRisorseTableAdapter.Connection); this._bazaarRisorseTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -27192,10 +27014,6 @@ SELECT Anno, Sett, DtLastSend, SentBy FROM LogEmailBaz WHERE (Anno = @Anno) AND this._anagTipoRisorseTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._anagTipoRisorseTableAdapter])); this._anagTipoRisorseTableAdapter.Transaction = null; } - if ((this._dip2ATRTableAdapter != null)) { - this._dip2ATRTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._dip2ATRTableAdapter])); - this._dip2ATRTableAdapter.Transaction = null; - } if ((this._bazaarRisorseTableAdapter != null)) { this._bazaarRisorseTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._bazaarRisorseTableAdapter])); this._bazaarRisorseTableAdapter.Transaction = null; diff --git a/ETS_Data/Ds_ProjEts.xsd b/ETS_Data/Ds_ProjEts.xsd index 7e082a8..24ce5a8 100644 --- a/ETS_Data/Ds_ProjEts.xsd +++ b/ETS_Data/Ds_ProjEts.xsd @@ -956,50 +956,13 @@ SELECT CodTipoRisorsa, DescrTipoRisorsa, costoOrario FROM AnagTipoRisorse WHERE - - - - DELETE FROM [dbo].[Dip2ATR] WHERE (([idxDipendente] = @Original_idxDipendente) AND ([CodTipoRisorsa] = @Original_CodTipoRisorsa) AND ((@IsNull_Gruppo = 1 AND [Gruppo] IS NULL) OR ([Gruppo] = @Original_Gruppo))) - - - - - - - - - - - INSERT INTO [dbo].[Dip2ATR] ([idxDipendente], [CodTipoRisorsa], [Gruppo]) VALUES (@idxDipendente, @CodTipoRisorsa, @Gruppo); -SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa = @CodTipoRisorsa) AND (idxDipendente = @idxDipendente) - - - - - - - + - + SELECT * FROM v_Dip2ATR - - - UPDATE [dbo].[Dip2ATR] SET [idxDipendente] = @idxDipendente, [CodTipoRisorsa] = @CodTipoRisorsa, [Gruppo] = @Gruppo WHERE (([idxDipendente] = @Original_idxDipendente) AND ([CodTipoRisorsa] = @Original_CodTipoRisorsa) AND ((@IsNull_Gruppo = 1 AND [Gruppo] IS NULL) OR ([Gruppo] = @Original_Gruppo))); -SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa = @CodTipoRisorsa) AND (idxDipendente = @idxDipendente) - - - - - - - - - - - @@ -1035,6 +998,30 @@ SELECT idxDipendente, CodTipoRisorsa, Gruppo FROM Dip2ATR WHERE (CodTipoRisorsa + + + + dbo.stp_D2ATR_insertMissing + + + + + + + + + + dbo.stp_D2ATR_updateQuery + + + + + + + + + + @@ -2039,7 +2026,7 @@ ORDER BY OrdGruppo - + @@ -2082,7 +2069,7 @@ ORDER BY OrdGruppo - + @@ -2132,7 +2119,7 @@ ORDER BY OrdGruppo - + @@ -2228,7 +2215,7 @@ ORDER BY OrdGruppo - + @@ -2279,7 +2266,7 @@ ORDER BY OrdGruppo - + @@ -2331,7 +2318,7 @@ ORDER BY OrdGruppo - + @@ -2434,7 +2421,7 @@ ORDER BY OrdGruppo - + @@ -2482,7 +2469,7 @@ ORDER BY OrdGruppo - + @@ -2499,7 +2486,7 @@ ORDER BY OrdGruppo - + @@ -2520,7 +2507,7 @@ ORDER BY OrdGruppo - + @@ -2565,7 +2552,7 @@ ORDER BY OrdGruppo - + @@ -2700,7 +2687,7 @@ ORDER BY OrdGruppo - + @@ -2719,7 +2706,7 @@ ORDER BY OrdGruppo - + @@ -2730,7 +2717,7 @@ ORDER BY OrdGruppo - + @@ -2746,7 +2733,7 @@ ORDER BY OrdGruppo - + @@ -2775,7 +2762,7 @@ ORDER BY OrdGruppo - + @@ -2795,7 +2782,7 @@ ORDER BY OrdGruppo - + @@ -2809,7 +2796,7 @@ ORDER BY OrdGruppo - + @@ -2824,7 +2811,7 @@ ORDER BY OrdGruppo - + @@ -2840,7 +2827,7 @@ ORDER BY OrdGruppo - + @@ -2939,7 +2926,7 @@ ORDER BY OrdGruppo - + @@ -3004,7 +2991,6 @@ ORDER BY OrdGruppo - @@ -3063,13 +3049,13 @@ ORDER BY OrdGruppo - - - - - - - + + + + + + + \ No newline at end of file diff --git a/ETS_Data/Ds_ProjEts.xss b/ETS_Data/Ds_ProjEts.xss index 97f52d4..a379c6e 100644 --- a/ETS_Data/Ds_ProjEts.xss +++ b/ETS_Data/Ds_ProjEts.xss @@ -6,27 +6,27 @@ --> - - - - + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -101,7 +101,7 @@ - + 172 @@ -117,7 +117,7 @@ - + 1298 diff --git a/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_2110.sql b/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_2110.sql index 4c447c7..9291967 100644 --- a/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_2110.sql +++ b/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_2110.sql @@ -54,6 +54,13 @@ insert into AnagGruppi select distinct REPLACE(gruppo, LEFT(gruppo,3),'') as gruppo, gruppo as descrizione, left(gruppo, 2) as OrdGruppo, 1 as visibile from dip2atr GO +-- gruppo zzz non visibile... +UPDATE AnagGruppi +SET Visibile = 0 + , Descrizione = 'NON ASSEGNATO' +WHERE Gruppo = 'ZZZ' +GO + -- sistemo gruppi sugli utenti UPDATE Dip2ATR @@ -281,3 +288,71 @@ ORDER BY GrpOrder RETURN GO + + +/********************************************************** +* STORED stp_D2ATR_updateQuery +* +* update dipentente x editing tipo, gruppo, ordinamento +* +* mod: S.E.L. 2021.10.15 release +* +**********************************************************/ +CREATE PROCEDURE [dbo].[stp_D2ATR_updateQuery] +( + @Original_idxDipendente INT = 0, + @CodTipoRisorsa NVARCHAR(50), + @Gruppo NVARCHAR(50), + @GrpOrder INT +) +AS + +UPDATE Dip2ATR +SET CodTipoRisorsa = @CodTipoRisorsa + , Gruppo = @Gruppo + , GrpOrder = @GrpOrder +WHERE idxDipendente = @Original_idxDipendente + +SELECT * +FROM Dip2ATR +WHERE idxDipendente = @Original_idxDipendente + +RETURN +GO + + +/********************************************************** +* STORED stp_D2ATR_insertMissing +* +* aggiunta dipententi mancanti in gruppo zzz +* +* mod: S.E.L. 2021.10.16 release +* +**********************************************************/ +CREATE PROCEDURE [dbo].[stp_D2ATR_insertMissing] + +AS + +WITH cteNewUser AS +( + SELECT D.idxDipendente + FROM Dipendenti D + LEFT OUTER JOIN Dip2ATR D2A ON D.idxDipendente = D2A.idxDipendente + WHERE D2A.idxDipendente IS NULL +) + +INSERT INTO Dip2ATR(idxDipendente, CodTipoRisorsa, Gruppo, GrpOrder) +SELECT idxDipendente, 'DIS', 'ZZZ', 999 +FROM cteNewUser + +RETURN +GO + + +-- fix primary key +ALTER TABLE Dip2ATR +DROP CONSTRAINT PK_Dip2ATR +ALTER TABLE Dip2ATR +ADD CONSTRAINT PK_Dip2ATR PRIMARY KEY (idxDipendente) +GO + diff --git a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache index bfc643f..8bedfe8 100644 Binary files a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll index 49ca361..e53f31b 100644 Binary files a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll differ diff --git a/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx b/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx index 5582791..daf25e7 100644 --- a/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx +++ b/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx @@ -1,7 +1,29 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bazaar.master" AutoEventWireup="true" CodeBehind="BazaarGroups.aspx.cs" Inherits="PROJ_ETS.BazaarGroups" %> <%@ Register Src="~/WebUserControls/mod_GroupsMan.ascx" TagPrefix="uc1" TagName="mod_GroupsMan" %> +<%@ Register Src="~/WebUserControls/mod_Dip2Atr.ascx" TagPrefix="uc1" TagName="mod_Dip2Atr" %> - + +
+
+ +
+
+ + + + + + gestione gruppi: +
    +
  • Anagrafica gruppi EDIT
    • +
  • Anagrafica gruppi SELECT --> detail utenti
    • +
  • Anagrafica gruppi ADD
    • +
  • Anagrafica gruppi DELETE
    • +
  • Sync utenti
    • +
  • Edit Assegnazione utenti-Gruppi
    • +
+
+
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.cs b/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.cs index 73c5816..634e9dd 100644 --- a/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.cs @@ -9,9 +9,35 @@ namespace PROJ_ETS { public partial class BazaarGroups : System.Web.UI.Page { + #region Private Methods + + private void Mod_GroupsMan_eh_Reset(object sender, EventArgs e) + { + mod_Dip2Atr.Gruppo = "#"; + divDetail.Visible = false; + } + + private void Mod_GroupsMan_eh_Select(object sender, EventArgs e) + { + mod_Dip2Atr.Gruppo = mod_GroupsMan.GruppoSel; + divDetail.Visible = true; + } + + #endregion Private Methods + + #region Protected Methods + protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + mod_Dip2Atr.Gruppo = "#"; + divDetail.Visible = false; + } + mod_GroupsMan.eh_Select += Mod_GroupsMan_eh_Select; + mod_GroupsMan.eh_Reset += Mod_GroupsMan_eh_Reset; } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.designer.cs index 2c9b928..3db8da5 100644 --- a/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/BazaarGroups.aspx.designer.cs @@ -22,5 +22,32 @@ namespace PROJ_ETS /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_GroupsMan mod_GroupsMan; + + /// + /// divDetail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail; + + /// + /// updDip2ATR control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updDip2ATR; + + /// + /// mod_Dip2Atr control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_Dip2Atr mod_Dip2Atr; } } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_Dip2Atr.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_Dip2Atr.ascx index 4cbcad6..02f7434 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_Dip2Atr.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_Dip2Atr.ascx @@ -1,13 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Dip2Atr.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_Dip2Atr" %> - + - <%-- + - + <%-- - + --%> @@ -18,13 +18,13 @@ - + <%-- - + --%> - --%> + <%-- @@ -32,20 +32,25 @@ --%> - - + - - - - - - + + + + + + - + + + + + + + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx index 3b8a1f7..e376fa0 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx @@ -1,73 +1,56 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_GroupsMan.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_GroupsMan" %> -<%@ Register Src="~/WebUserControls/mod_Dip2Atr.ascx" TagPrefix="uc1" TagName="mod_Dip2Atr" %> -
-
- - - - - - + + + + + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - gestione gruppi: -
    -
  • Anagrafica gruppi EDIT
    • -
  • Anagrafica gruppi SELECT --> detail utenti
    • -
  • Anagrafica gruppi ADD
    • -
  • Anagrafica gruppi DELETE
    • -
  • Sync utenti
    • -
  • Edit Assegnazione utenti-Gruppi
    • -
-
-
\ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.cs index 60e1dbf..d5cca2e 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.cs @@ -9,25 +9,48 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_GroupsMan : System.Web.UI.UserControl { + #region Public Events + + public event EventHandler eh_Reset; + + public event EventHandler eh_Select; + + #endregion Public Events + + #region Public Properties + + public string GruppoSel + { + get + { + return $"{grView.SelectedValue}"; + } + } + + #endregion Public Properties + #region Protected Methods protected void grView_SelectedIndexChanged(object sender, EventArgs e) { - divDetail.Visible = true; + if (eh_Select != null) + { + eh_Select(this, new EventArgs()); + } } protected void lbtReset_Click(object sender, EventArgs e) { grView.SelectedIndex = -1; - mod_Dip2Atr.Gruppo = "#"; - divDetail.Visible = false; grView.DataBind(); + if (eh_Reset != null) + { + eh_Reset(this, new EventArgs()); + } } protected void Page_Load(object sender, EventArgs e) { - mod_Dip2Atr.Gruppo = $"{grView.SelectedValue}"; - divDetail.Visible = false; } #endregion Protected Methods diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.designer.cs index 35090da..7b22b6d 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_GroupsMan.ascx.designer.cs @@ -31,23 +31,5 @@ namespace PROJ_ETS.WebUserControls /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - - /// - /// divDetail control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail; - - /// - /// mod_Dip2Atr control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::PROJ_ETS.WebUserControls.mod_Dip2Atr mod_Dip2Atr; } } diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index e8a5140..1c077a4 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 6603a69..abed843 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ