From ad16ae4945fb181149315eb7c74aa6f06a87b93c Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 18 Jul 2024 07:22:25 +0200 Subject: [PATCH] Bugfix: ATA/ATD values do not get changed when already displayed --- src/BreCalClient/ShipcallControl.xaml.cs | 34 +++++++----------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index 0c1b9b3..fbf6fad 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -25,10 +25,7 @@ namespace BreCalClient Participant? _terminal; Participant? _tug; Participant? _port_administration; - private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl)); - bool ataAdded = false; - bool atdAdded = false; - bool lockTimeAdded = false; + private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl)); #endregion @@ -346,26 +343,17 @@ namespace BreCalClient this.labelMooringETAETDValue.Content = mooringTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival); this.textBlockMooringRemarks.Text = mooringTimes.Remarks.TruncateDots(50); this.imageMooringLocked.Visibility = (mooringTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden; + ataRowDefinition.Height = mooringTimes.Ata.HasValue ? new(15) : new(0); + atdRowDefinition.Height = mooringTimes.Atd.HasValue ? new(15) : new(0); if(mooringTimes.Ata.HasValue) - { - if(!ataAdded) - { - - ataRowDefinition.Height = new GridLength(15); - labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm"); - ataAdded = true; - } + { + labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm"); } if (mooringTimes.Atd.HasValue) - { - if (!atdAdded) - { - atdRowDefinition.Height = new GridLength(15); - labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm"); - atdAdded = true; - } + { + labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm"); } } @@ -382,13 +370,9 @@ namespace BreCalClient this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival); this.textBlockPortAuthorityRemarks.Text = portAuthorityTimes.Remarks.TruncateDots(50); this.imagePortAuthorityLocked.Visibility = (portAuthorityTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden; + lockTimeRowDefinition.Height = portAuthorityTimes.LockTime.HasValue ? new(15) : new(0); if(portAuthorityTimes.LockTime.HasValue) - { - if(!lockTimeAdded) - { - lockTimeRowDefinition.Height = new GridLength(15); - lockTimeAdded = true; - } + { labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm"); } }