diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index 106a8ba..74d09e5 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -1243,6 +1243,8 @@ namespace Data { private global::System.Data.DataColumn columnnote; + private global::System.Data.DataColumn columnnomeFull; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagCondominiDataTable() { @@ -1356,6 +1358,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 nomeFullColumn { + get { + return this.columnnomeFull; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1393,7 +1403,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, string note) { + 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, string nomeFull) { AnagCondominiRow rowAnagCondominiRow = ((AnagCondominiRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1405,7 +1415,8 @@ namespace Data { cod_fisc, null, Attivo, - note}; + note, + nomeFull}; if ((parentAnagAmministratoriRowByFK_AnagCondomini_AnagAmministratori != null)) { columnValuesArray[7] = parentAnagAmministratoriRowByFK_AnagCondomini_AnagAmministratori[0]; } @@ -1448,6 +1459,7 @@ namespace Data { this.columnidxAmm = base.Columns["idxAmm"]; this.columnAttivo = base.Columns["Attivo"]; this.columnnote = base.Columns["note"]; + this.columnnomeFull = base.Columns["nomeFull"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1473,6 +1485,8 @@ namespace Data { 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.columnnomeFull = new global::System.Data.DataColumn("nomeFull", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnomeFull); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxCond}, true)); this.columnidxCond.AutoIncrement = true; @@ -1497,6 +1511,8 @@ namespace Data { this.columnAttivo.AllowDBNull = false; this.columnnote.AllowDBNull = false; this.columnnote.MaxLength = 250; + this.columnnomeFull.ReadOnly = true; + this.columnnomeFull.MaxLength = 83; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7310,6 +7326,22 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string nomeFull { + get { + try { + return ((string)(this[this.tableAnagCondomini.nomeFullColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'nomeFull\' nella tabella \'AnagCondomini\' รจ DBNull.", e); + } + } + set { + this[this.tableAnagCondomini.nomeFullColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AnagAmministratoriRow AnagAmministratoriRow { @@ -7321,6 +7353,18 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsnomeFullNull() { + return this.IsNull(this.tableAnagCondomini.nomeFullColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetnomeFullNull() { + this[this.tableAnagCondomini.nomeFullColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AssF2CRow[] GetAssF2CRows() { @@ -10697,60 +10741,8 @@ namespace Data.DS_appTableAdapters { tableMapping.ColumnMappings.Add("idxAmm", "idxAmm"); tableMapping.ColumnMappings.Add("Attivo", "Attivo"); tableMapping.ColumnMappings.Add("note", "note"); + tableMapping.ColumnMappings.Add("nomeFull", "nomeFull"); 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) 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, "", "", "")); - this._adapter.DeleteCommand.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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indirizzo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indirizzo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cap", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_citta", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "citta", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - 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], [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, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indirizzo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indirizzo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cap", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@citta", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "citta", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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, [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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indirizzo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indirizzo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cap", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@citta", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "citta", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indirizzo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indirizzo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cap", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cap", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_citta", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "citta", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - 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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10766,7 +10758,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.AnagCondomini"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_AnagCondomini"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -10862,324 +10854,6 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, this.Adapter.Fill(dataTable); return dataTable; } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_app.AnagCondominiDataTable dataTable) { - return this.Adapter.Update(dataTable); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_app dataSet) { - return this.Adapter.Update(dataSet, "AnagCondomini"); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_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"); - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_cod_cond)); - } - if ((Original_nome == null)) { - throw new global::System.ArgumentNullException("Original_nome"); - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_nome)); - } - if ((Original_indirizzo == null)) { - throw new global::System.ArgumentNullException("Original_indirizzo"); - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_indirizzo)); - } - if ((Original_cap == null)) { - throw new global::System.ArgumentNullException("Original_cap"); - } - else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_cap)); - } - if ((Original_citta == null)) { - throw new global::System.ArgumentNullException("Original_citta"); - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_citta)); - } - if ((Original_cod_fisc == null)) { - throw new global::System.ArgumentNullException("Original_cod_fisc"); - } - else { - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_cod_fisc)); - } - 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)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string 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"); - } - else { - this.Adapter.InsertCommand.Parameters[0].Value = ((string)(cod_cond)); - } - if ((nome == null)) { - throw new global::System.ArgumentNullException("nome"); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(nome)); - } - if ((indirizzo == null)) { - throw new global::System.ArgumentNullException("indirizzo"); - } - else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(indirizzo)); - } - if ((cap == null)) { - throw new global::System.ArgumentNullException("cap"); - } - else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(cap)); - } - if ((citta == null)) { - throw new global::System.ArgumentNullException("citta"); - } - else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(citta)); - } - if ((cod_fisc == null)) { - throw new global::System.ArgumentNullException("cod_fisc"); - } - else { - this.Adapter.InsertCommand.Parameters[5].Value = ((string)(cod_fisc)); - } - 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)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update( - string cod_cond, - string nome, - string indirizzo, - string cap, - string citta, - string cod_fisc, - int idxAmm, - bool Attivo, - string note, - 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, - int idxCond) { - if ((cod_cond == null)) { - throw new global::System.ArgumentNullException("cod_cond"); - } - else { - this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(cod_cond)); - } - if ((nome == null)) { - throw new global::System.ArgumentNullException("nome"); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(nome)); - } - if ((indirizzo == null)) { - throw new global::System.ArgumentNullException("indirizzo"); - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(indirizzo)); - } - if ((cap == null)) { - throw new global::System.ArgumentNullException("cap"); - } - else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(cap)); - } - if ((citta == null)) { - throw new global::System.ArgumentNullException("citta"); - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(citta)); - } - if ((cod_fisc == null)) { - throw new global::System.ArgumentNullException("cod_fisc"); - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(cod_fisc)); - } - this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(idxAmm)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((bool)(Attivo)); - 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[10].Value = ((string)(Original_cod_cond)); - } - if ((Original_nome == null)) { - throw new global::System.ArgumentNullException("Original_nome"); - } - else { - 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[12].Value = ((string)(Original_indirizzo)); - } - if ((Original_cap == null)) { - throw new global::System.ArgumentNullException("Original_cap"); - } - else { - 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[14].Value = ((string)(Original_citta)); - } - if ((Original_cod_fisc == null)) { - throw new global::System.ArgumentNullException("Original_cod_fisc"); - } - else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_cod_fisc)); - } - 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)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update( - string cod_cond, - string nome, - string indirizzo, - string cap, - string citta, - string cod_fisc, - int idxAmm, - bool Attivo, - string note, - 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) { - 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); - } } /// @@ -15710,8 +15384,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib private UpdateOrderOption _updateOrder; - private AnagCondominiTableAdapter _anagCondominiTableAdapter; - private AssF2ATableAdapter _assF2ATableAdapter; private AnagStatiTableAdapter _anagStatiTableAdapter; @@ -15737,20 +15409,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public AnagCondominiTableAdapter AnagCondominiTableAdapter { - get { - return this._anagCondominiTableAdapter; - } - set { - this._anagCondominiTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -15840,10 +15498,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib if ((this._connection != null)) { return this._connection; } - if (((this._anagCondominiTableAdapter != null) - && (this._anagCondominiTableAdapter.Connection != null))) { - return this._anagCondominiTableAdapter.Connection; - } if (((this._assF2ATableAdapter != null) && (this._assF2ATableAdapter.Connection != null))) { return this._assF2ATableAdapter.Connection; @@ -15877,9 +15531,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib public int TableAdapterInstanceCount { get { int count = 0; - if ((this._anagCondominiTableAdapter != null)) { - count = (count + 1); - } if ((this._assF2ATableAdapter != null)) { count = (count + 1); } @@ -15915,15 +15566,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib allChangedRows.AddRange(updatedRows); } } - if ((this._anagCondominiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagCondomini.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._anagCondominiTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._anagStatiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.AnagStati.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -15978,14 +15620,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib allAddedRows.AddRange(addedRows); } } - if ((this._anagCondominiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagCondomini.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._anagCondominiTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._anagStatiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.AnagStati.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -16060,14 +15694,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib allChangedRows.AddRange(deletedRows); } } - if ((this._anagCondominiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagCondomini.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._anagCondominiTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._assF2ATableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.AssF2A.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -16115,11 +15741,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib if ((dataSet.HasChanges() == false)) { return 0; } - if (((this._anagCondominiTableAdapter != null) - && (this.MatchTableAdapterConnection(this._anagCondominiTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); - } if (((this._assF2ATableAdapter != null) && (this.MatchTableAdapterConnection(this._assF2ATableAdapter.Connection) == false))) { throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + @@ -16178,15 +15799,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib try { // ---- Prepare for update ----------- // - if ((this._anagCondominiTableAdapter != null)) { - revertConnections.Add(this._anagCondominiTableAdapter, this._anagCondominiTableAdapter.Connection); - this._anagCondominiTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._anagCondominiTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._anagCondominiTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._anagCondominiTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._anagCondominiTableAdapter.Adapter); - } - } if ((this._assF2ATableAdapter != null)) { revertConnections.Add(this._assF2ATableAdapter, this._assF2ATableAdapter.Connection); this._assF2ATableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -16290,10 +15902,6 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib if (workConnOpened) { workConnection.Close(); } - if ((this._anagCondominiTableAdapter != null)) { - this._anagCondominiTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._anagCondominiTableAdapter])); - this._anagCondominiTableAdapter.Transaction = null; - } if ((this._assF2ATableAdapter != null)) { this._assF2ATableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._assF2ATableAdapter])); this._assF2ATableAdapter.Transaction = null; diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index 646717e..4723cbd 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -46,76 +46,14 @@ 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) AND ([note] = @Original_note)) - - - - - - - - - - - - - - - - - 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()) - - - - - - - - - - - - - + SELECT * -FROM dbo.AnagCondomini +FROM v_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, [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) - - - - - - - - - - - - - - - - - - - - - - - - @@ -129,6 +67,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo, + @@ -1069,7 +1008,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1096,7 +1035,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1151,10 +1090,17 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib + + + + + + + - + @@ -1183,7 +1129,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1248,7 +1194,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1257,7 +1203,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1339,7 +1285,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1353,7 +1299,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1454,7 +1400,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1482,7 +1428,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1507,7 +1453,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1523,7 +1469,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1538,7 +1484,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1610,7 +1556,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1624,7 +1570,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1672,7 +1618,7 @@ SELECT idxDoc, idxRichiesta, idxFornitore, numDoc, dataFatt, intervento, Imponib - + @@ -1754,11 +1700,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 9399d42..8f8cfb3 100644 --- a/Data/DS_app.xss +++ b/Data/DS_app.xss @@ -6,37 +6,37 @@ --> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + 355 - 185 + 166 440 - 185 + 166 - + 942 @@ -48,7 +48,7 @@ - + 933 @@ -60,19 +60,19 @@ - + 723 - 111 + 92 815 - 111 + 92 - + 967 diff --git a/Jenkinsfile b/Jenkinsfile index db1e8bd..eb06851 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=189']) { + withEnv(['NEXT_BUILD_NUMBER=191']) { // 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_doAct.ascx b/PUB/WebUserContols/mod_ER_doAct.ascx index cd52204..3d5978d 100644 --- a/PUB/WebUserContols/mod_ER_doAct.ascx +++ b/PUB/WebUserContols/mod_ER_doAct.ascx @@ -18,9 +18,9 @@
Cambia Fornitore
-
+ <%--
Modifica Messaggio -
+
--%>
Aggiungi Nota
diff --git a/PUB/WebUserContols/mod_ER_doAct.ascx.designer.cs b/PUB/WebUserContols/mod_ER_doAct.ascx.designer.cs index c59a2d2..24a66bd 100644 --- a/PUB/WebUserContols/mod_ER_doAct.ascx.designer.cs +++ b/PUB/WebUserContols/mod_ER_doAct.ascx.designer.cs @@ -66,15 +66,6 @@ namespace PUB.WebUserContols { /// protected global::System.Web.UI.WebControls.LinkButton lbtCambiaForn; - /// - /// Controllo lbtMessaggio. - /// - /// - /// 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.LinkButton lbtMessaggio; - /// /// Controllo lbtNota01. /// diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx b/PUB/WebUserContols/mod_ER_selCondominio.ascx index c22f945..69692b7 100644 --- a/PUB/WebUserContols/mod_ER_selCondominio.ascx +++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx @@ -3,7 +3,7 @@
- +