From f255b16ff48c620c670d2ecced539a2917478d42 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 23 Aug 2023 09:38:44 +0200
Subject: [PATCH 1/4] Work in progress, edit dialog completed, saving new
 elements works

---
 src/BreCalClient/EditTimesControl.xaml        |  55 +++++++++
 src/BreCalClient/EditTimesControl.xaml.cs     | 114 ++++++++++++++++++
 src/BreCalClient/Extensions.cs                |   6 +
 src/BreCalClient/MainWindow.xaml.cs           |  36 +++++-
 .../Resources/Resources.Designer.cs           |  81 +++++++++++++
 src/BreCalClient/Resources/Resources.de.resx  |  24 ++++
 src/BreCalClient/Resources/Resources.resx     |  27 +++++
 src/BreCalClient/ShipcallControl.xaml.cs      |  36 ++----
 src/server/BreCal/impl/shipcalls.py           |  12 ++
 src/server/BreCal/impl/times.py               |  12 ++
 src/server/BreCal/schemas/model.py            |  26 ++--
 11 files changed, 386 insertions(+), 43 deletions(-)
 create mode 100644 src/BreCalClient/EditTimesControl.xaml
 create mode 100644 src/BreCalClient/EditTimesControl.xaml.cs

diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
new file mode 100644
index 0000000..cec997c
--- /dev/null
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -0,0 +1,55 @@
+<Window x:Class="BreCalClient.EditTimesControl"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BreCalClient"
+        xmlns:p = "clr-namespace:BreCalClient.Resources"
+        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Title="{x:Static p:Resources.textEditTimes}" Height="320" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width=".25*" />
+            <ColumnDefinition Width=".75*" />
+            <ColumnDefinition Width="40" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="56" />
+            <RowDefinition Height="28" />
+        </Grid.RowDefinitions>
+        <Label Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textFixed}" />
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
+
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="1" Grid.Column="1" Margin="2" Name="datePickerETABerth" />
+        <CheckBox IsEnabled="False" Grid.Row="1" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtaBerthFixed" VerticalAlignment="Center" />
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="2" Grid.Column="1" Margin="2" Name="datePickerETDBerth" />
+        <CheckBox IsEnabled="False" Grid.Row="2" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtDBerthFixed" VerticalAlignment="Center" />
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="3" Grid.Column="1" Margin="2" Name="datePickerLockTime" />
+        <CheckBox IsEnabled="False" Grid.Row="3" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxLockTimeFixed" VerticalAlignment="Center" />
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" Name="datePickerZoneEntry" />
+        <CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" />
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" Name="datePickerOperationStart" />
+        <xctk:DateTimePicker IsEnabled="False" Grid.Row="6" Grid.Column="1" Margin="2" Name="datePickerOperationEnd" />
+        <TextBox Grid.Row="7" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="True" />
+        <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
+            <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+        </StackPanel>
+
+    </Grid>
+</Window>
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
new file mode 100644
index 0000000..4ef8f72
--- /dev/null
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -0,0 +1,114 @@
+// Copyright (c) 2023 schick Informatik
+// Description: Single dialog to edit times for all participant types
+// (we might use different controls at a later time)
+// 
+
+using BreCalClient.misc.Model;
+using System.Windows;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for EditTimesControl.xaml
+    /// </summary>
+    public partial class EditTimesControl : Window
+    {
+
+        #region Construction
+
+        public EditTimesControl()
+        {
+            InitializeComponent();
+        }
+
+        #endregion
+
+        #region Properties
+
+        public Times Times { get; set; } = new();
+
+        internal Extensions.ParticipantType ParticipantType { get; set; } = Extensions.ParticipantType.NONE;
+
+        #endregion
+
+        #region event handler
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.CopyToControls();
+            // enable controls according to participant type
+            this.datePickerETABerth.IsEnabled = App.Participant.IsFlagSet(Extensions.ParticipantType.AGENCY) ||
+                                                App.Participant.IsFlagSet(Extensions.ParticipantType.MOORING) ||
+                                                App.Participant.IsFlagSet(Extensions.ParticipantType.PILOT) ||
+                                                App.Participant.IsFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION) ||
+                                                App.Participant.IsFlagSet(Extensions.ParticipantType.TUG);
+
+            
+            this.checkBoxEtaBerthFixed.IsEnabled = this.datePickerETABerth.IsEnabled;            
+            this.datePickerETDBerth.IsEnabled = this.datePickerETABerth.IsEnabled;            
+            this.checkBoxEtDBerthFixed.IsEnabled = this.datePickerETABerth.IsEnabled;
+
+            this.datePickerLockTime.IsEnabled = App.Participant.IsFlagSet(Extensions.ParticipantType.AGENCY) ||
+                                                App.Participant.IsFlagSet(Extensions.ParticipantType.MOORING) ||
+                                                App.Participant.IsFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION);
+            this.checkBoxLockTimeFixed.IsEnabled = this.datePickerLockTime.IsEnabled;
+
+            this.datePickerZoneEntry.IsEnabled = App.Participant.IsFlagSet(Extensions.ParticipantType.AGENCY) ||
+                                                 App.Participant.IsFlagSet(Extensions.ParticipantType.PILOT);
+            this.checkBoxZoneEntryFixed.IsEnabled = this.datePickerZoneEntry.IsEnabled;
+
+            this.datePickerOperationStart.IsEnabled = App.Participant.IsFlagSet(Extensions.ParticipantType.TERMINAL);
+            this.datePickerOperationEnd.IsEnabled = App.Participant.IsFlagSet(Extensions.ParticipantType.TERMINAL);
+        }
+
+        private void buttonOK_Click(object sender, RoutedEventArgs e)
+        {
+            this.CopyToModel();
+            this.DialogResult = true;
+            this.Close();
+        }        
+
+        private void buttonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.Close();
+        }
+
+        #endregion
+
+        #region private methods
+
+        private void CopyToModel()
+        {
+            this.Times.Remarks = this.textBoxRemarks.Text.Trim().Truncate(512);
+            this.Times.EtaBerth = this.datePickerETABerth.Value;
+            this.Times.EtdBerth = this.datePickerETDBerth.Value;
+            this.Times.LockTime = this.datePickerLockTime.Value;
+            this.Times.ZoneEntry = this.datePickerZoneEntry.Value;
+            this.Times.OperationsStart = this.datePickerOperationStart.Value;
+            this.Times.OperationsEnd = this.datePickerOperationEnd.Value;
+            this.Times.EtaBerthFixed = this.checkBoxEtaBerthFixed.IsChecked;
+            this.Times.EtdBerthFixed = this.checkBoxEtDBerthFixed.IsChecked;
+            this.Times.LockTimeFixed = this.checkBoxLockTimeFixed.IsChecked;
+            this.Times.ZoneEntryFixed = this.checkBoxZoneEntryFixed.IsChecked;
+        }
+
+        private void CopyToControls()
+        {
+            this.textBoxRemarks.Text = this.Times.Remarks;
+            this.datePickerETABerth.Value = this.Times.EtaBerth;
+            this.datePickerETDBerth.Value = this.Times.EtdBerth;
+            this.datePickerLockTime.Value = this.Times.LockTime;
+            this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
+            this.datePickerOperationStart.Value = this.Times.OperationsStart;
+            this.datePickerOperationEnd.Value = this.Times.OperationsEnd;
+            this.checkBoxEtaBerthFixed.IsChecked = this.Times.EtaBerthFixed;
+            this.checkBoxEtDBerthFixed.IsChecked = this.Times.EtdBerthFixed;
+            this.checkBoxLockTimeFixed.IsChecked = this.Times.LockTimeFixed;
+            this.checkBoxZoneEntryFixed.IsChecked = this.Times.ZoneEntryFixed;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/BreCalClient/Extensions.cs b/src/BreCalClient/Extensions.cs
index 40bf07b..9ec655a 100644
--- a/src/BreCalClient/Extensions.cs
+++ b/src/BreCalClient/Extensions.cs
@@ -66,6 +66,12 @@ namespace BreCalClient
             else participant.Type &= (int)~flag;
         }
 
+        public static string Truncate(this string value, int maxLength)
+        {
+            if (string.IsNullOrEmpty(value)) return value;
+            return value.Length <= maxLength ? value : value.Substring(0, maxLength);
+        }
+
         #endregion
 
     }
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index b553096..c591f41 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -337,11 +337,41 @@ namespace BreCalClient
             }
         }
 
-        private void Sc_EditTimesRequested(ShipcallControl obj, Times times)
+        private async void Sc_EditTimesRequested(ShipcallControl obj, Times? times)
         {
             // show a dialog that lets the user create / update times for the given shipcall
-
-
+            EditTimesControl etc = new();
+            bool wasEdit = false;
+            if (times != null)
+            {
+                etc.Times = times;
+                wasEdit = true;
+            }
+            if(etc.ShowDialog() ?? false)
+            {
+                try
+                {
+                    if (wasEdit)
+                    {
+                        await _api.TimesPutAsync(etc.Times);
+                    }
+                    else
+                    {
+                        etc.Times.ParticipantId = App.Participant.Id;
+                        if ((obj.ShipcallControlModel != null) && (obj.ShipcallControlModel.Shipcall != null))
+                        {
+                            etc.Times.ShipcallId = obj.ShipcallControlModel.Shipcall.Id;
+                        }
+                        await _api.TimesPostAsync(etc.Times);
+                        obj.ShipcallControlModel?.Times.Add(etc.Times);
+                    }
+                    obj.RefreshData();
+                }
+                catch (Exception ex)
+                {
+                    ShowErrorDialog(ex.Message, "Error saving times");
+                }
+            }
         }
 
         private void ShowErrorDialog(string message, string caption)
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index ca28c6e..3e1de73 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -333,6 +333,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit times.
+        /// </summary>
+        public static string textEditTimes {
+            get {
+                return ResourceManager.GetString("textEditTimes", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enter keyword.
         /// </summary>
@@ -342,6 +351,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ETA berth.
+        /// </summary>
+        public static string textETABerth {
+            get {
+                return ResourceManager.GetString("textETABerth", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to ETD berth.
+        /// </summary>
+        public static string textETDBerth {
+            get {
+                return ResourceManager.GetString("textETDBerth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
@@ -351,6 +378,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Fixed.
+        /// </summary>
+        public static string textFixed {
+            get {
+                return ResourceManager.GetString("textFixed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to from.
         /// </summary>
@@ -378,6 +414,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Lock time.
+        /// </summary>
+        public static string textLockTime {
+            get {
+                return ResourceManager.GetString("textLockTime", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -450,6 +495,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Operations end.
+        /// </summary>
+        public static string textOperationsEnd {
+            get {
+                return ResourceManager.GetString("textOperationsEnd", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Operations start.
+        /// </summary>
+        public static string textOperationsStart {
+            get {
+                return ResourceManager.GetString("textOperationsStart", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Participants.
         /// </summary>
@@ -513,6 +576,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remarks.
+        /// </summary>
+        public static string textRemarks {
+            get {
+                return ResourceManager.GetString("textRemarks", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Repeat new password.
         /// </summary>
@@ -666,6 +738,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Zone entry.
+        /// </summary>
+        public static string textZoneEntryTime {
+            get {
+                return ResourceManager.GetString("textZoneEntryTime", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 2ab3ce8..6009777 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -196,6 +196,15 @@
   <data name="textEditShipcall" xml:space="preserve">
     <value>Schiffsanlauf bearbeiten</value>
   </data>
+  <data name="textEditTimes" xml:space="preserve">
+    <value>Zeiten bearbeiten</value>
+  </data>
+	<data name="textETABerth" xml:space="preserve">
+    <value>ETA Liegeplatz</value>
+  </data>
+	<data name="textETDBerth" xml:space="preserve">
+    <value>ETD Liegeplatz</value>
+  </data>
   <data name="textEnterKeyword" xml:space="preserve">
     <value>Suchbegriff eingeben</value>
   </data>
@@ -214,6 +223,18 @@
   <data name="textLogin" xml:space="preserve">
     <value>Anmelden</value>
   </data>
+  <data name="textFixed" xml:space="preserve">
+    <value>Fest</value>
+  </data>
+	<data name="textLockTime" xml:space="preserve">
+    <value>Zeit Schleuse</value>
+  </data>
+  <data name="textOperationsEnd" xml:space="preserve">
+    <value>Operation Ende</value>
+  </data>
+  <data name="textOperationsStart" xml:space="preserve">
+    <value>Operation Start</value>
+  </data>
   <data name="textMooredLock" xml:space="preserve">
     <value>Festmacher in Schleuse</value>
   </data>
@@ -229,6 +250,9 @@
   <data name="textNotRotated" xml:space="preserve">
     <value>Ungedreht</value>
   </data>
+  <data name="textZoneEntryTime" xml:space="preserve">
+    <value>Reviereintritt</value>
+  </data>
   <data name="textOK" xml:space="preserve">
     <value>OK</value>
   </data>
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 6d0a74e..531d465 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -205,12 +205,24 @@
   <data name="textEditShipcall" xml:space="preserve">
     <value>Edit ship call</value>
   </data>
+  <data name="textEditTimes" xml:space="preserve">
+    <value>Edit times</value>
+  </data>
   <data name="textEnterKeyword" xml:space="preserve">
     <value>Enter keyword</value>
   </data>
+  <data name="textETABerth" xml:space="preserve">
+    <value>ETA berth</value>
+  </data>
+  <data name="textETDBerth" xml:space="preserve">
+    <value>ETD berth</value>
+  </data>
   <data name="textExit" xml:space="preserve">
     <value>Exit</value>
   </data>
+  <data name="textFixed" xml:space="preserve">
+    <value>Fixed</value>
+  </data>
   <data name="textFrom" xml:space="preserve">
     <value>from</value>
   </data>
@@ -220,6 +232,9 @@
   <data name="textLengthWidth" xml:space="preserve">
     <value>L/W</value>
   </data>
+  <data name="textLockTime" xml:space="preserve">
+    <value>Lock time</value>
+  </data>
   <data name="textLogin" xml:space="preserve">
     <value>Login</value>
   </data>
@@ -244,6 +259,12 @@
   <data name="textOldPassword" xml:space="preserve">
     <value>Old password</value>
   </data>
+  <data name="textOperationsEnd" xml:space="preserve">
+    <value>Operations end</value>
+  </data>
+  <data name="textOperationsStart" xml:space="preserve">
+    <value>Operations start</value>
+  </data>
   <data name="textParticipants" xml:space="preserve">
     <value>Participants</value>
   </data>
@@ -265,6 +286,9 @@
   <data name="textRecommendedTugs" xml:space="preserve">
     <value>Recommended tugs</value>
   </data>
+  <data name="textRemarks" xml:space="preserve">
+    <value>Remarks</value>
+  </data>
   <data name="textRepeatNewPassword" xml:space="preserve">
     <value>Repeat new password</value>
   </data>
@@ -316,6 +340,9 @@
   <data name="textVoyage" xml:space="preserve">
     <value>Voyage</value>
   </data>
+  <data name="textZoneEntryTime" xml:space="preserve">
+    <value>Zone entry</value>
+  </data>
   <data name="trafficlight_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>trafficlight_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 356de8f..decf5e5 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -30,7 +30,7 @@ namespace BreCalClient
 
         public event Action<ShipcallControl>? EditRequested;
 
-        public event Action<ShipcallControl, Times>? EditTimesRequested;
+        public event Action<ShipcallControl, Times?>? EditTimesRequested;
 
         public event Action<ShipcallControl>? OpenExtraRequested;
 
@@ -161,11 +161,8 @@ namespace BreCalClient
         {
             if (App.Participant.IsFlagSet(Extensions.ParticipantType.AGENCY))
             {
-                Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
-                if (times != null)
-                {
-                    this.EditTimesRequested?.Invoke(this, times);
-                }
+                Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);                
+                this.EditTimesRequested?.Invoke(this, times);                
             }
         }        
 
@@ -174,10 +171,7 @@ namespace BreCalClient
             if (App.Participant.IsFlagSet(Extensions.ParticipantType.MOORING))
             {
                 Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.MOORING);
-                if(times != null)
-                {
-                    this.EditTimesRequested?.Invoke(this, times);
-                }
+                this.EditTimesRequested?.Invoke(this, times);                
             }
         }
 
@@ -185,11 +179,8 @@ namespace BreCalClient
         {
             if (App.Participant.IsFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION))
             {
-                Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);
-                if (times != null)
-                {
-                    this.EditTimesRequested?.Invoke(this, times);
-                }
+                Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);                
+                this.EditTimesRequested?.Invoke(this, times);                
             }
         }
 
@@ -198,10 +189,7 @@ namespace BreCalClient
             if (App.Participant.IsFlagSet(Extensions.ParticipantType.PILOT))
             {
                 Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PILOT);
-                if (times != null)
-                {
-                    this.EditTimesRequested?.Invoke(this, times);
-                }
+                this.EditTimesRequested?.Invoke(this, times);
             }
         }
 
@@ -210,10 +198,7 @@ namespace BreCalClient
             if (App.Participant.IsFlagSet(Extensions.ParticipantType.TUG))
             {
                 Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TUG);
-                if (times != null)
-                {
-                    this.EditTimesRequested?.Invoke(this, times);
-                }
+                this.EditTimesRequested?.Invoke(this, times);
             }
         }
 
@@ -222,10 +207,7 @@ namespace BreCalClient
             if (App.Participant.IsFlagSet(Extensions.ParticipantType.TERMINAL))
             {
                 Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
-                if (times != null)
-                {
-                    this.EditTimesRequested?.Invoke(this, times);
-                }
+                this.EditTimesRequested?.Invoke(this, times);
             }
         }
 
diff --git a/src/server/BreCal/impl/shipcalls.py b/src/server/BreCal/impl/shipcalls.py
index d59cd83..2a61951 100644
--- a/src/server/BreCal/impl/shipcalls.py
+++ b/src/server/BreCal/impl/shipcalls.py
@@ -59,6 +59,10 @@ def PostShipcalls(schemaModel):
                 continue
             if key == "participants":
                 continue
+            if key == "created":
+                continue
+            if key == "modified":
+                continue
             if isNotFirst:
                 query += ","
             isNotFirst = True
@@ -70,6 +74,10 @@ def PostShipcalls(schemaModel):
                 continue
             if key == "participants":
                 continue
+            if key == "created":
+                continue
+            if key == "modified":
+                continue
             if isNotFirst:
                 query += ","
             isNotFirst = True
@@ -125,6 +133,10 @@ def PutShipcalls(schemaModel):
                 continue
             if key == "participants":
                 continue
+            if key == "created":
+                continue
+            if key == "modified":
+                continue
             if isNotFirst:
                  query += ", "
             isNotFirst = True
diff --git a/src/server/BreCal/impl/times.py b/src/server/BreCal/impl/times.py
index 359d8d0..6aded52 100644
--- a/src/server/BreCal/impl/times.py
+++ b/src/server/BreCal/impl/times.py
@@ -53,6 +53,10 @@ def PostTimes(schemaModel):
         for key in schemaModel.keys():
             if key == "id":
                 continue
+            if key == "created":
+                continue
+            if key == "modified":
+                continue
             if isNotFirst:
                 query += ","
             isNotFirst = True
@@ -62,6 +66,10 @@ def PostTimes(schemaModel):
         for key in schemaModel.keys():
             if key == "id":
                 continue
+            if key == "created":
+                continue
+            if key == "modified":
+                continue
             if isNotFirst:
                 query += ","
             isNotFirst = True
@@ -100,6 +108,10 @@ def PutTimes(schemaModel):
         for key in schemaModel.keys():
             if key == "id":
                 continue
+            if key == "created":
+                continue
+            if key == "modified":
+                continue
             if isNotFirst:
                  query += ", "
             isNotFirst = True
diff --git a/src/server/BreCal/schemas/model.py b/src/server/BreCal/schemas/model.py
index 59140e2..2b096c1 100644
--- a/src/server/BreCal/schemas/model.py
+++ b/src/server/BreCal/schemas/model.py
@@ -130,21 +130,21 @@ class TimesSchema(Schema):
         pass
 
     id = fields.Int(Required=False)
-    eta_berth = fields.DateTime(Required = False)
-    eta_berth_fixed = fields.Bool(Required = False)
-    etd_berth = fields.DateTime(Required = False)
-    etd_berth_fixed = fields.Bool(Required = False)
-    lock_time = fields.DateTime(Required = False)
-    lock_time_fixed = fields.Bool(Required = False)
-    zone_entry = fields.DateTime(Required = False)
-    zone_entry_fixed = fields.Bool(Required = False)
-    operations_start = fields.DateTime(Required = False)
-    operations_end  = fields.DateTime(Required = False)
-    remarks = fields.String(Required = False)
+    eta_berth = fields.DateTime(Required = False, allow_none=True)
+    eta_berth_fixed = fields.Bool(Required = False, allow_none=True)
+    etd_berth = fields.DateTime(Required = False, allow_none=True)
+    etd_berth_fixed = fields.Bool(Required = False, allow_none=True)
+    lock_time = fields.DateTime(Required = False, allow_none=True)
+    lock_time_fixed = fields.Bool(Required = False, allow_none=True)
+    zone_entry = fields.DateTime(Required = False, allow_none=True)
+    zone_entry_fixed = fields.Bool(Required = False, allow_none=True)
+    operations_start = fields.DateTime(Required = False, allow_none=True)
+    operations_end  = fields.DateTime(Required = False, allow_none=True)
+    remarks = fields.String(Required = False, allow_none=True)
     participant_id = fields.Int(Required = True)
     shipcall_id = fields.Int(Required = True)
-    created = fields.DateTime(Required = False)
-    modified = fields.DateTime(Required = False)
+    created = fields.DateTime(Required = False, allow_none=True)
+    modified = fields.DateTime(Required = False, allow_none=True)
 
 # deserialize PUT object target
 

From f5b79d5d637ee7180b402fc823ed7567eb8da4eb Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 23 Aug 2023 17:12:41 +0200
Subject: [PATCH 2/4] work in progress..

---
 src/BreCalClient/MainWindow.xaml.cs      |   3 +-
 src/BreCalClient/ShipcallControl.xaml    | 124 +++++++++++++++++++++++
 src/BreCalClient/ShipcallControl.xaml.cs |  54 ++++++++++
 3 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index c591f41..db621ce 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -293,7 +293,8 @@ namespace BreCalClient
                     ShipcallControl sc = new()
                     {
                         Height = 120,
-                        ShipcallControlModel = selectedSCMModel
+                        ShipcallControlModel = selectedSCMModel,
+                        ParticipantDict = _participantLookupDict
                     };
                     sc.EditTimesRequested += Sc_EditTimesRequested;
                     sc.EditRequested += Sc_EditRequested;
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 5c427c0..2389d19 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -101,7 +101,131 @@
             <Label Grid.Row="0" Grid.Column="6" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="#203864" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTerminal" PreviewMouseUp="labelTerminal_PreviewMouseUp" />
 
+            <Grid Grid.Row="2" Grid.Column="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*" />
+                    <ColumnDefinition Width="0.7*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="2" Grid.Column="0" Content="ETD" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelAgencyETA" FontWeight="DemiBold"/>
+                <Label Grid.Row="2" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelAgencyETD" FontWeight="DemiBold"/>
+                <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="2" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockAgencyRemarks" />
+            </Grid>
 
+            <Grid Grid.Row="2" Grid.Column="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*" />
+                    <ColumnDefinition Width="0.7*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="2" Grid.Column="0" Content="ETD" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelMooringETA" FontWeight="DemiBold"/>
+                <Label Grid.Row="2" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelMooringETD" FontWeight="DemiBold"/>
+                <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="2" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockMooringRemarks"/>
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*" />
+                    <ColumnDefinition Width="0.7*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="2" Grid.Column="0" Content="ETD" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPortAuthorityETA" FontWeight="DemiBold"/>
+                <Label Grid.Row="2" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPortAuthorityETD" FontWeight="DemiBold"/>
+                <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="2" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPortAuthorityRemarks"/>
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*" />
+                    <ColumnDefinition Width="0.7*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="2" Grid.Column="0" Content="ETD" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPilotETA" FontWeight="DemiBold"/>
+                <Label Grid.Row="2" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPilotETD" FontWeight="DemiBold"/>
+                <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="2" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPilotRemarks"/>
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="5">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*" />
+                    <ColumnDefinition Width="0.7*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="2" Grid.Column="0" Content="ETD" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelTugETA" FontWeight="DemiBold"/>
+                <Label Grid.Row="2" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelTugETD" FontWeight="DemiBold"/>
+                <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="2" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTugRemarks" />
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="6">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*" />
+                    <ColumnDefinition Width="0.7*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="14" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="2" Grid.Column="0" Content="ETD" Padding="0" VerticalContentAlignment="Center" />
+                <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                <Label Grid.Row="1" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelTerminalETA" FontWeight="DemiBold"/>
+                <Label Grid.Row="2" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelTerminalETD" FontWeight="DemiBold"/>
+                <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="2" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTerminalRemarks" />
+            </Grid>
 
             <!-- Image Margin="2" Grid.Column="3" Grid.Row="0" Grid.RowSpan="3">
                 <Image.Style>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index decf5e5..3110d56 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -4,6 +4,7 @@
 
 using BreCalClient.misc.Model;
 using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -43,6 +44,11 @@ namespace BreCalClient
         /// </summary>
         public ShipcallControlModel? ShipcallControlModel { get; set; }
 
+        /// <summary>
+        /// these are all participants (currently loaded)
+        /// </summary>
+        public Dictionary<int, Participant>? ParticipantDict { get; set; }
+
         #endregion
 
         #region public methods
@@ -131,6 +137,54 @@ namespace BreCalClient
             this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
             this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";
 
+            if (this.ParticipantDict != null)
+            {
+                if (this.ShipcallControlModel != null)
+                {
+                    foreach (Times times in this.ShipcallControlModel.Times)
+                    {
+                        if(this.ParticipantDict.ContainsKey(times.ParticipantId))
+                        {
+                            if (this.ParticipantDict[times.ParticipantId].IsFlagSet(Extensions.ParticipantType.AGENCY))
+                            {
+                                this.labelAgencyETA.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelAgencyETD.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockAgency.Text = times.Remarks;
+                            }
+                            if (this.ParticipantDict[times.ParticipantId].IsFlagSet(Extensions.ParticipantType.MOORING))
+                            {
+                                this.labelMooringETA.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelMooringETD.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockMooringRemarks.Text = times.Remarks;
+                            }
+                            if (this.ParticipantDict[times.ParticipantId].IsFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION))
+                            {
+                                this.labelPortAuthorityETA.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelPortAuthorityETD.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockPortAuthorityRemarks.Text = times.Remarks;
+                            }
+                            if (this.ParticipantDict[times.ParticipantId].IsFlagSet(Extensions.ParticipantType.PILOT))
+                            {
+                                this.labelPilotETA.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelPilotETD.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockPilotRemarks.Text = times.Remarks;
+                            }
+                            if (this.ParticipantDict[times.ParticipantId].IsFlagSet(Extensions.ParticipantType.TUG))
+                            {
+                                this.labelTugETA.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelTugETD.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockTugRemarks.Text = times.Remarks;
+                            }
+                            if (this.ParticipantDict[times.ParticipantId].IsFlagSet(Extensions.ParticipantType.TERMINAL))
+                            {
+                                this.labelTerminalETA.Content = times.EtaBerth.HasValue ? times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelTerminalETD.Content = times.EtdBerth.HasValue ? times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.textBlockTerminalRemarks.Text = times.Remarks;
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         #endregion

From ef0776491519863e2fa03cd14a20652801325d4a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 24 Aug 2023 07:50:12 +0200
Subject: [PATCH 3/4] upped the UI some

---
 src/BreCalClient/Extensions.cs           |  8 ++++++
 src/BreCalClient/ShipcallControl.xaml    | 32 ++++++++++++------------
 src/BreCalClient/ShipcallControl.xaml.cs | 11 +++++---
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/BreCalClient/Extensions.cs b/src/BreCalClient/Extensions.cs
index 9ec655a..de76cdb 100644
--- a/src/BreCalClient/Extensions.cs
+++ b/src/BreCalClient/Extensions.cs
@@ -72,6 +72,14 @@ namespace BreCalClient
             return value.Length <= maxLength ? value : value.Substring(0, maxLength);
         }
 
+        public static string TruncateDots(this string value, int maxLength)
+        {
+            if(string.IsNullOrEmpty(value)) return value;
+            if (value.Length <= maxLength) return value;
+            if (value.Length > (maxLength + 1)) return $"{value.Substring(0, maxLength)}..";
+            return value.Substring(0, maxLength);
+        }
+
         #endregion
 
     }
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 2389d19..075b91a 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -49,40 +49,40 @@
                     <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="#203864" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp"/>
                 </Grid>
-                <Viewbox Grid.Row="1" Grid.Column="0">
+                <Viewbox Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="IMO" />
                 </Viewbox>
-                <Viewbox Grid.Row="1" Grid.Column="1">
-                    <TextBlock x:Name="textBlockIMO" />
+                <Viewbox Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="0">
+                <Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textCallsign}" />
                 </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="1">
-                    <TextBlock x:Name="textBlockCallsign" />
+                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockCallsign" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="0">
-                    <TextBlock Text="{x:Static p:Resources.textLengthWidth}" />
+                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
+                    <TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="1">
-                    <TextBlock x:Name="textBlockLengthWidth" />
+                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0">
+                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="1">
+                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockETA" />
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="0">
+                <Viewbox Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textBerth}" />
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="1">
+                <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockBerth" />
                 </Viewbox>
-                <Viewbox Grid.Row="7" Grid.Column="0">
+                <Viewbox Grid.Row="7" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textAgency}" />
                 </Viewbox>
-                <Viewbox Grid.Row="7" Grid.Column="1">
+                <Viewbox Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockAgency" />
                 </Viewbox>
 
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 3110d56..208090d 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -54,12 +54,16 @@ namespace BreCalClient
         #region public methods
 
         public void RefreshData()
-        {
+        {            
             if (this.ShipcallControlModel == null) return;
+            string agentName = "";
             string? name;
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.AGENCY);
             if (name != null)
+            {
                 this.labelAgent.Content = name;
+                agentName = name;
+            }
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.MOORING);
             if (name != null)
                 this.labelMooring.Content = name;
@@ -126,16 +130,17 @@ namespace BreCalClient
             this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
             if ((this.ShipcallControlModel?.Shipcall?.Type == 1) || (this.ShipcallControlModel?.Shipcall?.Type == 3))
             {
-                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta.ToString();
+                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta.ToString("dd.MM. HH:mm");
             }
             if(this.ShipcallControlModel?.Shipcall?.Type == 2)
             {
                 this.labelETA.Text = "ETD";
-                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd.ToString();
+                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd?.ToString("dd.MM. HH:mm");
             }
 
             this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
             this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";
+            this.textBlockAgency.Text = agentName.TruncateDots(10);
 
             if (this.ParticipantDict != null)
             {

From ed0a3379292683101564b16c1a5e4035431cafee Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 24 Aug 2023 08:15:46 +0200
Subject: [PATCH 4/4] Increased version for release

---
 misc/BreCalApi.cs                             | 62 +++++++++----------
 misc/BreCalApi.yaml                           |  2 +-
 src/BreCalClient/BreCalClient.csproj          |  4 +-
 .../PublishProfiles/ClickOnceProfile.pubxml   |  2 +-
 4 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index cbbd2b8..8186d69 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -1,7 +1,7 @@
 
 //----------------------
 // <auto-generated>
-//     Generated REST API Client Code Generator v1.7.17.0 on 21.08.2023 14:30:55
+//     Generated REST API Client Code Generator v1.7.17.0 on 24.08.2023 08:00:37
 //     Using the tool OpenAPI Generator v6.6.0
 // </auto-generated>
 //----------------------
@@ -44,13 +44,12 @@ using System.Threading.Tasks;
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
 namespace BreCalClient.misc.Api
 {
-    #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
     /// <summary>
     /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
@@ -2323,7 +2322,7 @@ namespace BreCalClient.misc.Api
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3058,7 +3057,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3118,7 +3117,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3258,7 +3257,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3476,7 +3475,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3916,7 +3915,7 @@ namespace BreCalClient.misc.Client
             string report = "C# SDK (BreCalClient.misc) Debug Report:\n";
             report += "    OS: " + System.Environment.OSVersion + "\n";
             report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
-            report += "    Version of the API: 0.3.0\n";
+            report += "    Version of the API: 0.5.0\n";
             report += "    SDK Package Version: 1.0.0\n";
             return report;
         }
@@ -3983,7 +3982,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4003,7 +4002,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4060,7 +4059,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4093,7 +4092,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4126,7 +4125,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4217,7 +4216,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4325,7 +4324,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4409,7 +4408,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4668,7 +4667,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4696,7 +4695,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4766,7 +4765,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4793,7 +4792,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4860,7 +4859,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5064,7 +5063,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5201,7 +5200,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5317,7 +5316,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5529,7 +5528,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5755,7 +5754,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6004,7 +6003,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6311,7 +6310,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6841,7 +6840,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7199,7 +7198,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 0.3.0
+ * The version of the OpenAPI document: 0.5.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7378,6 +7377,5 @@ namespace BreCalClient.misc.Model
             yield break;
         }
     }
-    #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 }
 
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index 9ffc176..fea7042 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -1,6 +1,6 @@
 openapi: "3.0.0"
 info:
-    version: "0.3.0"
+    version: "0.5.0"
     title: "Bremen calling API"
     description: Administer DEBRE ship calls, times and notifications
     termsOfService: "https://www.bsmd.de/" # url to terms page
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 2dcf5a8..d8439fe 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>E:\gitlager\git_brcal\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
+    <AssemblyVersion>0.5.0.0</AssemblyVersion>
+    <FileVersion>0.5.0.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index 4f7a307..e94a155 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.3.0.0</ApplicationVersion>
+    <ApplicationVersion>0.5.0.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>