diff --git a/IOB-MAN/utils.cs b/IOB-MAN/utils.cs index 3b9c0046..cba59ff5 100644 --- a/IOB-MAN/utils.cs +++ b/IOB-MAN/utils.cs @@ -43,13 +43,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}{(t.Item1 == 1 ? string.Empty : "s")}"; + Func, string> tupleFormatter = t => $"{t.Item1} {t.Item2}"; var components = new List> { Tuple.Create((int) timeSpan.TotalDays, "gg"), - Tuple.Create(timeSpan.Hours, "ore"), - Tuple.Create(timeSpan.Minutes, "min"), - Tuple.Create(timeSpan.Seconds, "sec"), + Tuple.Create(timeSpan.Hours, "h"), + Tuple.Create(timeSpan.Minutes, "m"), + Tuple.Create(timeSpan.Seconds, "s"), }; components.RemoveAll(i => i.Item1 == 0); @@ -60,7 +61,7 @@ namespace IOB_MAN { var finalComponent = components[components.Count - 1]; components.RemoveAt(components.Count - 1); - extra = $" and {tupleFormatter(finalComponent)}"; + extra = $"e {tupleFormatter(finalComponent)}"; } return $"{string.Join(", ", components.Select(tupleFormatter))}{extra}"; diff --git a/Jenkinsfile b/Jenkinsfile index 5da4c076..28fce652 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=630']) { + withEnv(['NEXT_BUILD_NUMBER=631']) { // 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'