Fixing installer for webview2 by frizzeling around with the right installation path

.gitignore

@@ -159,7 +159,7 @@ MANIFEST
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
+# *.manifest
 *.spec
 
 # Installer logs

misc/BreCalApi.cs

@@ -4971,7 +4971,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>();
@@ -4979,7 +4979,7 @@ namespace BreCalClient.misc.Client
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://brecaldevel.bsmd-emswe.eu"},
+                        {"url", "https://brecal.bsmd-emswe.eu"},
                         {"description", "Development server hosted on vcup"},
                     }
                 }
@@ -4998,7 +4998,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

@@ -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://brecal.bsmd-emswe.eu'
+    description: Test server hosted on vcup
 tags:
   - name: user
   - name: shipcall

misc/version.txt

@@ -1 +1 @@
-1.6.0.4
+1.6.2.1

src/BreCalClient/App.config

@@ -29,16 +29,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,13 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.6.0.4</AssemblyVersion>
-    <FileVersion>1.6.0.4</FileVersion>
+    <AssemblyVersion>1.6.7.0</AssemblyVersion>
+    <FileVersion>1.6.7.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>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>
@@ -50,6 +51,7 @@
     <None Remove="Resources\trafficlight_yellow.png" />
     <None Remove="Resources\umbrella_closed.png" />
     <None Remove="Resources\umbrella_open.png" />
+    <None Remove="Resources\window_size.png" />
     <None Remove="Resources\worker2.png" />
   </ItemGroup>
 
@@ -112,16 +114,18 @@
     <Resource Include="Resources\trafficlight_yellow.png" />
     <Resource Include="Resources\umbrella_closed.png" />
     <Resource Include="Resources\umbrella_open.png" />
+    <Resource Include="Resources\window_size.png" />
     <Resource Include="Resources\worker2.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.1" />
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.7.25104.5739" />
     <PackageReference Include="JsonSubTypes" Version="2.0.1" />
-    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="log4net" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3240.44" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Polly" Version="8.4.1" />
-    <PackageReference Include="RestSharp" Version="112.0.0" />
+    <PackageReference Include="Polly" Version="8.5.2" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/BreCalClient/EditShipcallControl.xaml.cs

@@ -42,13 +42,14 @@ namespace BreCalClient
 
         public ShipApi? ShipApi { get; set; }
 
+        public bool IsCreate { get; set; } = false;
+
         #endregion
 
         #region Event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {         
-            this.comboBoxAgency.ItemsSource = BreCalLists.Participants_Agent;
 
             this.comboBoxShip.ItemsSource = BreCalLists.Ships;
             Array types = Enum.GetValues(typeof(ShipcallType));
@@ -60,9 +61,6 @@ namespace BreCalClient
                 else first = false;
             }            
 
-            this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
-            this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
-
             this.comboBoxTimeRef.ItemsSource = BreCalLists.TimeRefs;
             this.comboBoxHarbour.ItemsSource = BreCalLists.Ports.Where(x => App.Participant.Ports.Contains(x.Id));
 
@@ -190,6 +188,8 @@ namespace BreCalClient
 
         void CheckForCompletion()
         {
+            if (this.ShipcallModel.Shipcall?.Canceled ?? false) return; // Cancelled shipcall never clicks ok
+
             bool isEnabled = true;
 
             isEnabled &= this.comboBoxShip.SelectedItem != null;
@@ -325,7 +325,7 @@ namespace BreCalClient
                 this.comboBoxCategories.SelectedItem = new EnumToStringConverter().Convert(this.ShipcallModel.Shipcall.Type, typeof(ShipcallType), new object(), System.Globalization.CultureInfo.CurrentCulture);
                 if (this.ShipcallModel.Shipcall.Eta != DateTime.MinValue)
                     this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;               
-                // this.textBoxVoyage.Text = this.ShipcallModel.Shipcall.Voyage;
+
                 this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
                 if (BreCalLists.Ships.Find(x => x.Ship.Id == this.ShipcallModel.Shipcall.ShipId) != null)
                 {
@@ -336,6 +336,16 @@ namespace BreCalClient
                 }
                 this.checkBoxCancelled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
 
+                if (BreCalLists.PortLookupDict.ContainsKey(this.ShipcallModel.Shipcall.PortId))
+                    this.comboBoxHarbour.SelectedValue = this.ShipcallModel.Shipcall.PortId;
+                List<Berth> availableBerths = BreCalLists.GetBerthsByPort(this.ShipcallModel.Shipcall.PortId);                
+                this.comboBoxArrivalBerth.ItemsSource = availableBerths;                
+                this.comboBoxDepartureBerth.ItemsSource = availableBerths;
+
+                // Filter agency combobox by port
+                List<Participant> availableAgencies = BreCalLists.GetParticipants(this.ShipcallModel.Shipcall.PortId, ParticipantType.AGENCY);                
+                this.comboBoxAgency.ItemsSource = availableAgencies;
+
                 if (this.ShipcallModel.Shipcall.Type != ShipcallType.Shifting) // incoming, outgoing
                 {
                     this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
@@ -357,8 +367,6 @@ namespace BreCalClient
                     }
                 }
                                 
-                if (BreCalLists.PortLookupDict.ContainsKey(this.ShipcallModel.Shipcall.PortId))
-                    this.comboBoxHarbour.SelectedValue = this.ShipcallModel.Shipcall.PortId;
                 this.comboBoxHarbour.SelectionChanged += this.comboBoxHarbour_SelectionChanged;
 
                 this.comboBoxHarbour.IsEnabled = this.ShipcallModel.AllowPortChange;
@@ -372,6 +380,8 @@ namespace BreCalClient
 
             bool editRightGrantedForBSMD = false;
 
+            if (this.ShipcallModel.Shipcall?.Canceled ?? false) return; // do not allow edit on canceled shipcall
+
             // Special case: Selected Agency allows BSMD to edit their fields
             if (this.comboBoxAgency.SelectedIndex >= 0)
             {
@@ -395,6 +405,7 @@ namespace BreCalClient
             this.datePickerETD.IsEnabled = isAgency || isBsmd;
 
             this.labelBSMDGranted.Visibility = editRightGrantedForBSMD ? Visibility.Visible : Visibility.Hidden;
+            this.comboBoxHarbour.IsEnabled = this.IsCreate && this.ShipcallModel.AllowPortChange;
 
             this.comboBoxCategories_SelectionChanged(null, null);
         }

src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs

@@ -366,7 +366,7 @@ namespace BreCalClient
 
         private void CheckOKButton()
         {
-            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet();
+            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet() && !(this.ShipcallModel.Shipcall?.Canceled ?? false);
         }
 
         #endregion

src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs

@@ -356,7 +356,7 @@ namespace BreCalClient
 
         private void CheckOKButton()
         {
-            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet();
+            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet() && !(this.ShipcallModel.Shipcall?.Canceled ?? false);
         }
 
         #endregion

src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs

@@ -394,7 +394,7 @@ namespace BreCalClient
 
         private void CheckOKButton()
         {
-            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet();
+            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet() && !(this.ShipcallModel.Shipcall?.Canceled ?? false);
         }
 
         #endregion

src/BreCalClient/EditTimesControl.xaml.cs

@@ -173,13 +173,13 @@ namespace BreCalClient
         {
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.datePickerETABerth.Value = this.Times.EtaBerth;
-            if(this.datePickerETABerth.IsEnabled && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaBerth != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) && (this.AgencyTimes?.EtaBerth > DateTime.Now))
+            if(this.datePickerETABerth.IsEnabled && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaBerth != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) && (this.AgencyTimes?.EtaBerth > DateTime.Now.AddDays(-1)))
             {
                 this.datePickerETABerth.Value = this.AgencyTimes.EtaBerth;
                 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.AgencyTimes?.EtdBerth > DateTime.Now))
+            if(this.datePickerETDBerth.IsEnabled && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdBerth != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)) && (this.AgencyTimes?.EtdBerth > DateTime.Now.AddDays(-1)))
             {
                 this.datePickerETDBerth.Value = this.AgencyTimes.EtdBerth;
                 if (this.datePickerETDBerth.Template.FindName("PART_TextBox", this.datePickerETDBerth) is WatermarkTextBox tb) tb.SelectAll();
@@ -190,14 +190,14 @@ namespace BreCalClient
             this.datePickerATA.Value = this.Times.Ata;
             this.datePickerATD.Value = this.Times.Atd;
             this.datePickerETABerth_End.Value = this.Times.EtaIntervalEnd;
-            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) && (this.AgencyTimes?.EtaBerth > DateTime.Now.AddDays(-1)))
             {
                 this.datePickerETABerth_End.Value = this.AgencyTimes.EtaIntervalEnd;
                 //if (this.datePickerETABerth_End.Template.FindName("PART_TextBox", this.datePickerETABerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
             }
 
             this.datePickerETDBerth_End.Value = this.Times.EtdIntervalEnd;
-            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)) && (this.AgencyTimes?.EtdBerth > DateTime.Now.AddDays(-1)))
             {
                 this.datePickerETDBerth_End.Value = this.AgencyTimes.EtdIntervalEnd;
                 //if (this.datePickerETDBerth_End.Template.FindName("PART_TextBox", this.datePickerETDBerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
@@ -259,7 +259,7 @@ namespace BreCalClient
 
             // setting en/dis-abled
 
-            if (this.Times.ParticipantId != App.Participant.Id)
+            if ((this.Times.ParticipantId != App.Participant.Id) || (this.ShipcallModel.Shipcall?.Canceled ?? false))
             {
                 this.buttonFixedOrder.IsEnabled = false;
                 this.buttonOK.IsEnabled = false;

src/BreCalClient/EditTimesTerminalControl.xaml.cs

@@ -217,7 +217,7 @@ namespace BreCalClient
 
         private void EnableControls()
         {
-            if (this.Times.ParticipantId != App.Participant.Id)
+            if ((this.Times.ParticipantId != App.Participant.Id) || (this.ShipcallModel.Shipcall?.Canceled ?? false))
             {
                 this.buttonOK.IsEnabled = false;
                 return;

src/BreCalClient/MainWindow.xaml

@@ -97,6 +97,7 @@
                     <ColumnDefinition Width=".15*" />
                     <ColumnDefinition Width=".15*" />
                     <ColumnDefinition Width=".15*" />
+                    <ColumnDefinition Width=".15*" />
                 </Grid.ColumnDefinitions>
                 <Label Grid.Column="0" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
                 <Label Grid.Column="1" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textAgency}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
@@ -105,6 +106,7 @@
                 <Label Grid.Column="4" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textPilots}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
                 <Label Grid.Column="5" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textTug}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
                 <Label Grid.Column="6" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textTerminal}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="7" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textPosition}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
             </Grid>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto">
                 <StackPanel x:Name="stackPanel"/>

src/BreCalClient/MainWindow.xaml.cs

@@ -169,14 +169,24 @@ namespace BreCalClient
                     if (_loginResult.Id > 0)
                     {
                         Mouse.OverrideCursor = Cursors.Wait;                        
-                        this.busyIndicator.IsBusy = false;
                         this._userApi.Configuration.ApiKey["Authorization"] = _loginResult.Token;
                         this._shipcallApi.Configuration.ApiKey["Authorization"] = _loginResult.Token;
                         this._timesApi.Configuration.ApiKey["Authorization"] = _loginResult.Token;
                         this._staticApi.Configuration.ApiKey["Authorization"] = _loginResult.Token;
                         this._shipApi.Configuration.ApiKey["Authorization"] = _loginResult.Token;
-                        this.LoadStaticLists();
-                        this.labelUsername.Text = $"{_loginResult.FirstName} {_loginResult.LastName}";
+                        bool loadingSuccessful = await this.LoadStaticLists();
+                        if (loadingSuccessful)
+                        {
+                            this.labelUsername.Text = $"{_loginResult.FirstName} {_loginResult.LastName}";
+                            this.busyIndicator.IsBusy = false;
+                        } 
+                        else
+                        {
+                            Mouse.OverrideCursor = null;
+                            textUsername.Text = "";
+                            textPassword.Password = "";
+                            textUsername.Focus();
+                        }
                     }
                 }
                 labelGeneralStatus.Text = $"Connection {ConnectionStatus.SUCCESSFUL}";
@@ -247,7 +257,8 @@ namespace BreCalClient
             EditShipcallControl esc = new()
             {
                 ShipEditingEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD),
-                ShipApi = _shipApi
+                ShipApi = _shipApi,
+                IsCreate = true
             };
             if (model != null)
                 esc.ShipcallModel = model;
@@ -373,8 +384,18 @@ namespace BreCalClient
         private void comboBoxPorts_ItemSelectionChanged(object sender, Xceed.Wpf.Toolkit.Primitives.ItemSelectionChangedEventArgs e)
         {
             this.searchFilterControl.SearchFilter.Ports.Clear();
+
+            List<Berth> berths = new List<Berth>();
             foreach (Port port in comboBoxPorts.SelectedItems)
+            {
                 this.searchFilterControl.SearchFilter.Ports.Add(port.Id);
+                berths.AddRange(BreCalLists.GetBerthsByPort(port.Id));
+            }
+            // create list of berths from selected port(s) or return all berths
+            if (berths.Count == 0)
+                berths = BreCalLists.AllBerths;
+            this.searchFilterControl.SetBerths(berths);
+
             this.SearchFilterControl_SearchFilterChanged();
         }
 
@@ -417,15 +438,22 @@ namespace BreCalClient
 
         #region network operations
 
-        private async void LoadStaticLists()
+        private async Task<bool> LoadStaticLists()
         {
-            if (_loginResult == null) return;
+            if (_loginResult == null) return false;
 
             BreCalLists.InitializePorts(await _staticApi.GetPortsAsync());
             BreCalLists.InitializeBerths(await _staticApi.BerthsGetAsync());
             BreCalLists.InitializeShips(await _shipApi.ShipsGetAsync());
             BreCalLists.InitializeParticipants(await _staticApi.ParticipantsGetAsync());
 
+            if(BreCalLists.Participants.Count == 0)
+            {
+                MessageBox.Show(BreCalClient.Resources.Resources.textNoPortAssigned, BreCalClient.Resources.Resources.textError, MessageBoxButton.OK, MessageBoxImage.Error);
+                Mouse.OverrideCursor = Cursors.Wait;
+                return false;
+            }
+
             this.searchFilterControl.SetBerths(BreCalLists.Berths);
 
             foreach (Participant participant in BreCalLists.Participants)
@@ -462,7 +490,7 @@ namespace BreCalClient
                 }
                 this.searchFilterControl.SetFilterFromModel(currentFilter);
 
-                if (currentFilter.Ports != null)
+                if ((currentFilter.Ports != null) && (this.comboBoxPorts.ItemsSource != null))
                 {
                     foreach (Port p in this.comboBoxPorts.ItemsSource)
                     {
@@ -474,6 +502,7 @@ namespace BreCalClient
             _ = Task.Run(() => RefreshShipcalls());
             _ = Task.Run(() => RefreshShips());
 
+            return true;
         }
 
 

src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.0</ApplicationVersion>
+    <ApplicationRevision>8</ApplicationRevision>
+    <ApplicationVersion>1.6.1.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
@@ -30,7 +30,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>net6.0-windows</TargetFramework>
     <UpdateEnabled>True</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
-    <UpdateRequired>False</UpdateRequired>
+    <UpdateRequired>True</UpdateRequired>
     <WebPageFileName>Publish.html</WebPageFileName>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
     <ErrorReportUrl>https://www.bsmd-emswe.eu/</ErrorReportUrl>
@@ -40,6 +40,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SupportUrl>https://www.bsmd-emswe.eu/</SupportUrl>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SkipPublishVerification>false</SkipPublishVerification>
+    <MinimumRequiredVersion>1.6.1.0</MinimumRequiredVersion>
   </PropertyGroup>
   <ItemGroup>
     <PublishFile Include="containership.ico">

src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.6.0.3</ApplicationVersion>
+    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationVersion>1.6.0.8</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
@@ -30,7 +30,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>net6.0-windows</TargetFramework>
     <UpdateEnabled>True</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
-    <UpdateRequired>False</UpdateRequired>
+    <UpdateRequired>True</UpdateRequired>
     <WebPageFileName>Publish.html</WebPageFileName>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
     <ErrorReportUrl>https://www.bsmd-emswe.eu/</ErrorReportUrl>
@@ -40,6 +40,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SupportUrl>http://www.textbausteine.net/</SupportUrl>
     <PublishDir>bin\Debug\net6.0-windows\win-x64\app.publish\</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SkipPublishVerification>false</SkipPublishVerification>
+    <MinimumRequiredVersion>1.6.0.8</MinimumRequiredVersion>
   </PropertyGroup>
   <ItemGroup>
     <PublishFile Include="containership.ico">

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("#1D751F")]
+        [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://brecaldevel.bsmd-emswe.eu")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")]
         public string API_URL {
             get {
                 return ((string)(this["API_URL"]));

src/BreCalClient/Properties/Settings.settings

@@ -3,10 +3,10 @@
   <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>
+      <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://brecaldevel.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>

src/BreCalClient/Resources/Resources.Designer.cs

@@ -596,6 +596,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Draft.
+        /// </summary>
+        public static string textDraftNoUnit {
+            get {
+                return ResourceManager.GetString("textDraftNoUnit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit.
         /// </summary>
@@ -875,6 +884,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to No port assigned to this participant.
+        /// </summary>
+        public static string textNoPortAssigned {
+            get {
+                return ResourceManager.GetString("textNoPortAssigned", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Not rotated.
         /// </summary>
@@ -1055,6 +1073,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Position.
+        /// </summary>
+        public static string textPosition {
+            get {
+                return ResourceManager.GetString("textPosition", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rain sensitive cargo.
         /// </summary>
@@ -1531,6 +1558,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] window_size {
+            get {
+                object obj = ResourceManager.GetObject("window_size", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>

src/BreCalClient/Resources/Resources.de.resx

@@ -235,6 +235,9 @@
   <data name="textDraft" xml:space="preserve">
     <value>Tiefgang (m)</value>
   </data>
+  <data name="textDraftNoUnit" xml:space="preserve">
+    <value>Tiefgang</value>
+  </data>
   <data name="textEdit" xml:space="preserve">
     <value>Bearbeiten</value>
   </data>
@@ -286,6 +289,9 @@
   <data name="textFrom" xml:space="preserve">
     <value>von</value>
   </data>
+  <data name="textHarbour" xml:space="preserve">
+    <value>Hafen</value>
+  </data>
   <data name="textIncoming" xml:space="preserve">
     <value>Einkommend</value>
   </data>
@@ -547,55 +553,13 @@
   <data name="arrow_up_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="textShiftingSequence" xml:space="preserve">
-    <value>Verhol. Nr.</value>
-  </data>
-  <data name="textClearAll" xml:space="preserve">
-    <value>Alle Eintragungen zurücksetzen?</value>
-  </data>
-  <data name="textBothTideTimesNecessary" xml:space="preserve">
-    <value>Beide Tidenzeiten sollten angegeben werden (von - bis)</value>
-  </data>
-  <data name="textEndValueBeforeStartValue" xml:space="preserve">
-    <value>Endzeit liegt vor Startzeit</value>
-  </data>
-  <data name="textError" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="textETAInThePast" xml:space="preserve">
-    <value>Zeitpunkt ETA liegt in der Vergangenheit</value>
-  </data>
-  <data name="textETDInThePast" xml:space="preserve">
-    <value>Zeitpunkt ETD liegt in der Vergangenheit</value>
-  </data>
-  <data name="textLockTimeInThePast" xml:space="preserve">
-    <value>Schleusenzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textOperationEndInThePast" xml:space="preserve">
-    <value>Operation Endzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textOperationStartInThePast" xml:space="preserve">
-    <value>Operation Startzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textTideTimesInThePast" xml:space="preserve">
-    <value>Tidenzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textWarning" xml:space="preserve">
-    <value>Warnung</value>
-  </data>
-  <data name="textZoneEntryInThePast" xml:space="preserve">
-    <value>Zeit Reviereintritt liegt in der Vergangenheit</value>
-  </data>
-  <data name="textTidalBothValues" xml:space="preserve">
-    <value>Für das Tidenfenster müssen beide Zeiten angegeben werden</value>
-  </data>
-	<data name="textTooFarInTheFuture" xml:space="preserve">
-    <value>Eine Zeiteingabe ist zu weit in der Zukunft</value>
-  </data>
   <data name="textStartTimeMissing" xml:space="preserve">
     <value>Wenn eine Ende-Zeit angegeben wird, muss auch eine Start-Zeit angegeben werden</value>
   </data>
-  <data name="textHarbour" xml:space="preserve">
-    <value>Hafen</value>
+  <data name="textNoPortAssigned" xml:space="preserve">
+    <value>Es ist keine Hafenzuordnung vorhanden</value>
+  </data>
+  <data name="textPosition" xml:space="preserve">
+    <value>Position</value>
   </data>
 </root>

src/BreCalClient/Resources/Resources.resx

@@ -601,4 +601,16 @@
   <data name="textStartTimeMissing" xml:space="preserve">
     <value>If an end time is set, a start time is also required</value>
   </data>
+  <data name="textNoPortAssigned" xml:space="preserve">
+    <value>No port assigned to this participant</value>
+  </data>
+  <data name="textPosition" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="window_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>window_size.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="textDraftNoUnit" xml:space="preserve">
+    <value>Draft</value>
+  </data>
 </root>

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=BreCalClient"
              mc:Ignorable="d"
              d:DesignHeight="135" d:DesignWidth="800">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
@@ -18,6 +18,7 @@
                 <ColumnDefinition Width=".15*" />
                 <ColumnDefinition Width=".15*" />
                 <ColumnDefinition Width=".15*" />
+                <ColumnDefinition Width=".15*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="42" />
@@ -29,7 +30,6 @@
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
-
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
@@ -64,17 +64,17 @@
                     <TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
                 <Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textCallsign}" />
-                </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockCallsign" Padding="0"/>
-                </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
+                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
+                    <TextBlock Text="{x:Static p:Resources.textDraftNoUnit}" />
+                </Viewbox>
+                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockDraft" Padding="0"/>
+                </Viewbox>
                 <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
@@ -90,7 +90,6 @@
                 <Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
-
             </Grid>
             <Grid Grid.Row="0" Grid.Column="1">
                 <Grid.RowDefinitions>
@@ -282,6 +281,17 @@
                     <TextBlock Grid.Row="3" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTerminalBerthRemarks"  FontSize="10"/>
                 </Grid>
             </Border>
+            <!-- TERMINAL -->
+            <Border Grid.Row="0" Grid.RowSpan="3" Grid.Column="7" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="16" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid x:Name="buttonPanel" Grid.Row="0" />
+                    <Grid x:Name="placeHolderMap" Grid.Row="1" />
+                </Grid>
+            </Border>
         </Grid>
     </Border>
 </UserControl>

src/BreCalClient/ShipcallControl.xaml.cs

@@ -4,7 +4,12 @@
 
 using BreCalClient.misc.Model;
 using log4net;
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
 using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -26,6 +31,7 @@ namespace BreCalClient
         Participant? _tug;
         Participant? _port_administration;
         private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
+        private WebView2? _webView = null;
 
         #endregion
 
@@ -59,7 +65,7 @@ namespace BreCalClient
 
         #region public methods
 
-        public void RefreshData()
+        public async void RefreshData()
         {
             try
             {
@@ -215,13 +221,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:,,,/BreCalClient;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:,,,/BreCalClient;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:,,,/BreCalClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -230,13 +236,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:,,,/BreCalClient;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:,,,/BreCalClient;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:,,,/BreCalClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
@@ -269,7 +275,7 @@ namespace BreCalClient
                         this.imageEvaluation.ToolTip = null;
 
                     this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
-                    this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
+                    this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1")} m" : "-";
                     this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
 
                     this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
@@ -508,6 +514,90 @@ namespace BreCalClient
 
                     }
                     this.DataContext = this.ShipcallControlModel;
+
+                    // initialize Map if eta is close to current time
+
+                    DateTime? refTime = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? this.ShipcallControlModel?.Eta : this.ShipcallControlModel?.Etd;
+                    if (refTime.HasValue)
+                    {
+                        if ((refTime.Value > DateTime.Now.AddDays(-1)) && refTime.Value < DateTime.Now.AddDays(2))
+                        {
+                            if(this._webView == null)
+                            {
+                                _webView = new WebView2();
+                                
+                                Button popOutButton = new()
+                                {
+                                    Width = 16,
+                                    Height = 16,
+                                    Content = new Image
+                                    {
+                                        Source = new BitmapImage(new Uri("Resources/window_size.png", UriKind.Relative))
+                                    },
+                                    HorizontalAlignment = HorizontalAlignment.Left,
+                                    VerticalAlignment = VerticalAlignment.Top
+                                };
+                                popOutButton.Click += (o, e) =>
+                                {
+                                    System.Diagnostics.Trace.WriteLine("Popout button clicked");
+                                    var pop = new Window
+                                    {
+                                        Title = "Detail map",
+                                        Width = 800,
+                                        Height = 600
+                                    };
+
+                                    this.placeHolderMap.Children.Remove(_webView);
+                                    pop.Content = _webView;
+
+                                    pop.Closing += (s, a) =>
+                                    {
+                                        pop.Content = null;
+                                        this.placeHolderMap.Children.Add(_webView);
+                                        popOutButton.IsEnabled = true;
+                                    };
+
+                                    pop.Show();
+
+                                    popOutButton.IsEnabled = false;
+                                };
+
+                                string trenzUri = $"https://aismap.trenz.de/Live/StaticDemo.aspx?site=bsmd&Zoom=13&api=usgPcOPJnvTWUPTVbfVs&apikey=demo-H6cE4SG0FG&imo={this.ShipcallControlModel?.Ship?.Imo}";
+
+                                string userDataFolder = Path.Combine(
+                                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                                    "BreCalClient", "WebView2");
+
+                                await Dispatcher.InvokeAsync(async () => {
+                                                                       
+                                    buttonPanel.Children.Add(popOutButton);
+                                    placeHolderMap.Children.Add(_webView);
+
+                                    _webView.CoreWebView2InitializationCompleted += (s, e) =>
+                                    {
+                                        if (!e.IsSuccess)
+                                        {
+                                            MessageBox.Show($"WebView2 initialization failed: {e.InitializationException.Message}");
+                                            return;
+                                        }
+                                        _webView.Source = new Uri(trenzUri);
+                                    };
+
+                                    try
+                                    {
+                                        var env = await CoreWebView2Environment.CreateAsync(null, userDataFolder);
+                                        await _webView.EnsureCoreWebView2Async(env);                                        
+                                    }
+                                    catch(Exception ex)
+                                    {
+                                        MessageBox.Show($"EnsureCoreWebView2Async threw:: {ex.Message}");
+                                    }
+                                                                                                           
+                                });
+                            }
+
+                        }
+                    }
                 }
             }
             catch (Exception ex)

src/BreCalClient/app.manifest

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. 
+       
+       Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>

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>

src/RoleEditor/Properties/Settings.Designer.cs

@@ -26,7 +26,7 @@ namespace RoleEditor.Properties {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_" +
-            "devel;Port=33306")]
+            "test;Port=33306")]
         public string ConnectionString {
             get {
                 return ((string)(this["ConnectionString"]));

src/RoleEditor/Properties/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="ConnectionString" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_devel;Port=33306</Value>
+      <Value Profile="(Default)">Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306</Value>
     </Setting>
   </Settings>
 </SettingsFile>

src/Setup/Setup.vdproj

@@ -13,6 +13,12 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_1E7663DCE02A4D848349229A724E961A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_3E48B6E716164CC1826E094025517B3F"
@@ -25,6 +31,30 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_CD20A468610C42B89F66B4D3367A5A6A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_E125FEFD1B0A4E82A92EB7C037145E1F"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_CD20A468610C42B89F66B4D3367A5A6A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_1E7663DCE02A4D848349229A724E961A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -43,6 +73,22 @@
         "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:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
+                    {
+                    "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.7.2"
+                    }
+                }
+            }
         }
         "Release"
         {
@@ -59,6 +105,22 @@
         "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:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
+                    {
+                    "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.7.2"
+                    }
+                }
+            }
         }
     }
     "Deployable"
@@ -76,6 +138,14 @@
         {
             "LaunchCondition"
             {
+                "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_3415D375792A4611BF998D78F56CD22C"
+                {
+                "Name" = "8:.NET Framework"
+                "Message" = "8:[VSDNETMSG]"
+                "FrameworkVersion" = "8:.NETFramework,Version=v4.7.2"
+                "AllowLaterVersions" = "11:FALSE"
+                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262"
+                }
                 "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_7C5ED856EDF94532A041DBACD5D5C09E"
                 {
                 "Name" = "8:.NET Core"
@@ -90,6 +160,37 @@
         }
         "File"
         {
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1E7663DCE02A4D848349229A724E961A"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Xceed.Wpf.AvalonDock.resources, Version=4.7.0.0, Culture=de, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_1E7663DCE02A4D848349229A724E961A"
+                    {
+                    "Name" = "8:Xceed.Wpf.AvalonDock.resources.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:..\\BreCalClient\\bin\\Debug\\net6.0-windows\\de\\Xceed.Wpf.AvalonDock.resources.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F64284776BC0480CBF6C33B1FE00C374"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EE484EAA4A246CBBB283030A6054BC0"
             {
             "SourcePath" = "8:..\\BreCalClient\\Resources\\containership.ico"
@@ -110,6 +211,57 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CD20A468610C42B89F66B4D3367A5A6A"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:BreCalClient.resources, Version=1.6.5.0, Culture=de, PublicKeyToken=9ce7b6b354e08ac9, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_CD20A468610C42B89F66B4D3367A5A6A"
+                    {
+                    "Name" = "8:BreCalClient.resources.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:..\\BreCalClient\\bin\\Debug\\net6.0-windows\\de\\BreCalClient.resources.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F64284776BC0480CBF6C33B1FE00C374"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E125FEFD1B0A4E82A92EB7C037145E1F"
+            {
+            "SourcePath" = "8:..\\BreCalClient\\bin\\Release\\net6.0-windows\\runtimes\\win-x64\\native\\WebView2Loader.dll"
+            "TargetName" = "8:WebView2Loader.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_7C8F7547CED64B3CAE7D0296A8BCE23F"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -137,6 +289,17 @@
             "Property" = "8:TARGETDIR"
                 "Folders"
                 {
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_F64284776BC0480CBF6C33B1FE00C374"
+                    {
+                    "Name" = "8:de"
+                    "AlwaysCreate" = "11:FALSE"
+                    "Condition" = "8:"
+                    "Transitive" = "11:FALSE"
+                    "Property" = "8:_319F0FD8E72443BFA3AE5E1F3F42523B"
+                        "Folders"
+                        {
+                        }
+                    }
                 }
             }
             "{1525181F-901A-416C-8A58-119130FE478E}:_8BBC7FE2F38E4B41A71D26CCED7D0BCB"
@@ -166,15 +329,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:{89C43CE2-DE96-450E-92B3-834CD3A0C232}"
+        "PackageCode" = "8:{4D02DC1F-8E66-4F0B-B131-92462C33CC8A}"
         "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.6.7"
         "Manufacturer" = "8:Informatikbüro Daniel Schick"
         "ARPHELPTELEPHONE" = "8:+49 (0) 421 - 38 48 27"
         "ARPHELPLINK" = "8:https://www.bsmd.de/"

src/server/BreCal/__init__.py

@@ -69,7 +69,7 @@ def create_app(test_config=None, instance_path=None):
     app.register_blueprint(history.bp)
     app.register_blueprint(ports.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')
 

src/server/BreCal/impl/participant.py

@@ -19,8 +19,13 @@ def GetParticipant(options):
             # query = SQLQuery.get_participant_by_user_id()
             query = ("SELECT p.id as id, p.name as name, p.street as street, p.postal_code as postal_code, p.city as city, p.type as type, p.flags as flags, " +
             "p.created as created, p.modified as modified, p.deleted as deleted FROM  participant p " +
-            "INNER JOIN user u WHERE u.participant_id = p.id and u.id = %d") % options["user_id"]
+            "INNER JOIN user u WHERE u.participant_id = p.id and u.id = %s") % options["user_id"]
             data = commands.query(query, model=model.Participant)
+            for participant in data:
+                port_query = "SELECT port_id FROM participant_port_map WHERE participant_id=?id?"
+                for record in commands.query(port_query, model=model.Port_Assignment, param={"id" : participant.id}, buffered=False):
+                    pa = model.Port_Assignment(record.port_id)
+                    participant.ports.append(pa.port_id)
         else:
             # query = SQLQuery.get_participants()
             if "participant_id" in options:
@@ -29,7 +34,7 @@ def GetParticipant(options):
                         "FROM participant p " +
                         "JOIN participant_port_map ON p.id = participant_port_map.participant_id " +
                         "WHERE participant_port_map.port_id IN " +
-                        "(SELECT port_id FROM participant_port_map where participant_id = %d) " +
+                        "(SELECT port_id FROM participant_port_map where participant_id = %s) " +
                         "GROUP BY id " +
                         "ORDER BY p.name") % options["participant_id"]
             else:
@@ -41,7 +46,7 @@ def GetParticipant(options):
 
             data = commands.query(query, model=model.Participant)
             for participant in data:
-                port_query = "SELECT port_id FROM participant_port_map WHERE participant_id=?id?";
+                port_query = "SELECT port_id FROM participant_port_map WHERE participant_id=?id?"
                 for record in commands.query(port_query, model=model.Port_Assignment, param={"id" : participant.id}, buffered=False):
                     pa = model.Port_Assignment(record.port_id)
                     participant.ports.append(pa.port_id)

src/server/BreCal/local_db.py

@@ -7,11 +7,11 @@ import sys
 
 config_path = None
 
-def initPool(instancePath, connection_filename="connection_data_devel.json"):
+def initPool(instancePath, connection_filename="connection_data_prod.json"):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,f'../../../secure/{connection_filename}') #connection_data_devel.json');
+            config_path = os.path.join(instancePath,f'../../../secure/{connection_filename}') #connection_data_test.json');
 
         print (config_path)
 

src/server/BreCal/validators/input_validation_ship.py

@@ -110,7 +110,7 @@ class InputValidationShip():
         ships = json.loads(response)
 
         # extract only the 'imo' values
-        ship_imos = [ship.get("imo") for ship in ships if not ship.deleted]
+        ship_imos = [ship.get("imo") for ship in ships if not ship.get("deleted")]
 
         # check, if the imo in the POST-request already exists in the list
         imo_already_exists = loadedModel.get("imo") in ship_imos

src/server/BreCal/validators/input_validation_shipcall.py

@@ -498,7 +498,7 @@ class InputValidationShipcall():
 
         # if the *existing* shipcall in the database is canceled, it may not be changed
         if shipcall.get("canceled", False):
-            raise ValidationError({"canceled":f"The shipcall with id 'shipcall_id' is canceled. A canceled shipcall may not be changed."})
+            raise ValidationError({"canceled":f"The shipcall with id {shipcall_id} is canceled. A canceled shipcall may not be changed."})
         return
 
     @staticmethod

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.12/site-packages/')
 
 import schedule