From 36e853fcda53977ee044d66dd62d215095be195a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 25 Jun 2024 08:22:25 +0200
Subject: [PATCH 01/25] Enter Agency Time as highlighted suggestion for other
 participants (not terminal)

---
 src/BreCalClient/EditTimesControl.xaml.cs | 22 +++++++++++++++++++---
 src/BreCalClient/MainWindow.xaml.cs       |  4 ++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index b09a40e..09d421d 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -7,6 +7,7 @@ using BreCalClient.misc.Model;
 using System;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Xceed.Wpf.Toolkit;
 
 namespace BreCalClient
 {
@@ -27,7 +28,9 @@ namespace BreCalClient
 
         #region Properties
 
-        public Times Times { get; set; } = new();                
+        public Times Times { get; set; } = new();
+
+        public Times? AgencyTimes { get; set; } = new();
 
         public ShipcallControlModel ShipcallModel { get; set; } = new();
 
@@ -36,9 +39,9 @@ namespace BreCalClient
         #region event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
-        {            
-            this.CopyToControls();
+        {                        
             this.EnableControls();
+            this.CopyToControls();
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
@@ -93,7 +96,20 @@ namespace BreCalClient
         {
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.datePickerETABerth.Value = this.Times.EtaBerth;
+            if(this.datePickerETABerth.IsEnabled && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaBerth != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            {
+                this.datePickerETABerth.Value = this.AgencyTimes.EtaBerth;
+                WatermarkTextBox? tb = this.datePickerETABerth.Template.FindName("PART_TextBox", this.datePickerETABerth) as WatermarkTextBox;
+                if (tb != null) { tb.Focus(); tb.SelectAll(); }
+            }
             this.datePickerETDBerth.Value = this.Times.EtdBerth;
+            if(this.datePickerETDBerth.IsEnabled && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdBerth != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            {
+                this.datePickerETDBerth.Value = this.AgencyTimes.EtdBerth;
+                WatermarkTextBox? tb = this.datePickerETDBerth.Template.FindName("PART_TextBox", this.datePickerETDBerth) as WatermarkTextBox;
+                if (tb != null) tb.SelectAll();
+            }
+
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
             this.datePickerATA.Value = this.Times.Ata;
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 38aa748..8c79de2 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -854,10 +854,14 @@ namespace BreCalClient
             if( obj.ShipcallControlModel == null) { return; }
             if (!obj.ShipcallControlModel.AssignedParticipants.ContainsKey(participantType)) return; // no assigment means no dialog my friend
 
+            Times? agencyTimes = obj.ShipcallControlModel.GetTimesForParticipantType(ParticipantType.AGENCY);
+
             // show a dialog that lets the user create / update times for the given shipcall
             IEditTimesControl etc = (participantType == ParticipantType.TERMINAL) ? new EditTimesTerminalControl() : new EditTimesControl();
             etc.Title = obj.ShipcallControlModel.Title;
             etc.ShipcallModel = obj.ShipcallControlModel;
+            if (etc is EditTimesControl control)
+                control.AgencyTimes = agencyTimes;
 
             bool wasEdit = false;
             if (times != null)

From 71a8b445329e0558b8b3040d69d787074257eb53 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 27 Jun 2024 16:41:33 +0200
Subject: [PATCH 02/25] fixed bug in search filter where time component wasnt
 cut of (as expected)

---
 src/BreCalClient/SearchFilterControl.xaml    |  2 +-
 src/BreCalClient/SearchFilterControl.xaml.cs | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/BreCalClient/SearchFilterControl.xaml b/src/BreCalClient/SearchFilterControl.xaml
index e964861..b2a941a 100644
--- a/src/BreCalClient/SearchFilterControl.xaml
+++ b/src/BreCalClient/SearchFilterControl.xaml
@@ -8,7 +8,7 @@
              xmlns:api="clr-namespace:BreCalClient.misc.Model"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
-             d:DesignHeight="56" d:DesignWidth="800" Loaded="UserControl_Loaded">
+             d:DesignHeight="56" d:DesignWidth="800">
     <UserControl.Resources>
         <local:EnumToStringConverter x:Key="enumToStringConverter" />
     </UserControl.Resources>
diff --git a/src/BreCalClient/SearchFilterControl.xaml.cs b/src/BreCalClient/SearchFilterControl.xaml.cs
index 73f8b83..92ac773 100644
--- a/src/BreCalClient/SearchFilterControl.xaml.cs
+++ b/src/BreCalClient/SearchFilterControl.xaml.cs
@@ -128,22 +128,17 @@ namespace BreCalClient
         private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
         {
             LogoImageClicked?.Invoke();
-        }        
-
-        private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
-        {
-            
-        }        
+        }
 
         private void datePickerETAFrom_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
         {
-            this._model.EtaFrom = this.datePickerETAFrom.SelectedDate;
+            this._model.EtaFrom = this.datePickerETAFrom.SelectedDate?.Date;
             SearchFilterChanged?.Invoke();
         }
 
         private void datePickerETATo_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
         {
-            this._model.EtaTo = datePickerETATo.SelectedDate;
+            this._model.EtaTo = datePickerETATo.SelectedDate?.Date;
             SearchFilterChanged?.Invoke();
         }
 

From bb956d479266574ff05ba9421903ac33579b1c82 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 27 Jun 2024 16:47:09 +0200
Subject: [PATCH 03/25] include last minute for day filter

---
 src/BreCalClient/MainWindow.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 8c79de2..c564a67 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -513,7 +513,7 @@ namespace BreCalClient
 
                         this.FilterShipcalls();
                         await uiLock.WaitAsync();
-                        this.UpdateUI();                        
+                        this.UpdateUI();
                     }
                 }
                 catch(Exception ex)
@@ -707,7 +707,7 @@ namespace BreCalClient
                 _ = this._visibleControlModels.RemoveAll(x =>
                 {
                     Times? t = x.GetTimesForParticipantType(ParticipantType.AGENCY);
-                    DateTime refValue = sfm.EtaTo.Value.AddMinutes(1439); // 23:59
+                    DateTime refValue = sfm.EtaTo.Value.AddMinutes(1440); // including 23:59
                     switch (x.Shipcall?.Type)
                     {
                         case ShipcallType.Arrival:

From 570a227b783b7bd09d0a1f99c3359347643f7967 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 28 Jun 2024 10:46:15 +0200
Subject: [PATCH 04/25] Simplified input text filtering: If user enters 10
 digits, then these are split up for the date

---
 src/BreCalClient/DateTimePickerExt.cs         | 11 +++++
 .../EditTimesAgencyOutgoingControl.xaml       |  2 +-
 .../EditTimesAgencyOutgoingControl.xaml.cs    | 45 +------------------
 3 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/src/BreCalClient/DateTimePickerExt.cs b/src/BreCalClient/DateTimePickerExt.cs
index e448d34..a86fd47 100644
--- a/src/BreCalClient/DateTimePickerExt.cs
+++ b/src/BreCalClient/DateTimePickerExt.cs
@@ -15,6 +15,15 @@ namespace BreCalClient
             string text = this.Text + e.Text;
             if (this.Template.FindName("PART_TextBox", this) is not WatermarkTextBox tb) return;
 
+            if (Regex.IsMatch(text, @"^\d{10}"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})", "$1.$2.20$3 $4:$5");
+                tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
+            }
+
+            /*
             if (Regex.IsMatch(text, @"^\d{3}"))
             {
                 e.Handled = true;
@@ -39,6 +48,8 @@ namespace BreCalClient
                 tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
                 tb.CaretIndex = tb.Text.Length;
             }
+            */
+
         }
     }
 }
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index 92c0ed8..5de2857 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -45,7 +45,7 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" PreviewKeyUp="datePickerETD_PreviewKeyUp" PreviewTextInput="datePickerETD_PreviewTextInput"/>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" AllowTextInput="True" />
             <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
         </Grid>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 94748c1..2bdc6ac 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -346,48 +346,7 @@ namespace BreCalClient
             CheckOKButton();
         }
 
-        #endregion
-
-        private void datePickerETD_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-
-        }
-
-        private void datePickerETD_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
-        {
-            DateTimePicker? dp = (sender as DateTimePicker);
-            if(dp == null) return;
-            
-            // Das ist der richtige Ansatz, funktioniert aber bei der Jahresangabe noch nicht ganz richtig.
-            // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
-
-            string text = dp.Text + e.Text;
-            if (dp.Template.FindName("PART_TextBox", dp) is not WatermarkTextBox tb) return;
-
-            if (Regex.IsMatch(text, @"^\d{3}"))
-            {
-                e.Handled = true;                                
-                tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
-            {
-                e.Handled = true;                
-                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-        }
+        #endregion        
+        
     }
 }

From b275320d541bc861da10c3ab1574c7f5f9cd21ba Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 28 Jun 2024 10:46:45 +0200
Subject: [PATCH 05/25] For the interval, the end date is also set in the
 control

---
 src/BreCalClient/EditTimesControl.xaml.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 09d421d..e9f8a4e 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -115,7 +115,18 @@ namespace BreCalClient
             this.datePickerATA.Value = this.Times.Ata;
             this.datePickerATD.Value = this.Times.Atd;
             this.datePickerETABerth_End.Value = this.Times.EtaIntervalEnd;
+            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            {
+                this.datePickerETABerth_End.Value = this.AgencyTimes.EtaIntervalEnd;
+                //if (this.datePickerETABerth_End.Template.FindName("PART_TextBox", this.datePickerETABerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
+
             this.datePickerETDBerth_End.Value = this.Times.EtdIntervalEnd;
+            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            {
+                this.datePickerETDBerth_End.Value = this.AgencyTimes.EtdIntervalEnd;
+                //if (this.datePickerETDBerth_End.Template.FindName("PART_TextBox", this.datePickerETDBerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
 
             this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
             this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);

From fe46b9b94e2cb63525c732327440a6c10206a228 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 28 Jun 2024 10:47:27 +0200
Subject: [PATCH 06/25] Filter shipcalls that have ata set and ata is more than
 2 hours in the past

---
 src/BreCalClient/MainWindow.xaml.cs | 31 +++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index c564a67..ee8826e 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -640,7 +640,7 @@ namespace BreCalClient
             // first add everything
             this._visibleControlModels.AddRange(_allShipcallsDict.Values);
 
-            // now remove elements whose filter criteria are met
+            // now remove elements whose filter criteria are met            
 
             if(sfm.Berths.Count > 0 )
             {
@@ -745,7 +745,34 @@ namespace BreCalClient
                 _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Canceled ?? false);
             }
 
-            switch(this._sortOrder)
+            // special Basti case: Wenn das ATA / ATD eingetragen ist und schon 2 Stunden in der Vergangenheit liegt
+            if (searchPastDays <= 3)
+            {
+                _ = this._visibleControlModels.RemoveAll(x =>
+                {
+                    Times? mooringTimes = x.GetTimesForParticipantType(ParticipantType.MOORING);
+                    if (mooringTimes != null)
+                    {
+                        switch (x.Shipcall?.Type)
+                        {
+                            case ShipcallType.Arrival:
+                                if (mooringTimes.Ata.HasValue && ((DateTime.Now - mooringTimes.Ata.Value).TotalHours > 2))
+                                    return true;
+                                break;
+
+                            default:
+                                if (mooringTimes.Atd.HasValue && ((DateTime.Now - mooringTimes.Atd.Value).TotalHours > 2))
+                                    return true;
+                                break;
+                        }
+                    }
+
+                    return false;
+                });
+            }
+
+
+                switch (this._sortOrder)
             {
                 case Extensions.SortOrder.SHIP_NAME:
                     this._visibleControlModels.Sort((x, y) => { if (x.Ship == null) return 0; if (y.Ship == null) return 0; return x.Ship.Name.CompareTo(y.Ship.Name); });

From ac21a2fa45c0120856b4cabc952a16d94dcbb2c7 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 28 Jun 2024 11:13:00 +0200
Subject: [PATCH 07/25] 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

From 6f1346c430ce7ee8a6836ef6e0691f5eef3b0163 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 30 Jun 2024 12:42:41 +0200
Subject: [PATCH 08/25] Fixed 4 digit time entry

---
 src/BreCalClient/DateTimePickerExt.cs | 38 +++++++++------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/BreCalClient/DateTimePickerExt.cs b/src/BreCalClient/DateTimePickerExt.cs
index a86fd47..d3642d4 100644
--- a/src/BreCalClient/DateTimePickerExt.cs
+++ b/src/BreCalClient/DateTimePickerExt.cs
@@ -9,12 +9,15 @@ namespace BreCalClient
         protected override void OnPreviewTextInput(TextCompositionEventArgs e)
         {
             base.OnPreviewTextInput(e);
-                        
-            // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
-
-            string text = this.Text + e.Text;
             if (this.Template.FindName("PART_TextBox", this) is not WatermarkTextBox tb) return;
 
+            // strip input after caret
+            string subText = (tb.CaretIndex > 0) ? this.Text[..tb.CaretIndex] : tb.Text; // Range operator instead of Substring(0, tb.CaretIndex)
+            string text = subText + e.Text;
+            
+            // System.Diagnostics.Debug.WriteLine("C:" + this.Text + " E: " + e.Text + " Caret: " + tb.CaretIndex + " Subt: " + subText);
+
+            // 10 char eingabe "am Stück"
             if (Regex.IsMatch(text, @"^\d{10}"))
             {
                 e.Handled = true;
@@ -23,32 +26,15 @@ namespace BreCalClient
                 tb.SelectedText = "";
             }
 
-            /*
-            if (Regex.IsMatch(text, @"^\d{3}"))
+            // nur die Zeit wird markiert und mit 4 Zahlen befüllt, diese Regel setzt den Doppelpunkt
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\. \d{4}  \d{3})"))
             {
                 e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\. \d{4}  \d{2})(\d)(.*)", "$1:$2");
+                // System.Diagnostics.Trace.WriteLine("Replaced: " + tb.Text);
                 tb.CaretIndex = tb.Text.Length;
+                tb.Select(tb.Text.Length, 0);
             }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            */
 
         }
     }

From c8c60c0f9b48a39f5185b545ac130f2ac34506f2 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 30 Jun 2024 13:02:37 +0200
Subject: [PATCH 09/25] Only user Interval end if interval start is also unset
 (as suggestion in terminal control)

---
 src/BreCalClient/EditTimesControl.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index e9f8a4e..b05dbb2 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -115,14 +115,14 @@ namespace BreCalClient
             this.datePickerATA.Value = this.Times.Ata;
             this.datePickerATD.Value = this.Times.Atd;
             this.datePickerETABerth_End.Value = this.Times.EtaIntervalEnd;
-            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
             {
                 this.datePickerETABerth_End.Value = this.AgencyTimes.EtaIntervalEnd;
                 //if (this.datePickerETABerth_End.Template.FindName("PART_TextBox", this.datePickerETABerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
             }
 
             this.datePickerETDBerth_End.Value = this.Times.EtdIntervalEnd;
-            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
             {
                 this.datePickerETDBerth_End.Value = this.AgencyTimes.EtdIntervalEnd;
                 //if (this.datePickerETDBerth_End.Template.FindName("PART_TextBox", this.datePickerETDBerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }

From b26fff7e17cca97b30b4625471e51c8e89d3794c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 2 Jul 2024 10:05:45 +0200
Subject: [PATCH 10/25] added product code info for vsproj file

---
 misc/product_codes.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 misc/product_codes.txt

diff --git a/misc/product_codes.txt b/misc/product_codes.txt
new file mode 100644
index 0000000..dbb4e54
--- /dev/null
+++ b/misc/product_codes.txt
@@ -0,0 +1,14 @@
+Bremen calling Installer Upgrade Codes:
+======================================
+
+Test: 1C7FA3E4-BAB9-4911-9348-73094357FC7C
+Prod: 81A329F1-C663-48DA-9E15-DAF19F99B5AE
+
+Product codes v1.2.2.3:
+
+Test: 6F89CBAA-2189-456F-A347-0C0158325B61
+Prod: 0ED342DD-DC00-4CE4-8348-96BB3AB726B1
+
+Note:
+If you want the MSI to "upgrade" from one version to the other, the
+upgrade code must stay the same and the product code must change.
\ No newline at end of file

From 8f40b82c5d09e036fa49a3bfe2b55f8e07cdfd7f Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 21 Jun 2024 14:12:16 +0200
Subject: [PATCH 11/25] Ship list WIP

---
 src/BreCalClient/BreCalLists.cs     |  5 ++++-
 src/BreCalClient/MainWindow.xaml.cs | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/BreCalClient/BreCalLists.cs b/src/BreCalClient/BreCalLists.cs
index 4fe6b2f..b0316a2 100644
--- a/src/BreCalClient/BreCalLists.cs
+++ b/src/BreCalClient/BreCalLists.cs
@@ -144,9 +144,12 @@ namespace BreCalClient
 
         internal static void InitializeShips(List<Ship> ships)
         {
+            _ships.Clear();
+            _allShips.Clear();
+
             foreach (var ship in ships)
             {
-                ShipModel sm = new ShipModel(ship);
+                ShipModel sm = new(ship);
                 _shipLookupDict[ship.Id] = sm;
                 if (!ship.Deleted)
                     _ships.Add(sm);
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index ee8826e..6a8b171 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -34,6 +34,7 @@ namespace BreCalClient
     {
         private readonly ILog _log = LogManager.GetLogger(typeof(MainWindow));
         private const int SHIPCALL_UPDATE_INTERVAL_SECONDS = 30;
+        private const int SHIPS_UPDATE_INTERVAL_SECONDS = 120;
         private const int PROGRESS_STEPS = 50;
 
         #region Fields
@@ -429,6 +430,18 @@ namespace BreCalClient
             }
 
             _ = Task.Run(() => RefreshShipcalls());
+
+            _ = Task.Run(() => RefreshShips());
+        }
+
+
+        public async Task RefreshShips()
+        {
+            while (true)
+            {                
+                Thread.Sleep(SHIPS_UPDATE_INTERVAL_SECONDS * 1000);
+                BreCalLists.InitializeShips(await _shipApi.ShipsGetAsync());
+            }
         }
 
         public async Task RefreshShipcalls()

From 39020fc5d34168c7ff21890b11e2688a8a7962a1 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 9 Jul 2024 10:01:36 +0200
Subject: [PATCH 12/25] Bugfix: Changed lock times not showing immediately

---
 src/BreCalClient/ShipcallControl.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 20b1913..fb726f2 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -376,10 +376,10 @@ namespace BreCalClient
                             {
                                 if(!lockTimeAdded)
                                 {
-                                    lockTimeRowDefinition.Height = new GridLength(15);
-                                    labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm");
+                                    lockTimeRowDefinition.Height = new GridLength(15);                                    
                                     lockTimeAdded = true;
                                 }
+                                labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm");
                             }
                         }
                         else

From 208d74f9e3929bea7b6f99ef74e47461b9354c29 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 9 Jul 2024 11:54:15 +0200
Subject: [PATCH 13/25] When creating a new shipcall 'Geeste' is the default
 time ref point

---
 src/BreCalClient/EditShipcallControl.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 7f0acf1..052dfaa 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -289,7 +289,7 @@ namespace BreCalClient
             if (this.ShipcallModel == null) return;
             if (this.ShipcallModel.Shipcall != null)
             {
-                this.comboBoxTimeRef.SelectedIndex = this.ShipcallModel.Shipcall.TimeRefPoint ?? 0;
+                this.comboBoxTimeRef.SelectedIndex = this.ShipcallModel.Shipcall.TimeRefPoint ?? 1;
                 this.comboBoxCategories.SelectedItem = new EnumToStringConverter().Convert(this.ShipcallModel.Shipcall.Type, typeof(ShipcallType), new object(), System.Globalization.CultureInfo.CurrentCulture);
                 if (this.ShipcallModel.Shipcall.Eta != DateTime.MinValue)
                     this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;

From e3000e1f1660a5e321150fbcb64661794efcb5ef Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 10 Jul 2024 09:05:45 +0200
Subject: [PATCH 14/25] Removed ETA from times dialog if shifting shipcall

---
 src/BreCalClient/EditTimesControl.xaml    |  2 +-
 src/BreCalClient/EditTimesControl.xaml.cs | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index e1aee6f..7092d7c 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -16,7 +16,7 @@
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowETA"/>
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index b05dbb2..289121e 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -128,8 +128,11 @@ namespace BreCalClient
                 //if (this.datePickerETDBerth_End.Template.FindName("PART_TextBox", this.datePickerETDBerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
             }
 
-            this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
-            this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
+            if (this.ShipcallModel.Shipcall?.Type != ShipcallType.Shifting)
+            {
+                this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
+                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
+            }
 
             switch (ShipcallModel.Shipcall?.Type)
             {
@@ -174,6 +177,12 @@ namespace BreCalClient
                 }
             }
 
+            if (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)
+            {
+                this.rowETA.Height = new(0);
+
+            }
+
             // setting en/dis-abled
 
             if (this.Times.ParticipantId != App.Participant.Id)

From ac8b6ba49112889c1f30e1eca94440bb9bd8689d Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 10 Jul 2024 09:28:36 +0200
Subject: [PATCH 15/25] Hide some controls depending on arrival/departure

---
 src/BreCalClient/EditTimesControl.xaml            | 4 ++--
 src/BreCalClient/EditTimesControl.xaml.cs         | 7 +++++--
 src/BreCalClient/EditTimesTerminalControl.xaml    | 4 ++--
 src/BreCalClient/EditTimesTerminalControl.xaml.cs | 4 ++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index 7092d7c..bf5ce84 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -16,8 +16,8 @@
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" x:Name="rowETA"/>
-            <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowETA" />
+            <RowDefinition Height="28" x:Name="rowETD" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 289121e..f021b81 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -177,10 +177,13 @@ namespace BreCalClient
                 }
             }
 
-            if (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)
+            if (ShipcallModel.Shipcall?.Type != ShipcallType.Arrival)
             {
                 this.rowETA.Height = new(0);
-
+            }
+            else
+            {
+                this.rowETD.Height = new(0);
             }
 
             // setting en/dis-abled
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index f07a031..a7a86cf 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -15,8 +15,8 @@
 
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowStart"/>
+            <RowDefinition Height="28" x:Name="rowEnd"/>
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="56" />
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index c09cd73..ba80394 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -124,8 +124,12 @@ namespace BreCalClient
                 case ShipcallType.Arrival:
                     this.labelStart.FontWeight = FontWeights.Bold;
                     this.datePickerOperationStart.ContextMenu.IsEnabled = false;
+                    this.rowEnd.Height = new(0);
                     break;
                 case ShipcallType.Departure:
+                    this.rowStart.Height = new(0);
+                    this.labelEnd.FontWeight = FontWeights.Bold;
+                    break;
                 case ShipcallType.Shifting:
                     this.labelEnd.FontWeight = FontWeights.Bold;
                     this.datePickerOperationEnd.ContextMenu.IsEnabled = false;

From e03c8dc7df740f5f22f3d4a4438a708ea94ebe0d Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 10 Jul 2024 10:35:40 +0200
Subject: [PATCH 16/25] User-Filter Settings now on a per-user basis, saved as
 a dictionary in user space. This is for the case of people using the same
 windows account but with several different BC users.

---
 src/BreCalClient/App.config                   |  3 ++
 src/BreCalClient/MainWindow.xaml.cs           | 31 +++++++++++++++----
 .../Properties/Settings.Designer.cs           | 14 ++++++++-
 src/BreCalClient/Properties/Settings.settings |  3 ++
 src/BreCalClient/SearchFilterModel.cs         | 11 ++++---
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index cab52d2..335a433 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -83,6 +83,9 @@
             <setting name="W4Top" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="FilterCriteriaMap" serializeAs="String">
+                <value />
+            </setting>
         </BreCalClient.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 6a8b171..734408d 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -143,7 +143,7 @@ namespace BreCalClient
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             // serialize filter settings
-            Properties.Settings.Default.FilterCriteria = this.searchFilterControl.SearchFilter.Serialize();
+            Properties.Settings.Default.FilterCriteriaMap = SearchFilterModel.Serialize();
             Properties.Settings.Default.Save();
             _tokenSource.Cancel();
         }
@@ -405,6 +405,8 @@ namespace BreCalClient
 
         private async void LoadStaticLists()
         {
+            if (_loginResult == null) return;
+
             BreCalLists.InitializeBerths(await _staticApi.BerthsGetAsync());
             BreCalLists.InitializeShips(await _shipApi.ShipsGetAsync());
             BreCalLists.InitializeParticipants(await _staticApi.ParticipantsGetAsync());
@@ -422,16 +424,33 @@ namespace BreCalClient
 
             this.searchFilterControl.SetAgencies(BreCalLists.Participants_Agent);
 
-            if (!string.IsNullOrEmpty(Properties.Settings.Default.FilterCriteria))
+            if (!string.IsNullOrEmpty(Properties.Settings.Default.FilterCriteriaMap))
             {
-                SearchFilterModel? sfm = SearchFilterModel.Deserialize(Properties.Settings.Default.FilterCriteria);
-                if (sfm != null)
-                    this.searchFilterControl.SetFilterFromModel(sfm);
+                SearchFilterModel.Deserialize(Properties.Settings.Default.FilterCriteriaMap);
+                SearchFilterModel? currentFilter = null;
+                if (SearchFilterModel.filterMap != null)
+                {
+                    if((_loginResult != null) && SearchFilterModel.filterMap.ContainsKey(_loginResult.Id))
+                    {
+                        currentFilter = SearchFilterModel.filterMap[_loginResult.Id];
+                    }
+                }
+                else
+                {
+                    SearchFilterModel.filterMap = new();
+                }
+                if (currentFilter == null)
+                {
+                    currentFilter = new();
+                    if(_loginResult != null)
+                        SearchFilterModel.filterMap[_loginResult.Id] = currentFilter;
+                }
+                this.searchFilterControl.SetFilterFromModel(currentFilter);
             }
 
             _ = Task.Run(() => RefreshShipcalls());
-
             _ = Task.Run(() => RefreshShips());
+
         }
 
 
diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs
index 2e8d6de..fd85a6b 100644
--- a/src/BreCalClient/Properties/Settings.Designer.cs
+++ b/src/BreCalClient/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace BreCalClient.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -214,5 +214,17 @@ namespace BreCalClient.Properties {
                 this["W4Top"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string FilterCriteriaMap {
+            get {
+                return ((string)(this["FilterCriteriaMap"]));
+            }
+            set {
+                this["FilterCriteriaMap"] = value;
+            }
+        }
     }
 }
diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings
index 7903ee0..b10fd5b 100644
--- a/src/BreCalClient/Properties/Settings.settings
+++ b/src/BreCalClient/Properties/Settings.settings
@@ -53,5 +53,8 @@
     <Setting Name="W4Top" Type="System.Double" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="FilterCriteriaMap" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/BreCalClient/SearchFilterModel.cs b/src/BreCalClient/SearchFilterModel.cs
index 478295e..a827ea3 100644
--- a/src/BreCalClient/SearchFilterModel.cs
+++ b/src/BreCalClient/SearchFilterModel.cs
@@ -33,18 +33,21 @@ namespace BreCalClient
 
         public bool? MineOnly { get; set; }
 
+        public static Dictionary<int, SearchFilterModel>? filterMap = new();
+
         #endregion
 
         #region Serialisation
 
-        public static SearchFilterModel? Deserialize(string json)
+        public static bool Deserialize(string json)
         {
-            return (SearchFilterModel?) JsonConvert.DeserializeObject(json, typeof(SearchFilterModel));
+            filterMap = (Dictionary<int, SearchFilterModel>?) JsonConvert.DeserializeObject(json, typeof(Dictionary<int, SearchFilterModel>));
+            return (filterMap != null);
         }
 
-        public string Serialize()
+        public static string Serialize()
         {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
+            return JsonConvert.SerializeObject(filterMap, Formatting.Indented);
         }
 
         #endregion

From ec0eb3cbfa920f910e8e360af65a42553664cdf6 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 11 Jul 2024 08:08:33 +0200
Subject: [PATCH 17/25] Switched visibility and position of ETA/ETD in shipcall
 dialog depending on type

---
 src/BreCalClient/EditShipcallControl.xaml    |  8 +++----
 src/BreCalClient/EditShipcallControl.xaml.cs | 24 ++++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 71eac00..8a44182 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -64,12 +64,12 @@
 
         <Label Content="Zeit Ref." Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" />
 
-        <Label Content="ETA" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2"/>
-        <Label Content="ETD" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
+        <Label Content="ETA" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2" x:Name="labelETA"/>
+        <Label Content="ETD" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" x:Name="labelETD"/>
 
         <ComboBox x:Name="comboBoxTimeRef" Grid.Column="3" Margin="2" Grid.Row="2" />
-        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
-        <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
 
         <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 052dfaa..077eebb 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -116,9 +116,13 @@ namespace BreCalClient
             {
                 switch (type)
                 {
-                    case ShipcallType.Arrival:
-                        this.datePickerETA.IsEnabled = true;
-                        this.datePickerETD.IsEnabled = false;
+                    case ShipcallType.Arrival:                        
+                        this.datePickerETD.Visibility = Visibility.Hidden;
+                        this.labelETD.Visibility = Visibility.Hidden;
+                        this.datePickerETA.Visibility = Visibility.Visible;
+                        this.labelETA.Visibility = Visibility.Visible;
+                        Grid.SetRow(datePickerETA, 3);
+                        Grid.SetRow(labelETA, 3);
                         this.datePickerETD.Value = null;
                         this.comboBoxDepartureBerth.SelectedIndex = -1;
                         this.comboBoxDepartureBerth.IsEnabled = false;
@@ -126,8 +130,10 @@ namespace BreCalClient
                         this.comboBoxTimeRef.IsEnabled = true;
                         break;
                     case ShipcallType.Departure:
-                        this.datePickerETA.IsEnabled = false;
-                        this.datePickerETD.IsEnabled = true;
+                        this.datePickerETD.Visibility = Visibility.Visible;
+                        this.labelETD.Visibility = Visibility.Visible;
+                        this.datePickerETA.Visibility = Visibility.Hidden;
+                        this.labelETA.Visibility = Visibility.Hidden;
                         this.datePickerETA.Value = null;
                         this.comboBoxArrivalBerth.SelectedIndex = -1;
                         this.comboBoxArrivalBerth.IsEnabled = false;
@@ -136,8 +142,12 @@ namespace BreCalClient
                         this.comboBoxTimeRef.SelectedIndex = 0;
                         break;
                     case ShipcallType.Shifting:
-                        this.datePickerETA.IsEnabled = true;
-                        this.datePickerETD.IsEnabled = true;
+                        Grid.SetRow(datePickerETA, 4);
+                        Grid.SetRow(labelETA, 4);
+                        this.datePickerETA.Visibility = Visibility.Visible;
+                        this.labelETA.Visibility = Visibility.Visible;
+                        this.datePickerETD.Visibility = Visibility.Visible;
+                        this.labelETD.Visibility = Visibility.Visible;
                         this.comboBoxArrivalBerth.IsEnabled = true;
                         this.comboBoxDepartureBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = false;

From 24138fc1e9fbfb0e84774161b7d6a3a41e848521 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 11 Jul 2024 11:39:12 +0200
Subject: [PATCH 18/25] Fixed an error regarding berth display in
 AGENT/TERMINAL and set to+from berth info for shifting shipcalls

---
 src/BreCalClient/ShipcallControlModel.cs | 48 +++++++++++++++---------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index 5b2a2b6..4d34de7 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -16,7 +16,7 @@ namespace BreCalClient
     public class ShipcallControlModel
     {
 
-        #region Enumerations       
+        #region Enumerations
 
         [Flags]
         public enum StatusFlags
@@ -146,28 +146,42 @@ namespace BreCalClient
             return false;
         }
 
+        /// <summary>
+        /// Get berth display text for columns AGENT and TERMINAL
+        /// </summary>
         public string? GetBerthText(Times times)
         {
+            string? timesBerthText = null;
+            string? scArrivalBerthText = null;
+            string? scDepartureBerthText = null;
             string? berthText = null;
-            if ((BreCalLists.Berths != null) && times.BerthId.HasValue && (this.Shipcall?.Type != ShipcallType.Shifting))
+            Berth? berth;
+
+            if(times.BerthId.HasValue)
             {
-                Berth? berth = BreCalLists.AllBerths.Find((x) => x.Id == times.BerthId);
-                berthText = berth?.Name;
+                berth = BreCalLists.AllBerths.Find((x) => x.Id == times.BerthId.Value);
+                timesBerthText = berth?.Name;
             }
 
-            if ((berthText == null) && (times.ParticipantType != (int) Extensions.ParticipantType.TERMINAL))
+            berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.ArrivalBerthId);
+            scArrivalBerthText = berth?.Name;
+
+            berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.DepartureBerthId);
+            scDepartureBerthText= berth?.Name;
+
+            switch(this.Shipcall?.Type)
             {
-                if (this.Shipcall?.Type == ShipcallType.Arrival)
-                {
-                    Berth? berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.ArrivalBerthId);
-                    berthText = berth?.Name;
-                }
-                else
-                {
-                    Berth? berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.DepartureBerthId);
-                    berthText = berth?.Name;
-                }
-            }
+                case ShipcallType.Arrival:
+                    berthText = timesBerthText ?? scArrivalBerthText;
+                break;
+                case ShipcallType.Departure:
+                    berthText = timesBerthText ?? scDepartureBerthText;
+                    break;
+                case ShipcallType.Shifting:
+                    berthText = (scDepartureBerthText ?? "") + "-" + timesBerthText ?? scArrivalBerthText;
+                    break;
+                default: break;
+            }                       
 
             return berthText;
         }
@@ -194,7 +208,7 @@ namespace BreCalClient
                 {
                     if (agentTimes.EtdBerth != null)
                         theDate = agentTimes.EtdBerth.Value;
-                }                     
+                }
             }
             return theDate.ToString();
         }

From 9d017524ef2b6c4eb63adbde9c9bf05c8e746d15 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 12 Jul 2024 09:32:09 +0200
Subject: [PATCH 19/25] Added shifting sequence number, storage hidden in
 flags. This is a prototype.

---
 src/BreCalClient/BreCalClient.csproj          |  4 +--
 src/BreCalClient/EditShipcallControl.xaml     | 11 +++++---
 src/BreCalClient/EditShipcallControl.xaml.cs  |  9 +++++++
 .../ClickOnceDevelProfile.pubxml              |  2 +-
 .../Resources/Resources.Designer.cs           |  9 +++++++
 src/BreCalClient/Resources/Resources.de.resx  |  3 +++
 src/BreCalClient/Resources/Resources.resx     |  3 +++
 src/BreCalClient/ShipcallControl.xaml         |  8 ++++--
 src/BreCalClient/ShipcallControl.xaml.cs      |  5 ++++
 src/BreCalClient/ShipcallControlModel.cs      | 25 +++++++++++++++++++
 10 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 5ce5682..7a12570 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <AssemblyVersion>1.3.0.1</AssemblyVersion>
+    <FileVersion>1.3.0.1</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/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 8a44182..956cc2e 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -8,7 +8,7 @@
         xmlns:api="clr-namespace:BreCalClient.misc.Model"
         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="270" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="298" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
         <local:EnumToStringConverter x:Key="enumToStringConverter" />
@@ -29,6 +29,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
         <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0"  HorizontalContentAlignment="Right"/>
@@ -80,8 +81,12 @@
             </ComboBox.ContextMenu>
         </ComboBox>
 
-        <Label x:Name="labelBSMDGranted" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
-        <StackPanel Grid.Row="7" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <Label x:Name="labelBSMDGranted" Grid.Row="7" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
+
+        <Label x:Name="labelShiftingCount" Grid.Row="6" Grid.Column="2" HorizontalAlignment="Right" Content="{x:Static p:Resources.textShiftingSequence}" />
+        <xctk:IntegerUpDown x:Name="integerUpDownShiftingCount" Grid.Row="6" Grid.Column="3" Margin="2" Minimum="0" Maximum="255" />
+
+        <StackPanel Grid.Row="8" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 077eebb..74dd3d5 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -64,6 +64,8 @@ namespace BreCalClient
 
             this.comboBoxTimeRef.ItemsSource = BreCalLists.TimeRefs;
 
+            this.integerUpDownShiftingCount.Value = this.ShipcallModel.ShiftSequence;
+
             if (this.ShipcallModel.Shipcall == null) this.ShipcallModel.Shipcall = new();
             this.CopyToControls();
 
@@ -128,6 +130,8 @@ namespace BreCalClient
                         this.comboBoxDepartureBerth.IsEnabled = false;
                         this.comboBoxArrivalBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = true;
+                        this.labelShiftingCount.Visibility = Visibility.Hidden;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Hidden;
                         break;
                     case ShipcallType.Departure:
                         this.datePickerETD.Visibility = Visibility.Visible;
@@ -140,6 +144,8 @@ namespace BreCalClient
                         this.comboBoxDepartureBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = false;
                         this.comboBoxTimeRef.SelectedIndex = 0;
+                        this.labelShiftingCount.Visibility = Visibility.Hidden;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Hidden;
                         break;
                     case ShipcallType.Shifting:
                         Grid.SetRow(datePickerETA, 4);
@@ -152,6 +158,8 @@ namespace BreCalClient
                         this.comboBoxDepartureBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = false;
                         this.comboBoxTimeRef.SelectedIndex = 0;
+                        this.labelShiftingCount.Visibility = Visibility.Visible;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Visible;
                         break;
                 }
             }
@@ -236,6 +244,7 @@ namespace BreCalClient
                 {
                     this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
                     this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
+                    this.ShipcallModel.ShiftSequence = (byte?) this.integerUpDownShiftingCount.Value;
                 }
 
                 Participant? participant;
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index bb9764c..fb2b52a 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.3.0.0</ApplicationVersion>
+    <ApplicationVersion>1.3.0.1</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 0538c96..679e66a 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -1027,6 +1027,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Shift. number.
+        /// </summary>
+        public static string textShiftingSequence {
+            get {
+                return ResourceManager.GetString("textShiftingSequence", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shifting to.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index e81f260..1d95aef 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -502,4 +502,7 @@
   <data name="textPortAuthority" xml:space="preserve">
     <value>Hafenamt</value>
   </data>
+  <data name="textShiftingSequence" xml:space="preserve">
+    <value>Verhol. Nr.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index bf31b56..a6d08f6 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -427,6 +427,9 @@
   <data name="textShiftingFrom" xml:space="preserve">
     <value>Shifting from</value>
   </data>
+  <data name="textShiftingSequence" xml:space="preserve">
+    <value>Shift. number</value>
+  </data>
   <data name="textShiftingTo" xml:space="preserve">
     <value>Shifting to</value>
   </data>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index b9faa9f..0f102c6 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -41,15 +41,19 @@
                 <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="30" />
+                        <ColumnDefinition Width="20" x:Name="columnDefinitionShiftingSequence"/>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="32" />
                     </Grid.ColumnDefinitions>
                     <Image Margin="2" Grid.Column="0" PreviewMouseUp="Image_PreviewMouseUp" x:Name="imageShipcallType" />
-                    <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+                    <Viewbox Grid.Column="1">
+                        <TextBlock x:Name="textBlockShiftingSequence"></TextBlock>
+                    </Viewbox>
+                    <Label Grid.Column="2" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp">
                         <TextBlock Name="textBlockShipName" />
                     </Label>
-                    <Grid Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
+                    <Grid Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
                         <Image Grid.Column="3" Margin="2" x:Name="imageEvaluation" />
                     </Grid>
                 </Grid>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index fb726f2..6beb445 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -68,6 +68,11 @@ namespace BreCalClient
             {
                 if (this.ShipcallControlModel != null)
                 {
+
+                    bool shiftingNoVisible = ((this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Shifting) && this.ShipcallControlModel.ShiftSequence.HasValue);
+                    this.textBlockShiftingSequence.Text = shiftingNoVisible ? this.ShipcallControlModel?.ShiftSequence.ToString() : "";
+                    this.columnDefinitionShiftingSequence.Width = shiftingNoVisible ? new(20) : new(0);
+
                     string agentName = "";
                     string? name;
                     _agency = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.AGENCY);
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index 4d34de7..dd95c2a 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -90,6 +90,31 @@ namespace BreCalClient
             }
         }
 
+        /// <summary>
+        /// This property attempts to store the (hopefully short) shifting sequence in the topmost
+        /// byte of the "flags" integer which will not be used for the forseeable future
+        /// 
+        /// This is a workaround to avoid adding another field to the interface and is only used in the
+        /// client display anyway. You could say hack as well.
+        /// </summary>
+        public byte? ShiftSequence
+        {
+            get
+            {
+                if((this.Shipcall == null) || (this.Shipcall.Flags == null)) return null;
+                return (byte?) (this.Shipcall?.Flags >> 24);
+            }
+            set
+            {                
+                if ((value != null) && (this.Shipcall != null))
+                {
+                    int currentFlag = this.Shipcall.Flags ?? 0;
+                    int moveUp = ((value ?? 0) << 24);
+                    this.Shipcall.Flags = (currentFlag & 0xffffff) | moveUp;
+                }               
+            }
+        }
+
         #endregion
 
         #region public methods

From 64977d5819aac2c331e0adf83185affa4e8c5c5e Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 12 Jul 2024 16:29:32 +0200
Subject: [PATCH 20/25] Small-time fixes to things previously changed and
 version bump to 1.3.0.2

---
 src/BreCalClient/BreCalClient.csproj             |  4 ++--
 src/BreCalClient/EditShipcallControl.xaml        |  3 ++-
 src/BreCalClient/EditTimesControl.xaml.cs        | 13 +++++++++++--
 src/BreCalClient/EditTimesTerminalControl.xaml   |  4 ++--
 .../EditTimesTerminalControl.xaml.cs             | 16 ++++++++++++++--
 .../PublishProfiles/ClickOnceDevelProfile.pubxml |  2 +-
 src/BreCalClient/ShipcallControl.xaml.cs         |  7 ++++++-
 src/BreCalClient/ShipcallControlModel.cs         |  9 ++++++---
 8 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 7a12570..84a97b7 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.3.0.1</AssemblyVersion>
-    <FileVersion>1.3.0.1</FileVersion>
+    <AssemblyVersion>1.3.0.2</AssemblyVersion>
+    <FileVersion>1.3.0.2</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/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 956cc2e..006256f 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -69,8 +69,9 @@
         <Label Content="ETD" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" x:Name="labelETD"/>
 
         <ComboBox x:Name="comboBoxTimeRef" Grid.Column="3" Margin="2" Grid.Row="2" />
-        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+        
         <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
 
         <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index f021b81..b5d46be 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -130,8 +130,17 @@ namespace BreCalClient
 
             if (this.ShipcallModel.Shipcall?.Type != ShipcallType.Shifting)
             {
-                this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
-                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
+                int displayIndex = this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0;
+                if (displayIndex > 0)
+                {
+                    this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[displayIndex]);
+                    this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[displayIndex]);
+                } 
+                else
+                {
+                    this.labelETA.Content = BreCalClient.Resources.Resources.textETABerth;
+                    this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
+                }
             }
 
             switch (ShipcallModel.Shipcall?.Type)
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index a7a86cf..6bfa3f7 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -26,8 +26,8 @@
 
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" x:Name="labelStart" />
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" x:Name="labelEnd" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" />
-        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" x:Name="labelBerth"/>
+        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" x:Name="labelPierside" />
         <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" />
 
         <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index ba80394..17cad98 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -124,15 +124,27 @@ namespace BreCalClient
                 case ShipcallType.Arrival:
                     this.labelStart.FontWeight = FontWeights.Bold;
                     this.datePickerOperationStart.ContextMenu.IsEnabled = false;
+                    this.labelEnd.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;
                     this.rowEnd.Height = new(0);
                     break;
                 case ShipcallType.Departure:
                     this.rowStart.Height = new(0);
-                    this.labelEnd.FontWeight = FontWeights.Bold;
+                    this.labelEnd.FontWeight = FontWeights.Bold;                    
+                    this.labelBerth.Visibility = Visibility.Hidden;
+                    this.comboBoxBerth.Visibility= Visibility.Hidden;
+                    this.labelPierside.Visibility = Visibility.Hidden;
+                    this.comboBoxPierside.Visibility = Visibility.Hidden;
                     break;
                 case ShipcallType.Shifting:
+                    this.rowStart.Height = new(0);
                     this.labelEnd.FontWeight = FontWeights.Bold;
-                    this.datePickerOperationEnd.ContextMenu.IsEnabled = false;
+                    this.datePickerOperationEnd.ContextMenu.IsEnabled = false;                    
+                    this.labelBerth.Visibility = Visibility.Hidden;
+                    this.comboBoxBerth.Visibility = Visibility.Hidden;
+                    this.labelPierside.Visibility = Visibility.Hidden;
+                    this.comboBoxPierside.Visibility = Visibility.Hidden;
                     break;
             }
 
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index fb2b52a..317f884 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.3.0.1</ApplicationVersion>
+    <ApplicationVersion>1.3.0.2</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 6beb445..fc40e6a 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -272,7 +272,12 @@ namespace BreCalClient
                     else
                         this.imageEvaluation.ToolTip = null;
 
-                    this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
+                    //Times? bsmdTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.BSMD);
+                    //if (bsmdTimes != null)
+                        this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
+                    //else
+                    //    this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
+
                     this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
                     if (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival)
                     {
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index dd95c2a..cf112c5 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -174,7 +174,7 @@ namespace BreCalClient
         /// <summary>
         /// Get berth display text for columns AGENT and TERMINAL
         /// </summary>
-        public string? GetBerthText(Times times)
+        public string? GetBerthText(Times? times)
         {
             string? timesBerthText = null;
             string? scArrivalBerthText = null;
@@ -182,7 +182,7 @@ namespace BreCalClient
             string? berthText = null;
             Berth? berth;
 
-            if(times.BerthId.HasValue)
+            if((times != null) && times.BerthId.HasValue)
             {
                 berth = BreCalLists.AllBerths.Find((x) => x.Id == times.BerthId.Value);
                 timesBerthText = berth?.Name;
@@ -203,7 +203,10 @@ namespace BreCalClient
                     berthText = timesBerthText ?? scDepartureBerthText;
                     break;
                 case ShipcallType.Shifting:
-                    berthText = (scDepartureBerthText ?? "") + "-" + timesBerthText ?? scArrivalBerthText;
+                    if (times?.ParticipantType != (int)Extensions.ParticipantType.TERMINAL)
+                        berthText = (scDepartureBerthText ?? "") + " / " + (timesBerthText ?? scArrivalBerthText);
+                    else
+                        berthText = scDepartureBerthText ?? "";
                     break;
                 default: break;
             }                       

From e30309bca24d2e0c8342005cf13547c62bfd89c3 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 13 Jul 2024 19:18:41 +0200
Subject: [PATCH 21/25] fixed more small things and version bump to 1.3.0.3

---
 src/BreCalClient/BreCalClient.csproj                         | 4 ++--
 src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs      | 5 ++++-
 .../Properties/PublishProfiles/ClickOnceDevelProfile.pubxml  | 2 +-
 src/BreCalClient/ShipcallControl.xaml                        | 2 +-
 src/BreCalClient/ShipcallControl.xaml.cs                     | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 84a97b7..54e3b24 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.3.0.2</AssemblyVersion>
-    <FileVersion>1.3.0.2</FileVersion>
+    <AssemblyVersion>1.3.0.3</AssemblyVersion>
+    <FileVersion>1.3.0.3</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/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
index 82b033c..8a38a07 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
@@ -209,7 +209,10 @@ namespace BreCalClient
                 this.checkBoxReplenishingLock.IsChecked = this.ShipcallModel.Shipcall.ReplenishingLock ?? false;
                 this.checkBoxReplenishingTerminal.IsChecked = this.ShipcallModel.Shipcall.ReplenishingTerminal ?? false;
 
-                this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+                if ((this.ShipcallModel.Shipcall.TimeRefPoint ?? 0) == 0)
+                    this.labelETA.Content = BreCalClient.Resources.Resources.textETABerth;
+                else
+                    this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
 
                 if(!string.IsNullOrEmpty(this.Times.Remarks)) 
                     this.textBoxRemarks.Text = this.Times.Remarks;
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index 317f884..8ab1a61 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.3.0.2</ApplicationVersion>
+    <ApplicationVersion>1.3.0.3</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 0f102c6..9fde2fe 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -230,7 +230,7 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20" />
                         <RowDefinition Height=".5*" />
-                        <RowDefinition Height="14" />
+                        <RowDefinition Height="14" x:Name="rowDefinitionTerminalBerth"/>
                         <RowDefinition Height=".5*" />
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" x:Name="labelETAETDTerminal" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index fc40e6a..15a0c80 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -430,6 +430,7 @@ namespace BreCalClient
                         Times? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
                         if (terminalTimes != null)
                         {
+                            this.labelTerminalBerth.Visibility = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? Visibility.Visible : Visibility.Hidden;
                             this.labelTerminalBerth.Content = this.ShipcallControlModel?.GetBerthText(terminalTimes);
                             this.labelOperationsStart.Content = terminalTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockTerminalRemarks.Text = terminalTimes.Remarks.TruncateDots(40);

From 1a5591cc390e4b1876a8e9c2e74409dbf1f4a2b7 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 14 Jul 2024 15:12:49 +0200
Subject: [PATCH 22/25] even more small fixes

---
 src/BreCalClient/BreCalClient.csproj                       | 4 ++--
 src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs    | 5 ++++-
 src/BreCalClient/EditTimesAgencyShiftingControl.xaml       | 4 ++--
 src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs    | 5 +----
 src/BreCalClient/EditTimesTerminalControl.xaml             | 2 +-
 src/BreCalClient/EditTimesTerminalControl.xaml.cs          | 7 ++++++-
 .../PublishProfiles/ClickOnceDevelProfile.pubxml           | 2 +-
 src/BreCalClient/ShipcallControl.xaml                      | 2 +-
 src/BreCalClient/ShipcallControl.xaml.cs                   | 5 ++++-
 9 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 54e3b24..0d25c00 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.3.0.3</AssemblyVersion>
-    <FileVersion>1.3.0.3</FileVersion>
+    <AssemblyVersion>1.3.0.4</AssemblyVersion>
+    <FileVersion>1.3.0.4</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/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 2bdc6ac..0a778fd 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -211,7 +211,10 @@ namespace BreCalClient
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
 
-                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+                if ((this.ShipcallModel.Shipcall.TimeRefPoint ?? 0) == 0)
+                    this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
+                else
+                    this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);                
 
                 if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index bd2d571..5dbafcb 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -43,7 +43,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingFrom}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETD" x:Name="labelETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="{x:Static p:Resources.textETDBerth}" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <Grid Grid.Column="1" Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
@@ -81,7 +81,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingTo}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETA" x:Name="labelETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="{x:Static p:Resources.textETABerth}" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <Grid Grid.Column="1" Grid.Row="9">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index c7b588c..5fa79ad 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -217,10 +217,7 @@ namespace BreCalClient
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
-
-                this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
-                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
-
+               
                 if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index 6bfa3f7..e1b96ad 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -28,7 +28,7 @@
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" x:Name="labelEnd" />
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" x:Name="labelBerth"/>
         <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" x:Name="labelPierside" />
-        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" x:Name="labelBerthRemarks"/>
 
         <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 17cad98..a80a1a6 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -126,7 +126,7 @@ namespace BreCalClient
                     this.datePickerOperationStart.ContextMenu.IsEnabled = false;
                     this.labelEnd.Visibility = Visibility.Hidden;
                     this.datePickerOperationEnd.Visibility = Visibility.Hidden;
-                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;                    
                     this.rowEnd.Height = new(0);
                     break;
                 case ShipcallType.Departure:
@@ -136,6 +136,8 @@ namespace BreCalClient
                     this.comboBoxBerth.Visibility= Visibility.Hidden;
                     this.labelPierside.Visibility = Visibility.Hidden;
                     this.comboBoxPierside.Visibility = Visibility.Hidden;
+                    this.labelBerthRemarks.Visibility = Visibility.Hidden;
+                    this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
                     break;
                 case ShipcallType.Shifting:
                     this.rowStart.Height = new(0);
@@ -145,6 +147,8 @@ namespace BreCalClient
                     this.comboBoxBerth.Visibility = Visibility.Hidden;
                     this.labelPierside.Visibility = Visibility.Hidden;
                     this.comboBoxPierside.Visibility = Visibility.Hidden;
+                    this.labelBerthRemarks.Visibility = Visibility.Hidden;
+                    this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
                     break;
             }
 
@@ -162,6 +166,7 @@ namespace BreCalClient
             this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival;
             this.textBoxRemarks.IsReadOnly = false;
+            
             this.CheckOKButton();
         }
 
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index 8ab1a61..a6aaa3c 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.3.0.3</ApplicationVersion>
+    <ApplicationVersion>1.3.0.4</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 9fde2fe..934ae9f 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -231,7 +231,7 @@
                         <RowDefinition Height="20" />
                         <RowDefinition Height=".5*" />
                         <RowDefinition Height="14" x:Name="rowDefinitionTerminalBerth"/>
-                        <RowDefinition Height=".5*" />
+                        <RowDefinition Height=".5*" x:Name="rowDefinitionTerminalBerthRemarks"/>
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" x:Name="labelETAETDTerminal" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelOperationsStart" FontWeight="DemiBold"/>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 15a0c80..0c1b9b3 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -427,7 +427,10 @@ namespace BreCalClient
                             this.imageTugLocked.Visibility = Visibility.Hidden;
                         }
 
-                        Times? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
+                        this.rowDefinitionTerminalBerth.Height = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? new(14) : new(0);
+                        this.rowDefinitionTerminalBerthRemarks.Height = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? new GridLength(.5, GridUnitType.Star) : new(0);
+
+                        Times ? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
                         if (terminalTimes != null)
                         {
                             this.labelTerminalBerth.Visibility = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? Visibility.Visible : Visibility.Hidden;

From 244d9fd96230d98522306a22799c115b39e80e1a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 15 Jul 2024 07:34:33 +0200
Subject: [PATCH 23/25] Test version 1.3.0.4

---
 misc/BreCalApi.cs                             |  8 ++--
 misc/BreCalApi.yaml                           |  4 +-
 src/BreCalClient/App.config                   |  4 +-
 src/BreCalClient/BreCalClient.csproj          |  2 +-
 .../ClickOnceTestProfile.pubxml               |  2 +-
 .../Properties/Settings.Designer.cs           | 48 +++++++++----------
 src/BreCalClient/Properties/Settings.settings |  4 +-
 src/BreCalClient/ShipcallControl.xaml         |  2 +-
 src/BreCalClient/ShipcallControl.xaml.cs      | 12 ++---
 src/RoleEditor/App.config                     |  2 +-
 src/server/BreCal/__init__.py                 |  2 +-
 src/server/BreCal/local_db.py                 |  2 +-
 src/server/flaskapp.wsgi                      |  2 +-
 13 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index 539d113..b56dcab 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -4833,7 +4833,7 @@ namespace BreCalClient.misc.Client
         {
             Proxy = null;
             UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
-            BasePath = "https://brecaldevel.bsmd-emswe.eu";
+            BasePath = "https://brecaltest.bsmd-emswe.eu";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
@@ -4841,8 +4841,8 @@ namespace BreCalClient.misc.Client
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://brecaldevel.bsmd-emswe.eu"},
-                        {"description", "Development server hosted on vcup"},
+                        {"url", "https://brecaltest.bsmd-emswe.eu"},
+                        {"description", "Test server hosted on vcup"},
                     }
                 }
             };
@@ -4860,7 +4860,7 @@ namespace BreCalClient.misc.Client
             IDictionary<string, string> defaultHeaders,
             IDictionary<string, string> apiKey,
             IDictionary<string, string> apiKeyPrefix,
-            string basePath = "https://brecaldevel.bsmd-emswe.eu") : this()
+            string basePath = "https://brecaltest.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index aa42b53..ef32af8 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -14,8 +14,8 @@ info:
     name: Use at your own risk
     url: 'https://www.bsmd.de/license'
 servers:
-  - url: 'https://brecaldevel.bsmd-emswe.eu'
-    description: Development server hosted on vcup
+  - url: 'https://brecaltest.bsmd-emswe.eu'
+    description: Test server hosted on vcup
 tags:
   - name: user
   - name: shipcall
diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index 335a433..9435c06 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -29,7 +29,7 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#1D751F</value>
+                <value>#751D1F</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
                 <value>!!Bremen calling Testversion!!</value>
@@ -38,7 +38,7 @@
                 <value>https://www.textbausteine.net/</value>
             </setting>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecaldevel.bsmd-emswe.eu</value>
+                <value>https://brecaltest.bsmd-emswe.eu</value>
             </setting>
         </BreCalClient.Properties.Settings>
     </applicationSettings>
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 0d25c00..b170a4a 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -13,7 +13,7 @@
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalDevelClient</AssemblyName>
+    <AssemblyName>BreCalTestClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 8a000ff..b4478a3 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.0.0</ApplicationVersion>
+    <ApplicationVersion>1.3.0.4</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs
index fd85a6b..18d33db 100644
--- a/src/BreCalClient/Properties/Settings.Designer.cs
+++ b/src/BreCalClient/Properties/Settings.Designer.cs
@@ -9,29 +9,29 @@
 //------------------------------------------------------------------------------
 
 namespace BreCalClient.Properties {
-    
-    
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
+
         public static Settings Default {
             get {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("!!Bremen calling Testversion!!")]
@@ -40,7 +40,7 @@ namespace BreCalClient.Properties {
                 return ((string)(this["APP_TITLE"]));
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("https://www.textbausteine.net/")]
@@ -49,7 +49,7 @@ namespace BreCalClient.Properties {
                 return ((string)(this["LOGO_IMAGE_URL"]));
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
@@ -61,16 +61,16 @@ namespace BreCalClient.Properties {
                 this["FilterCriteria"] = value;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://brecaldevel.bsmd-emswe.eu")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://brecaltest.bsmd-emswe.eu")]
         public string API_URL {
             get {
                 return ((string)(this["API_URL"]));
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("800")]
@@ -82,7 +82,7 @@ namespace BreCalClient.Properties {
                 this["Width"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("450")]
@@ -94,7 +94,7 @@ namespace BreCalClient.Properties {
                 this["Height"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -106,7 +106,7 @@ namespace BreCalClient.Properties {
                 this["Left"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -118,7 +118,7 @@ namespace BreCalClient.Properties {
                 this["Top"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -130,7 +130,7 @@ namespace BreCalClient.Properties {
                 this["W1Left"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -142,7 +142,7 @@ namespace BreCalClient.Properties {
                 this["W1Top"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -154,7 +154,7 @@ namespace BreCalClient.Properties {
                 this["W2Left"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -166,7 +166,7 @@ namespace BreCalClient.Properties {
                 this["W2Top"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -178,7 +178,7 @@ namespace BreCalClient.Properties {
                 this["W3Left"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -190,7 +190,7 @@ namespace BreCalClient.Properties {
                 this["W3Top"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -202,7 +202,7 @@ namespace BreCalClient.Properties {
                 this["W4Left"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("0")]
@@ -214,7 +214,7 @@ namespace BreCalClient.Properties {
                 this["W4Top"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings
index b10fd5b..a86943e 100644
--- a/src/BreCalClient/Properties/Settings.settings
+++ b/src/BreCalClient/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#1D751F</Value>
+      <Value Profile="(Default)">#751D1F</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
       <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
@@ -15,7 +15,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="API_URL" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://brecaldevel.bsmd-emswe.eu</Value>
+      <Value Profile="(Default)">https://brecaltest.bsmd-emswe.eu</Value>
     </Setting>
     <Setting Name="Width" Type="System.Double" Scope="User">
       <Value Profile="(Default)">800</Value>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 934ae9f..92f861e 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient"             
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
              mc:Ignorable="d" 
              d:DesignHeight="135" d:DesignWidth="800">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 0c1b9b3..0026755 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -219,13 +219,13 @@ namespace BreCalClient
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
                         case ShipcallType.Arrival: // incoming
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_down_red.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
                             break;
                         case ShipcallType.Departure: // outgoing
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_up_blue.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
                             break;
                         case ShipcallType.Shifting: // shifting
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_right_green.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -234,13 +234,13 @@ namespace BreCalClient
                     switch(this.ShipcallControlModel?.LightMode)
                     {
                         case EvaluationType.Green:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png"));
                             break;
                         case EvaluationType.Yellow:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/sign_warning.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png"));
                             break;
                         case EvaluationType.Red:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
diff --git a/src/RoleEditor/App.config b/src/RoleEditor/App.config
index 51c1ce1..bd2b4e4 100644
--- a/src/RoleEditor/App.config
+++ b/src/RoleEditor/App.config
@@ -8,7 +8,7 @@
     <applicationSettings>
         <RoleEditor.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_devel;Port=33306</value>
+                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>
diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py
index eb832f5..3db4e41 100644
--- a/src/server/BreCal/__init__.py
+++ b/src/server/BreCal/__init__.py
@@ -62,7 +62,7 @@ def create_app(test_config=None):
     app.register_blueprint(user.bp)
     app.register_blueprint(history.bp)
 
-    logging.basicConfig(filename='brecaldevel.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
+    logging.basicConfig(filename='brecaltest.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
     local_db.initPool(os.path.dirname(app.instance_path))
     logging.info('App started')
 
diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py
index 85dff68..baa0499 100644
--- a/src/server/BreCal/local_db.py
+++ b/src/server/BreCal/local_db.py
@@ -11,7 +11,7 @@ def initPool(instancePath):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,'../../../secure/connection_data_devel.json');
+            config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json');
 
         print (config_path)
 
diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index 4a5f543..9dec941 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,7 +2,7 @@ import os
 import sys
 import logging
 
-sys.path.insert(0, '/var/www/brecal_devel/src/server')
+sys.path.insert(0, '/var/www/brecal_test/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 import schedule

From 7f1923b6c86006ec56f4a531b212676a4dc276e1 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 15 Jul 2024 08:09:01 +0200
Subject: [PATCH 24/25] Release version 1.3.0.4

---
 misc/BreCalApi.cs                             |  8 ++---
 misc/BreCalApi.yaml                           |  4 +--
 src/BreCalClient/App.config                   |  6 ++--
 src/BreCalClient/BreCalClient.csproj          |  2 +-
 .../PublishProfiles/ClickOnceProfile.pubxml   |  2 +-
 .../Properties/Settings.Designer.cs           |  6 ++--
 src/BreCalClient/Properties/Settings.settings |  6 ++--
 src/BreCalClient/ShipcallControl.xaml         | 34 +++++++++----------
 src/BreCalClient/ShipcallControl.xaml.cs      | 14 ++++----
 src/RoleEditor/App.config                     |  2 +-
 src/server/BreCal/local_db.py                 |  2 +-
 src/server/flaskapp.wsgi                      |  2 +-
 12 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index b56dcab..f094063 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -4833,7 +4833,7 @@ namespace BreCalClient.misc.Client
         {
             Proxy = null;
             UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
-            BasePath = "https://brecaltest.bsmd-emswe.eu";
+            BasePath = "https://brecal.bsmd-emswe.eu";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
@@ -4841,8 +4841,8 @@ namespace BreCalClient.misc.Client
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://brecaltest.bsmd-emswe.eu"},
-                        {"description", "Test server hosted on vcup"},
+                        {"url", "https://brecal.bsmd-emswe.eu"},
+                        {"description", "Server hosted on vcup"},
                     }
                 }
             };
@@ -4860,7 +4860,7 @@ namespace BreCalClient.misc.Client
             IDictionary<string, string> defaultHeaders,
             IDictionary<string, string> apiKey,
             IDictionary<string, string> apiKeyPrefix,
-            string basePath = "https://brecaltest.bsmd-emswe.eu") : this()
+            string basePath = "https://brecal.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index ef32af8..d44b28d 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -14,8 +14,8 @@ info:
     name: Use at your own risk
     url: 'https://www.bsmd.de/license'
 servers:
-  - url: 'https://brecaltest.bsmd-emswe.eu'
-    description: Test server hosted on vcup
+  - url: 'https://brecal.bsmd-emswe.eu'
+    description: Server hosted on vcup
 tags:
   - name: user
   - name: shipcall
diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index 9435c06..dd96a94 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -29,16 +29,16 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#751D1F</value>
+                <value>#203864</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
-                <value>!!Bremen calling Testversion!!</value>
+                <value>Bremen calling</value>
             </setting>
             <setting name="LOGO_IMAGE_URL" serializeAs="String">
                 <value>https://www.textbausteine.net/</value>
             </setting>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecaltest.bsmd-emswe.eu</value>
+                <value>https://brecal.bsmd-emswe.eu</value>
             </setting>
         </BreCalClient.Properties.Settings>
     </applicationSettings>
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index b170a4a..bfe54c5 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -13,7 +13,7 @@
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalTestClient</AssemblyName>
+    <AssemblyName>BreCalClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index 94aa26d..c42e0bc 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>6.0</ApplicationVersion>
+    <ApplicationVersion>1.3.0.4</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs
index 18d33db..fe15701 100644
--- a/src/BreCalClient/Properties/Settings.Designer.cs
+++ b/src/BreCalClient/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace BreCalClient.Properties {
 
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#203864")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
@@ -34,7 +34,7 @@ namespace BreCalClient.Properties {
 
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("!!Bremen calling Testversion!!")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Bremen calling")]
         public string APP_TITLE {
             get {
                 return ((string)(this["APP_TITLE"]));
@@ -64,7 +64,7 @@ namespace BreCalClient.Properties {
 
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://brecaltest.bsmd-emswe.eu")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")]
         public string API_URL {
             get {
                 return ((string)(this["API_URL"]));
diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings
index a86943e..d2a98ce 100644
--- a/src/BreCalClient/Properties/Settings.settings
+++ b/src/BreCalClient/Properties/Settings.settings
@@ -3,10 +3,10 @@
   <Profiles />
   <Settings>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#751D1F</Value>
+      <Value Profile="(Default)">#203864</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
+      <Value Profile="(Default)">Bremen calling</Value>
     </Setting>
     <Setting Name="LOGO_IMAGE_URL" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://www.textbausteine.net/</Value>
@@ -15,7 +15,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="API_URL" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://brecaltest.bsmd-emswe.eu</Value>
+      <Value Profile="(Default)">https://brecal.bsmd-emswe.eu</Value>
     </Setting>
     <Setting Name="Width" Type="System.Double" Scope="User">
       <Value Profile="(Default)">800</Value>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 92f861e..5b050df 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="BreCalClient.ShipcallControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
-             mc:Ignorable="d" 
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
+             mc:Ignorable="d"
              d:DesignHeight="135" d:DesignWidth="800">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
         <Grid>
@@ -49,7 +49,7 @@
                     <Viewbox Grid.Column="1">
                         <TextBlock x:Name="textBlockShiftingSequence"></TextBlock>
                     </Viewbox>
-                    <Label Grid.Column="2" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+                    <Label Grid.Column="2" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp">
                         <TextBlock Name="textBlockShipName" />
                     </Label>
@@ -93,23 +93,23 @@
                 <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockBerth" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
-                
+
 
             </Grid>
 
-            <Label Grid.Row="0" Grid.Column="1" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Label Grid.Row="0" Grid.Column="1" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelAgent" PreviewMouseUp="labelAgent_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="2" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Label Grid.Row="0" Grid.Column="2" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelMooring" PreviewMouseUp="labelMooring_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="3" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Label Grid.Row="0" Grid.Column="3" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelPortAuthority" PreviewMouseUp="labelPortAuthority_PreviewMouseUp" />
-            <Label Grid.Row="0" Grid.Column="4" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Label Grid.Row="0" Grid.Column="4" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelPilot" PreviewMouseUp="labelPilot_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="5" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Label Grid.Row="0" Grid.Column="5" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTug" PreviewMouseUp="labelTug_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="6" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Label Grid.Row="0" Grid.Column="6" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch"
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTerminal" PreviewMouseUp="labelTerminal_PreviewMouseUp" />
-            
+
             <!-- AGENCY -->
             <Border Grid.Row="2" Grid.Column="1" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
                 <Grid Grid.Row="2" Grid.Column="1">
@@ -123,16 +123,16 @@
                         <RowDefinition Height="14" />
                         <RowDefinition Height=".5*" />
                     </Grid.RowDefinitions>
-                    
+
                     <Label Grid.Row="0" Grid.Column="0" Content = "ETA" x:Name="labelETAETDAgent" Padding="0" VerticalContentAlignment="Center" />
                     <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
                     <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" BorderThickness="0,1,0,0" BorderBrush="Gray" >
-                        <Label Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>    
+                        <Label Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
                     </Border>
-                    
+
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelAgencyETAETDValue" FontWeight="DemiBold"/>
                     <TextBlock Grid.Row="1" Grid.Column="1" Grid.RowSpan="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockAgencyRemarks"  FontSize="10"/>
-                    
+
                     <Label Grid.Row="2" Grid.Column="1" HorizontalContentAlignment="Left" x:Name="labelAgencyBerth" Padding="0" VerticalContentAlignment="Center"  FontSize="11" FontWeight="SemiBold" />
                     <TextBlock Grid.Row="3" Grid.Column="0"  Text="{x:Static p:Resources.textRemarks}" Padding="0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="9"/>
                     <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockAgencyBerthRemarks"  FontSize="10"/>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 0026755..32fef5e 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -219,13 +219,13 @@ namespace BreCalClient
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
                         case ShipcallType.Arrival: // incoming
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_down_red.png"));
                             break;
                         case ShipcallType.Departure: // outgoing
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_up_blue.png"));
                             break;
                         case ShipcallType.Shifting: // shifting
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -234,13 +234,13 @@ namespace BreCalClient
                     switch(this.ShipcallControlModel?.LightMode)
                     {
                         case EvaluationType.Green:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/check.png"));
                             break;
                         case EvaluationType.Yellow:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/sign_warning.png"));
                             break;
                         case EvaluationType.Red:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
@@ -386,7 +386,7 @@ namespace BreCalClient
                             {
                                 if(!lockTimeAdded)
                                 {
-                                    lockTimeRowDefinition.Height = new GridLength(15);                                    
+                                    lockTimeRowDefinition.Height = new GridLength(15);
                                     lockTimeAdded = true;
                                 }
                                 labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm");
diff --git a/src/RoleEditor/App.config b/src/RoleEditor/App.config
index bd2b4e4..7c6ee29 100644
--- a/src/RoleEditor/App.config
+++ b/src/RoleEditor/App.config
@@ -8,7 +8,7 @@
     <applicationSettings>
         <RoleEditor.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306</value>
+                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling;Port=33306</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>
diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py
index baa0499..d41f250 100644
--- a/src/server/BreCal/local_db.py
+++ b/src/server/BreCal/local_db.py
@@ -11,7 +11,7 @@ def initPool(instancePath):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json');
+            config_path = os.path.join(instancePath,'../../../secure/connection_data_prod.json');
 
         print (config_path)
 
diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index 9dec941..6296d8f 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,7 +2,7 @@ import os
 import sys
 import logging
 
-sys.path.insert(0, '/var/www/brecal_test/src/server')
+sys.path.insert(0, '/var/www/brecal/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 import schedule

From be375b67e352f30a190eaaf6304a463b934f99ea Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 18 Jul 2024 06:56:56 +0200
Subject: [PATCH 25/25] some weird changes to setup automatically made

---
 src/Setup/Setup.vdproj | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Setup/Setup.vdproj b/src/Setup/Setup.vdproj
index f1498e5..dc474ed 100644
--- a/src/Setup/Setup.vdproj
+++ b/src/Setup/Setup.vdproj
@@ -43,6 +43,14 @@
         "PrivateKeyFile" = "8:"
         "TimeStampServer" = "8:"
         "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+            }
         }
         "Release"
         {
@@ -59,6 +67,14 @@
         "PrivateKeyFile" = "8:"
         "TimeStampServer" = "8:"
         "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+            }
         }
     }
     "Deployable"
@@ -166,15 +182,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Bremen calling"
-        "ProductCode" = "8:{6EF71F76-3E55-483B-A032-4B29FDAFE6A4}"
-        "PackageCode" = "8:{8E55F30F-A9C8-41E9-BCE8-431770A951ED}"
+        "ProductCode" = "8:{D83D737A-BDC1-4D36-9D23-71EF58C7137B}"
+        "PackageCode" = "8:{D7E747A8-7492-47E9-9D4F-B7F955AD8313}"
         "UpgradeCode" = "8:{1C7FA3E4-BAB9-4911-9348-73094357FC7C}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.2.2"
+        "ProductVersion" = "8:1.3.0"
         "Manufacturer" = "8:Informatikbüro Daniel Schick"
         "ARPHELPTELEPHONE" = "8:+49 (0) 421 - 38 48 27"
         "ARPHELPLINK" = "8:https://www.bsmd.de/"