From 8619a923726ddfeb48a722f7dbc7e712ab2e5ef1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 15 Nov 2021 17:51:40 +0100 Subject: [PATCH] Update x refresh progetti e commesse ETS --- ETS_Data/DataProxy_ProjEts.cs | 3 + ETS_Data/Ds_ProjEts.Designer.cs | 156 ++++++--- ETS_Data/Ds_ProjEts.xsd | 82 +++-- ETS_Data/Ds_ProjEts.xss | 38 +-- PROJ-ETS/PROJ-ETS/Commesse.aspx | 3 + PROJ-ETS/PROJ-ETS/Commesse.aspx.cs | 302 ++++++++++-------- PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs | 57 ++-- PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj | 8 +- .../PublishProfiles/IIS01.pubxml.user | 2 +- .../WebUserControls/mod_progetti.ascx | 5 +- .../WebUserControls/mod_progetti.ascx.cs | 6 + .../mod_progetti.ascx.designer.cs | 43 ++- 12 files changed, 440 insertions(+), 265 deletions(-) diff --git a/ETS_Data/DataProxy_ProjEts.cs b/ETS_Data/DataProxy_ProjEts.cs index ce03cf2..b55135e 100644 --- a/ETS_Data/DataProxy_ProjEts.cs +++ b/ETS_Data/DataProxy_ProjEts.cs @@ -28,6 +28,7 @@ namespace ETS_Data /// public static DataProxy_ProjEts DP = new DataProxy_ProjEts(); + public Ds_ProjEtsTableAdapters.AnagCommFasiTableAdapter taACF; public Ds_ProjEtsTableAdapters.AnagFasiTableAdapter taAF; public Ds_ProjEtsTableAdapters.AnagLabelsTableAdapter taAL; public Ds_ProjEtsTableAdapters.AnagProgettiTableAdapter taAP; @@ -159,6 +160,7 @@ namespace ETS_Data /// protected void initTA() { + taACF = new Ds_ProjEtsTableAdapters.AnagCommFasiTableAdapter(); taAF = new Ds_ProjEtsTableAdapters.AnagFasiTableAdapter(); taAL = new Ds_ProjEtsTableAdapters.AnagLabelsTableAdapter(); taAP = new Ds_ProjEtsTableAdapters.AnagProgettiTableAdapter(); @@ -190,6 +192,7 @@ namespace ETS_Data protected virtual void setupConnectionStringBase() { // connections del db + taACF.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); taAF.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); taAL.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); taAP.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); diff --git a/ETS_Data/Ds_ProjEts.Designer.cs b/ETS_Data/Ds_ProjEts.Designer.cs index a2bd21c..e011a3e 100644 --- a/ETS_Data/Ds_ProjEts.Designer.cs +++ b/ETS_Data/Ds_ProjEts.Designer.cs @@ -18483,7 +18483,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [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[7]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_AP_Expl_getData"; @@ -18503,42 +18503,51 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_AP_getByIdxCli"; + this._commandCollection[2].CommandText = "dbo.stp_AP_Summary_Update"; 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("@idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gruppo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCliente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showPrjArch", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PrjArch", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 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_AP_getByIdxPrj"; + this._commandCollection[3].CommandText = "dbo.stp_AP_getByIdxCli"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCliente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showPrjArch", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 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_AP_insertQuery"; + this._commandCollection[4].CommandText = "dbo.stp_AP_getByIdxPrj"; 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("@idxCliente", 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("@nomeProj", 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("@descrProj", global::System.Data.SqlDbType.NVarChar, 250, 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("@idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_AP_updateAttivo"; + this._commandCollection[5].CommandText = "dbo.stp_AP_insertQuery"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCliente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nomeProj", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrProj", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_AP_update"; + this._commandCollection[6].CommandText = "dbo.stp_AP_updateAttivo"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCliente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nomeProj", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrProj", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "dbo.stp_AP_update"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCliente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nomeProj", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrProj", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxProgetto", 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()] @@ -18642,7 +18651,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual Ds_ProjEts.AnagProgettiDataTable geByIdxCli(global::System.Nullable idxCliente, global::System.Nullable showPrjArch) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((idxCliente.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxCliente.Value)); } @@ -18665,7 +18674,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual Ds_ProjEts.AnagProgettiDataTable getByIdxPrj(global::System.Nullable idxProgetto) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((idxProgetto.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxProgetto.Value)); } @@ -18845,11 +18854,57 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { return returnValue; } + [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 forceSummary_Update(global::System.Nullable idxProgetto, string gruppo, global::System.Nullable idxCliente, global::System.Nullable PrjArch) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((idxProgetto.HasValue == true)) { + command.Parameters[1].Value = ((int)(idxProgetto.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((gruppo == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(gruppo)); + } + if ((idxCliente.HasValue == true)) { + command.Parameters[3].Value = ((int)(idxCliente.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((PrjArch.HasValue == true)) { + command.Parameters[4].Value = ((bool)(PrjArch.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int insertQuery(global::System.Nullable idxCliente, string nomeProj, string descrProj) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((idxCliente.HasValue == true)) { command.Parameters[1].Value = ((int)(idxCliente.Value)); } @@ -18889,7 +18944,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateAttivo(global::System.Nullable Attivo, global::System.Nullable Original_idxProgetto) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((Attivo.HasValue == true)) { command.Parameters[1].Value = ((bool)(Attivo.Value)); } @@ -18923,7 +18978,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateQuery(global::System.Nullable idxCliente, string nomeProj, string descrProj, global::System.Nullable Attivo, global::System.Nullable Original_idxProgetto) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((idxCliente.HasValue == true)) { command.Parameters[1].Value = ((int)(idxCliente.Value)); } @@ -21196,7 +21251,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [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[4]; + 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 = "dbo.stp_ACF_getByIdxProjStatus"; @@ -21216,31 +21271,36 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_AF_InsertQuery"; + this._commandCollection[2].CommandText = "dbo.stp_ACF_CommesseSummary_Update"; 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("@idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFaseAncest", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nomeFase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizioneFase", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enableTime", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enableMoney", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@budgetTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@budgetMoney", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 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_AF_updateQuery"; + this._commandCollection[3].CommandText = "dbo.stp_AF_InsertQuery"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFaseAncest", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nomeFase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizioneFase", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enableTime", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enableMoney", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@budgetTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@budgetMoney", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 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_AF_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("@nomeFase", 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("@descrizioneFase", global::System.Data.SqlDbType.NVarChar, 250, 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("@enableTime", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enableMoney", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", 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("@budgetTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@budgetMoney", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxFase", 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()] @@ -21370,8 +21430,30 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [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 InsertQuery(global::System.Nullable idxProgetto, global::System.Nullable idxFaseAncest, string nomeFase, string descrizioneFase, global::System.Nullable enableTime, global::System.Nullable enableMoney, global::System.Nullable budgetTime, global::System.Nullable budgetMoney, global::System.Nullable Attivo) { + public virtual int forceCommesseSummary_Update() { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int InsertQuery(global::System.Nullable idxProgetto, global::System.Nullable idxFaseAncest, string nomeFase, string descrizioneFase, global::System.Nullable enableTime, global::System.Nullable enableMoney, global::System.Nullable budgetTime, global::System.Nullable budgetMoney, global::System.Nullable Attivo) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((idxProgetto.HasValue == true)) { command.Parameters[1].Value = ((int)(idxProgetto.Value)); } @@ -21447,7 +21529,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateQuery(string nomeFase, string descrizioneFase, global::System.Nullable enableTime, global::System.Nullable enableMoney, global::System.Nullable Attivo, global::System.Nullable budgetTime, global::System.Nullable budgetMoney, global::System.Nullable Original_idxFase) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((nomeFase == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/ETS_Data/Ds_ProjEts.xsd b/ETS_Data/Ds_ProjEts.xsd index 8cfa8a3..958c123 100644 --- a/ETS_Data/Ds_ProjEts.xsd +++ b/ETS_Data/Ds_ProjEts.xsd @@ -85,6 +85,20 @@ + + + + dbo.stp_AP_Summary_Update + + + + + + + + + + @@ -664,6 +678,16 @@ + + + + dbo.stp_ACF_CommesseSummary_Update + + + + + + @@ -2288,7 +2312,7 @@ ORDER BY OrdGruppo - + @@ -2331,7 +2355,7 @@ ORDER BY OrdGruppo - + @@ -2381,7 +2405,7 @@ ORDER BY OrdGruppo - + @@ -2477,7 +2501,7 @@ ORDER BY OrdGruppo - + @@ -2528,7 +2552,7 @@ ORDER BY OrdGruppo - + @@ -2580,7 +2604,7 @@ ORDER BY OrdGruppo - + @@ -2683,7 +2707,7 @@ ORDER BY OrdGruppo - + @@ -2731,7 +2755,7 @@ ORDER BY OrdGruppo - + @@ -2748,7 +2772,7 @@ ORDER BY OrdGruppo - + @@ -2769,7 +2793,7 @@ ORDER BY OrdGruppo - + @@ -2814,7 +2838,7 @@ ORDER BY OrdGruppo - + @@ -2949,7 +2973,7 @@ ORDER BY OrdGruppo - + @@ -2968,7 +2992,7 @@ ORDER BY OrdGruppo - + @@ -2979,7 +3003,7 @@ ORDER BY OrdGruppo - + @@ -2995,7 +3019,7 @@ ORDER BY OrdGruppo - + @@ -3024,7 +3048,7 @@ ORDER BY OrdGruppo - + @@ -3044,7 +3068,7 @@ ORDER BY OrdGruppo - + @@ -3058,7 +3082,7 @@ ORDER BY OrdGruppo - + @@ -3073,7 +3097,7 @@ ORDER BY OrdGruppo - + @@ -3089,7 +3113,7 @@ ORDER BY OrdGruppo - + @@ -3188,7 +3212,7 @@ ORDER BY OrdGruppo - + @@ -3211,7 +3235,7 @@ ORDER BY OrdGruppo - + @@ -3372,13 +3396,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 3994098..02aa20e 100644 --- a/ETS_Data/Ds_ProjEts.xss +++ b/ETS_Data/Ds_ProjEts.xss @@ -4,30 +4,30 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -102,7 +102,7 @@ - + 172 @@ -118,7 +118,7 @@ - + 1298 diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx b/PROJ-ETS/PROJ-ETS/Commesse.aspx index eb46479..15ff4bb 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx @@ -46,6 +46,9 @@ +
+ Refresh comesse +
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs b/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs index 3c984bd..4779548 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs @@ -10,78 +10,8 @@ namespace PROJ_ETS { public partial class Commesse : System.Web.UI.Page { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - utils.obj.emptySessionVal("idxProgetto_sel"); - utils.obj.emptySessionVal("idxCli_sel"); - utils.obj.emptySessionVal("nomeCli_sel"); - utils.obj.emptySessionVal("valoreCercato"); - txtCerca.Text = ""; - showChiusi = false; - showFasi = false; - showAddLabels = false; - CodLabel = "*"; - } - divModLabels.Visible = showAddLabels; - } - /// - /// determina se siano da visualizzare i progetti già chiusi - /// - public bool showChiusi - { - get - { - return utils.obj.BoolSessionObj("showCommArch"); - } - set - { - utils.obj.setSessionVal("showCommArch", value); - } - } - /// - /// determina se siano visibili progetti "vuoti" con zero ore caricate quindi - /// - public bool showVuoti - { - get - { - return utils.obj.BoolSessionObj("showCommZeroH"); - } - set - { - utils.obj.setSessionVal("showCommZeroH", value); - } - } - /// - /// determina se siano visibili le fasi delle commesse - /// - public bool showFasi - { - get - { - return utils.obj.BoolSessionObj("showFasi"); - } - set - { - utils.obj.setSessionVal("showFasi", value); - } - } - /// - /// determina se siano visibili i controlli di add/modifica labels - /// - public bool showAddLabels - { - get - { - return utils.obj.BoolSessionObj("showAddLabels"); - } - set - { - utils.obj.setSessionVal("showAddLabels", value); - } - } + #region Public Properties + /// /// filtro Capo Commessa /// @@ -96,6 +26,7 @@ namespace PROJ_ETS utils.obj.setSessionVal("capoComm", value); } } + /// /// filtro CodLabel /// @@ -110,45 +41,84 @@ namespace PROJ_ETS utils.obj.setSessionVal("CodLabel", value); } } + /// - /// determina se mostrare commesse archiviate + /// determina se siano visibili i controlli di add/modifica labels /// - /// - /// - protected void chkShowChiusi_CheckedChanged(object sender, EventArgs e) + public bool showAddLabels { - showChiusi = chkShowChiusi.Checked; - mod_commesseFull1.doUpdate(); + get + { + return utils.obj.BoolSessionObj("showAddLabels"); + } + set + { + utils.obj.setSessionVal("showAddLabels", value); + } } + /// - /// cambia impsotazione show/hide progetti con ore a zero... + /// determina se siano da visualizzare i progetti già chiusi /// - /// - /// - protected void chkShowVuoti_CheckedChanged(object sender, EventArgs e) + public bool showChiusi { - showVuoti = chkShowVuoti.Checked; - mod_commesseFull1.doUpdate(); + get + { + return utils.obj.BoolSessionObj("showCommArch"); + } + set + { + utils.obj.setSessionVal("showCommArch", value); + } } + /// - /// cambia impostazione show/hide fasi... + /// determina se siano visibili le fasi delle commesse /// - /// - /// - protected void chkShowFasi_CheckedChanged(object sender, EventArgs e) + public bool showFasi { - showFasi = chkShowFasi.Checked; - mod_commesseFull1.doUpdate(); + get + { + return utils.obj.BoolSessionObj("showFasi"); + } + set + { + utils.obj.setSessionVal("showFasi", value); + } } + /// - /// mostra/nasconde filtro CC + /// determina se siano visibili progetti "vuoti" con zero ore caricate quindi /// - /// - /// - protected void chkFiltroCC_CheckedChanged(object sender, EventArgs e) + public bool showVuoti { - fixFiltroCC(); + get + { + return utils.obj.BoolSessionObj("showCommZeroH"); + } + set + { + utils.obj.setSessionVal("showCommZeroH", value); + } } + + #endregion Public Properties + + #region Private Methods + + private void fixAddLabeld() + { + divModLabels.Visible = showAddLabels; + if (showAddLabels) + { + chkToggleAddLabels.Text = "Chiu[d]i"; + } + else + { + chkToggleAddLabels.Text = "Mo[d]ifica"; + } + } + /// /// salvo filtraggio capo commessa + update /// @@ -165,6 +135,75 @@ namespace PROJ_ETS } mod_commesseFull1.doUpdate(); } + + /// + /// salvo filtraggio capo commessa + update + /// + private void fixFiltroLabel() + { + CodLabel = ddlFiltLabel.SelectedValue; + mod_commesseFull1.doUpdate(); + } + + #endregion Private Methods + + #region Protected Methods + + /// + /// mostra/nasconde filtro CC + /// + /// + /// + protected void chkFiltroCC_CheckedChanged(object sender, EventArgs e) + { + fixFiltroCC(); + } + + /// + /// determina se mostrare commesse archiviate + /// + /// + /// + protected void chkShowChiusi_CheckedChanged(object sender, EventArgs e) + { + showChiusi = chkShowChiusi.Checked; + mod_commesseFull1.doUpdate(); + } + + /// + /// cambia impostazione show/hide fasi... + /// + /// + /// + protected void chkShowFasi_CheckedChanged(object sender, EventArgs e) + { + showFasi = chkShowFasi.Checked; + mod_commesseFull1.doUpdate(); + } + + /// + /// cambia impsotazione show/hide progetti con ore a zero... + /// + /// + /// + protected void chkShowVuoti_CheckedChanged(object sender, EventArgs e) + { + showVuoti = chkShowVuoti.Checked; + mod_commesseFull1.doUpdate(); + } + + /// + /// cambia impostazione set/filter labels + /// + /// + /// + protected void chkToggleAddLabels_CheckedChanged(object sender, EventArgs e) + { + showAddLabels = chkToggleAddLabels.Checked; + fixAddLabeld(); + mod_commesseFull1.doUpdate(); + } + /// /// cambio valore filtro CC /// @@ -184,15 +223,42 @@ namespace PROJ_ETS { fixFiltroLabel(); } - /// - /// salvo filtraggio capo commessa + update - /// - private void fixFiltroLabel() + + protected void lbtAddLabel_Click(object sender, EventArgs e) { - CodLabel = ddlFiltLabel.SelectedValue; + mod_commesseFull1.addLabel4Sel(ddlSelLabel.SelectedValue); + } + + protected void lbtRefresh_Click(object sender, EventArgs e) + { + // forza refresh progetti + mod_commesseFull1.Visible = false; + DataProxy_ProjEts.DP.taACF.forceCommesseSummary_Update(); + mod_commesseFull1.Visible = true; mod_commesseFull1.doUpdate(); } + protected void lbtResetLabels_Click(object sender, EventArgs e) + { + mod_commesseFull1.resetLabel4Sel(); + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + utils.obj.emptySessionVal("idxProgetto_sel"); + utils.obj.emptySessionVal("idxCli_sel"); + utils.obj.emptySessionVal("nomeCli_sel"); + utils.obj.emptySessionVal("valoreCercato"); + txtCerca.Text = ""; + showChiusi = false; + showFasi = false; + showAddLabels = false; + CodLabel = "*"; + } + divModLabels.Visible = showAddLabels; + } /// /// salvo ricerca @@ -204,40 +270,6 @@ namespace PROJ_ETS utils.obj.setSessionVal("valoreCercato", txtCerca.Text.Trim()); } - - /// - /// cambia impostazione set/filter labels - /// - /// - /// - protected void chkToggleAddLabels_CheckedChanged(object sender, EventArgs e) - { - showAddLabels = chkToggleAddLabels.Checked; - fixAddLabeld(); - mod_commesseFull1.doUpdate(); - } - - private void fixAddLabeld() - { - divModLabels.Visible = showAddLabels; - if (showAddLabels) - { - chkToggleAddLabels.Text = "Chiu[d]i"; - } - else - { - chkToggleAddLabels.Text = "Mo[d]ifica"; - } - } - - protected void lbtAddLabel_Click(object sender, EventArgs e) - { - mod_commesseFull1.addLabel4Sel(ddlSelLabel.SelectedValue); - } - - protected void lbtResetLabels_Click(object sender, EventArgs e) - { - mod_commesseFull1.resetLabel4Sel(); - } + #endregion Protected Methods } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs index 5c5a79e..db81dd8 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace PROJ_ETS { - - - public partial class Commesse { - +namespace PROJ_ETS +{ + + + public partial class Commesse + { + /// /// chkFiltroCC control. /// @@ -20,7 +22,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkFiltroCC; - + /// /// ddlCC control. /// @@ -29,7 +31,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlCC; - + /// /// odsCC control. /// @@ -38,7 +40,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsCC; - + /// /// chkShowChiusi control. /// @@ -47,7 +49,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkShowChiusi; - + /// /// chkShowVuoti control. /// @@ -56,7 +58,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkShowVuoti; - + /// /// chkShowFasi control. /// @@ -65,7 +67,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkShowFasi; - + /// /// mod_periodoAnalisi1 control. /// @@ -74,7 +76,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi1; - + /// /// lblCerca control. /// @@ -83,7 +85,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblCerca; - + /// /// txtCerca control. /// @@ -92,7 +94,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtCerca; - + /// /// lblLabels control. /// @@ -101,7 +103,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblLabels; - + /// /// ddlFiltLabel control. /// @@ -110,7 +112,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlFiltLabel; - + /// /// chkToggleAddLabels control. /// @@ -119,7 +121,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkToggleAddLabels; - + /// /// divModLabels control. /// @@ -128,7 +130,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divModLabels; - + /// /// lblBtns control. /// @@ -137,7 +139,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblBtns; - + /// /// ddlSelLabel control. /// @@ -146,7 +148,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlSelLabel; - + /// /// lbtAddLabel control. /// @@ -155,7 +157,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtAddLabel; - + /// /// lbtResetLabels control. /// @@ -164,7 +166,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetLabels; - + /// /// odsLabel control. /// @@ -173,7 +175,16 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsLabel; - + + /// + /// lbtRefresh control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtRefresh; + /// /// mod_commesseFull1 control. /// diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 3c59eb4..983faff 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -1,4 +1,4 @@ - + @@ -1259,8 +1259,8 @@ --> - + - \ No newline at end of file + diff --git a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/IIS01.pubxml.user b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/IIS01.pubxml.user index 93eb6e8..7382d0b 100644 --- a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/IIS01.pubxml.user +++ b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/IIS01.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAADvY+SBAoczt/EOIxwsD5TBAAAAAASAAACgAAAAEAAAAJXKKLDlbgkK4ahZt7BRG6UYAAAArcTCIN1myVeAqBrKaeEZ4Uw+mwhY24K5FAAAAMnqiYk6Os0t6BvJZLecNF+xetF9 - True|2021-11-02T08:51:00.4642226Z;False|2021-11-02T09:30:34.2647128+01:00;False|2021-11-02T09:30:15.6823409+01:00;False|2021-11-02T09:30:08.6274700+01:00;True|2021-11-02T09:11:27.2427159+01:00;True|2021-11-02T09:08:32.0829283+01:00;True|2021-10-29T09:47:58.4947571+02:00;True|2021-10-29T09:47:35.2090702+02:00; + True|2021-11-15T16:51:24.3411167Z;True|2021-11-02T09:51:00.4642226+01:00;False|2021-11-02T09:30:34.2647128+01:00;False|2021-11-02T09:30:15.6823409+01:00;False|2021-11-02T09:30:08.6274700+01:00;True|2021-11-02T09:11:27.2427159+01:00;True|2021-11-02T09:08:32.0829283+01:00;True|2021-10-29T09:47:58.4947571+02:00;True|2021-10-29T09:47:35.2090702+02:00; \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx index 22c4f1e..bf1d680 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx @@ -20,6 +20,9 @@ +
+ Refresh proj +
@@ -221,4 +224,4 @@
-
+
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs index ef271c6..3078233 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs @@ -362,6 +362,12 @@ namespace PROJ_ETS.WebUserControls ods.Insert(); } + protected void lbtRefresh_Click(object sender, EventArgs e) + { + // forza refresh progetti + DataProxy_ProjEts.DP.taAP.forceSummary_Update(0, "", 0, true); + } + /// /// check licenze in fase di update... /// diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs index 3374aff..de84d15 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace PROJ_ETS.WebUserControls { - - - public partial class mod_progetti { - +namespace PROJ_ETS.WebUserControls +{ + + + public partial class mod_progetti + { + /// /// filtroCli control. /// @@ -20,7 +22,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_autocomplete filtroCli; - + /// /// chkShowChiusi control. /// @@ -29,7 +31,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkShowChiusi; - + /// /// chkShowVuoti control. /// @@ -38,7 +40,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkShowVuoti; - + /// /// mod_periodoAnalisi1 control. /// @@ -47,7 +49,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi1; - + /// /// lblCerca control. /// @@ -56,7 +58,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblCerca; - + /// /// txtCerca control. /// @@ -65,7 +67,16 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtCerca; - + + /// + /// lbtRefresh control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtRefresh; + /// /// grView control. /// @@ -74,7 +85,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grView; - + /// /// ods control. /// @@ -83,7 +94,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - + /// /// odsClienti control. /// @@ -92,7 +103,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsClienti; - + /// /// lblNumRec control. /// @@ -101,7 +112,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNumRec; - + /// /// mod_commesse1 control. /// @@ -110,7 +121,7 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_commesse mod_commesse1; - + /// /// btnSposta control. ///