From b1665e8a6d2300870e1341428841d620e72ce283 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 27 Dec 2019 14:24:32 +0100 Subject: [PATCH] Ancora fix formatting --- IOB-MAN/IOBManPanel.cs | 3 ++- IOB-MAN/utils.cs | 4 ++-- Jenkinsfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index 8294da65..ff0f12e3 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -801,7 +801,8 @@ namespace IOB_MAN e.CellStyle.ForeColor = Color.Red; DataGridViewCellStyle currstyle = dgvManagedItems[0, e.RowIndex].Style; currstyle.ForeColor = Color.Red; - dgvManagedItems[3, e.RowIndex].Style = currstyle; + dgvManagedItems[1, e.RowIndex].Style = currstyle; + dgvManagedItems[2, e.RowIndex].Style = currstyle; dgvManagedItems[3, e.RowIndex].Style = currstyle; } } diff --git a/IOB-MAN/utils.cs b/IOB-MAN/utils.cs index cba59ff5..502d3d42 100644 --- a/IOB-MAN/utils.cs +++ b/IOB-MAN/utils.cs @@ -44,7 +44,7 @@ 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}"; var components = new List> { Tuple.Create((int) timeSpan.TotalDays, "gg"), @@ -61,7 +61,7 @@ namespace IOB_MAN { var finalComponent = components[components.Count - 1]; components.RemoveAt(components.Count - 1); - extra = $"e {tupleFormatter(finalComponent)}"; + extra = $" e {tupleFormatter(finalComponent)}"; } return $"{string.Join(", ", components.Select(tupleFormatter))}{extra}"; diff --git a/Jenkinsfile b/Jenkinsfile index 28fce652..bf0ba1a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=631']) { + withEnv(['NEXT_BUILD_NUMBER=632']) { // 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'