diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index ca41d71..db980ce 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -15597,13 +15597,14 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Lingua", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", 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()] [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.Fill, true)] - public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev, string Lingua) { + public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev, string Lingua, string CodVisib) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((IdxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); @@ -15629,6 +15630,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin else { this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Lingua)); } + if ((CodVisib == null)) { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodVisib)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -15640,7 +15647,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin [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.Select, true)] - public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev, string Lingua) { + public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev, string Lingua, string CodVisib) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((IdxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); @@ -15666,6 +15673,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin else { this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Lingua)); } + if ((CodVisib == null)) { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodVisib)); + } DS_Applicazione.ReportDataDataTable dataTable = new DS_Applicazione.ReportDataDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 3e36a26..e54414b 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1184,6 +1184,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index cc3c3d9..091d265 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -16,7 +16,7 @@ - + diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 26b16d4..7abf15f 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs index 5a7efa0..f1c2f78 100644 --- a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs +++ b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs @@ -62,7 +62,7 @@ namespace CMS_SC.WebUserControls // 2) caricamento tab dati DataTable tabDati = new DataTable(); DataTable tabVoc = new DataTable(); - tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev, Lingua); + tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev, Lingua, TipoReport); tabVoc = (DataTable)DtProxy.man.taVoc.getByLinguaLemmaLike(Lingua, "SC_PRT"); // 3) inserimento dataset nel report diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 20b07b3..ca957b9 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/sql/Update_3.2.sql b/CMS_SC/sql/Update_3.2.sql index a7e6974..6866287 100644 --- a/CMS_SC/sql/Update_3.2.sql +++ b/CMS_SC/sql/Update_3.2.sql @@ -25,11 +25,8 @@ exec voc.stp_insNewLemma 'FiltroSearchMatr','Filtro Ricerca Matricola (elenco)' /****** Object: StoredProcedure [dbo].[stp_rep_getDossier] Script Date: 19/03/2018 10:48:24 ******/ SET ANSI_NULLS ON GO - SET QUOTED_IDENTIFIER ON GO - - -- ============================================= -- Author: Steamware -- Create date: 2015.06.18 @@ -41,6 +38,7 @@ ALTER PROCEDURE [dbo].[stp_rep_getDossier] ,@Fase NVARCHAR(50) ,@Rev INT = 0 ,@Lingua NVARCHAR(3) = 'IT' + ,@CodVisib NVARCHAR(50) ='F' ) AS @@ -61,7 +59,7 @@ SELECT mi.IdxDossier, mi.CodDeroga, dbo.f_getStringLang(mi.NomeMisura, @Lingua,0) AS NomeMisura, mi.TipoValMisura, - dbo.f_getStringLang(mi.NomePar, @Lingua,0) AS NomePar, + dbo.f_getStringLang(mi.NomePar, @Lingua,0) AS NomePar, mi.MinPar, mi.MaxPar, mi.LIVal, @@ -80,6 +78,7 @@ FROM v_Misure AS mi INNER JOIN WHERE ( mi.IdxDossier = @IdxDossier OR @IdxDossier = 0 ) -- mettere ISNULL su variabile x estrarre anche con NULL? AND ( mi.Fase = @Fase OR @Fase = '' ) AND ( mi.Rev = @Rev) + AND ( mi.CodVisib LIKE '%'+@CodVisib+'%' ) ORDER BY CodScheda, Vers, NumScheda, CodMisura, NomeMisura /* diff --git a/Jenkinsfile b/Jenkinsfile index cd6d252..b227bd7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4238']) { + withEnv(['NEXT_BUILD_NUMBER=4240']) { // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC'