Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'IobMan' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-27 14:24:35 +01:00
parent ab3aa0ccec b1665e8a6d
commit dff175d4f9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/IOBManPanel.cs
+2 -1
View File
@@ -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;
}
}
IOB-MAN/utils.cs
+2 -2
View File
@@ -44,7 +44,7 @@ namespace IOB_MAN
public static string FormatTimeSpan(TimeSpan timeSpan)
{
//Func<Tuple<int, string>, string> tupleFormatter = t => $"{t.Item1} {t.Item2}{(t.Item1 == 1 ? string.Empty : "s")}";
Func<Tuple<int, string>, string> tupleFormatter = t => $"{t.Item1} {t.Item2}";
Func<Tuple<int, string>, string> tupleFormatter = t => $"{t.Item1}{t.Item2}";
var components = new List<Tuple<int, string>>
{
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}";
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'