diff --git a/INTERFACE/WebLCP/DS_App.Designer.cs b/INTERFACE/WebLCP/DS_App.Designer.cs index 192578a..1985e40 100644 --- a/INTERFACE/WebLCP/DS_App.Designer.cs +++ b/INTERFACE/WebLCP/DS_App.Designer.cs @@ -1178,6 +1178,7 @@ namespace WebLCP.DS_AppTableAdapters { 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("@selectOnly", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 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_JL_getIncomp"; @@ -1252,7 +1253,7 @@ namespace WebLCP.DS_AppTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_App.JobsListDataTable getByUser(string USER_NAME) { + public virtual DS_App.JobsListDataTable getByUser(string USER_NAME, global::System.Nullable selectOnly) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((USER_NAME == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -1260,6 +1261,12 @@ namespace WebLCP.DS_AppTableAdapters { else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(USER_NAME)); } + if ((selectOnly.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(selectOnly.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } DS_App.JobsListDataTable dataTable = new DS_App.JobsListDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/INTERFACE/WebLCP/DS_App.xsd b/INTERFACE/WebLCP/DS_App.xsd index 91b6ab7..623be66 100644 --- a/INTERFACE/WebLCP/DS_App.xsd +++ b/INTERFACE/WebLCP/DS_App.xsd @@ -42,6 +42,7 @@ + @@ -130,7 +131,7 @@ - + diff --git a/INTERFACE/WebLCP/DS_App.xss b/INTERFACE/WebLCP/DS_App.xss index 59874df..a13cfe7 100644 --- a/INTERFACE/WebLCP/DS_App.xss +++ b/INTERFACE/WebLCP/DS_App.xss @@ -6,7 +6,7 @@ --> - + \ No newline at end of file diff --git a/INTERFACE/WebLCP/WUC/mod_jobsList.ascx b/INTERFACE/WebLCP/WUC/mod_jobsList.ascx index ac3bcf3..6ccb3fd 100644 --- a/INTERFACE/WebLCP/WUC/mod_jobsList.ascx +++ b/INTERFACE/WebLCP/WUC/mod_jobsList.ascx @@ -60,6 +60,7 @@ + diff --git a/Jenkinsfile b/Jenkinsfile index e3a9aa2..1c9d9e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=63']) { + withEnv(['NEXT_BUILD_NUMBER=65']) { // env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'LCP'