diff --git a/IOB-MAN/utils.cs b/IOB-MAN/utils.cs index 502d3d42..3a77cc1d 100644 --- a/IOB-MAN/utils.cs +++ b/IOB-MAN/utils.cs @@ -44,13 +44,14 @@ namespace IOB_MAN public static string FormatTimeSpan(TimeSpan timeSpan) { //Func, string> tupleFormatter = t => $"{t.Item1} {t.Item2}{(t.Item1 == 1 ? string.Empty : "s")}"; - Func, string> tupleFormatter = t => $"{t.Item1}{t.Item2}"; + //Func, string> tupleFormatter = t => $"{t.Item1}{t.Item2}"; + Func, string> tupleFormatter = t => $"{t.Item1} {(t.Item1 == 1 ? t.Item2 : t.Item2.Replace("giorno", "giorni").Replace("ora", "ore"))}"; var components = new List> { - Tuple.Create((int) timeSpan.TotalDays, "gg"), - Tuple.Create(timeSpan.Hours, "h"), - Tuple.Create(timeSpan.Minutes, "m"), - Tuple.Create(timeSpan.Seconds, "s"), + Tuple.Create((int) timeSpan.TotalDays, "giorno"), + Tuple.Create(timeSpan.Hours, "ora"), + Tuple.Create(timeSpan.Minutes, "min"), + Tuple.Create(timeSpan.Seconds, "sec"), }; components.RemoveAll(i => i.Item1 == 0); diff --git a/Jenkinsfile b/Jenkinsfile index bf0ba1a3..fcfab164 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=632']) { + withEnv(['NEXT_BUILD_NUMBER=633']) { // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'