diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache
index 81395e3..9147403 100644
--- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache
+++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-73bbb3de17cae454ab54595b2c5a3ff7389a549e
+c355ee6932ff22a2f6c7d84b3449927b5b4b5506
diff --git a/CMS_SC/ReportCompleto.aspx.cs b/CMS_SC/ReportCompleto.aspx.cs
index 1783dba..0243374 100644
--- a/CMS_SC/ReportCompleto.aspx.cs
+++ b/CMS_SC/ReportCompleto.aspx.cs
@@ -11,11 +11,12 @@ namespace CMS_SC
if (!Page.IsPostBack)
{
ddlFase.DataBind();
- ddlRev.DataBind();
ddlLingue.DataBind();
hfIdxDossier.Value = memLayer.ML.QSS("IdxDossier");
// se c'รจ seleziono fase...
ddlFase.SelectedValue= memLayer.ML.QSS("Fase");
+ // fix x revisione...
+ ddlRev.DataBind();
//mod_reportCompleto.Fase = ddlFase.SelectedValue;
//mod_reportCompleto.Lingua = ddlLingue.SelectedValue;
fixSelReport();
@@ -37,6 +38,10 @@ namespace CMS_SC
///
protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e)
{
+ // update ddl rev...
+ odsRev.DataBind();
+ ddlRev.DataBind();
+ // fix!
fixSelReport();
}
///
diff --git a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs
index f1c2f78..67b365a 100644
--- a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs
@@ -39,8 +39,8 @@ namespace CMS_SC.WebUserControls
{
if (!Page.IsPostBack)
{
- // collego il report...
- fixReport();
+ //// collego il report...
+ //fixReport();
}
}
///
@@ -70,19 +70,7 @@ namespace CMS_SC.WebUserControls
localReport.DataSources.Add(new ReportDataSource("dsSchedaCollaudo", tabDati));
localReport.DataSources.Add(new ReportDataSource("dsVocabolario", tabVoc));
-#if false
- // 4) aggiungo parametro
- ReportParameter filtroPag;
- if (userIsMedicoRef)
- {
- filtroPag = new ReportParameter("PrintPage", "0");
- }
- else
- {
- filtroPag = new ReportParameter("PrintPage", "1");
- }
- localReport.SetParameters(filtroPag);
-#endif
+ // mostro!
showReport(true);
}
else
diff --git a/Jenkinsfile b/Jenkinsfile
index 7edefa1..333b6c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=4251']) {
+ withEnv(['NEXT_BUILD_NUMBER=4253']) {
// 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'