From 39f6e935762da50b75d870d2ebdff4ffc8f36473 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Fri, 28 Jun 2024 11:13:00 +0200 Subject: [PATCH] Changed interval date formatting so intervals spanning multiple days show ok --- src/BreCalClient/Extensions.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BreCalClient/Extensions.cs b/src/BreCalClient/Extensions.cs index 5c3ced1..f341598 100644 --- a/src/BreCalClient/Extensions.cs +++ b/src/BreCalClient/Extensions.cs @@ -98,7 +98,7 @@ namespace BreCalClient if(times.OperationsStart.HasValue) { string result = times.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm"); - if (times.EtaIntervalEnd.HasValue) result += " - " + times.EtaIntervalEnd.Value.ToString("HH:mm"); + if (times.EtaIntervalEnd.HasValue) result = times.OperationsStart.Value.ToString("d.M. HH:mm") + " - " + times.EtaIntervalEnd.Value.ToString("d.M. HH:mm"); return result; } else @@ -111,7 +111,7 @@ namespace BreCalClient if(times.EtaBerth.HasValue) { string result = times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm"); - if (times.EtaIntervalEnd.HasValue) result += " - " + times.EtaIntervalEnd.Value.ToString("HH:mm"); + if (times.EtaIntervalEnd.HasValue) result = times.EtaBerth.Value.ToString("d.M. HH:mm") + " - " + times.EtaIntervalEnd.Value.ToString("d.M. HH:mm"); return result; } else @@ -127,7 +127,7 @@ namespace BreCalClient if(times.OperationsEnd.HasValue) { string result = times.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm"); - if (times.EtdIntervalEnd.HasValue) result += " - " + times.EtdIntervalEnd.Value.ToString("HH:mm"); + if (times.EtdIntervalEnd.HasValue) result = times.OperationsEnd.Value.ToString("d.M. HH:mm") + " - " + times.EtdIntervalEnd.Value.ToString("d.M. HH:mm"); return result; } else @@ -140,7 +140,7 @@ namespace BreCalClient if(times.EtdBerth.HasValue) { string result = times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm"); - if (times.EtdIntervalEnd.HasValue) result += " - " + times.EtdIntervalEnd.Value.ToString("HH:mm"); + if (times.EtdIntervalEnd.HasValue) result = times.EtdBerth.Value.ToString("d.M. HH:mm") + " - " + times.EtdIntervalEnd.Value.ToString("d.M. HH:mm"); return result; } else