From 7aee7b897c824356c06ea3fa5a01b66e5f2f3b9f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Aug 2018 20:05:24 +0200 Subject: [PATCH] fix show note --- Data/DS_app.Designer.cs | 102 ++++++++++++++---- Data/DS_app.xsd | 64 ++++++----- Data/DS_app.xss | 4 +- Jenkinsfile | 2 +- PUB/WebUserContols/mod_ER_selCondominio.ascx | 3 + .../mod_ER_selCondominio.ascx.cs | 18 +++- .../mod_ER_selCondominio.ascx.designer.cs | 9 ++ 7 files changed, 151 insertions(+), 51 deletions(-) diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index e59e9cf..58ef745 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -1241,6 +1241,8 @@ namespace Data { private global::System.Data.DataColumn columnAttivo; + private global::System.Data.DataColumn columnnote; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagCondominiDataTable() { @@ -1346,6 +1348,14 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn noteColumn { + get { + return this.columnnote; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1383,7 +1393,7 @@ namespace Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public AnagCondominiRow AddAnagCondominiRow(string cod_cond, string nome, string indirizzo, string cap, string citta, string cod_fisc, AnagAmministratoriRow parentAnagAmministratoriRowByFK_AnagCondomini_AnagAmministratori, bool Attivo) { + public AnagCondominiRow AddAnagCondominiRow(string cod_cond, string nome, string indirizzo, string cap, string citta, string cod_fisc, AnagAmministratoriRow parentAnagAmministratoriRowByFK_AnagCondomini_AnagAmministratori, bool Attivo, string note) { AnagCondominiRow rowAnagCondominiRow = ((AnagCondominiRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1394,7 +1404,8 @@ namespace Data { citta, cod_fisc, null, - Attivo}; + Attivo, + note}; if ((parentAnagAmministratoriRowByFK_AnagCondomini_AnagAmministratori != null)) { columnValuesArray[7] = parentAnagAmministratoriRowByFK_AnagCondomini_AnagAmministratori[0]; } @@ -1436,6 +1447,7 @@ namespace Data { this.columncod_fisc = base.Columns["cod_fisc"]; this.columnidxAmm = base.Columns["idxAmm"]; this.columnAttivo = base.Columns["Attivo"]; + this.columnnote = base.Columns["note"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1459,6 +1471,8 @@ namespace Data { base.Columns.Add(this.columnidxAmm); this.columnAttivo = new global::System.Data.DataColumn("Attivo", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnAttivo); + this.columnnote = new global::System.Data.DataColumn("note", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnote); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxCond}, true)); this.columnidxCond.AutoIncrement = true; @@ -1481,6 +1495,8 @@ namespace Data { this.columncod_fisc.MaxLength = 15; this.columnidxAmm.AllowDBNull = false; this.columnAttivo.AllowDBNull = false; + this.columnnote.AllowDBNull = false; + this.columnnote.MaxLength = 250; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7421,6 +7437,17 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string note { + get { + return ((string)(this[this.tableAnagCondomini.noteColumn])); + } + set { + this[this.tableAnagCondomini.noteColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagAmministratoriRow AnagAmministratoriRow { @@ -10976,10 +11003,11 @@ namespace Data.DS_appTableAdapters { tableMapping.ColumnMappings.Add("cod_fisc", "cod_fisc"); tableMapping.ColumnMappings.Add("idxAmm", "idxAmm"); tableMapping.ColumnMappings.Add("Attivo", "Attivo"); + tableMapping.ColumnMappings.Add("note", "note"); 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].[AnagCondomini] WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[AnagCondomini] WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo) AND ([note] = @Original_note))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxCond", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxCond", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cod_cond", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_cond", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -10990,10 +11018,11 @@ namespace Data.DS_appTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cod_fisc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_fisc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxAmm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxAmm", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Attivo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Attivo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", 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].[AnagCondomini] ([cod_cond], [nome], [indirizzo], [cap], [citta], [cod_fisc], [idxAmm], [Attivo]) VALUES (@cod_cond, @nome, @indirizzo, @cap, @citta, @cod_fisc, @idxAmm, @Attivo); -SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo FROM AnagCondomini WHERE (idxCond = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[AnagCondomini] ([cod_cond], [nome], [indirizzo], [cap], [citta], [cod_fisc], [idxAmm], [Attivo], [note]) VALUES (@cod_cond, @nome, @indirizzo, @cap, @citta, @cod_fisc, @idxAmm, @Attivo, @note); +SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, note FROM AnagCondomini WHERE (idxCond = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cod_cond", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_cond", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nome", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "nome", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -11003,10 +11032,11 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cod_fisc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_fisc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxAmm", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Attivo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", 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].[AnagCondomini] SET [cod_cond] = @cod_cond, [nome] = @nome, [indirizzo] = @indirizzo, [cap] = @cap, [citta] = @citta, [cod_fisc] = @cod_fisc, [idxAmm] = @idxAmm, [Attivo] = @Attivo WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo)); -SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo FROM AnagCondomini WHERE (idxCond = @idxCond)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagCondomini] SET [cod_cond] = @cod_cond, [nome] = @nome, [indirizzo] = @indirizzo, [cap] = @cap, [citta] = @citta, [cod_fisc] = @cod_fisc, [idxAmm] = @idxAmm, [Attivo] = @Attivo, [note] = @note WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo) AND ([note] = @Original_note)); +SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, note FROM AnagCondomini WHERE (idxCond = @idxCond)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cod_cond", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_cond", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nome", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "nome", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -11016,6 +11046,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cod_fisc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_fisc", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxAmm", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Attivo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxCond", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxCond", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cod_cond", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_cond", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_nome", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "nome", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -11025,6 +11056,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cod_fisc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cod_fisc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxAmm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxAmm", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Attivo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Attivo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "note", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCond", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idxCond", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -11171,7 +11203,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idxCond, string Original_cod_cond, string Original_nome, string Original_indirizzo, string Original_cap, string Original_citta, string Original_cod_fisc, int Original_idxAmm, bool Original_Attivo) { + public virtual int Delete(int Original_idxCond, string Original_cod_cond, string Original_nome, string Original_indirizzo, string Original_cap, string Original_citta, string Original_cod_fisc, int Original_idxAmm, bool Original_Attivo, string Original_note) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idxCond)); if ((Original_cod_cond == null)) { throw new global::System.ArgumentNullException("Original_cod_cond"); @@ -11211,6 +11243,12 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo } this.Adapter.DeleteCommand.Parameters[7].Value = ((int)(Original_idxAmm)); this.Adapter.DeleteCommand.Parameters[8].Value = ((bool)(Original_Attivo)); + if ((Original_note == null)) { + throw new global::System.ArgumentNullException("Original_note"); + } + else { + this.Adapter.DeleteCommand.Parameters[9].Value = ((string)(Original_note)); + } 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)) { @@ -11231,7 +11269,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string cod_cond, string nome, string indirizzo, string cap, string citta, string cod_fisc, int idxAmm, bool Attivo) { + public virtual int Insert(string cod_cond, string nome, string indirizzo, string cap, string citta, string cod_fisc, int idxAmm, bool Attivo, string note) { if ((cod_cond == null)) { throw new global::System.ArgumentNullException("cod_cond"); } @@ -11270,6 +11308,12 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo } this.Adapter.InsertCommand.Parameters[6].Value = ((int)(idxAmm)); this.Adapter.InsertCommand.Parameters[7].Value = ((bool)(Attivo)); + if ((note == null)) { + throw new global::System.ArgumentNullException("note"); + } + else { + this.Adapter.InsertCommand.Parameters[8].Value = ((string)(note)); + } 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)) { @@ -11299,6 +11343,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo string cod_fisc, int idxAmm, bool Attivo, + string note, int Original_idxCond, string Original_cod_cond, string Original_nome, @@ -11308,6 +11353,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo string Original_cod_fisc, int Original_idxAmm, bool Original_Attivo, + string Original_note, int idxCond) { if ((cod_cond == null)) { throw new global::System.ArgumentNullException("cod_cond"); @@ -11347,46 +11393,58 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo } this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(idxAmm)); this.Adapter.UpdateCommand.Parameters[7].Value = ((bool)(Attivo)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idxCond)); + if ((note == null)) { + throw new global::System.ArgumentNullException("note"); + } + else { + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(note)); + } + this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idxCond)); if ((Original_cod_cond == null)) { throw new global::System.ArgumentNullException("Original_cod_cond"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_cod_cond)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_cod_cond)); } if ((Original_nome == null)) { throw new global::System.ArgumentNullException("Original_nome"); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_nome)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_nome)); } if ((Original_indirizzo == null)) { throw new global::System.ArgumentNullException("Original_indirizzo"); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_indirizzo)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_indirizzo)); } if ((Original_cap == null)) { throw new global::System.ArgumentNullException("Original_cap"); } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_cap)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_cap)); } if ((Original_citta == null)) { throw new global::System.ArgumentNullException("Original_citta"); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_citta)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_citta)); } if ((Original_cod_fisc == null)) { throw new global::System.ArgumentNullException("Original_cod_fisc"); } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_cod_fisc)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_cod_fisc)); } - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idxAmm)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_Attivo)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(idxCond)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idxAmm)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((bool)(Original_Attivo)); + if ((Original_note == null)) { + throw new global::System.ArgumentNullException("Original_note"); + } + else { + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_note)); + } + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(idxCond)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -11416,6 +11474,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo string cod_fisc, int idxAmm, bool Attivo, + string note, int Original_idxCond, string Original_cod_cond, string Original_nome, @@ -11424,8 +11483,9 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo string Original_citta, string Original_cod_fisc, int Original_idxAmm, - bool Original_Attivo) { - return this.Update(cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, Original_idxCond, Original_cod_cond, Original_nome, Original_indirizzo, Original_cap, Original_citta, Original_cod_fisc, Original_idxAmm, Original_Attivo, Original_idxCond); + bool Original_Attivo, + string Original_note) { + return this.Update(cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, note, Original_idxCond, Original_cod_cond, Original_nome, Original_indirizzo, Original_cap, Original_citta, Original_cod_fisc, Original_idxAmm, Original_Attivo, Original_note, Original_idxCond); } } diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index 1c6c009..dd9b11a 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -49,7 +49,7 @@ FROM dbo.v_AnagAmministratori - DELETE FROM [dbo].[AnagCondomini] WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo)) + DELETE FROM [dbo].[AnagCondomini] WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo) AND ([note] = @Original_note)) @@ -60,13 +60,14 @@ FROM dbo.v_AnagAmministratori + - INSERT INTO [dbo].[AnagCondomini] ([cod_cond], [nome], [indirizzo], [cap], [citta], [cod_fisc], [idxAmm], [Attivo]) VALUES (@cod_cond, @nome, @indirizzo, @cap, @citta, @cod_fisc, @idxAmm, @Attivo); -SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo FROM AnagCondomini WHERE (idxCond = SCOPE_IDENTITY()) + INSERT INTO [dbo].[AnagCondomini] ([cod_cond], [nome], [indirizzo], [cap], [citta], [cod_fisc], [idxAmm], [Attivo], [note]) VALUES (@cod_cond, @nome, @indirizzo, @cap, @citta, @cod_fisc, @idxAmm, @Attivo, @note); +SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, note FROM AnagCondomini WHERE (idxCond = SCOPE_IDENTITY()) @@ -76,6 +77,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo + @@ -88,8 +90,8 @@ FROM dbo.AnagCondomini - UPDATE [dbo].[AnagCondomini] SET [cod_cond] = @cod_cond, [nome] = @nome, [indirizzo] = @indirizzo, [cap] = @cap, [citta] = @citta, [cod_fisc] = @cod_fisc, [idxAmm] = @idxAmm, [Attivo] = @Attivo WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo)); -SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo FROM AnagCondomini WHERE (idxCond = @idxCond) + UPDATE [dbo].[AnagCondomini] SET [cod_cond] = @cod_cond, [nome] = @nome, [indirizzo] = @indirizzo, [cap] = @cap, [citta] = @citta, [cod_fisc] = @cod_fisc, [idxAmm] = @idxAmm, [Attivo] = @Attivo, [note] = @note WHERE (([idxCond] = @Original_idxCond) AND ([cod_cond] = @Original_cod_cond) AND ([nome] = @Original_nome) AND ([indirizzo] = @Original_indirizzo) AND ([cap] = @Original_cap) AND ([citta] = @Original_citta) AND ([cod_fisc] = @Original_cod_fisc) AND ([idxAmm] = @Original_idxAmm) AND ([Attivo] = @Original_Attivo) AND ([note] = @Original_note)); +SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, note FROM AnagCondomini WHERE (idxCond = @idxCond) @@ -99,6 +101,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo + @@ -108,6 +111,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo + @@ -124,6 +128,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo + @@ -1148,7 +1153,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1175,7 +1180,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1223,10 +1228,17 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib + + + + + + + - + @@ -1255,7 +1267,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1319,7 +1331,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1328,7 +1340,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1410,7 +1422,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1424,7 +1436,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1529,7 +1541,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1557,7 +1569,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1582,7 +1594,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1598,7 +1610,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1613,7 +1625,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1685,7 +1697,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1699,7 +1711,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1747,7 +1759,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1829,11 +1841,11 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - - - - - + + + + + \ No newline at end of file diff --git a/Data/DS_app.xss b/Data/DS_app.xss index 2e24ff0..2907ea3 100644 --- a/Data/DS_app.xss +++ b/Data/DS_app.xss @@ -4,10 +4,10 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + diff --git a/Jenkinsfile b/Jenkinsfile index d22f2b4..ac0c9e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=160']) { + withEnv(['NEXT_BUILD_NUMBER=161']) { // env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SOSCONDOMINI' diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx b/PUB/WebUserContols/mod_ER_selCondominio.ascx index e349878..c22f945 100644 --- a/PUB/WebUserContols/mod_ER_selCondominio.ascx +++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx @@ -12,3 +12,6 @@ +
+ +
diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs index cc43f0a..82691ec 100644 --- a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs +++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs @@ -57,6 +57,21 @@ namespace PUB.WebUserContols } public void saveSelections() { + // se ha note le mostro... + int idxCond = 0; + int.TryParse(condSelected, out idxCond); + lblMessage.Visible = false; + try + { + var rigaCond = DtProxy.man.taAC.getByKey(idxCond)[0]; + if (rigaCond.note != "") + { + lblMessage.Text = rigaCond.note; + lblMessage.Visible = true; + } + } + catch + { } // sollevo evento nuovo valore... if (eh_selected != null) { @@ -70,8 +85,9 @@ namespace PUB.WebUserContols } protected void lbtResetCond_Click(object sender, EventArgs e) { - ddlCondominio.SelectedIndex = 0; + fixSelCondomini(); ddlCondominio.DataBind(); + ddlCondominio.SelectedIndex = 0; saveSelections(); } diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx.designer.cs b/PUB/WebUserContols/mod_ER_selCondominio.ascx.designer.cs index 6c7348d..4581112 100644 --- a/PUB/WebUserContols/mod_ER_selCondominio.ascx.designer.cs +++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx.designer.cs @@ -38,5 +38,14 @@ namespace PUB.WebUserContols { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsCondomini; + + /// + /// Controllo lblMessage. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblMessage; } }