Version increase for 1.1.6 QF1

The lamba used to filter out arrivals/Departures was all wrong.

misc/BreCalApi.cs

@@ -3582,7 +3582,7 @@ namespace BreCalClient.misc.Client
         {
             Proxy = null;
             UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
-            BasePath = "https://brecaldevel.bsmd-emswe.eu";
+            BasePath = "https://brecal.bsmd-emswe.eu";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
@@ -3590,7 +3590,7 @@ namespace BreCalClient.misc.Client
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://brecaldevel.bsmd-emswe.eu"},
+                        {"url", "https://brecal.bsmd-emswe.eu"},
                         {"description", "Test server hosted on vcup"},
                     }
                 }
@@ -3609,7 +3609,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://brecal.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");

misc/BreCalApi.yaml

@@ -13,7 +13,7 @@ info:
         url: "https://www.bsmd.de/license"
 
 servers:
-    - url: "https://brecaltest.bsmd-emswe.eu/"
+    - url: "https://brecal.bsmd-emswe.eu/"
       description: "Test server hosted on vcup"
 
 paths:

misc/version.txt

@@ -1 +1 @@
-1.1.1.0
+1.1.6.0

src/BreCalClient/App.config

@@ -11,16 +11,16 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#1D751F</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://brecaldevel.bsmd-emswe.eu</value>
+                <value>https://brecal.bsmd-emswe.eu</value>
             </setting>
         </BreCalClient.Properties.Settings>
     </applicationSettings>

src/BreCalClient/BreCalClient.csproj

@@ -8,12 +8,12 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.1.1.0</AssemblyVersion>
+    <AssemblyVersion>1.1.6.0</AssemblyVersion>
-    <FileVersion>1.1.1.0</FileVersion>
+    <FileVersion>1.1.6.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalDevelClient</AssemblyName>
+    <AssemblyName>BreCalClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

src/BreCalClient/MainWindow.xaml.cs

@@ -582,12 +582,45 @@ namespace BreCalClient
 
             if(sfm.EtaFrom != null)
             {
-                _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Eta < sfm.EtaFrom);
+                _ = this._visibleControlModels.RemoveAll(x =>
+                {
+                    Times? t = x.GetTimesForParticipantType(ParticipantType.AGENCY);                    
+                    switch (x.Shipcall?.Type)
+                    {
+                        case (int)Extensions.TypeEnum.Incoming:
+                            {                                
+                                if ((t != null) && t.EtaBerth.HasValue) return t.EtaBerth.Value < sfm.EtaFrom;
+                                return x.Shipcall?.Eta < sfm.EtaFrom;
+                            }                            
+                        default: // Shifting / Departing
+                            {
+                                if ((t != null) && t.EtdBerth.HasValue) return t.EtdBerth.Value < sfm.EtaFrom;
+                                return x.Shipcall?.Etd < sfm.EtaFrom;
+                            }
+                    }
+                });
             }
 
             if(sfm.EtaTo != null)
             {
-                _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Eta > sfm.EtaTo);
+                _ = this._visibleControlModels.RemoveAll(x =>
+                {
+                    Times? t = x.GetTimesForParticipantType(ParticipantType.AGENCY);
+                    DateTime refValue = sfm.EtaTo.Value.AddMinutes(1439); // 23:59
+                    switch (x.Shipcall?.Type)
+                    {                        
+                        case (int)Extensions.TypeEnum.Incoming:
+                            {
+                            if ((t != null) && t.EtaBerth.HasValue) return t.EtaBerth.Value > refValue;
+                            return x.Shipcall?.Eta > refValue;
+                        }
+                        default: // Shifting / Departing
+                            {
+                            if ((t != null) && t.EtdBerth.HasValue) return t.EtdBerth.Value > refValue;
+                            return x.Shipcall?.Etd > refValue;
+                        }
+                    }
+                });                
             }
 
             if(!_showCanceled ?? true) // canceled calls are filtered by default

src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>6.0</ApplicationVersion>
+    <ApplicationVersion>1.1.6.1</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
@@ -39,7 +39,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SuiteName>Bremen calling client</SuiteName>
     <SupportUrl>https://www.bsmd-emswe.eu/</SupportUrl>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SkipPublishVerification>false</SkipPublishVerification>
   </PropertyGroup>
   <ItemGroup>
     <PublishFile Include="containership.ico">

src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.1.0.*</ApplicationVersion>
+    <ApplicationVersion>1.1.6.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>

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.7.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("#203864")]
         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://brecal.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")]

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)">#203864</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
       <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>

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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
+             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=BreCalClient"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
         <Grid>
@@ -45,7 +45,7 @@
                         <ColumnDefinition Width="32" />
                     </Grid.ColumnDefinitions>
                     <Image Margin="2" Grid.Column="0" PreviewMouseUp="Image_PreviewMouseUp" x:Name="imageShipcallType" />
-                    <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+                    <Label Grid.Column="1" 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>
@@ -83,23 +83,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">
@@ -113,7 +113,7 @@
                         <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"/>
                     <Label Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>

src/BreCalClient/ShipcallControl.xaml.cs

@@ -1,6 +1,6 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Show general shipcall info
-// 
+//
 
 using BreCalClient.misc.Model;
 using log4net;
@@ -53,7 +53,7 @@ namespace BreCalClient
         /// <summary>
         /// this is our datasource
         /// </summary>
-        public ShipcallControlModel? ShipcallControlModel { get; set; }        
+        public ShipcallControlModel? ShipcallControlModel { get; set; }
 
         #endregion
 
@@ -131,7 +131,7 @@ namespace BreCalClient
                     {
                         this.labelTerminal.FontWeight = FontWeights.Bold;
                         this.labelTerminal.Foreground = Brushes.LightYellow;
-                    } 
+                    }
                     else
                     {
                         this.labelTerminal.FontWeight = FontWeights.Normal;
@@ -210,13 +210,13 @@ namespace BreCalClient
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
                         case 1: // 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:,,,/BreCalClient;component/Resources/arrow_down_red.png"));
                             break;
                         case 2: // 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:,,,/BreCalClient;component/Resources/arrow_up_blue.png"));
                             break;
                         case 3: // 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:,,,/BreCalClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -225,13 +225,13 @@ namespace BreCalClient
                     switch(this.ShipcallControlModel?.LightMode)
                     {
                         case ShipcallControlModel.TrafficLightMode.GREEN:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/check.png"));
                             break;
                         case ShipcallControlModel.TrafficLightMode.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:,,,/BreCalClient;component/Resources/sign_warning.png"));
                             break;
                         case ShipcallControlModel.TrafficLightMode.RED:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
@@ -274,7 +274,7 @@ namespace BreCalClient
 
                     this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
                     this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
-                    if (this.ShipcallControlModel?.Shipcall?.Type == 1) 
+                    if (this.ShipcallControlModel?.Shipcall?.Type == 1)
                     {
                         this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta?.ToString("dd.MM. HH:mm");
                     }
@@ -287,7 +287,7 @@ namespace BreCalClient
                     this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
                     this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";
 
-                    // rename labels if this is not an incoming 
+                    // rename labels if this is not an incoming
                     // must be here because there may not be a times record for each participant (yet)
 
                     if (this.ShipcallControlModel?.Shipcall?.Type != 1)
@@ -301,7 +301,7 @@ namespace BreCalClient
                     }
 
                     if (this.ShipcallControlModel != null)
-                    {                        
+                    {
 
                         Times? agencyTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
                         if (agencyTimes != null)
@@ -314,7 +314,7 @@ namespace BreCalClient
                             {
                                 this.labelAgencyETAETDValue.Content = agencyTimes.EtdBerth.HasValue ? agencyTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
                             }
-                        } 
+                        }
                         else
                         {
                             // no agency times set (yet)
@@ -408,7 +408,7 @@ namespace BreCalClient
                             this.textBlockTerminalRemarks.Text = "";
                             this.textBlockTerminalBerthRemarks.Text = "";
                         }
-                        
+
                     }
                     this.DataContext = this.ShipcallControlModel;
                 }
@@ -432,7 +432,7 @@ namespace BreCalClient
         {
             if(App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD))
                 this.EditRequested?.Invoke(this);
-        }                
+        }
 
         private void Image_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
@@ -440,10 +440,10 @@ namespace BreCalClient
         }
 
         private void labelAgent_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {            
+        {
             Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
-            this.EditAgencyRequested?.Invoke(this, times);            
+            this.EditAgencyRequested?.Invoke(this, times);
-        }        
+        }
 
         private void labelMooring_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
@@ -453,7 +453,7 @@ namespace BreCalClient
 
         private void labelPortAuthority_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
-            Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);                
+            Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);
             this.EditTimesRequested?.Invoke(this, times, Extensions.ParticipantType.PORT_ADMINISTRATION);
         }
 

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;Port=33306</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>

src/server/BreCal/__init__.py

@@ -61,7 +61,7 @@ def create_app(test_config=None):
     app.register_blueprint(user.bp)
 
 
-    logging.basicConfig(filename='brecaldevel.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
+    logging.basicConfig(filename='brecal.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')
 
@@ -73,8 +73,8 @@ def create_app(test_config=None):
     return app
 
 __all__ = [
-    "get_project_root", 
+    "get_project_root",
-    "ensure_path", 
+    "ensure_path",
     "execute_test_with_pytest",
     "execute_coverage_test",
     "difference_to_then",

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_prod.json');
 
         print (config_path)
 

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/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 import schedule

src/server/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='BreCal',
-    version='1.1.1',
+    version='1.1.6',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,