diff --git a/Jenkinsfile b/Jenkinsfile index b0be38a4..0a2ec8e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=841']) { + withEnv(['NEXT_BUILD_NUMBER=842']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx b/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx index 38e63c83..7e554f6e 100644 --- a/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx +++ b/MP-TAB/WebUserControls/mod_pianoProdMacc.ascx @@ -1,32 +1,88 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pianoProdMacc.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_pianoProdMacc" %> +