Increased dialog width to allow start/end times to be fully seen. Also include end time(!) only in overview (if available)

src/BreCalClient/EditTimesAgencyIncomingControl.xaml

@@ -8,16 +8,16 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="403" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="403" Width="900" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.2*"/>
-            <ColumnDefinition Width=".3*" />
             <ColumnDefinition Width="0.15*"/>
-            <ColumnDefinition Width=".35*" />
+            <ColumnDefinition Width=".4*" />
+            <ColumnDefinition Width="0.15*"/>
+            <ColumnDefinition Width=".3*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />

src/BreCalClient/EditTimesAgencyOutgoingControl.xaml

@@ -8,13 +8,13 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="375" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="375" Width="900" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.2*"/>
-            <ColumnDefinition Width=".3*" />
             <ColumnDefinition Width="0.15*"/>
-            <ColumnDefinition Width=".35*" />
+            <ColumnDefinition Width=".4*" />
+            <ColumnDefinition Width="0.15*"/>
+            <ColumnDefinition Width=".3*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />

src/BreCalClient/EditTimesAgencyShiftingControl.xaml

@@ -8,12 +8,12 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="490" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="490" Width="900" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.2*"/>
+            <ColumnDefinition Width="0.15*"/>
-            <ColumnDefinition Width=".3*" />
+            <ColumnDefinition Width=".4*" />
-            <ColumnDefinition Width="0.2*"/>
+            <ColumnDefinition Width="0.15*"/>
             <ColumnDefinition Width=".3*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>

src/BreCalClient/EditTimesControl.xaml

@@ -8,11 +8,11 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditTimes}" Height="331" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditTimes}" Height="331" Width="500" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width=".25*" />
+            <ColumnDefinition Width=".20*" />
-            <ColumnDefinition Width=".75*" />
+            <ColumnDefinition Width=".80*" />
             <!--ColumnDefinition Width="40" /-->
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>

src/BreCalClient/EditTimesTerminalControl.xaml

@@ -7,11 +7,11 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:local="clr-namespace:BreCalClient"
         mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditTimes}" Loaded="Window_Loaded" Height="295" Width="400" >
+        Title="{x:Static p:Resources.textEditTimes}" Loaded="Window_Loaded" Height="295" Width="500" >
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width=".4*" />
+            <ColumnDefinition Width=".3*" />
-            <ColumnDefinition Width=".6*" />
+            <ColumnDefinition Width=".7*" />
             
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>

src/BreCalClient/Extensions.cs

@@ -3,8 +3,10 @@
 //
 
 using BreCalClient.misc.Model;
+using Newtonsoft.Json.Linq;
 using System;
 using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace BreCalClient
 {
@@ -82,6 +84,68 @@ namespace BreCalClient
             return value[..maxLength];
         }
 
+        public static string DisplayTime(this Times times, bool isArrival)
+        {
+            if (isArrival)
+            {
+                if(times.ParticipantType == (int) ParticipantType.TERMINAL)
+                {
+                    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");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+                else
+                {
+                    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");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+            }
+            else
+            {
+                if (times.ParticipantType == (int)ParticipantType.TERMINAL)
+                {
+                    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");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+                else
+                {
+                    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");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+            }
+        }
+
         #endregion
 
     }

src/BreCalClient/ShipcallControl.xaml.cs

@@ -310,13 +310,9 @@ namespace BreCalClient
                         if (agencyTimes != null)
                         {
                             this.labelAgencyBerth.Content = this.ShipcallControlModel?.GetBerthText(agencyTimes);
-                            this.labelAgencyETAETDValue.Content = agencyTimes.EtaBerth.HasValue ? agencyTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            this.labelAgencyETAETDValue.Content = agencyTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockAgencyRemarks.Text = agencyTimes.Remarks;
                             this.textBlockAgencyBerthRemarks.Text = agencyTimes.BerthInfo;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
-                            {
-                                this.labelAgencyETAETDValue.Content = agencyTimes.EtdBerth.HasValue ? agencyTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            }                            
                             this.textBlockDraft.Text = ShipcallControlModel?.Shipcall?.Draft?.ToString("N2");
                         }
                         else
@@ -334,12 +330,8 @@ namespace BreCalClient
                         if (mooringTimes != null)
                         {
 
-                            this.labelMooringETAETDValue.Content = mooringTimes.EtaBerth.HasValue ? mooringTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            this.labelMooringETAETDValue.Content = mooringTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockMooringRemarks.Text = mooringTimes.Remarks;                            
-                            if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
-                            {
-                                this.labelMooringETAETDValue.Content = mooringTimes.EtdBerth.HasValue ? mooringTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            }
                             this.imageMooringLocked.Visibility = (mooringTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
 
                             if(mooringTimes.Ata.HasValue)
@@ -374,12 +366,8 @@ namespace BreCalClient
                         Times? portAuthorityTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);
                         if (portAuthorityTimes != null)
                         {
-                            this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.EtaBerth.HasValue ? portAuthorityTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockPortAuthorityRemarks.Text = portAuthorityTimes.Remarks;                            
-                            if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
-                            {
-                                this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.EtdBerth.HasValue ? portAuthorityTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            }
                             this.imagePortAuthorityLocked.Visibility = (portAuthorityTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
                         }
                         else
@@ -392,12 +380,8 @@ namespace BreCalClient
                         Times? pilotTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PILOT);
                         if (pilotTimes != null)
                         {
-                            this.labelPilotETAETDValue.Content = pilotTimes.EtaBerth.HasValue ? pilotTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            this.labelPilotETAETDValue.Content = pilotTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockPilotRemarks.Text = pilotTimes.Remarks;                            
-                            if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
-                            {
-                                this.labelPilotETAETDValue.Content = pilotTimes.EtdBerth.HasValue ? pilotTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            }
                             this.imagePilotLocked.Visibility = (pilotTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
                         }
                         else
@@ -410,12 +394,8 @@ namespace BreCalClient
                         Times? tugTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TUG);
                         if (tugTimes != null)
                         {
-                            this.labelTugETAETDValue.Content = tugTimes.EtaBerth.HasValue ? tugTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            this.labelTugETAETDValue.Content = tugTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockTugRemarks.Text = tugTimes.Remarks;                            
-                            if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
-                            {
-                                this.labelTugETAETDValue.Content = tugTimes.EtdBerth.HasValue ? tugTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            }
                             this.imageTugLocked.Visibility = (tugTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
                         }
                         else
@@ -429,12 +409,8 @@ namespace BreCalClient
                         if (terminalTimes != null)
                         {
                             this.labelTerminalBerth.Content = this.ShipcallControlModel?.GetBerthText(terminalTimes);
-                            this.labelOperationsStart.Content = terminalTimes.OperationsStart.HasValue ? terminalTimes.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                            this.labelOperationsStart.Content = terminalTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockTerminalRemarks.Text = terminalTimes.Remarks;                            
-                            if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
-                            {
-                                this.labelOperationsStart.Content = terminalTimes.OperationsEnd.HasValue ? terminalTimes.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            }
                             this.textBlockTerminalBerthRemarks.Text = terminalTimes.BerthInfo;
                         }
                         else