diff --git a/Data/DS_User.Designer.cs b/Data/DS_User.Designer.cs index f81de0a..fc91f6e 100644 --- a/Data/DS_User.Designer.cs +++ b/Data/DS_User.Designer.cs @@ -6977,17 +6977,24 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.v_AnagAmministratori"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_AA_getByUA"; + this._commandCollection[1].CommandText = "dbo.stp_AU2A_deleteQuery"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxAmm", 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_AA_getByUA"; + 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("@USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7019,7 +7026,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_User.AnagAmministratoriDataTable getByUserAss(string USER_NAME) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((USER_NAME == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -7030,6 +7037,40 @@ 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 deleteRelAU2A(string Original_USER_NAME, global::System.Nullable Original_idxAmm) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_USER_NAME == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_USER_NAME)); + } + if ((Original_idxAmm.HasValue == true)) { + command.Parameters[2].Value = ((int)(Original_idxAmm.Value)); + } + else { + command.Parameters[2].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; + } } /// @@ -7184,17 +7225,24 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.v_AnagFornitori"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_AF_getByUA"; + this._commandCollection[1].CommandText = "dbo.stp_AU2F_deleteQuery"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxFornitore", 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_getByUA"; + 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("@USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7226,7 +7274,7 @@ SELECT idxCond, cod_cond, nome, indirizzo, cap, citta, cod_fisc, idxAmm, Attivo [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_User.AnagFornitoriDataTable getByUserAss(string USER_NAME) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((USER_NAME == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -7237,6 +7285,40 @@ 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 deleteRelAU2F(string Original_USER_NAME, global::System.Nullable Original_idxFornitore) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_USER_NAME == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_USER_NAME)); + } + if ((Original_idxFornitore.HasValue == true)) { + command.Parameters[2].Value = ((int)(Original_idxFornitore.Value)); + } + else { + command.Parameters[2].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; + } } /// diff --git a/Data/DS_User.xsd b/Data/DS_User.xsd index 816f955..978571b 100644 --- a/Data/DS_User.xsd +++ b/Data/DS_User.xsd @@ -474,6 +474,18 @@ FROM dbo.v_AnagAmministratori + + + + dbo.stp_AU2A_deleteQuery + + + + + + + + @@ -520,6 +532,18 @@ FROM dbo.v_AnagFornitori + + + + dbo.stp_AU2F_deleteQuery + + + + + + + + diff --git a/Data/DS_User.xss b/Data/DS_User.xss index afe83eb..3742a6d 100644 --- a/Data/DS_User.xss +++ b/Data/DS_User.xss @@ -4,15 +4,15 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + @@ -67,7 +67,7 @@ 205 - 402 + 425 205 diff --git a/Jenkinsfile b/Jenkinsfile index f6e58d1..19ca812 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=326']) { + withEnv(['NEXT_BUILD_NUMBER=327']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'B2BCONDOMINI' diff --git a/PUB/PBO/AnagUtenti.aspx b/PUB/PBO/AnagUtenti.aspx index 7ee56d1..babe5c0 100644 --- a/PUB/PBO/AnagUtenti.aspx +++ b/PUB/PBO/AnagUtenti.aspx @@ -5,7 +5,7 @@ <%@ Register Src="~/WebUserContols/mod_elencoRichResetUtenti.ascx" TagPrefix="uc1" TagName="mod_elencoRichResetUtenti" %> -
+
@@ -32,7 +32,7 @@
-
+
diff --git a/PUB/WebUserContols/mod_elencoRichResetUtenti.ascx b/PUB/WebUserContols/mod_elencoRichResetUtenti.ascx index b6b7964..4e47ead 100644 --- a/PUB/WebUserContols/mod_elencoRichResetUtenti.ascx +++ b/PUB/WebUserContols/mod_elencoRichResetUtenti.ascx @@ -7,39 +7,70 @@
-
-
-

USER DATA

+
+
+ USER DATA
-
+
- cognome: - -
- nome: - -
- email: - -
- CodGruppo: - - -   +
+
+ Cognome +
+ +
+
+
+ Nome +
+ +
+
+
+ Email +
+ +
+
+
+ CodGruppo +
+ +
+
+
+ +
+
+ +
+
- cognome: - -
- nome: - -
- email: - -
- CodGruppo: - +
+
+ Cognome +
+ +
+
+
+ Nome +
+ +
+
+
+ Email +
+ +
+
+
+ CodGruppo +
+ @@ -60,12 +91,12 @@
-
-
-

Aziende

+
+
+ Aziende
-
- +
+
@@ -84,27 +115,33 @@
- +
+ Rimuovi associazione +
- - + + Nessun Record - + + + + +
-
-
-

Amministratori

+
+
+ Amministratori
-
+