diff --git a/CMS_SC/StatoDossiers.aspx b/CMS_SC/StatoDossiers.aspx
index fedc7a0..5948b3e 100644
--- a/CMS_SC/StatoDossiers.aspx
+++ b/CMS_SC/StatoDossiers.aspx
@@ -52,7 +52,7 @@
diff --git a/CMS_SC/StatoDossiers.aspx.cs b/CMS_SC/StatoDossiers.aspx.cs
index c6341ea..9807f75 100644
--- a/CMS_SC/StatoDossiers.aspx.cs
+++ b/CMS_SC/StatoDossiers.aspx.cs
@@ -140,6 +140,7 @@ namespace CMS_SC
}
// imposto idxDossier
mod_StatoCollaudi.idxDossier = idxDossier.ToString();
+ mod_StatoCollaudi.doUpdate();
}
///
diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
index 26d95b2..f9a49b7 100644
--- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
@@ -158,6 +158,27 @@ namespace CMS_SC.WebUserControls
savePar("ddlSelScheda", "");
raiseEvent(ucEvType.Reset);
}
+ ///
+ /// Abilita o disabilita filtro su ODS..
+ ///
+ public bool enableFilter
+ {
+ get
+ {
+ return ods.FilterExpression != "";
+ }
+ set
+ {
+ if (value)
+ {
+ ods.FilterExpression = " Descrizione LIKE '%{0}%' OR DescrStato LIKE '%{0}%' OR CodScheda LIKE '%{0}%' ";
+ }
+ else
+ {
+ ods.FilterExpression = "";
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index ad1c9b5..e304bd9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=4235']) {
+ withEnv(['NEXT_BUILD_NUMBER=4236']) {
// 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'