diff --git a/Jenkinsfile b/Jenkinsfile index 603f514..e093cee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=306']) { + withEnv(['NEXT_BUILD_NUMBER=307']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs index 80fc8e8..9a00e39 100644 --- a/NKC_WF/Controllers/PrintQueueController.cs +++ b/NKC_WF/Controllers/PrintQueueController.cs @@ -155,7 +155,7 @@ namespace NKC_WF.Controllers { // recupero da dbe e salvo answ = countWaitingDb; - memLayer.ML.setRSV(redQueueCount, answ.ToString(), 30); + memLayer.ML.setRSV(redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec")); } return answ; } diff --git a/NKC_WF/Reports/Bin.rdlc b/NKC_WF/Reports/Bin.rdlc index 5cca71a..318ad68 100644 --- a/NKC_WF/Reports/Bin.rdlc +++ b/NKC_WF/Reports/Bin.rdlc @@ -11,7 +11,7 @@ - 6.94949in + 8.20162in @@ -21,13 +21,13 @@ External =Fields!PathImageFull.Value & First(Fields!ItemExtCode.Value, "stp_prt_Bin") & ".png" FitProportional - 3.59532in - 0.36334in - 3.35417in - 6.71875in + 3.12657in + 0.39459in + 117mm + 166mm + @@ -308,7 +308,7 @@ 0.1343in 0.00001cm - 6.94949in + 8.20162in 7.37604in - 7.08379in + 8.33592in