From ad16ae4945fb181149315eb7c74aa6f06a87b93c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 18 Jul 2024 07:22:25 +0200
Subject: [PATCH 1/9] Bugfix: ATA/ATD values do not get changed when already
 displayed

---
 src/BreCalClient/ShipcallControl.xaml.cs | 34 +++++++-----------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 0c1b9b3..fbf6fad 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -25,10 +25,7 @@ namespace BreCalClient
         Participant? _terminal;
         Participant? _tug;
         Participant? _port_administration;
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
-        bool ataAdded = false;
-        bool atdAdded = false;
-        bool lockTimeAdded = false;
+        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));        
 
         #endregion
 
@@ -346,26 +343,17 @@ namespace BreCalClient
                             this.labelMooringETAETDValue.Content = mooringTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockMooringRemarks.Text = mooringTimes.Remarks.TruncateDots(50);
                             this.imageMooringLocked.Visibility = (mooringTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+                            ataRowDefinition.Height = mooringTimes.Ata.HasValue ? new(15) : new(0);
+                            atdRowDefinition.Height = mooringTimes.Atd.HasValue ? new(15) : new(0);
 
                             if(mooringTimes.Ata.HasValue)
-                            {
-                                if(!ataAdded)
-                                {
-
-                                    ataRowDefinition.Height = new GridLength(15);
-                                    labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm");
-                                    ataAdded = true;
-                                }
+                            {                                                                    
+                                labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm");                                                                
                             }
 
                             if (mooringTimes.Atd.HasValue)
-                            {
-                                if (!atdAdded)
-                                {
-                                    atdRowDefinition.Height = new GridLength(15);
-                                    labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm");
-                                    atdAdded = true;
-                                }
+                            {                                                                    
+                                labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm");                                
                             }
 
                         }
@@ -382,13 +370,9 @@ namespace BreCalClient
                             this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockPortAuthorityRemarks.Text = portAuthorityTimes.Remarks.TruncateDots(50);
                             this.imagePortAuthorityLocked.Visibility = (portAuthorityTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+                            lockTimeRowDefinition.Height = portAuthorityTimes.LockTime.HasValue ? new(15) : new(0);
                             if(portAuthorityTimes.LockTime.HasValue)
-                            {
-                                if(!lockTimeAdded)
-                                {
-                                    lockTimeRowDefinition.Height = new GridLength(15);                                    
-                                    lockTimeAdded = true;
-                                }
+                            {                                
                                 labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm");
                             }
                         }

From 31c54f9d8fe512a626ce12c63d93702a59f15d59 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 22 Jul 2024 07:06:41 +0200
Subject: [PATCH 2/9] ETD is always enabled if user is bsmd group (was typo?
 can't recall)

---
 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 74dd3d5..322b534 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -373,7 +373,7 @@ namespace BreCalClient
             this.comboBoxDepartureBerth.IsEnabled = isBsmd || isAgency;
             this.comboBoxShip.IsEnabled = isBsmd;
             this.datePickerETA.IsEnabled = isAgency || isBsmd;
-            this.datePickerETD.IsEnabled = isAgency;
+            this.datePickerETD.IsEnabled = isAgency || isBsmd;
 
             this.labelBSMDGranted.Visibility = editRightGrantedForBSMD ? Visibility.Visible : Visibility.Hidden;
 

From 9bf84f8baa7f8fcd71ddce9ae83d8f9b7c2054a0 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 22 Jul 2024 08:22:09 +0200
Subject: [PATCH 3/9] remove required fields for Times and Times Terminal

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

diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index bf5ce84..fdfa2fd 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -44,7 +44,7 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="4,2,0,2" x:Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETABerth_ValueChanged">
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="4,2,0,2" x:Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETA" Click="contextMenuItemClearETA_Click" >
@@ -76,7 +76,7 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETDBerth_ValueChanged">
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETD" Click="contextMenuItemClearETD_Click" >
@@ -153,7 +153,7 @@
 
         <TextBox Grid.Row="7" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512"/>
         <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
 
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index b5d46be..710e81f 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -65,16 +65,6 @@ namespace BreCalClient
             SetLockButton(newValue);
         }
 
-        private void datePickerETABerth_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            CheckOKButton();
-        }
-
-        private void datePickerETDBerth_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            CheckOKButton();
-        }
-
         #endregion
 
         #region private methods
@@ -99,15 +89,13 @@ namespace BreCalClient
             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(); }
+                if (this.datePickerETABerth.Template.FindName("PART_TextBox", this.datePickerETABerth) is WatermarkTextBox tb) { 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();
+                if (this.datePickerETDBerth.Template.FindName("PART_TextBox", this.datePickerETDBerth) is WatermarkTextBox tb) tb.SelectAll();
             }
 
             this.datePickerLockTime.Value = this.Times.LockTime;
@@ -141,20 +129,7 @@ namespace BreCalClient
                     this.labelETA.Content = BreCalClient.Resources.Resources.textETABerth;
                     this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
                 }
-            }
-
-            switch (ShipcallModel.Shipcall?.Type)
-            {
-                case ShipcallType.Arrival:
-                    this.labelETA.FontWeight = FontWeights.Bold; 
-                    this.datePickerETABerth.ContextMenu.IsEnabled = false; 
-                    break;
-                case ShipcallType.Departure:
-                case ShipcallType.Shifting:
-                    this.labelETD.FontWeight = FontWeights.Bold;
-                    this.datePickerETDBerth.ContextMenu.IsEnabled = false;
-                    break;
-            }
+            }            
 
             this.SetLockButton(this.Times.EtaBerthFixed ?? false);
         }
@@ -222,10 +197,7 @@ namespace BreCalClient
                 case Extensions.ParticipantType.PILOT:                    
                     this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                                        
                     break;
-            }
-
-            CheckOKButton();
-                             
+            }                             
         }
 
         private void SetLockButton(bool newValue)
@@ -242,17 +214,7 @@ namespace BreCalClient
                 this.imageFixedOrder.Source = new BitmapImage(new Uri(@"pack://application:,,,/Resources/lock_open.png", UriKind.RelativeOrAbsolute));
                 this.buttonFixedOrder.ToolTip = BreCalClient.Resources.Resources.textTooltipSetFixedOrder;
             }
-        }
-
-        private void CheckOKButton()
-        {
-            Extensions.ParticipantType pType = (Extensions.ParticipantType)this.Times.ParticipantType;
-            if (pType != Extensions.ParticipantType.PORT_ADMINISTRATION)
-                this.buttonOK.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) ?
-                    this.datePickerETABerth.Value.HasValue : this.datePickerETDBerth.Value.HasValue;
-            else
-                this.buttonOK.IsEnabled = true;
-        }
+        }        
 
         #endregion
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index e1b96ad..86008cd 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -38,7 +38,7 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerOperationStart_ValueChanged">
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" >
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart" Click="contextMenuItemClearOperationStart_Click" >
@@ -69,7 +69,7 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerOperationEnd_ValueChanged">
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" >
                 <xctk:DateTimePicker.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd" Click="contextMenuItemClearOperationEnd_Click" >
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index a80a1a6..92f8111 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -76,16 +76,6 @@ namespace BreCalClient
             this.comboBoxPierside.SelectedIndex = -1;
         }
 
-        private void datePickerOperationStart_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            this.CheckOKButton();
-        }
-
-        private void datePickerOperationEnd_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            this.CheckOKButton();
-        }
-
         #endregion
 
         #region private methods
@@ -122,8 +112,6 @@ namespace BreCalClient
             switch (ShipcallModel.Shipcall?.Type)
             {
                 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;                    
@@ -131,7 +119,6 @@ namespace BreCalClient
                     break;
                 case ShipcallType.Departure:
                     this.rowStart.Height = new(0);
-                    this.labelEnd.FontWeight = FontWeights.Bold;                    
                     this.labelBerth.Visibility = Visibility.Hidden;
                     this.comboBoxBerth.Visibility= Visibility.Hidden;
                     this.labelPierside.Visibility = Visibility.Hidden;
@@ -140,9 +127,7 @@ namespace BreCalClient
                     this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
                     break;
                 case ShipcallType.Shifting:
-                    this.rowStart.Height = new(0);
-                    this.labelEnd.FontWeight = FontWeights.Bold;
-                    this.datePickerOperationEnd.ContextMenu.IsEnabled = false;                    
+                    this.rowStart.Height = new(0);                    
                     this.labelBerth.Visibility = Visibility.Hidden;
                     this.comboBoxBerth.Visibility = Visibility.Hidden;
                     this.labelPierside.Visibility = Visibility.Hidden;
@@ -166,15 +151,8 @@ namespace BreCalClient
             this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival;
             this.textBoxRemarks.IsReadOnly = false;
-            
-            this.CheckOKButton();
-        }
-
-        private void CheckOKButton()
-        {
-            this.buttonOK.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) ? this.datePickerOperationStart.Value.HasValue :
-                this.datePickerOperationEnd.Value.HasValue;
-        }
+                     
+        }        
 
         #endregion
         

From 14569ad7bc754e9d9712e70c7d92f35b05f30766 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 22 Jul 2024 08:51:20 +0200
Subject: [PATCH 4/9] Reset values button on times and times terminal dialog
 boxes to completely undo entries. Also fixed bug where clear context menu was
 disabled and wouldn't disappear

---
 src/BreCalClient/BreCalClient.csproj          |   2 ++
 src/BreCalClient/EditTimesControl.xaml        |   3 +++
 src/BreCalClient/EditTimesControl.xaml.cs     |  17 ++++++++++++++++
 .../EditTimesTerminalControl.xaml             |   5 ++++-
 .../EditTimesTerminalControl.xaml.cs          |  18 ++++++++++++++++-
 .../Resources/Resources.Designer.cs           |  19 ++++++++++++++++++
 src/BreCalClient/Resources/Resources.de.resx  |   3 +++
 src/BreCalClient/Resources/Resources.resx     |   6 ++++++
 src/BreCalClient/Resources/nav_undo_red.png   | Bin 0 -> 1643 bytes
 9 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 src/BreCalClient/Resources/nav_undo_red.png

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 0d25c00..9ffba81 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -39,6 +39,7 @@
     <None Remove="Resources\lock_open.png" />
     <None Remove="Resources\logo_bremen_calling.png" />
     <None Remove="Resources\nav_refresh_green.png" />
+    <None Remove="Resources\nav_undo_red.png" />
     <None Remove="Resources\ship2.png" />
     <None Remove="Resources\sign_warning.png" />
     <None Remove="Resources\trafficlight_green.png" />
@@ -96,6 +97,7 @@
     <Resource Include="Resources\lock_open.png" />
     <Resource Include="Resources\logo_bremen_calling.png" />
     <Resource Include="Resources\nav_refresh_green.png" />
+    <Resource Include="Resources\nav_undo_red.png" />
     <Resource Include="Resources\ship2.png" />
     <Resource Include="Resources\sign_warning.png" />
     <Resource Include="Resources\StringResources.de.xaml">
diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index fdfa2fd..ad03ed9 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -155,6 +155,9 @@
         <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+            <Button Width="28" x:Name="buttonClearAll" Click="buttonClearAll_Click" Margin="2" IsEnabled="False">
+                <Image Source="Resources\nav_undo_red.png"/>
+            </Button>
         </StackPanel>
 
     </Grid>
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 710e81f..dfd841d 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -65,6 +65,22 @@ namespace BreCalClient
             SetLockButton(newValue);
         }
 
+        private void buttonClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (System.Windows.MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                this.datePickerETABerth.Value = null;
+                this.datePickerETABerth_End.Value = null;
+                this.datePickerETDBerth.Value = null;
+                this.datePickerETDBerth_End.Value = null;
+                this.datePickerATA.Value = null;
+                this.datePickerATD.Value = null;
+                this.datePickerLockTime.Value = null;
+                this.datePickerZoneEntry.Value = null;
+                this.textBoxRemarks.Text = null;
+            }
+        }
+
         #endregion
 
         #region private methods
@@ -183,6 +199,7 @@ namespace BreCalClient
             this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
             this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
             this.textBoxRemarks.IsReadOnly = false;
+            this.buttonClearAll.IsEnabled = true;
 
             switch (pType)
             {
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index 86008cd..6875bca 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -115,8 +115,11 @@
         <TextBox Grid.Row="4" Grid.Column="1" Margin="2" Name="textBoxBerthRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512" />
         <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512" />
         <StackPanel Grid.Row="6" Grid.Column="1" 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.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="True"/>
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+            <Button Width="28" x:Name="buttonClearAll" Click="buttonClearAll_Click" Margin="2" IsEnabled="False">
+                <Image Source="Resources\nav_undo_red.png"/>
+            </Button>
         </StackPanel>
 
     </Grid>
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 92f8111..6071ba9 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -76,6 +76,21 @@ namespace BreCalClient
             this.comboBoxPierside.SelectedIndex = -1;
         }
 
+        private void buttonClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                this.datePickerOperationStart.Value = null;
+                this.datePickerOperationStart_End.Value = null;
+                this.datePickerOperationEnd.Value = null;
+                this.datePickerOperationEnd_End.Value = null;
+                this.comboBoxBerth.SelectedIndex = -1;
+                this.comboBoxPierside.SelectedIndex = -1;
+                this.textBoxRemarks.Text = null;
+                this.textBoxBerthRemarks.Text = null;
+            }
+        }
+
         #endregion
 
         #region private methods
@@ -151,8 +166,9 @@ namespace BreCalClient
             this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival;
             this.textBoxRemarks.IsReadOnly = false;
+            this.buttonClearAll.IsEnabled = true;
                      
-        }        
+        }
 
         #endregion
         
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 679e66a..492ef15 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -278,6 +278,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] nav_undo_red {
+            get {
+                object obj = ResourceManager.GetObject("nav_undo_red", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shifting.
         /// </summary>
@@ -469,6 +479,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clear all entries?.
+        /// </summary>
+        public static string textClearAll {
+            get {
+                return ResourceManager.GetString("textClearAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Clear assignment.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 1d95aef..a681ad9 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -505,4 +505,7 @@
   <data name="textShiftingSequence" xml:space="preserve">
     <value>Verhol. Nr.</value>
   </data>
+  <data name="textClearAll" xml:space="preserve">
+    <value>Alle Eintragungen zurücksetzen?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index a6d08f6..1cf2a78 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -178,6 +178,9 @@
   <data name="nav_refresh_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>nav_refresh_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="nav_undo_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>nav_undo_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="Shifting" xml:space="preserve">
     <value>Shifting</value>
   </data>
@@ -241,6 +244,9 @@
   <data name="textChangePassword" xml:space="preserve">
     <value>Change password</value>
   </data>
+  <data name="textClearAll" xml:space="preserve">
+    <value>Clear all entries?</value>
+  </data>
   <data name="textClearAssignment" xml:space="preserve">
     <value>Clear assignment</value>
   </data>
diff --git a/src/BreCalClient/Resources/nav_undo_red.png b/src/BreCalClient/Resources/nav_undo_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..692f6db977de0fa43e45a8206efdb556a65f2f6e
GIT binary patch
literal 1643
zcmV-x29)`UP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000I1Nkl<Zc-obf
zX-rgC6vzK>nSDW)DoeC3siG~4;1X*r7#FNDDb-JYswO5)i?K?zQK=v%Hnk#^RBf!r
zCW0~grDM?8fD0;ML@BNX5do1pYFKB%VU~A$&I6m;q()zIX6}3Up5NKulkl1=r*M0^
z+2U9^!WosBn2?Zcvs!F`1pk2F-|2qZ<ni`b1$w>5_kXv&9&dAfz4M3E{GSh9a9yg=
zDz8+Fqot)Hf9+baW%X*YWz{NCux_0wJys^pRo4jD<r<C8vd$a9xBj$0_t!JO2P?1C
zh;P66QXC-I<-L2w1D8uYJatMmpEx0I9XTS-=H-c!HEYDSoE%YET`O3Jb^ptIB}Loz
z9o#)LEp?;&Rs#a{*RklM41|M0XyGuzfdI5n2obvHH8f4vQ7snKHa5aRXX8^+aqW+W
zqMd6$-}I6xzg*<)JCHkr;BB?lc&Ft7=1!ghPe%s^ySowbdZCaJnM8?1pfY@L5TX8l
zc-q=9&EbHpwg&B2t1*ih%zDMZM#|s2W5<2p+tQ3AQb-`L2D`c-lgIKfn1KvuLkbyS
zBL*R$l7z{DSh|m?zk%M?7K|s>*4;xj(G6Ilql?EUBp3o0FCt!%bp_pH0?GttQOKA=
z=}|d?;V5(?q|YJ-1`ti+J97r(5)%wjj_6|DKu%#n`s69^XEs$<AlYO<m<~w<OD`<M
zw7fh_*{}gJgX!5zxXEO~h=~&so00;n)2T<oMnGrA`n+hYsK5kbt|zu?v^ZBr+ssn1
z;}PKVLotvM@>nD9G%hd!Bcy0C8X;5aqO-DKoiG7{p!5StQ4o0c4DPBbbd;APL=9lN
z-vryjMUt7=s?F}mlnH9@XoqBXKqUo1aEX*P5<v!D+`R{5QUb<o-U5)JL62v+2PIu(
zyB$f(mf^9>1vBlNoBjkdEp}(792Xy-?0?t-t73pmV7*I*J0L>o(nt)kQ5c(_4?)Tt
z8DxS|nq<0{$N;x)``NP)<h{{shDDO$r(#FNk4mOGYBr79%}79ob3XC>IU;nJy=TzG
zf*sHZBm~1{w4QRIe0es0Te<{S3-Zx>?;bjiAJ_FHP7$%RzJ3h82-wts-v`x5;e@D=
ziW!0qh4>%=c?!7(5*guiaXN06?18VY4x`NmNCpM|dv|fCp#cusHd(CzMPu~zBSJbn
zq-uXp&wx2)iZw{BY2bo(byMhuf6Y17fukdZCsh~VG#Qb&Xd%?F2LJVIu&OlKstSqc
z!ybhYITG@CVIDaW{kQK9s9l|%_svT`p58~fwvZTAnL0y$<xRrTaJmvR=0lmkK!3{J
z)1JQ-;z0`(ZU!o<Y_%Xl>Gsq9sL^B4U2*P;?Dh4RJ)$DZ)28c_D=5b@$q;1-uE#;e
z733wiY=|UG5~SE9E;t!8#Kh=p;q$>nPPEhO#?#kRAqV>Wmu@%Q6qf8y5FGGRgABDE
z(+yS|iS?g<l|-Rg;1`@SoMVnwjf;b<Dti6{6oGZcaxgQ{*K<iNKUr4)sp+$-?wK>@
zJLk-WoqL$lbavSi1UVX$3WYq>|J9+|M1mo`+v3d@YT-C)1RBaPy=l9<;QeqeJSH<9
zHr=l(KY6lVkAGoyc53X%QFS?M));*2ze18M5H!*>7*xH(c)DeyGUO%n0fwZSXy&N7
zsn}Xz5W&CP=%BTIZwdAvJ{;<P{%qDcm+PipO<r`lpKLx_R)&}#OW>AN*ku*;sf68T
zhr?!p-E5_QJDek8;f#rcmD9!T6?lQL`zcy!L|B&@%wpy%--Gkz<;BfSjYazo{Q~Qr
zJ#dek0N>+I%4>*vlzN`R)?@=Bks*&YuLmIlceS?R>3fqfqPQ5W+uYb##H|1QWX_(K
zk(;@AaqwX2F;QPpA+CS3NnBfzE$TAnh&zijbm28W<2^pZXIW?Vym`5A^j%I#OG`~n
zOS`ZjD@)t4YnQ0FTrIAiJ1=gWJ}s`3@S30T9-rZ}tb@0`l9Q9uCr+MRG-=YL8!1z#
z`UoUgKA<%}<2^p}I>z4{5FiqWnSJg6001j=MObu0Z*X~XX=iA307GwZd2(rIXmlW{
pATls8I4v?TF)<)XPD4*pQy@oeVn`5<Ax{7R002ovPDHLkV1idy3%vjU

literal 0
HcmV?d00001


From d7de35236cacd1a041fde29d5ea62e17d0dd2aac Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 22 Jul 2024 10:40:08 +0200
Subject: [PATCH 5/9] Version bump to 1.4

---
 misc/BreCalApi.cs                             | 82 +++++++++----------
 misc/BreCalApi.yaml                           |  2 +-
 misc/version.txt                              |  2 +-
 src/BreCalClient/BreCalClient.csproj          |  4 +-
 .../ClickOnceDevelProfile.pubxml              |  2 +-
 .../ClickOnceTestProfile.pubxml               |  2 +-
 src/server/setup.py                           |  2 +-
 7 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index 539d113..68a9e32 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -46,7 +46,7 @@ using System.Web;
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -850,7 +850,7 @@ namespace BreCalClient.misc.Api
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -1505,7 +1505,7 @@ namespace BreCalClient.misc.Api
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -2290,7 +2290,7 @@ namespace BreCalClient.misc.Api
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3109,7 +3109,7 @@ namespace BreCalClient.misc.Api
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -3594,7 +3594,7 @@ namespace BreCalClient.misc.Api
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4330,7 +4330,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4390,7 +4390,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4530,7 +4530,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -4748,7 +4748,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5207,7 +5207,7 @@ namespace BreCalClient.misc.Client
             string report = "C# SDK (BreCalClient.misc) Debug Report:\n";
             report += "    OS: " + System.Environment.OSVersion + "\n";
             report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
-            report += "    Version of the API: 1.3.0\n";
+            report += "    Version of the API: 1.4.0\n";
             report += "    SDK Package Version: 1.0.0\n";
             return report;
         }
@@ -5276,7 +5276,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5296,7 +5296,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5353,7 +5353,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5386,7 +5386,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5419,7 +5419,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5510,7 +5510,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5627,7 +5627,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5711,7 +5711,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5970,7 +5970,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -5998,7 +5998,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6068,7 +6068,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6095,7 +6095,7 @@ namespace BreCalClient.misc.Client
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6162,7 +6162,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6288,7 +6288,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6373,7 +6373,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6446,7 +6446,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6486,7 +6486,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6596,7 +6596,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6658,7 +6658,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6784,7 +6784,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6888,7 +6888,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6923,7 +6923,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6953,7 +6953,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -6993,7 +6993,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7150,7 +7150,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7226,7 +7226,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7396,7 +7396,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7701,7 +7701,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -7741,7 +7741,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -8023,7 +8023,7 @@ namespace BreCalClient.misc.Model
  *
  * Administer DEBRE ship calls, times and notifications
  *
- * The version of the OpenAPI document: 1.3.0
+ * The version of the OpenAPI document: 1.4.0
  * Contact: info@textbausteine.net
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index aa42b53..be9d091 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 x-stoplight:
   id: mwv4y8vcnopwr
 info:
-  version: 1.3.0
+  version: 1.4.0
   title: Bremen calling API
   description: 'Administer DEBRE ship calls, times and notifications'
   termsOfService: 'https://www.bsmd.de/'
diff --git a/misc/version.txt b/misc/version.txt
index fd76c73..77d55b2 100644
--- a/misc/version.txt
+++ b/misc/version.txt
@@ -1 +1 @@
-1.3.0.0
\ No newline at end of file
+1.4.0.0
\ No newline at end of file
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 9ffba81..b42f599 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.4</AssemblyVersion>
-    <FileVersion>1.3.0.4</FileVersion>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index a6aaa3c..0c88dd3 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.4</ApplicationVersion>
+    <ApplicationVersion>1.4.0.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 8a000ff..059b55a 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.4.0.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/server/setup.py b/src/server/setup.py
index 2733082..44750aa 100644
--- a/src/server/setup.py
+++ b/src/server/setup.py
@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='BreCal',
-    version='1.3.0',
+    version='1.4.0',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,

From d4903b80d4d2cdaf4ffd27a328f771eff38e50f2 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 25 Jul 2024 08:14:36 +0200
Subject: [PATCH 6/9] Updated postman collection

---
 misc/BreCal.postman_collection.json | 185 ++++++++++++++++++++++++++--
 1 file changed, 174 insertions(+), 11 deletions(-)

diff --git a/misc/BreCal.postman_collection.json b/misc/BreCal.postman_collection.json
index f1ef9ad..23307fb 100644
--- a/misc/BreCal.postman_collection.json
+++ b/misc/BreCal.postman_collection.json
@@ -18,7 +18,8 @@
 							"pm.environment.set(\"LOGON_TOKEN\", responseData.token)\r",
 							"console.log(\"Id: \" + responseData.id)"
 						],
-						"type": "text/javascript"
+						"type": "text/javascript",
+						"packages": {}
 					}
 				}
 			],
@@ -76,6 +77,39 @@
 			},
 			"response": []
 		},
+		{
+			"name": "History GET",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/history?shipcall_id=79",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"history"
+					],
+					"query": [
+						{
+							"key": "shipcall_id",
+							"value": "79"
+						}
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "Shipcalls GET",
 			"request": {
@@ -120,7 +154,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"ship_id\" : 1,\r\n    \"type\" : 1,\r\n    \"eta\" : \"2023-07-23T07:18:19\",\r\n    \"voyage\" : \"43B\",\r\n    \"tug_required\" : false,\r\n    \"pilot_required\" : true,\r\n    \"flags\" : 0,\r\n    \"pier_side\" : false,\r\n    \"bunkering\" : true,\r\n    \"recommended_tugs\" : 2\r\n}",
+					"raw": "{\r\n    \"anchored\": null,\r\n    \"arrival_berth_id\": 144,\r\n    \"bunkering\": null,\r\n    \"canceled\": false,\r\n    \"created\": \"0001-01-01T00:00:00\",\r\n    \"departure_berth_id\": null,\r\n    \"draft\": null,\r\n    \"eta\": \"2024-04-10T12:29:09.174\",\r\n    \"etd\": null,\r\n    \"evaluation\": null,\r\n    \"evaluation_message\": null,\r\n    \"flags\": null,\r\n    \"id\": 0,\r\n    \"modified\": null,\r\n    \"moored_lock\": null,\r\n    \"participants\": [\r\n        {\r\n            \"participant_id\": 136,\r\n            \"type\": 8\r\n        },\r\n        {\r\n            \"participant_id\": 11,\r\n            \"type\": 32\r\n        },\r\n        {\r\n            \"participant_id\": 1,\r\n            \"type\": 1\r\n        }\r\n    ],\r\n    \"pier_side\": null,\r\n    \"pilot_required\": null,\r\n    \"rain_sensitive_cargo\": null,\r\n    \"recommended_tugs\": null,\r\n    \"replenishing_lock\": null,\r\n    \"replenishing_terminal\": null,\r\n    \"ship_id\": 14,\r\n    \"tidal_window_from\": null,\r\n    \"tidal_window_to\": null,\r\n    \"time_ref_point\": 0,\r\n    \"tug_required\": null,\r\n    \"type\": \"arrival\",\r\n    \"voyage\": null\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -156,7 +190,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"id\" : 2,    \r\n    \"recommended_tugs\" : 3\r\n}",
+					"raw": "{\"type\": \"shifting\", \"evaluation\": \"green\", \"id\": 33, \"ship_id\": 2, \"eta\": \"2024-01-27T18:00:21\", \"etd\": \"2024-01-25T17:00:45\", \"arrival_berth_id\": 168, \"departure_berth_id\": 184,  \"rain_sensitive_cargo\": \"False\",  \"time_ref_point\": 1, \"participants\": [{\"participant_id\": 6, \"type\": 8}, {\"participant_id\": 11, \"type\": 32}, {\"participant_id\": 9, \"type\": 64}, {\"participant_id\": 1, \"type\": 1}], \"created\": \"2023-10-24T11:41:16\", \"modified\": \"2024-02-23T14:50:07\"}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -218,7 +252,7 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{SCHEMA}}{{PATH}}/notifications?participant_id=1",
+					"raw": "{{SCHEMA}}{{PATH}}/notifications?shipcall_id=4",
 					"host": [
 						"{{SCHEMA}}{{PATH}}"
 					],
@@ -227,8 +261,8 @@
 					],
 					"query": [
 						{
-							"key": "participant_id",
-							"value": "1"
+							"key": "shipcall_id",
+							"value": "4"
 						}
 					]
 				}
@@ -262,6 +296,99 @@
 			},
 			"response": []
 		},
+		{
+			"name": "Ships PUT",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "PUT",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n    \"id\": 17,\r\n        \"name\": \"Testschiff 1\",\r\n        \"imo\": 1231231,\r\n        \"callsign\": \"TEST1\",\r\n        \"participant_id\": null,\r\n        \"length\": 202.0,\r\n        \"width\": 25.0,\r\n        \"is_tug\": 0,\r\n        \"bollard_pull\": null,\r\n        \"eni\": null,\r\n        \"created\": \"2024-04-03T07:49:29\",\r\n        \"modified\": null,\r\n        \"deleted\": 0\r\n}"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/ships",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"ships"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Ships POST",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n        \"name\": \"Testschiff 02\",\r\n        \"imo\": 9999992,\r\n        \"length\": 100.2,\r\n        \"width\": 16.5,\r\n        \"is_tug\": 0,\r\n        \"bollard_pull\": 42,\r\n        \"callsign\": \"9992\",\r\n        \"participant_id\": null,\r\n        \"eni\": 1\r\n    }"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/ships",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"ships"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Ships DELETE",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "DELETE",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n        \"id\": 15,\r\n        \"name\": \"Testschiff 01\",\r\n        \"imo\": 9999991\r\n    }"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/ships",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"ships"
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "Times GET",
 			"request": {
@@ -278,7 +405,7 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{SCHEMA}}{{PATH}}/times?shipcall_id=3",
+					"raw": "{{SCHEMA}}{{PATH}}/times?shipcall_id=112",
 					"host": [
 						"{{SCHEMA}}{{PATH}}"
 					],
@@ -288,7 +415,7 @@
 					"query": [
 						{
 							"key": "shipcall_id",
-							"value": "3"
+							"value": "112"
 						}
 					]
 				}
@@ -348,7 +475,12 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"start_planned\" : \"2023-05-18T07:18:19\",\r\n    \"end_planned\" : \"2023-05-18T09:18:19\",        \r\n    \"id\" : 1\r\n}"
+					"raw": "{\r\n    \"etd_berth\" : \"2023-01-09T05:00:39\",        \r\n    \"id\" : 11,\r\n    \"participant_id\": 2,\r\n    \"remarks\": \"test 23\",\r\n    \"shipcall_id\" : 4,\r\n    \"pier_side\" : 0\r\n    \r\n}\r\n\r\n",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
 				},
 				"url": {
 					"raw": "{{SCHEMA}}{{PATH}}/times",
@@ -378,7 +510,7 @@
 				"method": "DELETE",
 				"header": [],
 				"url": {
-					"raw": "{{SCHEMA}}{{PATH}}/times?id=3",
+					"raw": "{{SCHEMA}}{{PATH}}/times?id=118",
 					"host": [
 						"{{SCHEMA}}{{PATH}}"
 					],
@@ -388,12 +520,43 @@
 					"query": [
 						{
 							"key": "id",
-							"value": "3"
+							"value": "118"
 						}
 					]
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "User PUT",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "PUT",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n    \"id\": 2,    \r\n    \"old_password\" : \"Gurkensalat\",\r\n    \"new_password\" : \"Hallowach\"\r\n}"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/user",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"user"
+					]
+				}
+			},
+			"response": []
 		}
 	],
 	"auth": {

From e687ca591c7b1798a6f9f52c60eb770de5f840c7 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 25 Jul 2024 09:37:36 +0200
Subject: [PATCH 7/9] Settings updated for test version

---
 misc/BreCalApi.cs                             |  8 ++--
 misc/BreCalApi.yaml                           |  4 +-
 src/BreCalClient/App.config                   |  4 +-
 src/BreCalClient/BreCalClient.csproj          |  2 +-
 .../PublishProfiles/ClickOnceProfile.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 68a9e32..b32a3e1 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 be9d091..02dcf7a 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 b42f599..e366ae1 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/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index 94aa26d..37f6209 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.4.0.0</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 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 fbf6fad..6f4dd6f 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -216,13 +216,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;
@@ -231,13 +231,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 1c478d35151cb9e3b66b5f8e829cf7f1daa451b7 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 25 Jul 2024 09:38:10 +0200
Subject: [PATCH 8/9] Bugfix for comparer when times value is null and
 DateTime.Now is inconsistent

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

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 734408d..475c8ac 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -817,14 +817,20 @@ namespace BreCalClient
                     {
                         if (x.Shipcall == null) return 0;
                         if (y.Shipcall == null) return 0;
-                        DateTime xDate = (x.Shipcall.Type == ShipcallType.Arrival) ? x.Eta ?? DateTime.Now : x.Etd ?? DateTime.Now;
+                        DateTime now = DateTime.Now;
+
+                        DateTime xDate = (x.Shipcall.Type == ShipcallType.Arrival) ? (x.Eta ?? now) : (x.Etd ?? now);
+
                         Times? xTimes = x.GetTimesForParticipantType(ParticipantType.AGENCY);
                         if(xTimes != null)
-                            xDate = (x.Shipcall.Type == ShipcallType.Arrival) ? xTimes.EtaBerth ?? DateTime.Now : xTimes.EtdBerth ?? DateTime.Now;
-                        DateTime yDate = (y.Shipcall.Type == ShipcallType.Arrival) ? y.Eta ?? DateTime.Now : y.Etd ?? DateTime.Now;
+                            xDate = (x.Shipcall.Type == ShipcallType.Arrival) ? (xTimes.EtaBerth ?? now) : (xTimes.EtdBerth ?? now);
+
+                        DateTime yDate = (y.Shipcall.Type == ShipcallType.Arrival) ? (y.Eta ?? now) : (y.Etd ?? now);
+
                         Times? yTimes = y.GetTimesForParticipantType(ParticipantType.AGENCY);
                         if (yTimes != null)
-                            yDate = (y.Shipcall.Type == ShipcallType.Arrival) ? yTimes.EtaBerth ?? DateTime.Now : yTimes.EtdBerth ?? DateTime.Now;
+                            yDate = (y.Shipcall.Type == ShipcallType.Arrival) ? (yTimes.EtaBerth ?? now) : (yTimes.EtdBerth ?? now);
+
                         return DateTime.Compare(xDate, yDate);
                     });
                     break;

From ec75d2c0a82889efef49adf9f37677768abf0244 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 25 Jul 2024 09:59:49 +0200
Subject: [PATCH 9/9] Updated settings for production version

---
 misc/BreCalApi.cs                             |  8 ++---
 misc/BreCalApi.yaml                           |  4 +--
 src/BreCalClient/App.config                   |  6 ++--
 src/BreCalClient/BreCalClient.csproj          |  2 +-
 .../Properties/Settings.Designer.cs           |  6 ++--
 src/BreCalClient/Properties/Settings.settings |  6 ++--
 src/BreCalClient/ShipcallControl.xaml         | 34 +++++++++----------
 src/BreCalClient/ShipcallControl.xaml.cs      | 24 ++++++-------
 src/RoleEditor/App.config                     |  2 +-
 src/Setup/Setup.vdproj                        | 22 ++++++++++--
 src/server/BreCal/local_db.py                 |  2 +-
 src/server/flaskapp.wsgi                      |  2 +-
 12 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index b32a3e1..9e94162 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", "Prod 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 02dcf7a..900b7e1 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: Prod 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 e366ae1..108b004 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/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 6f4dd6f..d6df2cc 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -25,7 +25,7 @@ namespace BreCalClient
         Participant? _terminal;
         Participant? _tug;
         Participant? _port_administration;
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));        
+        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
 
         #endregion
 
@@ -216,13 +216,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;
@@ -231,13 +231,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;
@@ -347,13 +347,13 @@ namespace BreCalClient
                             atdRowDefinition.Height = mooringTimes.Atd.HasValue ? new(15) : new(0);
 
                             if(mooringTimes.Ata.HasValue)
-                            {                                                                    
-                                labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm");                                                                
+                            {
+                                labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm");
                             }
 
                             if (mooringTimes.Atd.HasValue)
-                            {                                                                    
-                                labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm");                                
+                            {
+                                labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm");
                             }
 
                         }
@@ -372,7 +372,7 @@ namespace BreCalClient
                             this.imagePortAuthorityLocked.Visibility = (portAuthorityTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
                             lockTimeRowDefinition.Height = portAuthorityTimes.LockTime.HasValue ? new(15) : new(0);
                             if(portAuthorityTimes.LockTime.HasValue)
-                            {                                
+                            {
                                 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/Setup/Setup.vdproj b/src/Setup/Setup.vdproj
index f1498e5..7acdec0 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:{79B2385A-EA5E-4008-A190-7374F18BBA5E}"
+        "PackageCode" = "8:{084F8E83-0A68-4410-B23D-614BBA59227E}"
         "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.4.0"
         "Manufacturer" = "8:Informatikbüro Daniel Schick"
         "ARPHELPTELEPHONE" = "8:+49 (0) 421 - 38 48 27"
         "ARPHELPLINK" = "8:https://www.bsmd.de/"
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