Egalware/b2bcondomini.it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vers 300

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-14 11:37:54 +02:00
parent 733479fafa
commit d64eb0fe79
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
PUB/WebUserContols/tpl_footer.ascx.cs
+16 -2
View File
@@ -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;