From d64eb0fe79f3c036a12143eed12e81bcf524a210 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Sep 2018 11:37:54 +0200 Subject: [PATCH] vers 300 --- Jenkinsfile | 2 +- PUB/WebUserContols/tpl_footer.ascx.cs | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 58ad045..c1ddc88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=299']) { + withEnv(['NEXT_BUILD_NUMBER=300']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'B2BCONDOMINI' diff --git a/PUB/WebUserContols/tpl_footer.ascx.cs b/PUB/WebUserContols/tpl_footer.ascx.cs index b575198..9e5137a 100644 --- a/PUB/WebUserContols/tpl_footer.ascx.cs +++ b/PUB/WebUserContols/tpl_footer.ascx.cs @@ -20,6 +20,20 @@ namespace PUB.WebUserContols return string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision); } } + protected int idxAmm + { + get + { + return memLayer.ML.IntSessionObj("idxAmm"); + } + } + protected int idxFornitore + { + get + { + return memLayer.ML.IntSessionObj("idxFornitore"); + } + } public string nomeForn { get @@ -53,12 +67,12 @@ namespace PUB.WebUserContols // aggiungo eventuali codici Amm, Forn, .. if (nomeAmm != "") { - answ += string.Format(" | A: {0}", nomeAmm); + answ += string.Format(" | A: {0} ({1})", nomeAmm, idxAmm); } if (nomeForn != "") { - answ += string.Format(" | F: {0}", nomeForn); + answ += string.Format(" | F: {0} ({1})", nomeForn, idxFornitore); } return answ;