From 6c87142caccdde6d6c523e2f4a5d7f0d170f5338 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 27 Oct 2023 08:46:29 +0200
Subject: [PATCH 01/44] added deployment info and fixed production publishing
 profile

---
 misc/Deployment.md                            |  8 +++++++
 .../PublishProfiles/ClickOnceProfile.pubxml   | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/misc/Deployment.md b/misc/Deployment.md
index 21ee272..8ac28a0 100644
--- a/misc/Deployment.md
+++ b/misc/Deployment.md
@@ -6,6 +6,14 @@ ___
 
 ## Client
 
+Deployment of the productive client:
+- create a branch release/pub_<version> from test release branch
+- remove all text references to 'test' (changing target url in the process)
+- rename application in settings
+- change BG_COLOR in settings to #203864
+- user deployment publish xml
+
+
 ## Database
 
 ## Backend / Flask app
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index fab3079..ce50fd9 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -19,12 +19,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <MapFileExtensions>True</MapFileExtensions>
     <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net6.0-windows\app.publish\</PublishDir>
+    <PublishDir>bin\Release\net6.0-windows\win-x64\app.publish\</PublishDir>
     <PublishUrl>bin\publish\</PublishUrl>
     <PublishProtocol>ClickOnce</PublishProtocol>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishSingleFile>False</PublishSingleFile>
-    <SelfContained>False</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <SelfContained>True</SelfContained>
     <SignatureAlgorithm>(none)</SignatureAlgorithm>
     <SignManifests>False</SignManifests>
     <TargetFramework>net6.0-windows</TargetFramework>
@@ -38,11 +38,18 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <SuiteName>Bremen calling client</SuiteName>
     <SupportUrl>https://www.bsmd-emswe.eu/</SupportUrl>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SkipPublishVerification>false</SkipPublishVerification>
   </PropertyGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.NetCore.DesktopRuntime.6.0.x64">
-      <Install>true</Install>
-      <ProductName>.NET Desktop Runtime 6.0.16 (x64)</ProductName>
-    </BootstrapperPackage>
+    <PublishFile Include="containership.ico">
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>true</IncludeHash>
+      <FileType>File</FileType>
+    </PublishFile>
   </ItemGroup>
 </Project>
\ No newline at end of file

From d24cc67554e14d1ecd34c179d14e893c4e5fbb69 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 28 Oct 2023 12:07:07 +0200
Subject: [PATCH 02/44] Allow saving of user data also if password change info
 has not been given

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

diff --git a/src/BreCalClient/AboutDialog.xaml b/src/BreCalClient/AboutDialog.xaml
index da82547..68c72b7 100644
--- a/src/BreCalClient/AboutDialog.xaml
+++ b/src/BreCalClient/AboutDialog.xaml
@@ -54,7 +54,7 @@
         <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textOldPassword}" Grid.Column="1" Grid.Row="7" Margin="2" x:Name="wpBoxOldPassword" TextChanged="wpBoxOldPassword_TextChanged"/>
         <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textNewPassword}" Grid.Column="1" Grid.Row="8" Margin="2" x:Name="wpBoxNewPassword" TextChanged="wpBoxOldPassword_TextChanged"/>
         <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textRepeatNewPassword}" Grid.Column="1" Grid.Row="9" Margin="2" x:Name="wpBoxNewPasswordRepeat" TextChanged="wpBoxOldPassword_TextChanged"/>
-        <Button x:Name="buttonChangePassword" Click="buttonChangePassword_Click" Grid.Column="1" Grid.Row="10" Margin="2" Content="{x:Static p:Resources.textChange}" Width="80" HorizontalAlignment="Left" IsEnabled="False" />
+        <Button x:Name="buttonChangePassword" Click="buttonChangePassword_Click" Grid.Column="1" Grid.Row="10" Margin="2" Content="{x:Static p:Resources.textChange}" Width="80" HorizontalAlignment="Left" IsEnabled="True" />
 
         <Button x:Name="buttonClose" Click="buttonClose_Click" Content="{x:Static p:Resources.textClose}" Width="80" Margin="2" Grid.Column="1" Grid.Row="12" HorizontalAlignment="Right" />
 

From b25475956234c9ae0dc5bb5a42e21b72513d880c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 28 Oct 2023 12:43:36 +0200
Subject: [PATCH 03/44] fixed mixup in enum ids outgoing/shifting for shipcall
 queries

---
 src/server/BreCal/impl/shipcalls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/BreCal/impl/shipcalls.py b/src/server/BreCal/impl/shipcalls.py
index 1e29dec..dd9cc3f 100644
--- a/src/server/BreCal/impl/shipcalls.py
+++ b/src/server/BreCal/impl/shipcalls.py
@@ -21,8 +21,8 @@ def GetShipcalls(options):
         commands = pydapper.using(pooledConnection)
         query = ("SELECT id, ship_id, type, eta, voyage, etd, arrival_berth_id, departure_berth_id, tug_required, pilot_required, "
                 "flags, pier_side, bunkering, replenishing_terminal, replenishing_lock, draft, tidal_window_from, tidal_window_to, rain_sensitive_cargo, recommended_tugs, "
-                "anchored, moored_lock, canceled, evaluation, evaluation_message, created, modified FROM shipcall WHERE ((type = 1 OR type = 2) AND eta >= DATE(NOW() - INTERVAL %d DAY)"
-                "OR (type = 3 AND etd >= DATE(NOW() - INTERVAL %d DAY))) "
+                "anchored, moored_lock, canceled, evaluation, evaluation_message, created, modified FROM shipcall WHERE ((type = 1 OR type = 3) AND eta >= DATE(NOW() - INTERVAL %d DAY)"
+                "OR (type = 2 AND etd >= DATE(NOW() - INTERVAL %d DAY))) "
                 "ORDER BY eta") % (options["past_days"], options["past_days"])
 
         data = commands.query(query, model=model.Shipcall)

From f2ecc7ca2ecf28922ae49daefd68c33f48cb15d4 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 28 Oct 2023 13:02:18 +0200
Subject: [PATCH 04/44] make ETA/ETD the default sort order

---
 src/BreCalClient/MainWindow.xaml.cs | 50 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index e5f21ea..08736fc 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -46,7 +46,7 @@ namespace BreCalClient
         private bool _refreshImmediately = false;
 
         private bool? _showCanceled = null;
-        private SortOrder? _sortOrder;
+        private SortOrder _sortOrder = SortOrder.ETA_ETD;
         private int searchPastDays = 0;
 
         // private bool _filterChanged = false;
@@ -90,6 +90,7 @@ namespace BreCalClient
                 Process.Start("explorer", Properties.Settings.Default.LOGO_IMAGE_URL);                
             };
             this.comboBoxSortOrder.ItemsSource = Enum.GetValues(typeof(Extensions.SortOrder));
+            this.comboBoxSortOrder.SelectedIndex = (int)_sortOrder;
         }        
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
@@ -511,31 +512,28 @@ namespace BreCalClient
             {
                 _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Canceled ?? false);
             }
-
-            if (this._sortOrder != null)
-            {                
-                switch(this._sortOrder)
-                {
-                    case Extensions.SortOrder.SHIP_NAME:
-                        this._visibleControlModels.Sort((x, y) => { if (x.Ship == null) return 0; if (y.Ship == null) return 0; return x.Ship.Name.CompareTo(y.Ship.Name); }); 
-                        break;
-                    case Extensions.SortOrder.MODIFIED:
-                        this._visibleControlModels.Sort((x, y) => { if (x.Shipcall == null) return 0; if (y.Shipcall == null) return 0; return DateTime.Compare(x.Shipcall.Modified ?? x.Shipcall.Created, y.Shipcall.Modified ?? x.Shipcall.Created); });
-                        break;
-                    case Extensions.SortOrder.ETA_ETD:
-                        this._visibleControlModels.Sort((x, y) =>
-                        {                            
-                            if (x.Shipcall == null) return 0;
-                            if (y.Shipcall == null) return 0;
-                            DateTime xDate = (x.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? x.Shipcall.Eta ?? DateTime.Now : x.Shipcall.Etd ?? DateTime.Now;
-                            DateTime yDate = (y.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? y.Shipcall.Eta ?? DateTime.Now : y.Shipcall.Etd ?? DateTime.Now;
-                            return DateTime.Compare(xDate, yDate);
-                        });
-                        break;
-                    default:
-                        break;
-                }
-            }
+                            
+            switch(this._sortOrder)
+            {
+                case Extensions.SortOrder.SHIP_NAME:
+                    this._visibleControlModels.Sort((x, y) => { if (x.Ship == null) return 0; if (y.Ship == null) return 0; return x.Ship.Name.CompareTo(y.Ship.Name); }); 
+                    break;
+                case Extensions.SortOrder.MODIFIED:
+                    this._visibleControlModels.Sort((x, y) => { if (x.Shipcall == null) return 0; if (y.Shipcall == null) return 0; return DateTime.Compare(x.Shipcall.Modified ?? x.Shipcall.Created, y.Shipcall.Modified ?? x.Shipcall.Created); });
+                    break;
+                case Extensions.SortOrder.ETA_ETD:
+                    this._visibleControlModels.Sort((x, y) =>
+                    {                            
+                        if (x.Shipcall == null) return 0;
+                        if (y.Shipcall == null) return 0;
+                        DateTime xDate = (x.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? x.Shipcall.Eta ?? DateTime.Now : x.Shipcall.Etd ?? DateTime.Now;
+                        DateTime yDate = (y.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? y.Shipcall.Eta ?? DateTime.Now : y.Shipcall.Etd ?? DateTime.Now;
+                        return DateTime.Compare(xDate, yDate);
+                    });
+                    break;
+                default:
+                    break;
+            }            
         }
 
 

From 1695ca101e5532e2df07207f3619e7b5f5b651ad Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 29 Oct 2023 17:56:06 +0100
Subject: [PATCH 05/44] Set development / feature branch to 'devel' settings,
 added scripts to move to test and to production. Added script to increase
 version, store version and to update the respective files

---
 misc/Deployment.md                            |  10 +-
 misc/bump-version.sh                          |  25 +++
 misc/copyprod.sh                              |  42 ++++
 misc/copytest.sh                              |  42 ++++
 misc/sample_static_data.sql                   | 192 ++++++++++++++++++
 misc/version.txt                              |   1 +
 src/BreCalClient/App.config                   |   2 +-
 src/BreCalClient/BreCalClient.csproj          |   2 +-
 .../ClickOnceDevelProfile.pubxml              |  54 +++++
 .../ClickOnceTestProfile.pubxml               |   7 +-
 .../Properties/Settings.Designer.cs           |   2 +-
 src/BreCalClient/Properties/Settings.settings |   2 +-
 src/BreCalClient/ShipcallControl.xaml         |   2 +-
 src/BreCalClient/ShipcallControl.xaml.cs      |  12 +-
 src/server/BreCal/impl/berths.py              |   2 +-
 src/server/BreCal/local_db.py                 |   2 +-
 src/server/BreCal/schemas/model.py            |   1 -
 src/server/flaskapp.wsgi                      |   2 +-
 18 files changed, 383 insertions(+), 19 deletions(-)
 create mode 100644 misc/bump-version.sh
 create mode 100644 misc/copyprod.sh
 create mode 100644 misc/copytest.sh
 create mode 100644 misc/sample_static_data.sql
 create mode 100644 misc/version.txt
 create mode 100644 src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml

diff --git a/misc/Deployment.md b/misc/Deployment.md
index 8ac28a0..38a7ccd 100644
--- a/misc/Deployment.md
+++ b/misc/Deployment.md
@@ -22,7 +22,7 @@ In order to not have complicated and error-prone copying manoevers a direct depl
 
 ### File structure
 
-### Steps
+### Installation steps
 
 1) Created a ssh-key for the user that does the installation on the server following the Github [instructions](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent).
 2) Deploy generated key to the Github user account.
@@ -35,6 +35,8 @@ ssh-add ~/.ssh/od_ed25519
 
 4) Change to deployment folder
 
+e.g.
+
 ```bash
 cd /var/www/brecal_test
 ```
@@ -51,6 +53,12 @@ git checkout
 6) Database credentials are stored outside the web root, we are using /var/www/secure. Here the file ```connection_data.json``` is placed, a different named copy for each instance.
 
 
+### Changing Devel / Test / Prod Environment
+
+Please note that in the "develop" branch the environment and paths are set to the "devel" setting. If a deployment is made (to testing or to the production) the scripts ```copytest.sh``` and ```copyprod.sh``` have to be run. These scripts will change the environment and paths to the respective settings.
+
+There is also a script called ```bump-version.sh``` which can be used to upgrade all version entries in the repository.
+
 ### Installing Requirements
 Python 3.11 & Pip3.11 installation (linux), virtualenv package
 
diff --git a/misc/bump-version.sh b/misc/bump-version.sh
new file mode 100644
index 0000000..f9105c1
--- /dev/null
+++ b/misc/bump-version.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+CURRENT_VERSION=$(cat version.txt)
+NEW_VERSION="${1}"
+
+if [ -z "${NEW_VERSION}" ]; then
+    echo "No new version given"
+    exit 1
+fi
+
+echo "Bumping version ${CURRENT_VERSION} to ${NEW_VERSION}"
+
+CURRENT_VERSION=$(printf '%s\n' "$CURRENT_VERSION" | sed -e 's/[\/&]/\\&/g')
+NEW_VERSION=$(printf '%s\n' "$NEW_VERSION" | sed -e 's/[\/&]/\\&/g')
+
+echo "Found the following matching version strings:"
+git grep -I "${CURRENT_VERSION}"
+
+echo "Proceed? [N/y]"
+read proceed
+
+if [ "${proceed}" = "y" ]; then
+    git grep -Il "${CURRENT_VERSION}" | xargs sed --in-place -e "s/${CURRENT_VERSION}/${NEW_VERSION}/g"
+    git add $(git grep -Il "${NEW_VERSION}")
+fi
diff --git a/misc/copyprod.sh b/misc/copyprod.sh
new file mode 100644
index 0000000..afa5092
--- /dev/null
+++ b/misc/copyprod.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# This script replaces all references to the development version with the test version
+# 1) Database references and paths
+
+git grep -I "connection_data_test.json"
+git grep -I "/var/www/brecal_test/"
+
+# 2) Color references
+# Bar colors in client: (BG_COLOR)
+# Devel: #1D751F
+# Test: #751D1F
+# Prod: #203864
+
+git grep -I "#751D1F" 
+
+# 3) Assembly name references
+
+git grep -I "BreCalTestClient"
+
+echo "Proceed? [N/y]"
+read proceed
+
+# for color
+
+if [ "${proceed}" = "y" ]; then
+
+    # 1. for database references and paths
+    git grep -I "connection_data_test.json" | xargs sed --in-place -e "s/connection_data_test.json/connection_data_prod.json/g"
+    git add $(git grep -I "connection_data_prod.json")
+    git grep -I "/var/www/brecal_test/" | xargs sed --in-place -e "s/\/var\/www\/brecal_test\//\/var\/www\/brecal\//g"
+    git add $(git grep -I "/var/www/brecal/")
+
+    # 2. for color
+    git grep -Il "#751D1F" | xargs sed --in-place -e "s/#751D1F/#203864/g"
+    git add $(git grep -Il "#203864")
+
+    # 3. for assembly name
+
+    git grep -I "BreCalTestClient" | xargs sed --in-place -e "s/BreCalTestClient/BreCalClient/g"
+    git add $(git grep -I "BreCalClient")
+
+fi
diff --git a/misc/copytest.sh b/misc/copytest.sh
new file mode 100644
index 0000000..2cea439
--- /dev/null
+++ b/misc/copytest.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# This script replaces all references to the development version with the test version
+# 1) Database references and paths
+
+git grep -I "connection_data_devel.json"
+git grep -I "/var/www/brecal_devel/"
+
+# 2) Color references
+# Bar colors in client: (BG_COLOR)
+# Devel: #1D751F
+# Test: #751D1F
+# Prod: #203864
+
+git grep -I "#1D751F" 
+
+# 3) Assembly name references
+
+git grep -I "BreCalDevelClient"
+
+echo "Proceed? [N/y]"
+read proceed
+
+# for color
+
+if [ "${proceed}" = "y" ]; then
+
+    # 1. for database references and paths
+    git grep -I "connection_data_devel.json" | xargs sed --in-place -e "s/connection_data_devel.json/connection_data_test.json/g"
+    git add $(git grep -I "connection_data_test.json")
+    git grep -I "/var/www/brecal_devel/" | xargs sed --in-place -e "s/\/var\/www\/brecal_devel\//\/var\/www\/brecal_test\//g"
+    git add $(git grep -I "/var/www/brecal_test/")
+
+    # 2. for color
+    git grep -Il "#1D751F" | xargs sed --in-place -e "s/#1D751F/#751D1F/g"
+    git add $(git grep -Il "#751D1F")
+
+    # 3. for assembly name
+
+    git grep -I "BreCalDevelClient" | xargs sed --in-place -e "s/BreCalDevelClient/BreCalTestClient/g"
+    git add $(git grep -I "BreCalTestClient")
+
+fi
diff --git a/misc/sample_static_data.sql b/misc/sample_static_data.sql
new file mode 100644
index 0000000..5cacc46
--- /dev/null
+++ b/misc/sample_static_data.sql
@@ -0,0 +1,192 @@
+-- --------------------------------------------------------
+-- Host:                         127.0.0.1
+-- Server Version:               8.0.34-0ubuntu0.22.04.1 - (Ubuntu)
+-- Server Betriebssystem:        Linux
+-- HeidiSQL Version:             10.2.0.5599
+-- --------------------------------------------------------
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+
+-- Exportiere Daten aus Tabelle bremen_calling_test.berth: ~59 rows (ungefähr)
+/*!40000 ALTER TABLE `berth` DISABLE KEYS */;
+INSERT INTO `berth` (`id`, `name`, `lock`, `owner_id`, `authority_id`, `created`, `modified`, `deleted`) VALUES
+	(1, 'Roland Mühle', NULL, NULL, 11, '2023-06-26 14:01:40', '2023-10-06 15:04:08', b'1'),
+	(2, 'Stahlwerk', NULL, NULL, 11, '2023-06-26 14:01:40', '2023-10-06 15:04:08', b'1'),
+	(3, 'Kellogs', NULL, NULL, 11, '2023-06-26 14:01:40', '2023-10-06 15:04:08', b'1'),
+	(139, 'Avangard Dalben', NULL, 110, 136, '2023-08-21 08:23:35', '2023-10-06 16:06:01', b'0'),
+	(140, 'Avangard Kaje', NULL, 110, 11, '2023-08-21 08:23:35', '2023-10-06 15:04:08', b'0'),
+	(141, 'Baustelle 2', NULL, 111, 11, '2023-08-21 08:23:35', '2023-10-06 15:04:08', b'0'),
+	(142, 'BHW', NULL, 112, 11, '2023-08-21 08:23:36', '2023-10-06 15:04:08', b'0'),
+	(143, 'Dalben 2', NULL, 111, 11, '2023-08-21 08:23:36', '2023-10-06 15:04:08', b'0'),
+	(144, 'Dalben 3', NULL, 111, 11, '2023-08-21 08:23:36', '2023-10-06 15:04:08', b'0'),
+	(145, 'Egerland Kaje', NULL, 113, 11, '2023-08-21 08:23:36', '2023-10-06 15:04:08', b'0'),
+	(146, 'Getreideanlage Pier A', NULL, 114, 11, '2023-08-21 08:23:37', '2023-10-06 15:04:08', b'0'),
+	(147, 'Getreideanlage Pier D', NULL, 114, 11, '2023-08-21 08:23:37', '2023-10-06 15:04:08', b'0'),
+	(148, 'Griepe, Bnp Paribas', NULL, 115, 11, '2023-08-21 08:23:37', '2023-10-06 15:04:08', b'0'),
+	(149, 'Hafen F', NULL, 116, 11, '2023-08-21 08:23:37', '2023-10-06 15:04:08', b'0'),
+	(150, 'Hansa Landhandel', NULL, 117, 11, '2023-08-21 08:23:38', '2023-10-06 15:04:08', b'0'),
+	(151, 'Hansa Melasse', NULL, 118, 11, '2023-08-21 08:23:38', '2023-10-06 15:04:08', b'0'),
+	(152, 'Hansa-Mühle', NULL, 119, 11, '2023-08-21 08:23:38', '2023-10-06 15:04:08', b'0'),
+	(153, 'Heidelberger Sand', NULL, 120, 11, '2023-08-21 08:23:38', '2023-10-06 15:04:08', b'0'),
+	(154, 'HGM Bunkerstation', NULL, 121, 11, '2023-08-21 08:23:39', '2023-10-06 15:04:08', b'0'),
+	(155, 'HGM Tanklager', NULL, 121, 11, '2023-08-21 08:23:39', '2023-10-06 15:04:08', b'0'),
+	(156, 'Kap Horn Innen', NULL, 122, 11, '2023-08-21 08:23:39', '2023-10-06 15:04:08', b'0'),
+	(157, 'Kap Horn Weser', NULL, 122, 11, '2023-08-21 08:23:39', '2023-10-06 15:04:08', b'0'),
+	(158, 'Kap Horn Weser Bremer Recycling', NULL, 123, 11, '2023-08-21 08:23:40', '2023-10-06 15:04:08', b'0'),
+	(159, 'Kap Horn Weser -GHK-', NULL, 124, 11, '2023-08-21 08:23:40', '2023-10-06 15:04:08', b'0'),
+	(160, 'Kohlenhafen 2', NULL, 111, 11, '2023-08-21 08:23:40', '2023-10-06 15:04:08', b'0'),
+	(161, 'Kraftwerk Farge', NULL, 125, 11, '2023-08-21 08:23:40', '2023-10-06 15:04:08', b'0'),
+	(162, 'Kraftwerk Industriehafen', NULL, 126, 11, '2023-08-21 08:23:41', '2023-10-06 15:04:08', b'0'),
+	(163, 'Lankenau B', NULL, 111, 11, '2023-08-21 08:23:41', '2023-10-06 15:04:08', b'0'),
+	(164, 'Mibau, Bnp Paribas', NULL, 127, 11, '2023-08-21 08:23:41', '2023-10-06 15:04:08', b'0'),
+	(165, 'Müller Weser', NULL, 114, 11, '2023-08-21 08:23:41', '2023-10-06 15:04:08', b'0'),
+	(166, 'Osterort 5 Aussen', NULL, 111, 11, '2023-08-21 08:23:41', '2023-10-06 15:04:08', b'0'),
+	(167, 'Pier 2 Anleger', NULL, 128, 11, '2023-08-21 08:23:42', '2023-10-06 15:04:08', b'0'),
+	(168, 'Pier III', NULL, 129, 11, '2023-08-21 08:23:42', '2023-10-06 15:04:08', b'0'),
+	(169, 'Plump', NULL, 130, 11, '2023-08-21 08:23:42', '2023-10-06 15:04:08', b'0'),
+	(170, 'Rolandmühle', NULL, 131, 11, '2023-08-21 08:23:42', '2023-10-06 15:04:08', b'0'),
+	(171, 'Schleusenvorhafen Nord', NULL, 111, 11, '2023-08-21 08:23:43', '2023-10-06 15:04:08', b'0'),
+	(172, 'Schrägpier', NULL, 4, 11, '2023-08-21 08:23:43', '2023-10-06 15:04:08', b'0'),
+	(173, 'Schuppen 19', NULL, 132, 11, '2023-08-21 08:23:43', '2023-10-06 15:04:08', b'0'),
+	(174, 'Schuppen 20', NULL, 4, 11, '2023-08-21 08:23:43', '2023-10-06 15:04:08', b'0'),
+	(175, 'Schuppen 21', NULL, 4, 11, '2023-08-21 08:23:43', '2023-10-06 15:04:08', b'0'),
+	(176, 'Schuppen 22', NULL, 4, 11, '2023-08-21 08:23:43', '2023-10-06 15:04:08', b'0'),
+	(177, 'Schuppen 23', NULL, 4, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(178, 'Schuppen 24', NULL, 4, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(179, 'Seedalben Dlg-Seite', NULL, 111, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(180, 'Seedalben Kw-Seite', NULL, 111, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(181, 'Seehausen Spüler', NULL, 111, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(182, 'Tankschiffliegeplatz 1', NULL, 111, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(183, 'Tankschiffliegeplatz 2', NULL, 111, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(184, 'Terminal 1', NULL, 10, 11, '2023-08-21 08:23:44', '2023-10-06 15:04:08', b'0'),
+	(185, 'Terminal 2', NULL, 10, 11, '2023-08-21 08:23:45', '2023-10-06 15:04:08', b'0'),
+	(186, 'Terminal 3', NULL, 10, 11, '2023-08-21 08:23:45', '2023-10-06 15:04:08', b'0'),
+	(187, 'Terminal 4', NULL, 10, 11, '2023-08-21 08:23:45', '2023-10-06 15:04:08', b'0'),
+	(188, 'TSR Recycling', NULL, 133, 11, '2023-08-21 08:23:45', '2023-10-06 15:04:08', b'0'),
+	(189, 'Viehbrücke', NULL, 111, 11, '2023-08-21 08:23:45', '2023-10-06 15:04:08', b'0'),
+	(190, 'Vulkan Industriegebiet', NULL, 120, 11, '2023-08-21 08:23:46', '2023-10-06 15:04:08', b'0'),
+	(191, 'Weserbahnhof', NULL, 132, 11, '2023-08-21 08:23:46', '2023-10-06 15:04:08', b'0'),
+	(192, 'Weser-Petrol Holzhafen', NULL, 134, 11, '2023-08-21 08:23:46', '2023-10-06 15:04:08', b'0'),
+	(193, 'Weser-Petrol Kalihafen', NULL, 134, 11, '2023-08-21 08:23:46', '2023-10-06 15:04:08', b'0'),
+	(194, 'Wesertanking', NULL, 135, 11, '2023-08-21 08:23:46', '2023-10-06 15:04:08', b'0');
+/*!40000 ALTER TABLE `berth` ENABLE KEYS */;
+
+-- Exportiere Daten aus Tabelle bremen_calling_test.participant: ~40 rows (ungefähr)
+/*!40000 ALTER TABLE `participant` DISABLE KEYS */;
+INSERT INTO `participant` (`id`, `name`, `street`, `postal_code`, `city`, `type`, `flags`, `created`, `modified`, `deleted`) VALUES
+	(1, 'Schick Informatik', 'Gottlieb-Daimler-Str. 8', '73614', 'Schorndorf', 1, 42, '2023-04-17 07:18:19', '2023-08-24 07:07:02', b'0'),
+	(2, 'Lotsenbrüderschaft Weser 1', '', '', '', 4, 0, '2023-08-10 07:07:41', NULL, b'0'),
+	(3, 'Bremer Schiffsmeldedienst', 'Hafenkopf II / Überseetor 20', '28217', 'Bremen', 1, 0, '2023-08-10 07:11:10', NULL, b'0'),
+	(4, 'BLG Cargo Logistics GmbH', '', '', '', 2, 0, '2023-08-10 07:14:40', NULL, b'0'),
+	(5, 'Schiffsmakler-Verband für Küsten und Seeschiffsbefrachter e.V.', '', '', '', 8, 0, '2023-08-10 07:15:56', NULL, b'0'),
+	(6, 'RMS Rhenus Maritime Services GmbH', '', '', '', 8, 1, '2023-08-10 07:19:29', '2023-09-06 09:02:53', b'0'),
+	(7, 'J.MÜLLER Weser GmbH & Co. KG', '', '', '', 10, 0, '2023-08-10 07:21:43', '2023-08-10 08:47:59', b'0'),
+	(8, 'Schiffahrtskontor Detra GmbH & Co.KG', '', '', '', 8, 0, '2023-08-10 07:23:04', NULL, b'0'),
+	(9, 'Boluda Deutschland GmbH', '', '', '', 64, 0, '2023-08-10 07:24:18', NULL, b'0'),
+	(10, 'Weserport GmbH', '', '', '', 10, 0, '2023-08-10 07:26:42', '2023-08-10 08:48:19', b'0'),
+	(11, 'Port Authority Bremen', '', '', '', 32, 0, '2023-08-10 07:28:11', NULL, b'0'),
+	(12, 'Nordenia Frachtkontor GmbH', '', '', '', 8, 0, '2023-08-21 06:52:04', NULL, b'0'),
+	(15, 'Extern', '', '', '', 0, 0, '2023-08-21 06:55:18', NULL, b'0'),
+	(16, 'FESTMA Vertäugesellschaft mbH', '', '', '', 16, 0, '2023-08-21 06:57:23', NULL, b'0'),
+	(110, 'Avangard', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:35', '2023-08-21 10:04:21', b'0'),
+	(111, 'Bremenports', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:35', '2023-08-21 10:04:21', b'0'),
+	(112, 'Bremer Holzwerke', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:36', '2023-08-21 10:04:21', b'0'),
+	(113, 'Egerland', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:36', '2023-08-21 10:04:21', b'0'),
+	(114, 'Müller J. Bremen', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:37', '2023-08-21 10:04:21', b'0'),
+	(115, 'Griepe', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:37', '2023-08-21 10:04:21', b'0'),
+	(116, 'Mseven Real Estate', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:37', '2023-08-21 10:04:21', b'0'),
+	(117, 'Hansa Landhandel', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:38', '2023-08-21 10:04:21', b'0'),
+	(118, 'Hansa Melasse', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:38', '2023-08-21 10:04:21', b'0'),
+	(119, 'Hansa-Mühle', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:38', '2023-08-21 10:04:21', b'0'),
+	(120, 'Heidelberger Sand Und Kies Gmbh', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:38', '2023-08-21 10:04:21', b'0'),
+	(121, 'HGM', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:39', '2023-08-21 10:04:21', b'0'),
+	(122, 'Kap-Horn Logistics Gmbh', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:39', '2023-08-21 10:04:21', b'0'),
+	(123, 'Bremer Recycling Kontor', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:39', '2023-08-21 10:04:21', b'0'),
+	(124, 'GHK', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:40', '2023-08-21 10:04:21', b'0'),
+	(125, 'Kraftwerk Farge Engie Gmbh & Co. KG', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:40', '2023-08-21 10:04:21', b'0'),
+	(126, 'Swb Erzeugung', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:40', '2023-08-21 10:04:21', b'0'),
+	(127, 'Mibau', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:41', '2023-08-21 10:04:21', b'0'),
+	(128, 'SWG', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:41', '2023-08-21 10:04:21', b'0'),
+	(129, 'Umweltschutz Nord Ganderkesee', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:42', '2023-08-21 10:04:21', b'0'),
+	(130, 'Nehlsen Industrieservice Gmbh & Co. KG', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:42', '2023-08-21 10:04:21', b'0'),
+	(131, 'Rolandmühle', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:42', '2023-08-21 10:04:21', b'0'),
+	(132, 'Wfb', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:43', '2023-08-21 10:04:21', b'0'),
+	(133, 'TSR', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:45', '2023-08-21 10:04:21', b'0'),
+	(134, 'Weser-Petrol', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:46', '2023-08-21 10:04:21', b'0'),
+	(135, 'Wesertanking', NULL, NULL, NULL, 2, 0, '2023-08-21 08:23:46', '2023-08-21 10:04:21', b'0'),
+	(136, 'TEST_BSMD', 'Überseetor 20', '28217', 'Bremen', 127, 1, '2023-10-04 11:54:36', '2023-10-13 11:37:51', b'0');
+/*!40000 ALTER TABLE `participant` ENABLE KEYS */;
+
+-- Exportiere Daten aus Tabelle bremen_calling_test.role: ~2 rows (ungefähr)
+/*!40000 ALTER TABLE `role` DISABLE KEYS */;
+INSERT INTO `role` (`id`, `name`, `description`, `created`, `modified`) VALUES
+	(1, 'My first role', 'A very good description', '2023-04-17 07:31:57', NULL),
+	(2, 'Another role', 'This role is very nice as well', '2023-04-17 07:32:12', NULL);
+/*!40000 ALTER TABLE `role` ENABLE KEYS */;
+
+-- Exportiere Daten aus Tabelle bremen_calling_test.securable: ~2 rows (ungefähr)
+/*!40000 ALTER TABLE `securable` DISABLE KEYS */;
+INSERT INTO `securable` (`id`, `name`, `created`, `modified`) VALUES
+	(1, 'First secure thing', '2023-04-17 07:38:12', NULL),
+	(2, 'Another secure thing', '2023-04-17 07:38:22', NULL);
+/*!40000 ALTER TABLE `securable` ENABLE KEYS */;
+
+-- Exportiere Daten aus Tabelle bremen_calling_test.ship: ~12 rows (ungefähr)
+/*!40000 ALTER TABLE `ship` DISABLE KEYS */;
+INSERT INTO `ship` (`id`, `name`, `imo`, `callsign`, `participant_id`, `length`, `width`, `is_tug`, `bollard_pull`, `eni`, `created`, `modified`, `deleted`) VALUES
+	(1, 'Dicke Berta', 1234567, 'DEBE', 1, 100, 20, b'0', NULL, NULL, '2023-06-27 10:43:02', NULL, b'0'),
+	(2, 'Maersk Neston', 9632167, '9V3532', 1, 210.07, 30.2, b'0', NULL, NULL, '2023-07-27 12:34:13', NULL, b'0'),
+	(3, 'AFRICAN HALCYON', 9343613, NULL, NULL, 177.13, 28.4, b'0', NULL, NULL, '2023-08-24 10:41:56', NULL, b'0'),
+	(4, 'AMIKO', 9125669, NULL, NULL, 99.98, 16.5, b'0', NULL, NULL, '2023-08-24 10:42:17', NULL, b'0'),
+	(5, 'ARKLOW BEACON', 9638795, NULL, NULL, 119.49, 14.99, b'0', NULL, NULL, '2023-08-24 10:42:17', NULL, b'0'),
+	(6, 'FWN ATLANTIDE', 9535620, NULL, NULL, 145.65, 18.25, b'0', NULL, NULL, '2023-08-24 10:42:17', NULL, b'0'),
+	(7, 'IONIAN SPIRIT', 9747235, NULL, NULL, 179.9, 30, b'0', NULL, NULL, '2023-08-24 10:42:17', NULL, b'0'),
+	(8, 'IRMA', 9180396, NULL, NULL, 199.9, 23.6, b'0', NULL, NULL, '2023-08-24 10:42:17', NULL, b'0'),
+	(9, 'JANA', 9330185, NULL, NULL, 69.34, 12, b'0', NULL, NULL, '2023-08-24 10:42:18', NULL, b'0'),
+	(10, 'MEDI PERTH', 9804552, NULL, NULL, 199.99, 32.24, b'0', NULL, NULL, '2023-08-24 10:42:18', NULL, b'0'),
+	(11, 'S NEPTUNE', 9634892, NULL, NULL, 169.99, 27, b'0', NULL, NULL, '2023-08-24 10:42:18', NULL, b'0'),
+	(12, 'WESER STAHL', 9186687, NULL, NULL, 192, 32.26, b'0', NULL, NULL, '2023-08-24 10:42:18', NULL, b'0'),
+	(13, 'BOTHNIABORG', 9267728, 'PBIO', NULL, 153.05, 21.8, b'0', NULL, NULL, '2023-10-04 11:52:32', NULL, b'0');
+/*!40000 ALTER TABLE `ship` ENABLE KEYS */;
+
+-- Exportiere Daten aus Tabelle bremen_calling_test.user: ~27 rows (ungefähr)
+/*!40000 ALTER TABLE `user` DISABLE KEYS */;
+INSERT INTO `user` (`id`, `participant_id`, `first_name`, `last_name`, `user_name`, `user_email`, `user_phone`, `password_hash`, `api_key`, `created`, `modified`) VALUES
+	(1, 1, 'Daniel', 'Schick', 'dani', NULL, NULL, '$2b$12$qfjw4b3XvGuu0t6HR8OYGOzF5b8gmC6PyIIBNbIXMXEayJunEEKmi', '0815', '2023-04-17 07:15:41', '2023-08-11 11:11:34'),
+	(2, 1, 'Londo', 'Mollari', 'Londo', 'l.mollari@centauri.gov', '+01 555 324 2314', '$2b$12$8r1oGQiWdiuQNoGbzm.z.OoCOc8.4YACN93k7ge7YDWKjQ8tPuTrm', NULL, '2023-06-27 08:34:55', '2023-10-28 12:04:54'),
+	(3, 2, 'Maik', 'Baudeck', 'maikb', NULL, NULL, '$2b$12$4SxGRlinOrpEVvqDZcE.wOusMZYsepdc6vj1vDpNhbPtApxU8VGPi', '', '2023-08-10 07:09:35', '2023-08-11 11:11:55'),
+	(4, 3, 'Christin', 'Hollmann', 'christinh', NULL, NULL, '$2b$12$evGJop3j19bNTkdg2GHrIeRedC7LG5SIHm8.hKhdUSrlXsp6sXBDG', '', '2023-08-10 07:12:05', '2023-10-04 11:48:13'),
+	(5, 3, 'Bastian', 'Güttner', 'bastiang', NULL, NULL, '$2b$12$0oCX3c2WyMykmxMoLqmpNubke713xhYlEEQgnxBV6Fj/TaUn.3/U6', '', '2023-08-10 07:12:26', '2023-08-11 11:11:13'),
+	(6, 3, 'Benjamin', 'Wiese', 'benjaminw', NULL, NULL, '$2b$12$RRj32KdLIf3D7z7cVWFqa.yZM5.ODOS0HqU3rdCuFrJS8HJ/rtqwy', '', '2023-08-10 07:13:01', '2023-08-11 11:11:16'),
+	(7, 1, 'Sladjan', 'Veselinovic', 'sladjanv', NULL, NULL, '$2b$12$4DctoCbZwxTvE39lXNRzneQ2kb/lXlJ5wEZ1CGbbw.rGM3nuAYjpa', '', '2023-08-10 07:13:39', '2023-08-11 11:11:45'),
+	(8, 1, 'Kersten', 'Gevers', 'kersteng', NULL, NULL, '$2b$12$zKX8iLPnXRmp5wD1Yp8P7e..U9R0A4ytbiMjd.l.IGkMzahcHPNWq', '', '2023-08-10 07:13:59', '2023-08-11 11:11:49'),
+	(9, 4, 'Dirk', 'Brunnert', 'dirkb', NULL, NULL, '$2b$12$HTeq/Fdfse6oElk7DLsQae5dtvWJloee.VtBH.THsj2kdcxxBkCDW', '', '2023-08-10 07:15:01', '2023-08-11 11:12:01'),
+	(10, 5, 'Thorsten', 'Fischer', 'thorstenf', NULL, NULL, '$2b$12$NHEpTNHuKU4ruPRIfd9yc.yv5faHGemFfRI3TISniqM7QNqHiyZpK', '', '2023-08-10 07:16:20', '2023-08-11 11:12:07'),
+	(11, 6, 'Lisa', 'Friedhoff', 'lisaf', NULL, NULL, '$2b$12$DJKJHGrQwfY9pwzgFfPds.DHGsygHyV3KDs38Hq4AUHPPs3jBPH3y', '', '2023-08-10 07:19:52', '2023-08-11 11:12:12'),
+	(12, 6, 'Dario', 'Fritschi', 'dariof', NULL, NULL, '$2b$12$MwCVTMQkN6zCAzCsE572Ye.M0nRDQNld4AgorLVyWq.DcQEmAy5lu', '', '2023-08-10 07:20:11', '2023-08-11 11:12:15'),
+	(13, 7, 'Hergen', 'Hanke', 'hergenh', NULL, NULL, '$2b$12$MKb6BDRrTbNd0qg5BdAS.upzlqxcWOgU/VEafJKSuzE9JLIWCimq6', '', '2023-08-10 07:22:09', '2023-08-11 11:12:24'),
+	(14, 8, 'Hardy', 'Paasch', 'hardyp', NULL, NULL, '$2b$12$l1lE/UqnYnOvci.N4j3zBOz6HC0z87ovnO0n6BIZYO7VN8gj.qGey', '', '2023-08-10 07:23:25', '2023-08-11 11:12:28'),
+	(15, 8, 'Marc', 'Pagel', 'marcp', NULL, NULL, '$2b$12$UCVJKzqX92Z8xZJ4kK0BRuFXMRdqcaXaGmBrqnYWARdKlPvZvLUZq', '', '2023-08-10 07:23:41', '2023-08-11 11:12:30'),
+	(16, 9, 'Andreas', 'Peukert', 'andreasp', NULL, NULL, '$2b$12$jNmciJAVR6p0IflvAthmk.j0SoOBvFHwDiEDKUHfwJq7baRsKg/LG', '', '2023-08-10 07:24:37', '2023-08-11 11:12:45'),
+	(17, 8, 'Christina', 'Rachiele', 'christinar', NULL, NULL, '$2b$12$BCsVgPRuIWPuuor07lprF.klQxvF901O3AXUhRrBJoEvYIjNQ.HKS', '', '2023-08-10 07:25:05', '2023-08-11 11:12:33'),
+	(18, 9, 'Sonia', 'Rekawek', 'soniar', NULL, NULL, '$2b$12$uHCkH6gu13yqllXBibLFIOWOpvctMC7NmojtXqDd6xsLq7bmvNOMu', '', '2023-08-10 07:25:27', '2023-08-11 11:12:48'),
+	(19, 6, 'Frank', 'Roelfs', 'frankr', NULL, NULL, '$2b$12$cEQAhUe9VJV6uTkfOY6/R.oAVfmFZQ4vS5G6BqoNEyaVHtFRDtB56', '', '2023-08-10 07:26:04', '2023-08-11 11:12:19'),
+	(20, 10, 'Vera', 'Schliedermann', 'veras', NULL, NULL, '$2b$12$FKcitW6W1HPwd.cdkZLGLeTFuzjsEIrbiKInysAKN.RibZ4gVLZHi', '', '2023-08-10 07:27:01', '2023-08-11 11:12:54'),
+	(21, 8, 'Michael', 'Strudthoff', 'michaels', NULL, NULL, '$2b$12$doTiywWpkso1UWB5eiAW1eoACP6rN4UDVt7qFFdRFvhhWUXikCmS2', '', '2023-08-10 07:27:27', '2023-08-11 11:12:37'),
+	(22, 4, 'Volker', 'Viohl', 'volkerv', NULL, NULL, '$2b$12$.YavQbWNE4eJDQA.ZNSKROYvMPWifBXyMX0IL0H2z50M720fpfTJW', '', '2023-08-10 07:27:50', '2023-08-11 11:12:04'),
+	(23, 11, 'Frauke', 'Zabel', 'fraukez', NULL, NULL, '$2b$12$rawQg6Cjl1yECGm9DOG8degdWdD.nZjEgGp8eXO98nh11QV1sEEEO', '', '2023-08-10 07:28:33', '2023-08-11 11:12:58'),
+	(24, 8, 'Jan', 'Zierow', 'janz', NULL, NULL, '$2b$12$CbnjUT42cf0mkIAqAURg3OksP9G3brmsE2GQTECTZ4.cVuhPn5D2G', '', '2023-08-10 07:28:55', '2023-08-11 11:12:39'),
+	(25, 12, 'Berit', 'Güstrau', 'beritg', NULL, NULL, '$2b$12$g8WJTEWwsrtMyqpVW/GFVuzyRjB2/n0YJJyvBx.3l51YiVEUjEQYy', '', '2023-08-21 06:52:35', NULL),
+	(26, 15, 'Ilknur', 'Colmorn', 'ilknurc', NULL, NULL, '$2b$12$tpEb0JQ8Li4YkPH28FeYk.1Jt2vK.TFn9SyhBKJ08gn7S5d8WYRlO', '', '2023-08-21 06:56:42', NULL),
+	(27, 16, 'Horst', 'Imgram', 'horsti', NULL, NULL, '$2b$12$05NFPSaP78puAa8pL39KrOKTafs/TzWwr4YfV4/Vrdu90assvNFZa', '', '2023-08-21 06:57:58', NULL),
+	(28, 136, 'Christin', 'Hollmann', 'chollmann', NULL, NULL, '$2b$12$pb1bWJ7hxOplFoqT/nIhyuRD39dxOpQ9t0LwZUI8CNOkTkE.eXiSO', '', '2023-10-04 11:55:05', NULL),
+	(29, 1, 'Max', 'Metz', 'maxm', NULL, NULL, '$2b$12$gm4EwjCF44Ls20vDHnlG/ew/cZ.DK4gcYed.OHER5J4OzZrA.9Jt.', '', '2023-10-06 13:02:56', '2023-10-13 11:53:35');
+/*!40000 ALTER TABLE `user` ENABLE KEYS */;
+
+/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
+/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
diff --git a/misc/version.txt b/misc/version.txt
new file mode 100644
index 0000000..82c7058
--- /dev/null
+++ b/misc/version.txt
@@ -0,0 +1 @@
+0.9.4.0
\ No newline at end of file
diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index 0800667..87c70a1 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -14,7 +14,7 @@
                 <value>https://brecaltest.bsmd-emswe.eu</value>
             </setting>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#751D1F</value>
+                <value>#1D751F</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
                 <value>!!Bremen calling Testversion!!</value>
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 012ca50..fd2a8c8 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -13,7 +13,7 @@
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalTestClient</AssemblyName>
+    <AssemblyName>BreCalDevelClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
new file mode 100644
index 0000000..a5b4284
--- /dev/null
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>0.9.4.*</ApplicationVersion>
+    <BootstrapperEnabled>True</BootstrapperEnabled>
+    <Configuration>Debug</Configuration>
+    <CreateDesktopShortcut>True</CreateDesktopShortcut>
+    <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
+    <ErrorReportUrl>https://www.textbausteine.net/</ErrorReportUrl>
+    <GenerateManifests>true</GenerateManifests>
+    <Install>True</Install>
+    <InstallFrom>Web</InstallFrom>
+    <InstallUrl>https://www.bsmd-emswe.eu/develclient/</InstallUrl>
+    <IsRevisionIncremented>False</IsRevisionIncremented>
+    <IsWebBootstrapper>True</IsWebBootstrapper>
+    <MapFileExtensions>True</MapFileExtensions>
+    <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
+    <Platform>Any CPU</Platform>
+    <ProductName>Bremen calling development client</ProductName>
+    <PublishDir>bin\Release\net6.0-windows\win-x64\app.publish\</PublishDir>
+    <PublishUrl>bin\publish.devel\</PublishUrl>
+    <PublisherName>Informatikbüro Daniel Schick</PublisherName>
+    <PublishProtocol>ClickOnce</PublishProtocol>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishSingleFile>True</PublishSingleFile>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <SignatureAlgorithm>(none)</SignatureAlgorithm>
+    <SignManifests>False</SignManifests>
+    <SkipPublishVerification>false</SkipPublishVerification>
+    <SuiteName>Bremen calling</SuiteName>
+    <SupportUrl>https://www.textbausteine.net/</SupportUrl>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UpdateEnabled>True</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateRequired>False</UpdateRequired>
+    <WebPageFileName>Publish.html</WebPageFileName>
+  </PropertyGroup>
+  <ItemGroup>
+    <PublishFile Include="containership.ico">
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>true</IncludeHash>
+      <FileType>File</FileType>
+    </PublishFile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 300d77f..55c6d0e 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,11 +5,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.3.0</ApplicationVersion>
-    <BootstrapperEnabled>False</BootstrapperEnabled>
+    <ApplicationVersion>0.9.4.*</ApplicationVersion>
+    <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
+    <CreateDesktopShortcut>True</CreateDesktopShortcut>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
-    <ErrorReportUrl>http://www.textbausteine.net</ErrorReportUrl>
+    <ErrorReportUrl>https://www.textbausteine.net/</ErrorReportUrl>
     <GenerateManifests>true</GenerateManifests>
     <Install>True</Install>
     <InstallFrom>Web</InstallFrom>
diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs
index 6f08fee..8e2d2d1 100644
--- a/src/BreCalClient/Properties/Settings.Designer.cs
+++ b/src/BreCalClient/Properties/Settings.Designer.cs
@@ -34,7 +34,7 @@ namespace BreCalClient.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings
index 4833674..fdf2294 100644
--- a/src/BreCalClient/Properties/Settings.settings
+++ b/src/BreCalClient/Properties/Settings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">https://brecal.bsmd-emswe.eu</Value>
     </Setting>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#751D1F</Value>
+      <Value Profile="(Default)">#1D751F</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
       <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index eb07fe8..c3b9155 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient"             
              mc:Ignorable="d" 
              d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index fccb616..a9d922f 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -139,13 +139,13 @@ namespace BreCalClient
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
                         case 1: // incoming
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_down_red.png"));
                             break;
                         case 2: // outgoing
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_up_blue.png"));
                             break;
                         case 3: // shifting
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -154,13 +154,13 @@ namespace BreCalClient
                     switch(this.ShipcallControlModel?.LightMode)
                     {
                         case ShipcallControlModel.TrafficLightMode.GREEN:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png"));
                             break;
                         case ShipcallControlModel.TrafficLightMode.YELLOW:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/sign_warning.png"));
                             break;
                         case ShipcallControlModel.TrafficLightMode.RED:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
diff --git a/src/server/BreCal/impl/berths.py b/src/server/BreCal/impl/berths.py
index 7581d32..d41025c 100644
--- a/src/server/BreCal/impl/berths.py
+++ b/src/server/BreCal/impl/berths.py
@@ -15,7 +15,7 @@ def GetBerths(token):
     try:
         pooledConnection = local_db.getPoolConnection()
         commands = pydapper.using(pooledConnection)
-        data = commands.query("SELECT id, name, participant_id, `lock`, owner_id, authority_id, created, modified, deleted FROM berth WHERE deleted = 0 ORDER BY name", model=model.Berth)
+        data = commands.query("SELECT id, name, `lock`, owner_id, authority_id, created, modified, deleted FROM berth WHERE deleted = 0 ORDER BY name", model=model.Berth)
         pooledConnection.close()
 
     except Exception as ex:
diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py
index 4afd51b..1619ff3 100644
--- a/src/server/BreCal/local_db.py
+++ b/src/server/BreCal/local_db.py
@@ -10,7 +10,7 @@ def initPool(instancePath):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json');
+            config_path = os.path.join(instancePath,'../../../secure/connection_data_devel.json');
 
         print (config_path)
 
diff --git a/src/server/BreCal/schemas/model.py b/src/server/BreCal/schemas/model.py
index 905d412..193c3f4 100644
--- a/src/server/BreCal/schemas/model.py
+++ b/src/server/BreCal/schemas/model.py
@@ -16,7 +16,6 @@ def obj_dict(obj):
 class Berth(Schema):
     id: int
     name: str
-    participant_id: int
     lock: bool
     owner_id: int
     authority_id: int
diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index e734f70..1591b35 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,7 +2,7 @@ import os
 import sys
 import logging
 
-sys.path.insert(0, '/var/www/brecal_test/src/server')
+sys.path.insert(0, '/var/www/brecal_devel/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 # set the key

From 4aa7d6579096a3e62d06adf1fa6a9bade1e3e312 Mon Sep 17 00:00:00 2001
From: puls200 <schick@textbausteine.net>
Date: Tue, 31 Oct 2023 16:42:51 +0100
Subject: [PATCH 06/44] updated devel publishing profile

---
 .../PublishProfiles/ClickOnceDevelProfile.pubxml           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index a5b4284..c83771d 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.4.*</ApplicationVersion>
+    <ApplicationVersion>0.9.4.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
@@ -21,17 +21,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
     <Platform>Any CPU</Platform>
     <ProductName>Bremen calling development client</ProductName>
-    <PublishDir>bin\Release\net6.0-windows\win-x64\app.publish\</PublishDir>
+    <PublishDir>bin\Debug\net6.0-windows\win-x64\app.publish\</PublishDir>
     <PublishUrl>bin\publish.devel\</PublishUrl>
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <PublishProtocol>ClickOnce</PublishProtocol>
-    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishReadyToRun>True</PublishReadyToRun>
     <PublishSingleFile>True</PublishSingleFile>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <SignatureAlgorithm>(none)</SignatureAlgorithm>
     <SignManifests>False</SignManifests>
-    <SkipPublishVerification>false</SkipPublishVerification>
     <SuiteName>Bremen calling</SuiteName>
     <SupportUrl>https://www.textbausteine.net/</SupportUrl>
     <TargetFramework>net6.0-windows</TargetFramework>

From 8e2e676cb0e289f6e53c76bd40c9954a615ccb04 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 31 Oct 2023 18:15:59 +0100
Subject: [PATCH 07/44] hotfixing open errors, as defined by Daniel Schick and
 Christin Hollman (26.10. and 27.10.). Adding descriptions for the error codes
 instead of using 'cryptic' function names. This should make the application
 much more readable.

---
 .../validators/validation_rule_functions.py   | 90 ++++++++++++++++---
 .../BreCal/validators/validation_rules.py     |  3 +
 .../test_validation_rule_functions.py         |  8 ++
 3 files changed, 90 insertions(+), 11 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 81f53f3..9e51eaf 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -7,6 +7,43 @@ from BreCal.validators.time_logic import TimeLogic
 from BreCal.database.enums import StatusFlags
 #from BreCal.validators.schema_validation import validation_state_and_validation_name
 
+# a human interpretable dictionary for error messages. In this case, the English language is preferred
+error_message_dict = {
+    # 0001 A-M
+    "validation_rule_fct_missing_time_agency_berth_eta":"The shipcall arrives in less than 20 hours, but there are still missing times by the agency. Please add the estimated time of arrival (ETA) {Rule #0001A}", # A
+    "validation_rule_fct_missing_time_agency_berth_etd":"The shipcall departs in less than 20 hours, but there are still missing times by the agency. Please add the estimated time of departure (ETD) {Rule #0001B}", # B
+    "validation_rule_fct_missing_time_mooring_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the mooring. Please add the estimated time of arrival (ETA) {Rule #0001C}", # C
+    "validation_rule_fct_missing_time_mooring_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the mooring. Please add the estimated time of departure (ETD) {Rule #0001D}", # D
+    "validation_rule_fct_missing_time_portadministration_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the port administration. Please add the estimated time of arrival (ETA) {Rule #0001F}", # F
+    "validation_rule_fct_missing_time_portadministration_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the port administration. Please add the estimated time of departure (ETD)  {Rule #0001G}", # G
+    "validation_rule_fct_missing_time_pilot_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the pilot. Please add the estimated time of arrival (ETA) {Rule #0001H}", # H
+    "validation_rule_fct_missing_time_pilot_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the pilot. Please add the estimated time of departure (ETD)  {Rule #0001I}", # I
+    "validation_rule_fct_missing_time_tug_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the tugs. Please add the estimated time of arrival (ETA) {Rule #0001J}", # J
+    "validation_rule_fct_missing_time_tug_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the tugs. Please add the estimated time of departure (ETD)  {Rule #0001K}", # K
+    "validation_rule_fct_missing_time_terminal_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the terminal. Please add the estimated time of arrival (ETA) {Rule #0001L}", # L
+    "validation_rule_fct_missing_time_terminal_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the terminal. Please add the estimated time of departure (ETD)  {Rule #0001M}", # M
+
+    # 0002 A+B+C
+    "validation_rule_fct_shipcall_incoming_participants_disagree_on_eta":"There are deviating times between agency, mooring, port authority, pilot and tug for the estimated time of arrival (ETA) {Rule #0002A}",
+    "validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd":"There are deviating times between agency, mooring, port authority, pilot and tug for the estimated time of departure (ETD) {Rule #0002B}",
+    "validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd":"There are deviating times between agency, mooring, port authority, pilot and tug for ETA and ETD {Rule #0002C}",
+
+    # 0003 A+B
+    "validation_rule_fct_eta_time_not_in_operation_window":"The estimated time of arrival will be AFTER the planned start of operations. {Rule #0003A}",
+    "validation_rule_fct_etd_time_not_in_operation_window":"The estimated time of departure is supposed to be AFTER the planned end of operations. {Rule #0003D}",
+
+    # 0004 A+B
+    "validation_rule_fct_eta_time_not_in_tidal_window":"The tidal window does not fit to the agency's estimated time of arrival (ETA) {Rule #0004A}",
+    "validation_rule_fct_etd_time_not_in_tidal_window":"The tidal window does not fit to the agency's estimated time of departure (ETD) {Rule #0004B}",
+
+    # 0005 A+B
+    "validation_rule_fct_too_many_identical_eta_times":"There are more than three ships with the same planned time of arrival (ETA) {Rule #0005A}",
+    "validation_rule_fct_too_many_identical_etd_times":"There are more than three ships with the same planned time of departure (ETD) {Rule #0005B}",
+
+    # 0006 A+B
+    "validation_rule_fct_agency_and_terminal_berth_id_disagreement":"Agency and Terminal are planning with different berths (the berth_id deviates). {Rule #0006A}",
+    "validation_rule_fct_agency_and_terminal_pier_side_disagreement":"Agency and Terminal are planning with different pier sides (the pier_side deviates).  {Rule #0006B}",
+}
 
 class ValidationRuleBaseFunctions():
     """
@@ -16,6 +53,16 @@ class ValidationRuleBaseFunctions():
     def __init__(self, sql_handler):
         self.sql_handler = sql_handler
         self.time_logic = TimeLogic()
+        self.error_message_dict = error_message_dict
+
+    def describe_error_message(self, key)->str:
+        """
+        Takes any error message, which typically is the validation rule's function name and returns a description of the error. 
+        In case that the error code is not defined in self.error_message_dict, return the cryptic error code instead
+
+        returns: string
+        """
+        return self.error_message_dict.get(key,key)
 
     def check_time_delta_violation_query_time_to_now(self, query_time:pd.Timestamp, key_time:pd.Timestamp, threshold:float)->bool:
         """
@@ -36,7 +83,7 @@ class ValidationRuleBaseFunctions():
             threshold: threshold where a time difference becomes crucial. When the delta is below the threshold, a violation might occur
         """
         # rule is not applicable -> return 'GREEN'
-        if key_time is not None:
+        if self.check_is_not_a_time_or_is_none(key_time) or self.check_is_not_a_time_or_is_none(query_time):
             return False
         
         # otherwise, this rule applies and the difference between 'now' and the query time is measured
@@ -76,7 +123,7 @@ class ValidationRuleBaseFunctions():
         df_times = df_times.loc[df_times["participant_type"].isin(participant_types),:]
 
         # exclude missing entries and consider only pd.Timestamp entries (which ignores pd.NaT/null entries)
-        estimated_times = [type(time_) for time_ in df_times.loc[:,query].tolist() if isinstance(time_, pd.Timestamp)] # df_times = df_times.loc[~df_times[query].isnull(),:]
+        estimated_times = [time_ for time_ in df_times.loc[:,query].tolist() if isinstance(time_, pd.Timestamp)] # df_times = df_times.loc[~df_times[query].isnull(),:]
 
         # apply rounding. For example, the agreement of different participants may be required to match minute-wise
         # '15min' rounds to 'every 15 minutes'. E.g., '2023-09-22 08:18:49' becomes '2023-09-22 08:15:00'
@@ -112,6 +159,11 @@ class ValidationRuleBaseFunctions():
         violation_state = np.any(np.greater(counts, maximum_threshold))
         return violation_state
 
+    def check_is_not_a_time_or_is_none(self, value)->bool:
+        """checks, if a provided value is either None or NaT"""
+        return (value is None) or (value is pd.NaT)
+
+
 
 class ValidationRuleFunctions(ValidationRuleBaseFunctions):
     """
@@ -466,12 +518,12 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
     
     def validation_rule_fct_missing_time_terminal_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
-        Code: #0001-K
+        Code: #0001-M
         Type: Local Rule
         Description: this validation checks, whether there is a missing time. When the difference between an event (e.g., the shipcall eta) is below
         a certain threshold (e.g., 20 hours), a violation occurs
 
-        0001-K:
+        0001-M:
             - Checks, if times_terminal.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
@@ -595,7 +647,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
-        if (times_terminal.operations_end is pd.NaT) or (times_agency.etd_berth is pd.NaT):
+        if self.check_is_not_a_time_or_is_none(times_terminal.operations_start) or self.check_is_not_a_time_or_is_none(times_agency.eta_berth):
             return (StatusFlags.GREEN, None)
 
         # check, whether the start of operations is AFTER the estimated arrival time
@@ -607,7 +659,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         else:
             return (StatusFlags.GREEN, None)
     
-    def validation_rule_fct_eta_time_not_in_operation_window(self, shipcall, df_times, *args, **kwargs):
+    def validation_rule_fct_etd_time_not_in_operation_window(self, shipcall, df_times, *args, **kwargs):
         """
         Code: #0003-B
         Type: Local Rule
@@ -624,7 +676,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
-        if (times_terminal.operations_end is pd.NaT) or (times_agency.etd_berth is pd.NaT):
+        if self.check_is_not_a_time_or_is_none(times_terminal.operations_end) or self.check_is_not_a_time_or_is_none(times_agency.etd_berth):
             return (StatusFlags.GREEN, None)
 
         # check, whether the end of operations is AFTER the estimated departure time
@@ -651,11 +703,11 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
 
         # requirements: tidal window (from & to) is filled in
-        if (shipcall.tidal_window_from is pd.NaT) or (shipcall.tidal_window_to is pd.NaT) or (df_times.eta_berth is pd.NaT):
+        if self.check_is_not_a_time_or_is_none(shipcall.tidal_window_from) or self.check_is_not_a_time_or_is_none(shipcall.tidal_window_to) or self.check_is_not_a_time_or_is_none(times_agency.eta_berth): # 202310310: note: this should check times_agency, shouldn't it?
             return (StatusFlags.GREEN, None)
 
         # check, whether the query time is between start & end time
-        # a violation is observed, when the is NOT between start & end
+        # a violation is observed, when the time is NOT between start & end
         violation_state = not self.time_logic.time_inbetween(query_time=times_agency.eta_berth, start_time=shipcall.tidal_window_from, end_time=shipcall.tidal_window_to)
 
         if violation_state:
@@ -679,11 +731,11 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
 
         # requirements: tidal window (from & to) is filled in
-        if (shipcall.tidal_window_from is pd.NaT) or (shipcall.tidal_window_to is pd.NaT) or (df_times.etd_berth is pd.NaT):
+        if self.check_is_not_a_time_or_is_none(shipcall.tidal_window_from) or self.check_is_not_a_time_or_is_none(shipcall.tidal_window_to) or self.check_is_not_a_time_or_is_none(times_agency.etd_berth): # 202310310: note: this should check times_agency, shouldn't it?
             return (StatusFlags.GREEN, None)
 
         # check, whether the query time is between start & end time
-        # a violation is observed, when the is NOT between start & end
+        # a violation is observed, when the time is NOT between start & end
         violation_state = not self.time_logic.time_inbetween(query_time=times_agency.etd_berth, start_time=shipcall.tidal_window_from, end_time=shipcall.tidal_window_to)
 
         if violation_state:
@@ -698,6 +750,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         Type: Global Rule
         Description: this validation rule checks, whether there are too many shipcalls with identical ETA times.
         """
+        # check, if the header is filled in (agency)
+        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
+            return (StatusFlags.GREEN, None)
+
         # when ANY of the unique values exceeds the threshold, a violation is observed
         query = "eta_berth"
         violation_state = self.check_unique_shipcall_counts(query, rounding=rounding, maximum_threshold=maximum_threshold)
@@ -714,6 +770,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         Type: Global Rule
         Description: this validation rule checks, whether there are too many shipcalls with identical ETD times.
         """
+        # check, if the header is filled in (agency)
+        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
+            return (StatusFlags.GREEN, None)
+
         # when ANY of the unique values exceeds the threshold, a violation is observed
         query = "etd_berth"
         violation_state = self.check_unique_shipcall_counts(query, rounding=rounding, maximum_threshold=maximum_threshold)
@@ -737,6 +797,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
+        # when one of the two values is null, the state is GREEN
+        if (times_agency.berth_id is None) or (times_terminal.berth_id is None):
+            return (StatusFlags.GREEN, None)
+
         violation_state = times_agency.berth_id!=times_terminal.berth_id
 
         if violation_state:
@@ -758,6 +822,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
+        # when one of the two values is null, the state is GREEN
+        if (times_agency.pier_side is None) or (times_terminal.pier_side is None):
+            return (StatusFlags.GREEN, None)
+
         violation_state = times_agency.pier_side!=times_terminal.pier_side
 
         if violation_state:
diff --git a/src/server/BreCal/validators/validation_rules.py b/src/server/BreCal/validators/validation_rules.py
index 7e7fcef..2753446 100644
--- a/src/server/BreCal/validators/validation_rules.py
+++ b/src/server/BreCal/validators/validation_rules.py
@@ -41,6 +41,9 @@ class ValidationRules(ValidationRuleFunctions):
         # filter out all 'None' results, which indicate that no violation occured.
         evaluation_results = [evaluation_result for evaluation_result in evaluation_results if evaluation_result[1] is not None]
 
+        # 'translate' all error codes into readable, human-understandable format.
+        evaluation_results = [(state, self.describe_error_message(msg)) for (state, msg) in evaluation_results]
+
         """ # deprecated
         # check, if ANY of the evaluation results (evaluation_state) is larger than the .GREEN state. This means, that .YELLOW and .RED
         # would return 'True'. Numpy arrays and functions are used to accelerate the comparison. 
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index 00554b8..671458b 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -156,4 +156,12 @@ def test_validation_rule_fct_agency_and_terminal_berth_id_agreement(build_sql_pr
 
 
 
+def test_all_validation_rule_fcts_have_a_description():
+    from BreCal.validators.validation_rule_functions import error_message_dict, ValidationRuleFunctions
+    import types
 
+    vr = ValidationRuleFunctions(sql_handler=None)
+    assert all(
+        [mthd_ in list(error_message_dict.keys()) for mthd_ in dir(vr) if ('validation_rule_fct' in mthd_)]
+        ), f"one of the validation_rule_fcts is currently not defined in the error_message_dict and will create cryptic descriptions! Please add it to the error_message_dict BreCal.validators.validation_rule_functions"
+    return

From a82080b9705cccbefc63b54bef0c1244f678cddf Mon Sep 17 00:00:00 2001
From: puls200 <schick@textbausteine.net>
Date: Wed, 1 Nov 2023 11:10:28 +0100
Subject: [PATCH 08/44] Fixed berth display changing between add and update

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

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 08736fc..c9e49ae 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -416,8 +416,16 @@ namespace BreCalClient
             Shipcall shipcall = scm.Shipcall;
             if (BreCalLists.ShipLookupDict.ContainsKey(shipcall.ShipId))
                 scm.Ship = BreCalLists.ShipLookupDict[shipcall.ShipId];
-            if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
-                scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
+            if (shipcall.Type == 1)
+            {
+                if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
+                    scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
+            }
+            else
+            {
+                if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.DepartureBerthId ?? 0))
+                    scm.Berth = BreCalLists.BerthLookupDict[shipcall.DepartureBerthId ?? 0].Name;
+            }
             scm.AssignParticipants();
         }
 

From 44de849430546e2b4be0e8318a709a922c38d4a7 Mon Sep 17 00:00:00 2001
From: puls200 <schick@textbausteine.net>
Date: Wed, 1 Nov 2023 15:53:29 +0100
Subject: [PATCH 09/44] fixed little bugs, bumped version and set API endpoint
 to (correct for develop branch) brecaldevel endpoint

---
 misc/BreCalApi.cs                                         | 8 ++++----
 misc/BreCalApi.yaml                                       | 2 +-
 misc/version.txt                                          | 2 +-
 src/BreCalClient/BreCalClient.csproj                      | 4 ++--
 .../PublishProfiles/ClickOnceDevelProfile.pubxml          | 2 +-
 .../Properties/PublishProfiles/ClickOnceProfile.pubxml    | 2 +-
 .../PublishProfiles/ClickOnceTestProfile.pubxml           | 2 +-
 src/BreCalClient/ShipcallControl.xaml.cs                  | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index df88d8c..741fbf4 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -1,7 +1,7 @@
 
 //----------------------
 // <auto-generated>
-//     Generated REST API Client Code Generator v1.8.4.0 on 23.10.2023 09:06:40
+//     Generated REST API Client Code Generator v1.8.4.0 on 01.11.2023 15:27:09
 //     Using the tool OpenAPI Generator v7.0.0
 // </auto-generated>
 //----------------------
@@ -3582,7 +3582,7 @@ namespace BreCalClient.misc.Client
         {
             Proxy = null;
             UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
-            BasePath = "https://brecaltest.bsmd-emswe.eu";
+            BasePath = "https://brecaldevel.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://brecaltest.bsmd-emswe.eu"},
+                        {"url", "https://brecaldevel.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://brecaltest.bsmd-emswe.eu") : this()
+            string basePath = "https://brecaldevel.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index 738816a..f3c845c 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -14,7 +14,7 @@ info:
 
 servers:
     # tutorial: https://idratherbewriting.com/learnapidoc/pubapis_openapi_step3_servers_object.html
-    - url: "https://brecaltest.bsmd-emswe.eu/"
+    - url: "https://brecaldevel.bsmd-emswe.eu/"
       description: "Test server hosted on vcup"
 
 paths:
diff --git a/misc/version.txt b/misc/version.txt
index 82c7058..9afd78e 100644
--- a/misc/version.txt
+++ b/misc/version.txt
@@ -1 +1 @@
-0.9.4.0
\ No newline at end of file
+0.9.5.0
\ No newline at end of file
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index fd2a8c8..4d27982 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>0.9.3.0</AssemblyVersion>
-    <FileVersion>0.9.3.0</FileVersion>
+    <AssemblyVersion>0.9.5.0</AssemblyVersion>
+    <FileVersion>0.9.5.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index c83771d..146bf89 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.4.0</ApplicationVersion>
+    <ApplicationVersion>0.9.5.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index ce50fd9..1926cef 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.3.0</ApplicationVersion>
+    <ApplicationVersion>0.9.5.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 55c6d0e..190ecc9 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.4.*</ApplicationVersion>
+    <ApplicationVersion>0.9.5.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index a9d922f..eb74cc7 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -222,7 +222,7 @@ namespace BreCalClient
                         foreach (Times times in this.ShipcallControlModel.Times)
                         {
                             string? berthText = null;
-                            if ((BreCalLists.Berths != null) && times.BerthId.HasValue)
+                            if ((BreCalLists.Berths != null) && times.BerthId.HasValue && (this.ShipcallControlModel?.Shipcall?.Type != (int) Extensions.TypeEnum.Shifting))
                             {
                                 Berth? berth = BreCalLists.Berths.Find((x) => x.Id == times.BerthId);
                                 berthText = berth?.Name;

From b75ea6891c2b43d43b170fafee4c752feb229f40 Mon Sep 17 00:00:00 2001
From: puls200 <schick@textbausteine.net>
Date: Wed, 1 Nov 2023 17:03:15 +0100
Subject: [PATCH 10/44] fixed path in app.config

---
 src/BreCalClient/App.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index 87c70a1..c86f39a 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -11,7 +11,7 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecaltest.bsmd-emswe.eu</value>
+                <value>https://brecaldevel.bsmd-emswe.eu</value>
             </setting>
             <setting name="BG_COLOR" serializeAs="String">
                 <value>#1D751F</value>

From 8606e1fdb638db33c3b59eba1cc9b87fd0c45dc1 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Sat, 4 Nov 2023 10:04:02 +0100
Subject: [PATCH 11/44] removing the Pandas 'sqlalchemy' warning by refactoring

removing the Pandas 'sqlalchemy' warning by refactoring.

reformatting
---
 src/server/BreCal/database/sql_handler.py | 50 ++++++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index 3ae0e27..457b950 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -26,7 +26,7 @@ class SQLHandler():
         with self.sql_connection.cursor(buffered=True) as cursor:
             cursor.execute("SHOW TABLES")
             schema = cursor.fetchall()
-        all_schemas = [schem[0] for schem in schema]
+            all_schemas = [schem[0] for schem in schema]
         return all_schemas
     
     def build_str_to_model_dict(self):
@@ -42,13 +42,51 @@ class SQLHandler():
 
     def read_mysql_table_to_df(self, table_name:str):
         """determine a {table_name}, which will be read from a mysql server. returns a pandas DataFrame with the respective data"""
-        df = pd.read_sql(sql=f"SELECT * FROM {table_name}", con=self.sql_connection)
+        with self.sql_connection.cursor(buffered=True) as cursor: #df = pd.read_sql(sql=f"SELECT * FROM {table_name}", con=self.sql_connection)
+            # 1.) get the column names
+            cursor.execute(f"DESCRIBE {table_name}")
+            cols = cursor.fetchall()
+            column_names = [col_name[0] for col_name in cols]
+            
+            # 2.) get the data tuples
+            cursor.execute(f"SELECT * FROM {table_name}")
+            data = cursor.fetchall()
+
+        # 3.) map the data tuples to the correct column names
+        data = [{k:v for k,v in zip(column_names, dat)} for dat in data]
+
+        # 4.) build a dataframe from the respective data models (which ensures the correct data type)
+        data_model = self.str_to_model_dict.get(table_name)
+        if data_model is not None:
+            df = pd.DataFrame([data_model(**dat) for dat in data])
+        else:
+            df = pd.DataFrame([dat for dat in data])
         return df
 
-    def mysql_to_df(self, query):
+    def mysql_to_df(self, query, table_name):
         """provide an arbitrary sql query that should be read from a mysql server {sql_connection}. returns a pandas DataFrame with the obtained data"""
-        df = pd.read_sql(query, self.sql_connection).convert_dtypes()
-        df = df.set_index('id', inplace=False) # avoid inplace updates, so the raw sql remains unchanged
+        with self.sql_connection.cursor(buffered=True) as cursor: # df = pd.read_sql(query, self.sql_connection).convert_dtypes()
+            # 1.) get the column names
+            cursor.execute(f"DESCRIBE {table_name}")
+            cols = cursor.fetchall()
+            column_names = [col_name[0] for col_name in cols]
+
+            # 2.) get the data tuples
+            cursor.execute(query)
+            data = cursor.fetchall()
+
+        # 3.) map the data tuples to the correct column names
+        data = [{k:v for k,v in zip(column_names, dat)} for dat in data]
+
+        # 4.) build a dataframe from the respective data models (which ensures the correct data type)
+        data_model = self.str_to_model_dict.get(table_name)
+        if data_model is not None:
+            df = pd.DataFrame([data_model(**dat) for dat in data])
+        else:
+            df = pd.DataFrame([dat for dat in data])
+        
+        if 'id' in df.columns:
+            df = df.set_index('id', inplace=False) # avoid inplace updates, so the raw sql remains unchanged
         return df
     
     def read_all(self, all_schemas):
@@ -64,7 +102,7 @@ class SQLHandler():
         mysql_df_dict = {}
         for schem in all_schemas:
             query = f"SELECT * FROM {schem}"
-            mysql_df_dict[schem] = self.mysql_to_df(query)
+            mysql_df_dict[schem] = self.mysql_to_df(query, table_name=schem)
         return mysql_df_dict
     
     def initialize_shipcall_participant_list(self):

From 2374cf4ff06e5cc328037a7f02c5af3ce0892319 Mon Sep 17 00:00:00 2001
From: scopesorting <143536577+scopesorting@users.noreply.github.com>
Date: Tue, 7 Nov 2023 07:08:52 +0100
Subject: [PATCH 12/44] Feature/removing pandas warning (#14)

* removing the Pandas 'sqlalchemy' warning by refactoring

* removing the Pandas 'sqlalchemy' warning by refactoring.

* reformatting
---
 src/server/BreCal/database/sql_handler.py | 50 ++++++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index 3ae0e27..457b950 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -26,7 +26,7 @@ class SQLHandler():
         with self.sql_connection.cursor(buffered=True) as cursor:
             cursor.execute("SHOW TABLES")
             schema = cursor.fetchall()
-        all_schemas = [schem[0] for schem in schema]
+            all_schemas = [schem[0] for schem in schema]
         return all_schemas
     
     def build_str_to_model_dict(self):
@@ -42,13 +42,51 @@ class SQLHandler():
 
     def read_mysql_table_to_df(self, table_name:str):
         """determine a {table_name}, which will be read from a mysql server. returns a pandas DataFrame with the respective data"""
-        df = pd.read_sql(sql=f"SELECT * FROM {table_name}", con=self.sql_connection)
+        with self.sql_connection.cursor(buffered=True) as cursor: #df = pd.read_sql(sql=f"SELECT * FROM {table_name}", con=self.sql_connection)
+            # 1.) get the column names
+            cursor.execute(f"DESCRIBE {table_name}")
+            cols = cursor.fetchall()
+            column_names = [col_name[0] for col_name in cols]
+            
+            # 2.) get the data tuples
+            cursor.execute(f"SELECT * FROM {table_name}")
+            data = cursor.fetchall()
+
+        # 3.) map the data tuples to the correct column names
+        data = [{k:v for k,v in zip(column_names, dat)} for dat in data]
+
+        # 4.) build a dataframe from the respective data models (which ensures the correct data type)
+        data_model = self.str_to_model_dict.get(table_name)
+        if data_model is not None:
+            df = pd.DataFrame([data_model(**dat) for dat in data])
+        else:
+            df = pd.DataFrame([dat for dat in data])
         return df
 
-    def mysql_to_df(self, query):
+    def mysql_to_df(self, query, table_name):
         """provide an arbitrary sql query that should be read from a mysql server {sql_connection}. returns a pandas DataFrame with the obtained data"""
-        df = pd.read_sql(query, self.sql_connection).convert_dtypes()
-        df = df.set_index('id', inplace=False) # avoid inplace updates, so the raw sql remains unchanged
+        with self.sql_connection.cursor(buffered=True) as cursor: # df = pd.read_sql(query, self.sql_connection).convert_dtypes()
+            # 1.) get the column names
+            cursor.execute(f"DESCRIBE {table_name}")
+            cols = cursor.fetchall()
+            column_names = [col_name[0] for col_name in cols]
+
+            # 2.) get the data tuples
+            cursor.execute(query)
+            data = cursor.fetchall()
+
+        # 3.) map the data tuples to the correct column names
+        data = [{k:v for k,v in zip(column_names, dat)} for dat in data]
+
+        # 4.) build a dataframe from the respective data models (which ensures the correct data type)
+        data_model = self.str_to_model_dict.get(table_name)
+        if data_model is not None:
+            df = pd.DataFrame([data_model(**dat) for dat in data])
+        else:
+            df = pd.DataFrame([dat for dat in data])
+        
+        if 'id' in df.columns:
+            df = df.set_index('id', inplace=False) # avoid inplace updates, so the raw sql remains unchanged
         return df
     
     def read_all(self, all_schemas):
@@ -64,7 +102,7 @@ class SQLHandler():
         mysql_df_dict = {}
         for schem in all_schemas:
             query = f"SELECT * FROM {schem}"
-            mysql_df_dict[schem] = self.mysql_to_df(query)
+            mysql_df_dict[schem] = self.mysql_to_df(query, table_name=schem)
         return mysql_df_dict
     
     def initialize_shipcall_participant_list(self):

From 1a0fb6f9ef0153933483e58c5591f4a83fbef8f8 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 7 Nov 2023 09:00:14 +0100
Subject: [PATCH 13/44] fixed gitignore file and copy scripts

---
 .gitignore       | 322 ++---------------------------------------------
 misc/copyprod.sh |  24 ++--
 misc/copytest.sh |  24 ++--
 3 files changed, 31 insertions(+), 339 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbd7a3a..83afcd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,3 @@
-
-Skip to content
-Pull requests
-Issues
-Codespaces
-Marketplace
-Explore
-@danielschick
-github /
-gitignore
-Public
-
-Fork your own copy of github/gitignore
-
-Code
-Pull requests 371
-Actions
-Security
-
-    Insights
-
-Beta Try the new code view
-gitignore/VisualStudio.gitignore
-@n0099
-n0099 [VisualStudio.gitignore] remove a trailing space
-Latest commit 491040e Jan 26, 2022
-History
-165 contributors
-@shiftkey
-@arcresu
-@aroben
-@bbodenmiller
-@HassanHashemi
-@haacked
-@niik
-@AArnott
-@sayedihashimi
-@saschanaz
-@bdougie
-@OsirisTerje
-398 lines (319 sloc) 6.7 KB
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -75,40 +34,11 @@ bld/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
 # Files built by Visual Studio
 *_i.c
 *_p.c
@@ -139,20 +69,6 @@ StyleCopReport.xml
 *.svclog
 *.scc
 
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
 # Visual Studio profiler
 *.psess
 *.vsp
@@ -162,108 +78,9 @@ ipch/
 # Visual Studio Trace Files
 *.e2e
 
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
 # Click-Once directory
 publish/
 
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-# *.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
@@ -279,158 +96,33 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
 *.ndf
 
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 node_modules/
 
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio 6 auto-generated project file (contains which files were open etc.)
-*.vbp
-
-# Visual Studio 6 workspace and project file (working project files containing files to include in project)
-*.dsw
-*.dsp
-
-# Visual Studio 6 technical files
-*.ncb
-*.aps
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
 
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
 
 # Visual Studio History (VSHistory) files
 .vshistory/
 
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
 # VS Code files for those working on multiple tools
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
+.vscode/
+
+#!.vscode/settings.json
+#!.vscode/tasks.json
+#!.vscode/launch.json
+#!.vscode/extensions.json
+#*.code-workspace
 
 # Local History for Visual Studio Code
 .history/
-
-# Windows Installer files from build outputs
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
diff --git a/misc/copyprod.sh b/misc/copyprod.sh
index afa5092..2083bce 100644
--- a/misc/copyprod.sh
+++ b/misc/copyprod.sh
@@ -2,8 +2,8 @@
 # This script replaces all references to the development version with the test version
 # 1) Database references and paths
 
-git grep -I "connection_data_test.json"
-git grep -I "/var/www/brecal_test/"
+git grep -I "connection_data_test.json" -- '..' ':(exclude)*.sh'
+git grep -I "/var/www/brecal_test/" -- '..' ':(exclude)*.sh'
 
 # 2) Color references
 # Bar colors in client: (BG_COLOR)
@@ -11,11 +11,11 @@ git grep -I "/var/www/brecal_test/"
 # Test: #751D1F
 # Prod: #203864
 
-git grep -I "#751D1F" 
+git grep -I "#751D1F" -- '..' ':(exclude)*.sh'
 
 # 3) Assembly name references
 
-git grep -I "BreCalTestClient"
+git grep -I "BreCalTestClient" -- '..' ':(exclude)*.sh'
 
 echo "Proceed? [N/y]"
 read proceed
@@ -25,18 +25,18 @@ read proceed
 if [ "${proceed}" = "y" ]; then
 
     # 1. for database references and paths
-    git grep -I "connection_data_test.json" | xargs sed --in-place -e "s/connection_data_test.json/connection_data_prod.json/g"
-    git add $(git grep -I "connection_data_prod.json")
-    git grep -I "/var/www/brecal_test/" | xargs sed --in-place -e "s/\/var\/www\/brecal_test\//\/var\/www\/brecal\//g"
-    git add $(git grep -I "/var/www/brecal/")
+    git grep -I "connection_data_test.json" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/connection_data_test.json/connection_data_prod.json/g"
+    git add $(git grep -Il "connection_data_prod.json" -- '..' ':(exclude)*.sh')
+    git grep -I "/var/www/brecal_test/" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/\/var\/www\/brecal_test\//\/var\/www\/brecal\//g"
+    git add $(git grep -Il "/var/www/brecal/" -- '..' ':(exclude)*.sh')
 
     # 2. for color
-    git grep -Il "#751D1F" | xargs sed --in-place -e "s/#751D1F/#203864/g"
-    git add $(git grep -Il "#203864")
+    git grep -Il "#751D1F" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/#751D1F/#203864/g"
+    git add $(git grep -Il "#203864" -- '..' ':(exclude)*.sh')
 
     # 3. for assembly name
 
-    git grep -I "BreCalTestClient" | xargs sed --in-place -e "s/BreCalTestClient/BreCalClient/g"
-    git add $(git grep -I "BreCalClient")
+    git grep -I "BreCalTestClient" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/BreCalTestClient/BreCalClient/g"
+    git add $(git grep -Il "BreCalClient" -- '..' ':(exclude)*.sh')
 
 fi
diff --git a/misc/copytest.sh b/misc/copytest.sh
index 2cea439..d7bbd87 100644
--- a/misc/copytest.sh
+++ b/misc/copytest.sh
@@ -2,8 +2,8 @@
 # This script replaces all references to the development version with the test version
 # 1) Database references and paths
 
-git grep -I "connection_data_devel.json"
-git grep -I "/var/www/brecal_devel/"
+git grep -I "connection_data_devel.json" -- '..' ':(exclude)*.sh'
+git grep -I "/var/www/brecal_devel/" -- '..' ':(exclude)*.sh'
 
 # 2) Color references
 # Bar colors in client: (BG_COLOR)
@@ -11,11 +11,11 @@ git grep -I "/var/www/brecal_devel/"
 # Test: #751D1F
 # Prod: #203864
 
-git grep -I "#1D751F" 
+git grep -I "#1D751F" -- '..' ':(exclude)*.sh'
 
 # 3) Assembly name references
 
-git grep -I "BreCalDevelClient"
+git grep -I "BreCalDevelClient" -- '..' ':(exclude)*.sh'
 
 echo "Proceed? [N/y]"
 read proceed
@@ -25,18 +25,18 @@ read proceed
 if [ "${proceed}" = "y" ]; then
 
     # 1. for database references and paths
-    git grep -I "connection_data_devel.json" | xargs sed --in-place -e "s/connection_data_devel.json/connection_data_test.json/g"
-    git add $(git grep -I "connection_data_test.json")
-    git grep -I "/var/www/brecal_devel/" | xargs sed --in-place -e "s/\/var\/www\/brecal_devel\//\/var\/www\/brecal_test\//g"
-    git add $(git grep -I "/var/www/brecal_test/")
+    git grep -Il "connection_data_devel.json" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/connection_data_devel.json/connection_data_test.json/g"
+    git add $(git grep -Il "connection_data_test.json" -- '..' ':(exclude)*.sh')
+    git grep -Il "/var/www/brecal_devel/" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/\/var\/www\/brecal_devel\//\/var\/www\/brecal_test\//g"
+    git add $(git grep -Il "/var/www/brecal_test/" -- '..' ':(exclude)*.sh')
 
     # 2. for color
-    git grep -Il "#1D751F" | xargs sed --in-place -e "s/#1D751F/#751D1F/g"
-    git add $(git grep -Il "#751D1F")
+    git grep -Il "#1D751F" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/#1D751F/#751D1F/g"
+    git add $(git grep -Il "#751D1F" -- '..' ':(exclude)*.sh')
 
     # 3. for assembly name
 
-    git grep -I "BreCalDevelClient" | xargs sed --in-place -e "s/BreCalDevelClient/BreCalTestClient/g"
-    git add $(git grep -I "BreCalTestClient")
+    git grep -Il "BreCalDevelClient" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/BreCalDevelClient/BreCalTestClient/g"
+    git add $(git grep -Il "BreCalTestClient" -- '..' ':(exclude)*.sh')
 
 fi

From b7a8b3aa1b1c969c5e7512c8f07ca92895b3532b Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 8 Nov 2023 07:44:17 +0100
Subject: [PATCH 14/44] Bugfix: switch arrival/departure berth combobox for
 incoming / outgoing calls (just for display, not logical)

---
 src/BreCalClient/EditShipcallControl.xaml    |  4 +--
 src/BreCalClient/EditShipcallControl.xaml.cs | 27 ++++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index ffd82ee..0ed9c54 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -66,14 +66,14 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
                 <ComboBox.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
                     </ContextMenu>
                 </ComboBox.ContextMenu>
             </ComboBox>
-            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
+            <ComboBox Name="comboBoxArrivalBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
                 <ComboBox.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 041d16a..9c157e7 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -158,9 +158,17 @@ namespace BreCalClient
 
                 this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id;
                 this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
-                this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
-                this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
-                
+
+                if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
+                {
+                    this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
+                    this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
+                } 
+                else // shifting
+                {
+                    this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
+                    this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
+                }
 
                 Participant? participant;
                 participant = (Participant?)this.comboBoxAgency.SelectedItem;
@@ -224,8 +232,17 @@ namespace BreCalClient
                 // this.textBoxVoyage.Text = this.ShipcallModel.Shipcall.Voyage;
                 this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
                 this.comboBoxShip.SelectedValue = this.ShipcallModel.Shipcall.ShipId;
-                this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
-                this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+
+                if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
+                {
+                    this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
+                    this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+                }
+                else // shifting
+                {
+                    this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+                    this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
+                }
 
                 if (this.ShipcallModel.Shipcall.Participants == null) this.ShipcallModel.Shipcall.Participants = new();
                 

From d439b7ed1275ed7bcc81af80e5ac4b13da7ed400 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 10 Nov 2023 11:36:17 +0100
Subject: [PATCH 15/44] fixed removing of assignments (delete times record),
 removed green bg color

---
 src/BreCalClient/EditShipcallControl.xaml | 15 ++++-----
 src/BreCalClient/ShipcallControl.xaml.cs  | 41 +++++++++++++++++++++--
 src/BreCalClient/ShipcallControlModel.cs  | 27 +++++++++++++++
 3 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 0ed9c54..8f20e1b 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -65,14 +65,6 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-
-            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
             <ComboBox Name="comboBoxArrivalBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
                 <ComboBox.ContextMenu>
                     <ContextMenu>
@@ -80,6 +72,13 @@
                     </ContextMenu>
                 </ComboBox.ContextMenu>
             </ComboBox>
+            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+                <ComboBox.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
+                    </ContextMenu>
+                </ComboBox.ContextMenu>
+            </ComboBox>
         </Grid>
         
         <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="2" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False"/>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index eb74cc7..b9f016e 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -71,26 +71,61 @@ namespace BreCalClient
                     name = _agency?.Name;
                     if (name != null) agentName = name;
                     this.labelAgent.Content = name ?? "- / -";
+                    if(_agency == null)
+                    {
+                        // clear agency display controls
+                        this.labelAgencyBerth.Content = "";
+                        this.labelAgencyETAETDValue.Content = "";
+                        this.textBlockAgencyRemarks.Text = "";
+                        this.textBlockAgencyBerthRemarks.Text = "";
+                    }
 
                     _mooring = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.MOORING);
                     name = _mooring?.Name;
                     this.labelMooring.Content = name ?? "- / -";
+                    if(_mooring == null)
+                    {
+                        this.labelMooringETAETDValue.Content = "";
+                        this.textBlockMooringRemarks.Text = "";
+                    }
 
                     _pilot = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PILOT);
                     name = _pilot?.Name;
                     this.labelPilot.Content = name ?? "- / - ";
+                    if(_pilot == null)
+                    {
+                        this.labelPilotETAETDValue.Content = "";
+                        this.textBlockPilotRemarks.Text = "";
+                    }
 
                     _tug = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TUG);
                     name = _tug?.Name;
                     this.labelTug.Content = name ?? "- / - ";
+                    if(_tug == null)
+                    {
+                        this.labelTugETAETDValue.Content = "";
+                        this.textBlockTugRemarks.Text = "";
+                    }
 
                     _port_administration = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
                     name = _port_administration?.Name;
                     this.labelPortAuthority.Content = name ?? "- / - ";
+                    if(_port_administration == null)
+                    {
+                        this.labelPortAuthorityETAETDValue.Content = "";
+                        this.textBlockPortAuthorityRemarks.Text = "";
+                    }
 
                     _terminal = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TERMINAL);
                     name = _terminal?.Name;
                     this.labelTerminal.Content = name ?? "- / - ";
+                    if(_terminal == null)
+                    {
+                        this.textBlockTerminalRemarks.Text = "";
+                        this.textBlockTerminalBerthRemarks.Text = "";
+                        this.labelTerminalBerth.Content = "";
+                        this.labelOperationsStart.Content = "";
+                    }
 
                     if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TERMINAL) && (App.Participant.Id == _terminal?.Id))
                     {
@@ -171,9 +206,9 @@ namespace BreCalClient
                         ShipcallControlModel.TrafficLightMode resultColor = (ShipcallControlModel.TrafficLightMode) (this.ShipcallControlModel?.Shipcall?.Evaluation ?? 0); // der nullable Operator hier ist so doof, die VS validation blickts einfach nicht
                         switch (resultColor)
                         {
-                            case ShipcallControlModel.TrafficLightMode.GREEN:
-                                this.Background = Brushes.LightGreen;
-                                break;
+                            //case ShipcallControlModel.TrafficLightMode.GREEN:
+                            //    this.Background = Brushes.LightGreen;
+                            //    break;
                             case ShipcallControlModel.TrafficLightMode.YELLOW:
                                 this.Background= Brushes.LightYellow;
                                 break;
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index a5e8e73..64610ba 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -142,6 +142,33 @@ namespace BreCalClient
                     await _api.TimesPutAsync(times);
                 }
             }
+
+            // if somebody just removed an assignment it is gone fom AssignedParticipants, but there is still a
+            // times record left which must be removed
+
+            List<Times> deleteTimes = new();
+            foreach (Times times in this.Times)
+            {
+                bool foundTimes = false;
+                foreach (ParticipantAssignment pa in this.AssignedParticipants.Values)
+                {
+                    if((pa.ParticipantId == times.ParticipantId) && (pa.Type == times.ParticipantType))
+                    {
+                        foundTimes = true;
+                        break;
+                    }
+                }
+                if (!foundTimes)
+                {
+                    deleteTimes.Add(times);
+                }
+            }
+
+            foreach(Times times in deleteTimes)
+            {
+                _api.TimesDelete(times.Id);
+                this.Times.Remove(times);
+            }
         }
 
         #endregion

From f0fa9285affd6b1fd511dab7b618a8211cff6acb Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 10 Nov 2023 11:46:43 +0100
Subject: [PATCH 16/44] fixed ETA/ETD sorting by taking agency values into
 account

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

diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index c9e49ae..78ddde6 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -534,8 +534,8 @@ namespace BreCalClient
                     {                            
                         if (x.Shipcall == null) return 0;
                         if (y.Shipcall == null) return 0;
-                        DateTime xDate = (x.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? x.Shipcall.Eta ?? DateTime.Now : x.Shipcall.Etd ?? DateTime.Now;
-                        DateTime yDate = (y.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? y.Shipcall.Eta ?? DateTime.Now : y.Shipcall.Etd ?? DateTime.Now;
+                        DateTime xDate = (x.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? x.Eta ?? DateTime.Now : x.Etd ?? DateTime.Now;
+                        DateTime yDate = (y.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? y.Eta ?? DateTime.Now : y.Etd ?? DateTime.Now;
                         return DateTime.Compare(xDate, yDate);
                     });
                     break;
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index 64610ba..707c1cc 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -52,6 +52,28 @@ namespace BreCalClient
 
         public List<Times> Times { get; set; } = new();
 
+        public DateTime? Eta
+        {
+            get
+            {
+                Times? agencyTimes = this.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
+                if((agencyTimes != null) && (agencyTimes.EtaBerth != null))
+                    return agencyTimes.EtaBerth;
+                return Shipcall?.Eta;
+            }
+        }
+
+        public DateTime? Etd
+        {
+            get
+            {
+                Times? agencyTimes = this.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
+                if ((agencyTimes != null) && (agencyTimes.EtdBerth != null))
+                    return agencyTimes.EtdBerth;
+                return Shipcall?.Etd;
+            }
+        }
+
         public TrafficLightMode LightMode
         {
             get

From 09623f144297db30dce0f71f0470593b24b7ee2f Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 10 Nov 2023 14:13:06 +0100
Subject: [PATCH 17/44] bugfixes and small improvements for 0.9.5 test results

---
 .../EditTimesAgencyIncomingControl.xaml.cs    |  3 +-
 .../EditTimesAgencyOutgoingControl.xaml.cs    |  2 +
 .../EditTimesAgencyShiftingControl.xaml.cs    |  2 +
 src/BreCalClient/EditTimesControl.xaml        | 12 +++---
 src/BreCalClient/EditTimesControl.xaml.cs     | 40 +++++++++----------
 .../EditTimesTerminalControl.xaml.cs          |  8 ++--
 src/BreCalClient/IEditTimesControl.cs         |  2 +
 src/BreCalClient/MainWindow.xaml.cs           |  1 +
 src/BreCalClient/ShipcallControl.xaml.cs      |  3 +-
 src/BreCalClient/ShipcallControlModel.cs      | 10 +++++
 10 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
index 3945882..093e20f 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
@@ -46,7 +46,8 @@ namespace BreCalClient
 
             this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
             this.CopyToControls();
-
+            
+            this.Title = this.ShipcallModel.Title;
 
             Participant? p = null;
             if(this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 652346e..f0369b0 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -46,6 +46,8 @@ namespace BreCalClient
             this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
             this.CopyToControls();
 
+            this.Title = this.ShipcallModel.Title;
+
             Participant? p = null;
             if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
                 p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index 86b5dfb..adea08e 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -47,6 +47,8 @@ namespace BreCalClient
             this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
             this.CopyToControls();
 
+            this.Title = this.ShipcallModel.Title;
+
             Participant? p = null;
             if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
                 p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index 01a78c9..41fb072 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -13,7 +13,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".25*" />
             <ColumnDefinition Width=".75*" />
-            <ColumnDefinition Width="40" />
+            <!--ColumnDefinition Width="40" /-->
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -24,7 +24,7 @@
             <RowDefinition Height="56" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
-        <Label Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textFixed}" />
+        <!-- Label Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textFixed}" /-->
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" />
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" />
         <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
@@ -43,7 +43,7 @@
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
-        <CheckBox IsEnabled="False" Grid.Row="1" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtaBerthFixed" VerticalAlignment="Center" />
+        <!--CheckBox IsEnabled="False" Grid.Row="1" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtaBerthFixed" VerticalAlignment="Center" /-->
         <xctk:DateTimePicker IsEnabled="False" Grid.Row="2" Grid.Column="1" Margin="2" Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
@@ -55,7 +55,7 @@
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
-        <CheckBox IsEnabled="False" Grid.Row="2" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtDBerthFixed" VerticalAlignment="Center" />
+        <!--CheckBox IsEnabled="False" Grid.Row="2" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtDBerthFixed" VerticalAlignment="Center" /-->
         <xctk:DateTimePicker IsEnabled="False" Grid.Row="3" Grid.Column="1" Margin="2" Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
@@ -67,7 +67,7 @@
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
-        <CheckBox IsEnabled="False" Grid.Row="3" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxLockTimeFixed" VerticalAlignment="Center" />
+        <!--CheckBox IsEnabled="False" Grid.Row="3" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxLockTimeFixed" VerticalAlignment="Center" /-->
         <xctk:DateTimePicker IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
@@ -79,7 +79,7 @@
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
         </xctk:DateTimePicker>
-        <CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" />
+        <!--CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" /-->
         
         <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="True" IsEnabled="False"/>
         <StackPanel Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index a157705..20845f1 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -25,7 +25,7 @@ namespace BreCalClient
 
         #region Properties
 
-        public Times Times { get; set; } = new();
+        public Times Times { get; set; } = new();        
 
         public Extensions.TypeEnum CallType { get; set; }        
 
@@ -34,7 +34,7 @@ namespace BreCalClient
         #region event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
+        {            
             this.CopyToControls();
             this.EnableControls();
         }
@@ -64,10 +64,10 @@ namespace BreCalClient
             this.Times.LockTime = this.datePickerLockTime.Value;
             this.Times.ZoneEntry = this.datePickerZoneEntry.Value;
             
-            this.Times.EtaBerthFixed = this.checkBoxEtaBerthFixed.IsChecked;
-            this.Times.EtdBerthFixed = this.checkBoxEtDBerthFixed.IsChecked;
-            this.Times.LockTimeFixed = this.checkBoxLockTimeFixed.IsChecked;
-            this.Times.ZoneEntryFixed = this.checkBoxZoneEntryFixed.IsChecked;
+            //this.Times.EtaBerthFixed = this.checkBoxEtaBerthFixed.IsChecked;
+            //this.Times.EtdBerthFixed = this.checkBoxEtDBerthFixed.IsChecked;
+            //this.Times.LockTimeFixed = this.checkBoxLockTimeFixed.IsChecked;
+            //this.Times.ZoneEntryFixed = this.checkBoxZoneEntryFixed.IsChecked;
         }
 
         private void CopyToControls()
@@ -78,10 +78,10 @@ namespace BreCalClient
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
             
-            this.checkBoxEtaBerthFixed.IsChecked = this.Times.EtaBerthFixed;
-            this.checkBoxEtDBerthFixed.IsChecked = this.Times.EtdBerthFixed;
-            this.checkBoxLockTimeFixed.IsChecked = this.Times.LockTimeFixed;
-            this.checkBoxZoneEntryFixed.IsChecked = this.Times.ZoneEntryFixed;
+            //this.checkBoxEtaBerthFixed.IsChecked = this.Times.EtaBerthFixed;
+            //this.checkBoxEtDBerthFixed.IsChecked = this.Times.EtdBerthFixed;
+            //this.checkBoxLockTimeFixed.IsChecked = this.Times.LockTimeFixed;
+            //this.checkBoxZoneEntryFixed.IsChecked = this.Times.ZoneEntryFixed;
         }
 
         private void EnableControls()
@@ -94,25 +94,25 @@ namespace BreCalClient
                 case Extensions.ParticipantType.MOORING:
                 case Extensions.ParticipantType.PORT_ADMINISTRATION:
                 case Extensions.ParticipantType.TUG:
-                    this.datePickerETABerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming ||  CallType == Extensions.TypeEnum.Shifting);
-                    this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
+                    this.datePickerETABerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
+                    //this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
                     this.datePickerETDBerth.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
+                    //this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
                     this.datePickerLockTime.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
+                    //this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
                     this.datePickerZoneEntry.IsEnabled = false;
-                    this.checkBoxZoneEntryFixed.IsEnabled = false;
+                    //this.checkBoxZoneEntryFixed.IsEnabled = false;
                     this.textBoxRemarks.IsEnabled = true;
                     break;
                 case Extensions.ParticipantType.PILOT:
-                    this.datePickerETABerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
+                    this.datePickerETABerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
+                    //this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
                     this.datePickerETDBerth.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
+                    //this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
                     this.datePickerLockTime.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
+                    //this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
                     this.datePickerZoneEntry.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-                    this.checkBoxZoneEntryFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
+                    //this.checkBoxZoneEntryFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
                     this.textBoxRemarks.IsEnabled = true;
                     break;
             }
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index ea9f257..4d9549f 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -96,11 +96,11 @@ namespace BreCalClient
         {
             if (this.Times.ParticipantId != App.Participant.Id) return;
 
-            this.datePickerOperationStart.IsEnabled = (CallType == Extensions.TypeEnum.Incoming) || (CallType == Extensions.TypeEnum.Shifting);
+            this.datePickerOperationStart.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
             this.datePickerOperationEnd.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing) || (CallType == Extensions.TypeEnum.Shifting);
-            this.comboBoxBerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming) || (CallType == Extensions.TypeEnum.Shifting);
-            this.comboBoxPierside.IsEnabled = (CallType == Extensions.TypeEnum.Incoming) || (CallType == Extensions.TypeEnum.Shifting);
-            this.textBoxBerthRemarks.IsEnabled = (CallType == Extensions.TypeEnum.Incoming) || (CallType == Extensions.TypeEnum.Shifting);
+            this.comboBoxBerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
+            this.comboBoxPierside.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
+            this.textBoxBerthRemarks.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
             this.textBoxRemarks.IsEnabled = true;
             this.buttonOK.IsEnabled = true;
         }
diff --git a/src/BreCalClient/IEditTimesControl.cs b/src/BreCalClient/IEditTimesControl.cs
index aaaf669..8be49ff 100644
--- a/src/BreCalClient/IEditTimesControl.cs
+++ b/src/BreCalClient/IEditTimesControl.cs
@@ -11,6 +11,8 @@ namespace BreCalClient
     {
         Times Times { get; set; }
 
+        string Title { get; set; }
+
         Extensions.TypeEnum CallType { get; set; }
 
         bool? ShowDialog();
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 78ddde6..f9e31c6 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -623,6 +623,7 @@ namespace BreCalClient
 
             // show a dialog that lets the user create / update times for the given shipcall
             IEditTimesControl etc = (participantType == ParticipantType.TERMINAL) ? new EditTimesTerminalControl() : new EditTimesControl();
+            etc.Title = obj.ShipcallControlModel.Title;
 
             if(obj.ShipcallControlModel.Shipcall != null)
                 etc.CallType = (TypeEnum) obj.ShipcallControlModel.Shipcall.Type;
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index b9f016e..50fee9e 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -262,7 +262,8 @@ namespace BreCalClient
                                 Berth? berth = BreCalLists.Berths.Find((x) => x.Id == times.BerthId);
                                 berthText = berth?.Name;
                             }
-                            if (berthText == null)
+
+                            if ((berthText == null) && (times.ParticipantType != (int) Extensions.ParticipantType.TERMINAL))
                             {
                                 if (this.ShipcallControlModel?.Shipcall?.Type == (int)Extensions.TypeEnum.Incoming)
                                 {
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index 707c1cc..81df824 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -91,6 +91,16 @@ namespace BreCalClient
             }                
         }
 
+        public string Title
+        {
+            get
+            {
+                if (this.Shipcall == null) return "";
+                Extensions.TypeEnum callType = (Extensions.TypeEnum) this.Shipcall.Type;
+                return string.Format("{0} {1}", callType, this.Ship?.Name);
+            }
+        }
+
         #endregion
 
         #region public methods

From 9d61b9537877efa38300d0572a65cbffa7a6ae0e Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 10 Nov 2023 14:36:25 +0100
Subject: [PATCH 18/44] Version bump to 0.9.6

---
 misc/version.txt                                              | 2 +-
 src/BreCalClient/BreCalClient.csproj                          | 4 ++--
 .../Properties/PublishProfiles/ClickOnceDevelProfile.pubxml   | 2 +-
 .../Properties/PublishProfiles/ClickOnceProfile.pubxml        | 2 +-
 .../Properties/PublishProfiles/ClickOnceTestProfile.pubxml    | 2 +-
 src/server/BreCal/__init__.py                                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/misc/version.txt b/misc/version.txt
index 9afd78e..c2e8527 100644
--- a/misc/version.txt
+++ b/misc/version.txt
@@ -1 +1 @@
-0.9.5.0
\ No newline at end of file
+0.9.6.0
\ No newline at end of file
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 4d27982..32c42c3 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>0.9.5.0</AssemblyVersion>
-    <FileVersion>0.9.5.0</FileVersion>
+    <AssemblyVersion>0.9.6.0</AssemblyVersion>
+    <FileVersion>0.9.6.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index 146bf89..bd31a28 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.5.0</ApplicationVersion>
+    <ApplicationVersion>0.9.6.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index 1926cef..94aa26d 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.5.0</ApplicationVersion>
+    <ApplicationVersion>6.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 190ecc9..3fcf4f2 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.5.*</ApplicationVersion>
+    <ApplicationVersion>0.9.6.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py
index 3e1839d..1a6dc48 100644
--- a/src/server/BreCal/__init__.py
+++ b/src/server/BreCal/__init__.py
@@ -41,7 +41,7 @@ def create_app(test_config=None):
     app.register_blueprint(user.bp)
 
 
-    logging.basicConfig(filename='brecal.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
+    logging.basicConfig(filename='brecaldevel.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')
 

From b2cde8b6f50c707e4df5c21ca081e4896d51905a Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Fri, 10 Nov 2023 17:50:01 +0100
Subject: [PATCH 19/44] correcting the open issues from 09.11.2023 (0001 A-M
 was previously commited, 0006A+B are corrected herein)

---
 .../validators/validation_rule_functions.py      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 9e51eaf..b7f2662 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -800,7 +800,15 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         # when one of the two values is null, the state is GREEN
         if (times_agency.berth_id is None) or (times_terminal.berth_id is None):
             return (StatusFlags.GREEN, None)
+        
+        # when one of the two values is null, the state is GREEN
+        if (pd.isnull(times_agency.berth_id)) or (pd.isnull(times_terminal.berth_id)):
+            return (StatusFlags.GREEN, None)
+        
+        if shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return (StatusFlags.GREEN, None)
 
+        # only incoming shipcalls matter. The other ones are not relevant for the berth selection
         violation_state = times_agency.berth_id!=times_terminal.berth_id
 
         if violation_state:
@@ -825,6 +833,14 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         # when one of the two values is null, the state is GREEN
         if (times_agency.pier_side is None) or (times_terminal.pier_side is None):
             return (StatusFlags.GREEN, None)
+        
+        # when one of the two values is null, the state is GREEN
+        if (pd.isnull(times_agency.pier_side)) or (pd.isnull(times_terminal.pier_side)):
+            return (StatusFlags.GREEN, None)
+        
+        # only incoming shipcalls matter. The other ones are not relevant for the pier_side selection
+        if shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return (StatusFlags.GREEN, None)
 
         violation_state = times_agency.pier_side!=times_terminal.pier_side
 

From e9aace626896f4ea4731116158a4af1aaa33ce57 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Fri, 3 Nov 2023 19:45:55 +0100
Subject: [PATCH 20/44] creating stub objects for every single validation
 function. Unit tests are created for each function to check whether they
 return 'GREEN' whenever no violation is expected, or 'YELLOW'/'RED' when a
 rule violation is artificially forced. The test framework now successfully
 runs 116 unit tests. Adapted some validation functions, applied refactoring
 and solved potential obstacles along the way. At least from the perspective
 of unit tests, every function now works as expected.

---
 src/server/BreCal/__init__.py                 |  45 +-
 src/server/BreCal/database/sql_handler.py     |  24 +-
 src/server/BreCal/stubs/__init__.py           |   1 +
 src/server/BreCal/stubs/berth.py              |   2 -
 src/server/BreCal/stubs/df_times.py           |  78 ++
 src/server/BreCal/stubs/times_agency.py       |   8 +
 src/server/BreCal/stubs/times_bsmd.py         |   8 +
 src/server/BreCal/stubs/times_full.py         |   4 +
 src/server/BreCal/stubs/times_mooring.py      |   8 +
 src/server/BreCal/stubs/times_pilot.py        |   8 +
 .../BreCal/stubs/times_portauthority.py       |   9 +
 src/server/BreCal/stubs/times_terminal.py     |   8 +
 src/server/BreCal/stubs/times_tug.py          |   8 +
 .../validators/validation_rule_functions.py   |  38 +-
 src/server/tests/test_import_modules.py       |   2 +-
 .../test_validation_rule_functions.py         | 846 +++++++++++++++++-
 16 files changed, 1033 insertions(+), 64 deletions(-)
 create mode 100644 src/server/BreCal/stubs/df_times.py
 create mode 100644 src/server/BreCal/stubs/times_bsmd.py
 create mode 100644 src/server/BreCal/stubs/times_tug.py

diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py
index 1a6dc48..c4cf995 100644
--- a/src/server/BreCal/__init__.py
+++ b/src/server/BreCal/__init__.py
@@ -13,6 +13,25 @@ from .api import ships
 from .api import login
 from .api import user
 
+from BreCal.brecal_utils.file_handling import get_project_root, ensure_path
+from BreCal.brecal_utils.test_handling import execute_test_with_pytest, execute_coverage_test
+from BreCal.brecal_utils.time_handling import difference_to_then
+
+from BreCal.validators.time_logic import TimeLogic
+from BreCal.validators.validation_rules import ValidationRules
+from BreCal.validators.schema_validation import validation_state_and_validation_name
+
+from BreCal.stubs.times_agency import get_times_agency
+from BreCal.stubs.times_bsmd import get_times_bsmd
+from BreCal.stubs.times_mooring import get_times_mooring
+from BreCal.stubs.times_pilot import get_times_pilot
+from BreCal.stubs.times_portauthority import get_times_port_authority
+from BreCal.stubs.times_terminal import get_times_terminal
+from BreCal.stubs.times_tug import get_times_tug
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.stubs.df_times import get_df_times
+
+
 def create_app(test_config=None):
 
     app = Flask(__name__, instance_relative_config=True)
@@ -47,22 +66,24 @@ def create_app(test_config=None):
 
     return app
 
-from BreCal.brecal_utils.file_handling import get_project_root, ensure_path
-from BreCal.brecal_utils.test_handling import execute_test_with_pytest, execute_coverage_test
-from BreCal.brecal_utils.time_handling import difference_to_then
-
-from BreCal.validators.time_logic import TimeLogic
-from BreCal.validators.validation_rules import ValidationRules
-from BreCal.validators.schema_validation import validation_state_and_validation_name
-
 __all__ = [
-	"get_project_root", 
-	"ensure_path", 
-	"execute_test_with_pytest",
-	"execute_coverage_test",
+    "get_project_root", 
+    "ensure_path", 
+    "execute_test_with_pytest",
+    "execute_coverage_test",
     "difference_to_then",
     "TimeLogic",
     "ValidationRules",
     "validation_state_and_validation_name",
+
+    "get_times_agency",
+    "get_times_bsmd",
+    "get_times_mooring",
+    "get_times_pilot",
+    "get_times_port_authority",
+    "get_times_terminal",
+    "get_times_tug",
+    "get_times_full_simple",
+    "get_df_times",
 ]
 
diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index 457b950..6c1acd2 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -221,6 +221,9 @@ class SQLHandler():
 
         # filter out all NaN and NaT entries
         if non_null_column is not None:
+            # in the Pandas documentation, it says for .isnull(): 
+            # "This function takes a scalar or array-like object and indicates whether values are missing 
+            # (NaN in numeric arrays, None or NaN in object arrays, NaT in datetimelike)."
             df_times = df_times.loc[~df_times[non_null_column].isnull()] # NOT null filter
 
         # filter by the agency participant_type
@@ -230,13 +233,20 @@ class SQLHandler():
     def filter_df_by_key_value(self, df, key, value)->pd.DataFrame:
         return df.loc[df[key]==value]
     
-    def get_unique_ship_counts(self, all_df_times:pd.DataFrame, query:str, rounding:str="min", maximum_threshold=3):
+    def get_unique_ship_counts(self, all_df_times:pd.DataFrame, times_agency:pd.DataFrame, query:str, rounding:str="min", maximum_threshold=3):
         """given a dataframe of all agency times, get all unique ship counts, their values (datetime) and the string tags. returns a tuple (values,unique,counts)"""
-        # get values and optional: rounding
-        values = all_df_times.loc[:, query]
+        # optional: rounding
         if rounding is not None:
-            values = values.dt.round(rounding) # e.g., 'min'
+            all_df_times.loc[:, query] = all_df_times.loc[:, query].dt.round(rounding) # e.g., 'min'
+            query_time_agency = times_agency[query].iloc[0].round(rounding)# e.g., 'min'
 
-        unique, counts = np.unique(values, return_counts=True)
-        violation_state = np.any(np.greater(counts, maximum_threshold))
-        return (values, unique, counts)
+        # after rounding, filter {all_df_times}, so only those, which match the current query are of interest
+        # takes 'times_agency' to sample, which value should match
+        all_df_times = all_df_times.loc[all_df_times[query]==query_time_agency]
+
+        # finally, count all remaining entries
+        values = all_df_times.loc[:, query]
+
+        # get unique entries and counts
+        counts = len(values) # unique, counts = np.unique(values, return_counts=True)
+        return counts # (values, unique, counts)
diff --git a/src/server/BreCal/stubs/__init__.py b/src/server/BreCal/stubs/__init__.py
index 83dd2ed..95578de 100644
--- a/src/server/BreCal/stubs/__init__.py
+++ b/src/server/BreCal/stubs/__init__.py
@@ -3,3 +3,4 @@ def generate_uuid1_int():
     """# TODO: clarify, what kind of integer ID is used in mysql. Generates a proxy ID, which is used in the stubs"""
     from uuid import uuid1
     return uuid1().int>>64
+
diff --git a/src/server/BreCal/stubs/berth.py b/src/server/BreCal/stubs/berth.py
index 240bcbe..2a782d7 100644
--- a/src/server/BreCal/stubs/berth.py
+++ b/src/server/BreCal/stubs/berth.py
@@ -7,7 +7,6 @@ def get_berth_simple():
 
     # Note: #TODO: name, participant_id & lock state are arbitrary
     name = "Avangard Dalben"
-    participant_id = 1# e.g., Avangard
     lock = False
     owner_id = 1 # e.g., Avangard
     authority_id = 1 # e.g., Avangard
@@ -19,7 +18,6 @@ def get_berth_simple():
     berth = Berth(
         berth_id, 
         name, 
-        participant_id, 
         lock, 
         owner_id, 
         authority_id, 
diff --git a/src/server/BreCal/stubs/df_times.py b/src/server/BreCal/stubs/df_times.py
new file mode 100644
index 0000000..08d8fd7
--- /dev/null
+++ b/src/server/BreCal/stubs/df_times.py
@@ -0,0 +1,78 @@
+import pandas as pd
+import random
+import datetime
+
+from BreCal.stubs.times_agency import get_times_agency
+from BreCal.stubs.times_bsmd import get_times_bsmd
+from BreCal.stubs.times_mooring import get_times_mooring
+from BreCal.stubs.times_pilot import get_times_pilot
+from BreCal.stubs.times_portauthority import get_times_port_authority
+from BreCal.stubs.times_terminal import get_times_terminal
+from BreCal.stubs.times_tug import get_times_tug
+from BreCal.database.enums import ParticipantType
+
+def get_df_times(shipcall=None):
+    """in case of providing a shipcall, one can read the id to set each times entry in the dataframe towards that shipcall id"""
+    df_times = pd.DataFrame([
+        fct()
+
+        for fct in [
+            get_times_agency,
+            get_times_bsmd,
+            get_times_mooring,
+            get_times_pilot,
+            get_times_port_authority,
+            get_times_terminal,
+            get_times_tug
+            ]
+    ])
+    if shipcall is not None:
+        df_times.loc[:,"shipcall_id"] = shipcall.id
+    return df_times
+
+def random_time_perturbation(df_times, query):
+    # random perturbations
+    population = [datetime.datetime.now(), None, pd.NaT]
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, query] = random.sample(population,k=1)[0]
+    df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, query] = random.sample(population,k=1)[0]
+    df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, query] = random.sample(population,k=1)[0]
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, query] = random.sample(population,k=1)[0]
+    df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, query] = random.sample(population,k=1)[0]
+    return df_times
+
+def get_df_times_participants_disagree(query, shipcall=None, df_times = None):
+    if df_times is None:
+        df_times = get_df_times(shipcall)
+    df_times = random_time_perturbation(df_times=df_times, query=query)
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, query] = datetime.datetime.now()+datetime.timedelta(hours=2, minutes=14)
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, query] = datetime.datetime.now()+datetime.timedelta(hours=1, minutes=7)
+
+    return df_times
+
+def build_stub_df_times(shipcall, query, reference_time):
+    """creates an artificial dataset, which simulates having too many shipcalls with too many identical times"""
+    df_times_a = get_df_times(shipcall)
+    df_times_a = df_times_a.loc[df_times_a["participant_type"]==ParticipantType.AGENCY.value]
+    df_times_a.loc[:,query] = reference_time + datetime.timedelta(seconds=17)
+
+    df_times_b = get_df_times(shipcall)
+    df_times_b = df_times_b.loc[df_times_b["participant_type"]==ParticipantType.AGENCY.value]
+    df_times_b.loc[:,query] = reference_time + datetime.timedelta(seconds=21)
+
+    df_times_c = get_df_times(shipcall)
+    df_times_c = df_times_c.loc[df_times_c["participant_type"]==ParticipantType.AGENCY.value]
+    df_times_c.loc[:,query] = reference_time + datetime.timedelta(seconds=26)
+
+    df_times_d = get_df_times(shipcall)
+    df_times_d = df_times_d.loc[df_times_d["participant_type"]==ParticipantType.AGENCY.value]
+    df_times_d.loc[:,query] = reference_time + datetime.timedelta(seconds=28)
+
+    df_times_e = get_df_times(shipcall)
+    df_times_e = df_times_e.loc[df_times_e["participant_type"]==ParticipantType.AGENCY.value]
+    df_times_e.loc[:,query] = reference_time + datetime.timedelta(seconds=29)
+
+    return pd.concat([df_times_a, df_times_b, df_times_c, df_times_d, df_times_e],axis=0)
+
+
diff --git a/src/server/BreCal/stubs/times_agency.py b/src/server/BreCal/stubs/times_agency.py
index e69de29..31fc0e7 100644
--- a/src/server/BreCal/stubs/times_agency.py
+++ b/src/server/BreCal/stubs/times_agency.py
@@ -0,0 +1,8 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_agency():
+    times_agency = get_times_full_simple()
+    times_agency.participant_type = ParticipantType.AGENCY.value
+    return times_agency
+
diff --git a/src/server/BreCal/stubs/times_bsmd.py b/src/server/BreCal/stubs/times_bsmd.py
new file mode 100644
index 0000000..3f36e24
--- /dev/null
+++ b/src/server/BreCal/stubs/times_bsmd.py
@@ -0,0 +1,8 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_bsmd():
+    times_bsmd = get_times_full_simple()
+    times_bsmd.participant_type = ParticipantType.BSMD.value
+    return times_bsmd
+
diff --git a/src/server/BreCal/stubs/times_full.py b/src/server/BreCal/stubs/times_full.py
index 984f3db..f0176a1 100644
--- a/src/server/BreCal/stubs/times_full.py
+++ b/src/server/BreCal/stubs/times_full.py
@@ -3,9 +3,11 @@ this stub creates an example time object, where the times of every role are pres
 users will thereby be able to modify these values
 """
 import datetime
+
 from BreCal.stubs import generate_uuid1_int
 from BreCal.schemas.model import Times
 
+
 def get_times_full_simple():
     # only used for the stub
     base_time = datetime.datetime.now()
@@ -65,3 +67,5 @@ def get_times_full_simple():
         modified=modified,
     )   
     return times
+
+
diff --git a/src/server/BreCal/stubs/times_mooring.py b/src/server/BreCal/stubs/times_mooring.py
index e69de29..5e6570a 100644
--- a/src/server/BreCal/stubs/times_mooring.py
+++ b/src/server/BreCal/stubs/times_mooring.py
@@ -0,0 +1,8 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_mooring():
+    times_mooring = get_times_full_simple()
+    times_mooring.participant_type = ParticipantType.MOORING.value
+    return times_mooring
+
diff --git a/src/server/BreCal/stubs/times_pilot.py b/src/server/BreCal/stubs/times_pilot.py
index e69de29..1282133 100644
--- a/src/server/BreCal/stubs/times_pilot.py
+++ b/src/server/BreCal/stubs/times_pilot.py
@@ -0,0 +1,8 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_pilot():
+    times_pilot = get_times_full_simple()
+    times_pilot.participant_type = ParticipantType.PILOT.value
+    return times_pilot
+
diff --git a/src/server/BreCal/stubs/times_portauthority.py b/src/server/BreCal/stubs/times_portauthority.py
index e69de29..61ad4a5 100644
--- a/src/server/BreCal/stubs/times_portauthority.py
+++ b/src/server/BreCal/stubs/times_portauthority.py
@@ -0,0 +1,9 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_port_authority():
+    times_port_authority = get_times_full_simple()
+    times_port_authority.participant_type = ParticipantType.PORT_ADMINISTRATION.value
+    return times_port_authority
+
+
diff --git a/src/server/BreCal/stubs/times_terminal.py b/src/server/BreCal/stubs/times_terminal.py
index e69de29..549ddb5 100644
--- a/src/server/BreCal/stubs/times_terminal.py
+++ b/src/server/BreCal/stubs/times_terminal.py
@@ -0,0 +1,8 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_terminal():
+    times_terminal = get_times_full_simple()
+    times_terminal.participant_type = ParticipantType.TERMINAL.value
+    return times_terminal
+
diff --git a/src/server/BreCal/stubs/times_tug.py b/src/server/BreCal/stubs/times_tug.py
new file mode 100644
index 0000000..0e8cdd1
--- /dev/null
+++ b/src/server/BreCal/stubs/times_tug.py
@@ -0,0 +1,8 @@
+from BreCal.stubs.times_full import get_times_full_simple
+from BreCal.database.enums import ParticipantType
+
+def get_times_tug():
+    times_tug = get_times_full_simple()
+    times_tug.participant_type = ParticipantType.TUG.value
+    return times_tug
+
diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 9e51eaf..fec7a7c 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -73,17 +73,22 @@ class ValidationRuleBaseFunctions():
         when the query_time lays in the future, the delta is positive
 
         returns a violation state depending on whether the delta is
-            Violation, if: 0 >= delta > threshold
+            Violation, if: 0 >= delta <= threshold
 
         When the key time is defined (not None), there is no violation. Returns False
 
         options:
             query_time: will be used to measure the time difference of 'now' until the query time
             key_time: will be used to check, whether the respective key already has a value
-            threshold: threshold where a time difference becomes crucial. When the delta is below the threshold, a violation might occur
+            threshold: threshold where a time difference becomes crucial. When the delta is below the threshold, a violation might occur (minutes)
         """
         # rule is not applicable -> return 'GREEN'
-        if self.check_is_not_a_time_or_is_none(key_time) or self.check_is_not_a_time_or_is_none(query_time):
+        # rule is only applicable, when 'key_time' is not defined (neither None, nor pd.NaT)
+        if (key_time is not None) and (key_time is not pd.NaT):
+            return False
+        
+        # when query_time is not valid, the rule cannot be applied
+        if self.check_is_not_a_time_or_is_none(query_time):
             return False
         
         # otherwise, this rule applies and the difference between 'now' and the query time is measured
@@ -91,7 +96,7 @@ class ValidationRuleBaseFunctions():
 
         # a violation occurs, when the delta (in minutes) exceeds the specified threshold of a participant
         # to prevent past-events from triggering violations, negative values are ignored
-        # Violation, if 0 >= delta >= threshold
+        # Violation, if 0 <= delta <= threshold
         violation_state = (delta >= 0) and (delta<=threshold)
         return violation_state
     
@@ -141,7 +146,7 @@ class ValidationRuleBaseFunctions():
         violation_state = n_unique_times!=1
         return violation_state
     
-    def check_unique_shipcall_counts(self, query:str, rounding="min", maximum_threshold=3)->bool:
+    def check_unique_shipcall_counts(self, query:str, times_agency:pd.DataFrame, rounding="min", maximum_threshold=3, all_times_agency=None)->bool:
         """
         # base function for all validation rules in the group {0005} A&B
 
@@ -150,10 +155,11 @@ class ValidationRuleBaseFunctions():
         """
         # filter the df: keep only times_agents
         # filter out all NaN and NaT entries
-        times_agency = self.sql_handler.get_times_for_agency(non_null_column=query)
+        if all_times_agency is None:
+            all_times_agency = self.sql_handler.get_times_for_agency(non_null_column=query)
 
-        # get values and optionally round the values
-        (values, unique, counts) = self.sql_handler.get_unique_ship_counts(all_df_times=times_agency, query=query, rounding=rounding, maximum_threshold=maximum_threshold)
+        # get values and optionally round the values (internally)
+        counts = self.sql_handler.get_unique_ship_counts(all_df_times=all_times_agency, times_agency=times_agency, query=query, rounding=rounding, maximum_threshold=maximum_threshold)
 
         # when ANY of the unique values exceeds the threshold, a violation is observed
         violation_state = np.any(np.greater(counts, maximum_threshold))
@@ -651,7 +657,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             return (StatusFlags.GREEN, None)
 
         # check, whether the start of operations is AFTER the estimated arrival time
-        violation_state = times_terminal.operations_start<times_agency.eta_berth
+        violation_state = times_terminal.operations_start < times_agency.eta_berth
 
         if violation_state:
             validation_name = inspect.currentframe().f_code.co_name
@@ -744,19 +750,20 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         else:
             return (StatusFlags.GREEN, None)
     
-    def validation_rule_fct_too_many_identical_eta_times(self, shipcall, df_times, rounding = "min", maximum_threshold = 3, *args, **kwargs):
+    def validation_rule_fct_too_many_identical_eta_times(self, shipcall, df_times, rounding = "min", maximum_threshold = 3, all_times_agency=None, *args, **kwargs):
         """
         Code: #0005-A
         Type: Global Rule
         Description: this validation rule checks, whether there are too many shipcalls with identical ETA times.
         """
+        times_agency = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
         # check, if the header is filled in (agency)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
+        if len(times_agency) != 1:
             return (StatusFlags.GREEN, None)
 
         # when ANY of the unique values exceeds the threshold, a violation is observed
         query = "eta_berth"
-        violation_state = self.check_unique_shipcall_counts(query, rounding=rounding, maximum_threshold=maximum_threshold)
+        violation_state = self.check_unique_shipcall_counts(query, times_agency=times_agency, rounding=rounding, maximum_threshold=maximum_threshold, all_times_agency=all_times_agency)
 
         if violation_state:
             validation_name = inspect.currentframe().f_code.co_name
@@ -764,19 +771,20 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         else:
             return (StatusFlags.GREEN, None)
     
-    def validation_rule_fct_too_many_identical_etd_times(self, shipcall, df_times, rounding = "min", maximum_threshold = 3, *args, **kwargs):
+    def validation_rule_fct_too_many_identical_etd_times(self, shipcall, df_times, rounding = "min", maximum_threshold = 3, all_times_agency=None, *args, **kwargs):
         """
         Code: #0005-B
         Type: Global Rule
         Description: this validation rule checks, whether there are too many shipcalls with identical ETD times.
         """
+        times_agency = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
         # check, if the header is filled in (agency)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
+        if len(times_agency) != 1:
             return (StatusFlags.GREEN, None)
 
         # when ANY of the unique values exceeds the threshold, a violation is observed
         query = "etd_berth"
-        violation_state = self.check_unique_shipcall_counts(query, rounding=rounding, maximum_threshold=maximum_threshold)
+        violation_state = self.check_unique_shipcall_counts(query, times_agency=times_agency, rounding=rounding, maximum_threshold=maximum_threshold, all_times_agency=all_times_agency)
 
         if violation_state:
             validation_name = inspect.currentframe().f_code.co_name
diff --git a/src/server/tests/test_import_modules.py b/src/server/tests/test_import_modules.py
index 754772b..08b97bd 100644
--- a/src/server/tests/test_import_modules.py
+++ b/src/server/tests/test_import_modules.py
@@ -44,7 +44,7 @@ def test_import_webargs():
     from webargs.flaskparser import parser
     return
 
-def test_import_mashmallow():
+def test_import_marshmallow():
     """currently used in ~/brecal/src/server/BreCal/api/shipcalls.py"""
     import marshmallow
     from marshmallow import Schema, fields
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index 671458b..3fccac5 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -1,7 +1,13 @@
 import pytest
+import datetime
+import pandas as pd
 from BreCal.validators.validation_rule_functions import ValidationRuleFunctions
 from BreCal.validators.validation_rules import ValidationRules
 from BreCal.database.sql_handler import SQLHandler
+from BreCal.database.enums import ParticipantwiseTimeDelta, ParticipantType, StatusFlags, ShipcallType
+
+from BreCal.stubs.shipcall import get_shipcall_simple
+from BreCal.stubs.df_times import get_df_times, random_time_perturbation, get_df_times_participants_disagree, build_stub_df_times
 
 @pytest.fixture(scope="session")
 def build_sql_proxy_connection():
@@ -25,38 +31,796 @@ def test_build_validation_rule_functions(build_sql_proxy_connection):
 
 
 
-
-def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement(build_sql_proxy_connection):
-    """#0006-A validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
-    import pandas as pd
-
-    from BreCal.stubs.times_full import get_times_full_simple
-    from BreCal.stubs.shipcall import get_shipcall_simple
-    from BreCal.database.enums import ParticipantType
-    from BreCal.database.enums import StatusFlags
-
+def test_check_time_delta_violation_query_time_to_now_key_time_is_defined(build_sql_proxy_connection):
     vr = build_sql_proxy_connection["vr"]
-    shipcall = get_shipcall_simple()
-    t1 = get_times_full_simple()
-    t2 = get_times_full_simple()
 
-    # roles: agency & terminal
-    t1.participant_type = ParticipantType.AGENCY.value
-    t2.participant_type = ParticipantType.TERMINAL.value
+    # ship arrives in three hours, while the threshold for an alert is (e.g.) 5 hours
+    # key time is given, so the function should always return False (no violation)
+    query_time = datetime.datetime.now() + datetime.timedelta(hours=3)
+    key_time = datetime.datetime.now() + datetime.timedelta(hours=7, minutes=30)
 
-    # disagreement
-    t1.pier_side = True
-    t2.pier_side = False
-
-    time_objects = [t1, t2]
-    df_times = pd.DataFrame.from_records([to_.__dict__ for to_ in time_objects])
-    df_times.set_index('id',inplace=True)
-
-    (state, description) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall, df_times)
-    assert state.value > StatusFlags.GREEN.value, f"a violation must be identified"
-    assert description is not None, f"a violation description must be identified"
+    threshold = 60*5
+    violation_state = vr.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
+    assert not violation_state, f"the key time is filled in, so there should not be a violation"
     return
 
+def test_check_time_delta_violation_query_time_to_now_no_key_time_but_event_in_distant_future(build_sql_proxy_connection):
+    vr = build_sql_proxy_connection["vr"]
+
+    # ship arrives in three hours, while the threshold for an alert is (e.g.) 5 hours
+    # key time is given, so the function should always return False (no violation)
+    # query time (-> delta) & threshold have the same time -> no violation
+    query_time = datetime.datetime.now() + datetime.timedelta(hours=5, seconds=10) # when the delta & threshold are identical, microseconds between checking the time and defining it here, raise the violation
+    key_time = None
+
+    threshold = 60*5
+    violation_state = vr.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
+    assert not violation_state, f"the event is still far enough away, so there should not be a violation."
+    return
+
+def test_check_time_delta_violation_query_time_to_now_key_time_is_none(build_sql_proxy_connection):
+    vr = build_sql_proxy_connection["vr"]
+
+    # ship arrives in three hours, while the threshold for an alert is (e.g.) 5 hours
+    # key time is given, so the function should always return False (no violation)
+    query_time = datetime.datetime.now() + datetime.timedelta(hours=3)
+    key_time = None
+
+    threshold = 60*5 # minutes
+    violation_state = vr.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
+    assert violation_state, f"when the key time is not filled in and the query time is 'dangerously close', there should be a violation to indicate the traffic state"
+    return
+
+def test_check_time_delta_violation_query_time_to_now_key_time_is_pd_nat(build_sql_proxy_connection):
+    vr = build_sql_proxy_connection["vr"]
+
+    # ship arrives in three hours, while the threshold for an alert is (e.g.) 5 hours
+    # key time is given, so the function should always return False (no violation)
+    query_time = datetime.datetime.now() + datetime.timedelta(hours=3)
+    key_time = pd.NaT
+
+    threshold = 60*5 # minutes
+    violation_state = vr.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
+    assert violation_state, f"when the key time is not filled in and the query time is 'dangerously close', there should be a violation to indicate the traffic state"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_agency_berth_eta__missing_time_agency_no_violation(build_sql_proxy_connection):
+    """0001-A validation_rule_fct_missing_time_agency_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # artificially remove the agency, so the function is properly checked
+    df_times = df_times.loc[df_times["participant_type"]!=ParticipantType.AGENCY.value]
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the agency's entry is not present"
+    assert msg is None, f"with a 'green' state, there should be no message returned"
+    return
+
+def test_validation_rule_fct_missing_time_agency_berth_eta__shipcall_eta_dangerously_close_no_times_agency(build_sql_proxy_connection):
+    """0001-A validation_rule_fct_missing_time_agency_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # the shipcall happens 'soon'
+    shipcall.eta = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.AGENCY-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the agency's entry is not present and the shipcall takes place soon"
+    return
+
+def test_validation_rule_fct_missing_time_agency_berth_eta__shipcall_eta_distant_enough_no_times_agency(build_sql_proxy_connection):
+    """0001-A validation_rule_fct_missing_time_agency_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # the shipcall happens 'soon'
+    shipcall.eta = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.AGENCY+10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'yellow', because the agency's entry is not present and the shipcall takes place soon"
+    return
+
+def test_validation_rule_fct_missing_time_agency_berth_eta__shipcall_eta_is_undefined_agency_eta_is_defined(build_sql_proxy_connection):
+    """0001-A validation_rule_fct_missing_time_agency_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # the shipcall is undefined
+    shipcall.eta = None
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'yellow', because the agency's entry is not present and the shipcall takes place soon"
+    return
+
+def test_validation_rule_fct_missing_time_agency_berth_etd__shipcall_etd_is_undefined_agency_etd_is_defined(build_sql_proxy_connection):
+    """0001-B validation_rule_fct_missing_time_agency_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # the shipcall etd is 'soon'
+    shipcall.etd = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.AGENCY-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the agency's entry is not present and the shipcall takes place soon"
+    return
+
+def test_validation_rule_fct_missing_time_mooring_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-C validation_rule_fct_missing_time_mooring_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.MOORING-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_mooring_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_mooring_berth_etd__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-D validation_rule_fct_missing_time_mooring_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.MOORING-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, "etd_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_mooring_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_portadministration_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-F validation_rule_fct_missing_time_portadministration_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PORT_ADMINISTRATION-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_portadministration_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_portadministration_berth_etd__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-G validation_rule_fct_missing_time_portadministration_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PORT_ADMINISTRATION-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, "etd_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_portadministration_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+def test_validation_rule_fct_missing_time_pilot_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-H validation_rule_fct_missing_time_pilot_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PILOT-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-I validation_rule_fct_missing_time_pilot_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PILOT-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "etd_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_tug_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-J validation_rule_fct_missing_time_tug_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.TUG-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_tug_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_tug_berth_etd__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-K validation_rule_fct_missing_time_tug_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.TUG-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, "etd_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_tug_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_terminal_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-L validation_rule_fct_missing_time_terminal_berth_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.TERMINAL-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "eta_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_terminal_berth_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+
+def test_validation_rule_fct_missing_time_terminal_berth_etd__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
+    """0001-M validation_rule_fct_missing_time_terminal_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.TERMINAL-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "etd_berth"] = None
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_terminal_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
+
+def test_validation_rule_fct_shipcall_incoming_participants_disagree_on_eta__participants_disagree_on_time_but_different_shipcall_type(build_sql_proxy_connection):
+    """0002-A validation_rule_fct_shipcall_incoming_participants_disagree_on_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+
+    # set shipcall type to NOT match the function -> returns 'green'
+    query = "eta_berth"
+    shipcall.type = ShipcallType.SHIFTING.value
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall)
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_incoming_participants_disagree_on_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the shipcall type does not match the function"
+    return
+
+
+def test_validation_rule_fct_shipcall_incoming_participants_disagree_on_eta__participants_disagree_on_time(build_sql_proxy_connection):
+    """0002-A validation_rule_fct_shipcall_incoming_participants_disagree_on_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+
+    # set shipcall type to match the function
+    query = "eta_berth"
+    shipcall.type = ShipcallType.INCOMING.value
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall) # makes sure that there is disagreement among participants
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_incoming_participants_disagree_on_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.RED, f"function should return 'red', because agency and pilot disagree on the query"
+    return
+
+def test_validation_rule_fct_shipcall_incoming_participants_disagree_on_eta__participants_agree_on_time(build_sql_proxy_connection):
+    """0002-A validation_rule_fct_shipcall_incoming_participants_disagree_on_eta"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+
+    # set shipcall type to NOT match the function -> returns 'green'
+    query = "eta_berth"
+    shipcall.type = ShipcallType.INCOMING.value
+    df_times = get_df_times(shipcall)
+    df_times.loc[:,query] = datetime.datetime.now()
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_incoming_participants_disagree_on_eta(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the participants fully agree on the time"
+    return
+
+def test_validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd__participants_disagree_on_time_but_different_shipcall_type(build_sql_proxy_connection):
+    """0002-B validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+
+    # set shipcall type to NOT match the function -> returns 'green'
+    query = "etd_berth"
+    shipcall.type = ShipcallType.SHIFTING.value
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall)
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the shipcall type does not match the function"
+    return
+
+
+def test_validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd__participants_disagree_on_time(build_sql_proxy_connection):
+    """0002-B validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+
+    # set shipcall type to match the function
+    query = "etd_berth"
+    shipcall.type = ShipcallType.OUTGOING.value
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall) # makes sure that there is disagreement among participants
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.RED, f"function should return 'red', because agency and pilot disagree on the query"
+    return
+
+def test_validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd__participants_agree_on_time(build_sql_proxy_connection):
+    """0002-B validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+
+    # set shipcall type to NOT match the function -> returns 'green'
+    query = "etd_berth"
+    shipcall.type = ShipcallType.OUTGOING.value
+    df_times = get_df_times(shipcall)
+    df_times.loc[:,query] = datetime.datetime.now()
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the participants fully agree on the time"
+    return
+
+
+
+def test_validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd__participants_disagree_on_time_but_different_shipcall_type(build_sql_proxy_connection):
+    """0002-C validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.INCOMING.value
+    df_times = get_df_times(shipcall)
+
+    # set shipcall type to match the function
+    query = "eta_berth"
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall, df_times=df_times) # makes sure that there is disagreement among participants
+
+    # set shipcall type to match the function
+    query = "etd_berth"
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall, df_times=df_times) # makes sure that there is disagreement among participants
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the shipcall type does not match the function"
+    return
+
+def test_validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd__participants_disagree_on_time(build_sql_proxy_connection):
+    """0002-C validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.SHIFTING.value
+    df_times = get_df_times(shipcall)
+
+    # set shipcall type to match the function
+    query = "eta_berth"
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall, df_times=df_times) # makes sure that there is disagreement among participants
+
+    # set shipcall type to match the function
+    query = "etd_berth"
+    df_times = get_df_times_participants_disagree(query=query, shipcall=shipcall, df_times=df_times) # makes sure that there is disagreement among participants
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.RED, f"function should return 'red', because agency and pilot disagree on the query"
+    return
+
+def test_validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd__participants_agree_on_time(build_sql_proxy_connection):
+    """0002-C validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd"""
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.SHIFTING.value
+    df_times = get_df_times(shipcall)
+
+    # set shipcall type to match the function
+    query = "eta_berth"
+    df_times.loc[:,query] = datetime.datetime.now()
+
+    # set shipcall type to match the function
+    query = "etd_berth"
+    df_times.loc[:,query] = datetime.datetime.now()
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the participants fully agree on the time"
+    return
+
+def test_validation_rule_fct_eta_time_not_in_operation_window__times_dont_match(build_sql_proxy_connection):
+    """0003-A validation_rule_fct_eta_time_not_in_operation_window"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now() # reference time for easier readability
+
+    # the planned operations_start is before eta_berth (by one minute in this case)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = t0_time + datetime.timedelta(minutes=1)
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_start"] = t0_time + datetime.timedelta(minutes=0)
+
+    (code, msg) = vr.validation_rule_fct_eta_time_not_in_operation_window(shipcall, df_times)
+    assert code==StatusFlags.RED, f"status flag should be 'red', because the planned operations start is BEFORE the estimated time of arrival for the shipcall"
+    return
+
+def test_validation_rule_fct_etd_time_not_in_operation_window__times_dont_match(build_sql_proxy_connection):
+    """0003-B validation_rule_fct_etd_time_not_in_operation_window"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now() # reference time for easier readability
+
+    # the planned operations_end is after etd_berth (by one minute in this case)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = t0_time + datetime.timedelta(hours=1)
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_end"] = t0_time+datetime.timedelta(hours=1, minutes=1)
+
+
+    (code, msg) = vr.validation_rule_fct_etd_time_not_in_operation_window(shipcall, df_times)
+    assert code==StatusFlags.RED, f"status flag should be 'red', because the planned operations end is AFTER the estimated time of departure for the shipcall"
+    return
+
+def test_validation_rule_fct_eta_time_not_in_operation_window_and_validation_rule_fct_etd_time_not_in_operation_window__always_okay(build_sql_proxy_connection):
+    """
+    0003-A validation_rule_fct_eta_time_not_in_operation_window
+    0003-B validation_rule_fct_etd_time_not_in_operation_window
+    """
+    vr = build_sql_proxy_connection['vr']
+    import random
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now()
+
+    # 10 random permutations of None/pd.NaT/suitable values
+    # each of these combinations is okay and should return a 'green' state
+    for _i in range(10): 
+        # eta_berth & operations start
+        df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = random.sample([None, pd.NaT, t0_time + datetime.timedelta(minutes=0)],k=1)[0]
+        df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_start"] = random.sample([None, pd.NaT, t0_time + datetime.timedelta(minutes=0)], k=1)[0]
+
+        # etd_berth & operations start
+        df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = random.sample([None, pd.NaT, t0_time + datetime.timedelta(hours=1)],k=1)[0]
+        df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_end"] = random.sample([None, pd.NaT, t0_time+datetime.timedelta(hours=1)],k=1)[0]
+
+        (code, msg) = vr.validation_rule_fct_eta_time_not_in_operation_window(shipcall=shipcall, df_times=df_times)
+        assert code==StatusFlags.GREEN, f"status flag should be 'green', as any of these perturbations sets operation & estimated time to be on par ot one the values missed"
+        (code, msg) = vr.validation_rule_fct_etd_time_not_in_operation_window(shipcall=shipcall, df_times=df_times)
+        assert code==StatusFlags.GREEN, f"status flag should be 'green', as any of these perturbations sets operation & estimated time to be on par ot one the values missed"
+    return
+
+def test_validation_rule_fct_eta_time_not_in_tidal_window__is_okay(build_sql_proxy_connection):
+    """0004-A validation_rule_fct_eta_time_not_in_tidal_window"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now()
+
+    # tidal window: [t0 +1min, t0 +1hr)
+    # eta berth: 
+    shipcall.tidal_window_from = t0_time + datetime.timedelta(minutes=1)
+    shipcall.tidal_window_to = t0_time + datetime.timedelta(hours=1)
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = t0_time + datetime.timedelta(minutes=1)
+    (code, msg) = vr.validation_rule_fct_eta_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.GREEN, f"state should be 'green', because eta_berth matches precisely the tidal_window_from"
+
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = t0_time + datetime.timedelta(hours=1)
+    (code, msg) = vr.validation_rule_fct_eta_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.GREEN, f"state should be 'green', because eta_berth matches precisely the tidal_window_to (in this case, the etd_berth would likely cause an issue)"
+    return
+
+def test_validation_rule_fct_eta_time_not_in_tidal_window__eta_outside_tidal_window(build_sql_proxy_connection):
+    """0004-A validation_rule_fct_eta_time_not_in_tidal_window"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now()
+
+    # tidal window: [t0 +1min, t0 +1hr)
+    # eta berth: t0+0min
+    shipcall.tidal_window_from = t0_time + datetime.timedelta(minutes=1)
+    shipcall.tidal_window_to = t0_time + datetime.timedelta(hours=1)
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = t0_time + datetime.timedelta(minutes=0)
+    (code, msg) = vr.validation_rule_fct_eta_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.RED, f"state should be 'red', eta_berth takes place before the tidal window"
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = t0_time + datetime.timedelta(hours=1, minutes=1)
+    (code, msg) = vr.validation_rule_fct_eta_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.RED, f"state should be 'red', eta_berth takes place after the tidal window"
+    return
+
+
+
+def test_validation_rule_fct_etd_time_not_in_tidal_window__is_okay(build_sql_proxy_connection):
+    """0004-B validation_rule_fct_etd_time_not_in_tidal_window"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now()
+
+    # tidal window: [t0 +1min, t0 +1hr)
+    # etd berth: 
+    shipcall.tidal_window_from = t0_time + datetime.timedelta(minutes=1)
+    shipcall.tidal_window_to = t0_time + datetime.timedelta(hours=1)
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = t0_time + datetime.timedelta(minutes=1)
+    (code, msg) = vr.validation_rule_fct_etd_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.GREEN, f"state should be 'green', because etd_berth matches precisely the tidal_window_from"
+
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = t0_time + datetime.timedelta(hours=1)
+    (code, msg) = vr.validation_rule_fct_etd_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.GREEN, f"state should be 'green', because etd_berth matches precisely the tidal_window_to (in this case, the etd_berth would likely cause an issue)"
+    return
+
+def test_validation_rule_fct_etd_time_not_in_tidal_window__etd_outside_tidal_window(build_sql_proxy_connection):
+    """0004-B validation_rule_fct_etd_time_not_in_tidal_window"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    t0_time = datetime.datetime.now()
+
+    # tidal window: [t0 +1min, t0 +1hr)
+    # etd berth: 
+    shipcall.tidal_window_from = t0_time + datetime.timedelta(minutes=1)
+    shipcall.tidal_window_to = t0_time + datetime.timedelta(hours=1)
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = t0_time + datetime.timedelta(minutes=0)
+    (code, msg) = vr.validation_rule_fct_etd_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.RED, f"state should be 'red', etd_berth takes place before the tidal window"
+
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = t0_time + datetime.timedelta(hours=1, minutes=1)
+    (code, msg) = vr.validation_rule_fct_etd_time_not_in_tidal_window(shipcall, df_times)
+    assert code==StatusFlags.RED, f"state should be 'red', etd_berth takes place after the tidal window"
+    return
+
+def test_validation_rule_fct_too_many_identical_eta_times__is_violated_by_too_many_identical_times(build_sql_proxy_connection):
+    """0005-A validation_rule_fct_too_many_identical_eta_times"""
+    vr = build_sql_proxy_connection['vr']
+    query = "eta_berth"
+
+    reference_time = pd.Timestamp(datetime.datetime.now())
+    reference_time = reference_time.round("min")
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
+    df_times.loc[:,query] = reference_time + datetime.timedelta(seconds=12)
+
+    all_times_df = build_stub_df_times(shipcall, query, reference_time)
+    (code, msg) = vr.validation_rule_fct_too_many_identical_eta_times(shipcall=shipcall, df_times=df_times, all_times_agency=all_times_df)
+    assert code == StatusFlags.YELLOW, f"status should be 'yellow', because the artificial 'all_times_df' contains five shipcalls with identical times, which exceeds the threshold"
+    return
+
+def test_validation_rule_fct_too_many_identical_etd_times__is_violated_by_too_many_identical_times(build_sql_proxy_connection):
+    """0005-B validation_rule_fct_too_many_identical_etd_times"""
+    vr = build_sql_proxy_connection['vr']
+    query = "etd_berth"
+
+    reference_time = pd.Timestamp(datetime.datetime.now())
+    reference_time = reference_time.round("min")
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
+    df_times.loc[:,query] = reference_time + datetime.timedelta(seconds=12)
+
+    all_times_df = build_stub_df_times(shipcall, query, reference_time)
+    (code, msg) = vr.validation_rule_fct_too_many_identical_etd_times(shipcall=shipcall, df_times=df_times, all_times_agency=all_times_df)
+    assert code == StatusFlags.YELLOW, f"status should be 'yellow', because the artificial 'all_times_df' contains five shipcalls with identical times, which exceeds the threshold"
+    return
+
+def test_validation_rule_fct_agency_and_terminal_berth_id_disagreement__agency_and_terminal_agree(build_sql_proxy_connection):
+    """0006-A validation_rule_fct_agency_and_terminal_berth_id_disagreement"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "berth_id"] = 143
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "berth_id"] = 143
+
+    (code, msg) = vr.validation_rule_fct_agency_and_terminal_berth_id_disagreement(shipcall=shipcall, df_times=df_times)
+    assert code==StatusFlags.GREEN, f"status should be 'green', because agency and terminal agree on the selected berth id"
+    return
+
+def test_validation_rule_fct_agency_and_terminal_berth_id_disagreement__agency_and_terminal_disagree(build_sql_proxy_connection):
+    """0006-A validation_rule_fct_agency_and_terminal_berth_id_disagreement"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "berth_id"] = 143
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "berth_id"] = 145
+
+    (code, msg) = vr.validation_rule_fct_agency_and_terminal_berth_id_disagreement(shipcall=shipcall, df_times=df_times)
+    assert code==StatusFlags.YELLOW, f"status should be 'yellow', because agency and terminal do not agree on the selected berth id"
+    return
+
+def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_and_terminal_agree(build_sql_proxy_connection):
+    """0006-B validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = True
+
+    (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
+    assert code==StatusFlags.GREEN, f"status should be 'green', because agency and terminal agree on the selected pier side"
+    return
+
+def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_and_terminal_disagree(build_sql_proxy_connection):
+    """0006-B validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = False
+
+    (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
+    assert code==StatusFlags.YELLOW, f"status should be 'yellow', because agency and terminal do not agree on the selected pier side"
+    return
+
+
 
 def test_validation_rule_fct_agency_and_terminal_pier_side_agreement(build_sql_proxy_connection):
     """#0006-A validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
@@ -89,8 +853,36 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_agreement(build_sql_p
     assert description is None, f"no violation should be observed"
     return
 
+def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement(build_sql_proxy_connection):
+    """#0006-A validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
+    import pandas as pd
 
+    from BreCal.stubs.times_full import get_times_full_simple
+    from BreCal.stubs.shipcall import get_shipcall_simple
+    from BreCal.database.enums import ParticipantType
+    from BreCal.database.enums import StatusFlags
 
+    vr = build_sql_proxy_connection["vr"]
+    shipcall = get_shipcall_simple()
+    t1 = get_times_full_simple()
+    t2 = get_times_full_simple()
+
+    # roles: agency & terminal
+    t1.participant_type = ParticipantType.AGENCY.value
+    t2.participant_type = ParticipantType.TERMINAL.value
+
+    # disagreement
+    t1.pier_side = True
+    t2.pier_side = False
+
+    time_objects = [t1, t2]
+    df_times = pd.DataFrame.from_records([to_.__dict__ for to_ in time_objects])
+    df_times.set_index('id',inplace=True)
+
+    (state, description) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall, df_times)
+    assert state.value > StatusFlags.GREEN.value, f"a violation must be identified"
+    assert description is not None, f"a violation description must be identified"
+    return
 
 def test_validation_rule_fct_agency_and_terminal_berth_id_disagreement(build_sql_proxy_connection):
     """#0006-B validation_rule_fct_agency_and_terminal_pier_side_disagreement"""

From c6d1bf30a68285856938bfe4bb81deab917b8511 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 14 Nov 2023 12:06:39 +0100
Subject: [PATCH 21/44] adapting rules 0001-L & 0001-M (times terminal) and
 0006-B. However, for 0006-B the provided solution is not verified, as the
 errors could not be reproduced locally.

---
 .../validators/validation_rule_functions.py   | 10 +++----
 .../test_validation_rule_functions.py         | 28 +++++++++++++++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 591dfb8..80bb15d 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -500,7 +500,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         a certain threshold (e.g., 20 hours), a violation occurs
 
         0001-L:
-            - Checks, if times_terminal.eta_berth is filled in. 
+            - Checks, if times_terminal.operations_start is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & terminal)
@@ -512,7 +512,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         query_time = times_agency.eta_berth
-        key_time = times_terminal.eta_berth
+        key_time = times_terminal.operations_start # eta_berth does not exist in times_terminal! Instead, it is called operations_start
         threshold = ParticipantwiseTimeDelta.TERMINAL
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -530,7 +530,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         a certain threshold (e.g., 20 hours), a violation occurs
 
         0001-M:
-            - Checks, if times_terminal.etd_berth is filled in. 
+            - Checks, if times_terminal.operations_end is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
         # check, if the header is filled in (agency & terminal)
@@ -542,7 +542,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         query_time = times_agency.etd_berth
-        key_time = times_terminal.etd_berth
+        key_time = times_terminal.operations_end # etd_berth does not exist in times_terminal! Instead, it is called operations_end
         threshold = ParticipantwiseTimeDelta.TERMINAL
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -850,7 +850,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         if shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
             return (StatusFlags.GREEN, None)
 
-        violation_state = times_agency.pier_side!=times_terminal.pier_side
+        violation_state = bool(times_agency.pier_side)!=bool(times_terminal.pier_side)
 
         if violation_state:
             validation_name = inspect.currentframe().f_code.co_name
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index 3fccac5..cdb0183 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -367,7 +367,7 @@ def test_validation_rule_fct_missing_time_terminal_berth_eta__shipcall_soon_but_
     df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.TERMINAL-10)
 
     # set times agency to be undetermined
-    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "eta_berth"] = None
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_start"] = None # previously: eta_berth, which does not exist in times_terminal
 
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_terminal_berth_eta(shipcall=shipcall, df_times=df_times)
@@ -389,7 +389,7 @@ def test_validation_rule_fct_missing_time_terminal_berth_etd__shipcall_soon_but_
     df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.TERMINAL-10)
 
     # set times agency to be undetermined
-    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "etd_berth"] = None
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_end"] = None  # previously: etd_berth, which does not exist in times_terminal
 
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_terminal_berth_etd(shipcall=shipcall, df_times=df_times)
@@ -820,6 +820,30 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_
     assert code==StatusFlags.YELLOW, f"status should be 'yellow', because agency and terminal do not agree on the selected pier side"
     return
 
+def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_and_terminal_disagree_terminal_is_none(build_sql_proxy_connection):
+    """0006-B validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = None
+
+    (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
+    assert code==StatusFlags.GREEN, f"status should be 'green', because the terminal's pier_side is not provided"
+    return
+
+def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_and_terminal_disagree_terminal_is_nan(build_sql_proxy_connection):
+    """0006-B validation_rule_fct_agency_and_terminal_pier_side_disagreement"""
+    vr = build_sql_proxy_connection['vr']
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = float("nan")
+
+    (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
+    assert code==StatusFlags.GREEN, f"status should be 'yellow', because the terminal's pier_side is not provided"
+    return
+
 
 
 def test_validation_rule_fct_agency_and_terminal_pier_side_agreement(build_sql_proxy_connection):

From 21e9c7578196b72331f8207a032dfc82f38221b0 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 14 Nov 2023 12:07:59 +0100
Subject: [PATCH 22/44] typo.

---
 src/server/tests/validators/test_validation_rule_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index cdb0183..1847973 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -841,7 +841,7 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_
     df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = float("nan")
 
     (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
-    assert code==StatusFlags.GREEN, f"status should be 'yellow', because the terminal's pier_side is not provided"
+    assert code==StatusFlags.GREEN, f"status should be 'green', because the terminal's pier_side is not provided"
     return
 
 

From 40dc022b258766f87fdf76db9eb5810c4da7607b Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Mon, 20 Nov 2023 16:22:58 +0100
Subject: [PATCH 23/44] fixing np to_list error, which may have caused the
 evaluation function to stop altogether.

---
 src/server/BreCal/database/sql_handler.py     |   7 +-
 .../validators/validation_rule_functions.py   | 141 ++++++++++--------
 2 files changed, 86 insertions(+), 62 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index 6c1acd2..3ecd895 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -176,7 +176,8 @@ class SQLHandler():
     
     def get_times_for_participant_type(self, df_times, participant_type:int):
         filtered_series = df_times.loc[df_times["participant_type"]==participant_type]
-        assert len(filtered_series)<=1, f"found multiple results"
+
+        assert len(filtered_series)<=1, f"found multiple results in function SQLHandler.get_times_for_participant_type"
         times = self.df_loc_to_data_model(filtered_series, id=0, model_str='times', loc_type="iloc") # use iloc! to retrieve the first result
         return times
     
@@ -201,7 +202,9 @@ class SQLHandler():
         df = df.set_index('shipcall_id', inplace=False)
         
         # the 'if' call is needed to ensure, that no Exception is raised, when the shipcall_id is not present in the df
-        participant_id_list = df.loc[shipcall_id, "participant_id"].to_list() if shipcall_id in list(df.index) else []
+        participant_id_list = df.loc[shipcall_id, "participant_id"].tolist() if shipcall_id in list(df.index) else []
+        if not isinstance(participant_id_list,list):
+            participant_id_list = [participant_id_list]
         return participant_id_list
     
     def get_times_of_shipcall(self, shipcall)->pd.DataFrame:
diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 80bb15d..a8138ab 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -63,6 +63,10 @@ class ValidationRuleBaseFunctions():
         returns: string
         """
         return self.error_message_dict.get(key,key)
+    
+    def get_no_violation_default_output(self):
+        """return the default output of a validation function with no validation: a tuple of (GREEN state, None)"""
+        return (StatusFlags.GREEN, None)
 
     def check_time_delta_violation_query_time_to_now(self, query_time:pd.Timestamp, key_time:pd.Timestamp, threshold:float)->bool:
         """
@@ -209,7 +213,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -222,7 +226,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_agency_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -237,7 +241,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -250,7 +254,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_mooring_berth_eta(self, shipcall, df_times, *args, **kwargs):
         """
@@ -265,7 +269,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & MOORING)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.MOORING.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -280,7 +284,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_mooring_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -295,7 +299,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & MOORING)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.MOORING.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -310,7 +314,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_portadministration_berth_eta(self, shipcall, df_times, *args, **kwargs):
         """
@@ -325,7 +329,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & PORT_ADMINISTRATION)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PORT_ADMINISTRATION.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -340,7 +344,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_portadministration_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -355,7 +359,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & PORT_ADMINISTRATION)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PORT_ADMINISTRATION.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -370,7 +374,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_pilot_berth_eta(self, shipcall, df_times, *args, **kwargs):
         """
@@ -385,7 +389,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & PILOT)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PILOT.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -400,7 +404,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_pilot_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -415,7 +419,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & PILOT)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PILOT.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -430,7 +434,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_tug_berth_eta(self, shipcall, df_times, *args, **kwargs):
         """
@@ -445,7 +449,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & TUG)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TUG.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -460,7 +464,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_tug_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -475,7 +479,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency & TUG)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TUG.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -490,7 +494,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_terminal_berth_eta(self, shipcall, df_times, *args, **kwargs):
         """
@@ -504,8 +508,11 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TERMINAL.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
+
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -520,7 +527,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_missing_time_terminal_berth_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -534,8 +541,11 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TERMINAL.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
+
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -550,8 +560,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
-
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_shipcall_incoming_participants_disagree_on_eta(self, shipcall, df_times, *args, **kwargs):
         """
@@ -574,7 +583,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -597,7 +606,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd(self, shipcall, df_times, *args, **kwargs):
         """
@@ -634,7 +643,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_eta_time_not_in_operation_window(self, shipcall, df_times, *args, **kwargs):
         """
@@ -646,15 +655,18 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         start_time & end_time: operations_start & operations_end (times_terminal)
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TERMINAL.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
+
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
         
         # get agency & terminal times
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         if self.check_is_not_a_time_or_is_none(times_terminal.operations_start) or self.check_is_not_a_time_or_is_none(times_agency.eta_berth):
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # check, whether the start of operations is AFTER the estimated arrival time
         violation_state = times_terminal.operations_start < times_agency.eta_berth
@@ -663,7 +675,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_etd_time_not_in_operation_window(self, shipcall, df_times, *args, **kwargs):
         """
@@ -675,15 +687,18 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         start_time & end_time: operations_start & operations_end (times_terminal)
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TERMINAL.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
+
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
         
         # get agency & terminal times
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         if self.check_is_not_a_time_or_is_none(times_terminal.operations_end) or self.check_is_not_a_time_or_is_none(times_agency.etd_berth):
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # check, whether the end of operations is AFTER the estimated departure time
         violation_state = times_terminal.operations_end > times_agency.etd_berth
@@ -692,7 +707,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_eta_time_not_in_tidal_window(self, shipcall, df_times, *args, **kwargs):
         """
@@ -705,12 +720,12 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
 
         # requirements: tidal window (from & to) is filled in
         if self.check_is_not_a_time_or_is_none(shipcall.tidal_window_from) or self.check_is_not_a_time_or_is_none(shipcall.tidal_window_to) or self.check_is_not_a_time_or_is_none(times_agency.eta_berth): # 202310310: note: this should check times_agency, shouldn't it?
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # check, whether the query time is between start & end time
         # a violation is observed, when the time is NOT between start & end
@@ -720,7 +735,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_etd_time_not_in_tidal_window(self, shipcall, df_times, *args, **kwargs):
         """
@@ -733,12 +748,12 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         """
         # check, if the header is filled in (agency)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
 
         # requirements: tidal window (from & to) is filled in
         if self.check_is_not_a_time_or_is_none(shipcall.tidal_window_from) or self.check_is_not_a_time_or_is_none(shipcall.tidal_window_to) or self.check_is_not_a_time_or_is_none(times_agency.etd_berth): # 202310310: note: this should check times_agency, shouldn't it?
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # check, whether the query time is between start & end time
         # a violation is observed, when the time is NOT between start & end
@@ -748,7 +763,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.RED, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_too_many_identical_eta_times(self, shipcall, df_times, rounding = "min", maximum_threshold = 3, all_times_agency=None, *args, **kwargs):
         """
@@ -759,7 +774,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
         # check, if the header is filled in (agency)
         if len(times_agency) != 1:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # when ANY of the unique values exceeds the threshold, a violation is observed
         query = "eta_berth"
@@ -769,7 +784,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_too_many_identical_etd_times(self, shipcall, df_times, rounding = "min", maximum_threshold = 3, all_times_agency=None, *args, **kwargs):
         """
@@ -780,7 +795,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
         # check, if the header is filled in (agency)
         if len(times_agency) != 1:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # when ANY of the unique values exceeds the threshold, a violation is observed
         query = "etd_berth"
@@ -790,7 +805,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_agency_and_terminal_berth_id_disagreement(self, shipcall, df_times, *args, **kwargs):
         """
@@ -799,22 +814,25 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         Description: This validation rule checks, whether agency and terminal agree with their designated berth place by checking berth_id.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TERMINAL.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
+
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
         
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         # when one of the two values is null, the state is GREEN
         if (times_agency.berth_id is None) or (times_terminal.berth_id is None):
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # when one of the two values is null, the state is GREEN
         if (pd.isnull(times_agency.berth_id)) or (pd.isnull(times_terminal.berth_id)):
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         if shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         # only incoming shipcalls matter. The other ones are not relevant for the berth selection
         violation_state = times_agency.berth_id!=times_terminal.berth_id
@@ -823,7 +841,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
     
     def validation_rule_fct_agency_and_terminal_pier_side_disagreement(self, shipcall, df_times, *args, **kwargs):
         """
@@ -832,23 +850,26 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         Description: This validation rule checks, whether agency and terminal agree with their designated pier side by checking pier_side.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TERMINAL.value])]) != 2:
-            return (StatusFlags.GREEN, None)
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
+
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+            return self.get_no_violation_default_output() # rule not applicable
         
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         # when one of the two values is null, the state is GREEN
         if (times_agency.pier_side is None) or (times_terminal.pier_side is None):
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # when one of the two values is null, the state is GREEN
         if (pd.isnull(times_agency.pier_side)) or (pd.isnull(times_terminal.pier_side)):
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
         
         # only incoming shipcalls matter. The other ones are not relevant for the pier_side selection
         if shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
         violation_state = bool(times_agency.pier_side)!=bool(times_terminal.pier_side)
 
@@ -856,6 +877,6 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             validation_name = inspect.currentframe().f_code.co_name
             return (StatusFlags.YELLOW, validation_name)
         else:
-            return (StatusFlags.GREEN, None)
+            return self.get_no_violation_default_output()
 
 

From 49bbb7762483c5dd53273890f1da86c061d6f6a7 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Mon, 20 Nov 2023 16:35:31 +0100
Subject: [PATCH 24/44] refactoring a few methods

---
 .../validators/validation_rule_functions.py   | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index a8138ab..478a7cf 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -268,7 +268,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & MOORING)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.MOORING.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -298,7 +298,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
         # check, if the header is filled in (agency & MOORING)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.MOORING.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -328,7 +328,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & PORT_ADMINISTRATION)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PORT_ADMINISTRATION.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -358,7 +358,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
         # check, if the header is filled in (agency & PORT_ADMINISTRATION)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PORT_ADMINISTRATION.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -388,7 +388,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & PILOT)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PILOT.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -418,7 +418,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
         # check, if the header is filled in (agency & PILOT)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.PILOT.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -448,7 +448,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & TUG)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TUG.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -478,7 +478,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
         # check, if the header is filled in (agency & TUG)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value, ParticipantType.TUG.value])]) != 2:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value]) != 1):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -508,10 +508,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
-            return self.get_no_violation_default_output() # rule not applicable
-
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1):
             return self.get_no_violation_default_output() # rule not applicable
         
         # preparation: obtain the correct times of the participant, define the query time and the key time

From a5220fd6f257a5018adfb6299d3ea84c3d23665e Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Mon, 20 Nov 2023 16:43:27 +0100
Subject: [PATCH 25/44] refactoring: simplification of error messages. These
 now stem from a string, which is the function name. Previously, the inspect
 module was used with a rather complex function call to obtain the method's
 name. The simplification makes code more readable for future work.

---
 .../validators/validation_rule_functions.py   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 478a7cf..9bb2e94 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -223,7 +223,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_agency_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -251,7 +251,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_agency_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -281,7 +281,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_mooring_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -311,7 +311,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_mooring_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -341,7 +341,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_portadministration_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -371,7 +371,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_portadministration_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -401,7 +401,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_pilot_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -431,7 +431,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_pilot_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -461,7 +461,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_tug_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -491,7 +491,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_tug_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -521,7 +521,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_terminal_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -554,7 +554,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_terminal_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -577,7 +577,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             )
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_shipcall_incoming_participants_disagree_on_eta"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -600,7 +600,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             )
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -637,7 +637,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = (violation_state_eta) or (violation_state_etd)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -669,7 +669,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = times_terminal.operations_start < times_agency.eta_berth
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_eta_time_not_in_operation_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -701,7 +701,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = times_terminal.operations_end > times_agency.etd_berth
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_etd_time_not_in_operation_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -729,7 +729,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = not self.time_logic.time_inbetween(query_time=times_agency.eta_berth, start_time=shipcall.tidal_window_from, end_time=shipcall.tidal_window_to)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_eta_time_not_in_tidal_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -757,7 +757,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = not self.time_logic.time_inbetween(query_time=times_agency.etd_berth, start_time=shipcall.tidal_window_from, end_time=shipcall.tidal_window_to)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_etd_time_not_in_tidal_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -778,7 +778,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_unique_shipcall_counts(query, times_agency=times_agency, rounding=rounding, maximum_threshold=maximum_threshold, all_times_agency=all_times_agency)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_too_many_identical_eta_times"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -799,7 +799,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_unique_shipcall_counts(query, times_agency=times_agency, rounding=rounding, maximum_threshold=maximum_threshold, all_times_agency=all_times_agency)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_too_many_identical_etd_times"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -835,7 +835,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = times_agency.berth_id!=times_terminal.berth_id
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_agency_and_terminal_berth_id_disagreement"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -871,7 +871,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = bool(times_agency.pier_side)!=bool(times_terminal.pier_side)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_agency_and_terminal_pier_side_disagreement"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()

From 3cc1591aba108e539988d184b55faaeee35bfc43 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 21 Nov 2023 11:41:56 +0100
Subject: [PATCH 26/44] potentially correcting 0006A/0006B

---
 src/server/BreCal/database/sql_handler.py        | 16 ++++++++++++----
 .../validators/validation_rule_functions.py      |  8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index 3ecd895..f715b4b 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -159,7 +159,10 @@ class SQLHandler():
         return all_data
     
     def df_loc_to_data_model(self, df, id, model_str, loc_type:str="loc"):
-        assert len(df)>0, f"empty dataframe"
+        if not len(df)>0:
+            import warnings
+            warnings.warn(f"empty dataframe in SQLHandler.df_loc_to_data_model for model type: {model_str}\n")
+            return df
         
         # get a pandas series from the dataframe
         series = df.loc[id] if loc_type=="loc" else df.iloc[id]
@@ -177,7 +180,12 @@ class SQLHandler():
     def get_times_for_participant_type(self, df_times, participant_type:int):
         filtered_series = df_times.loc[df_times["participant_type"]==participant_type]
 
-        assert len(filtered_series)<=1, f"found multiple results in function SQLHandler.get_times_for_participant_type"
+        if not len(filtered_series)<=1:
+            # correcting the error: ERROR:root:found multiple results 
+            # however, a warning will still be issued
+            import warnings
+            warnings.warn(f"found multiple results in function SQLHandler.get_times_for_participant_type\nConsidering only the first match!\nAffected Times Indexes: {filtered_series.index}")
+
         times = self.df_loc_to_data_model(filtered_series, id=0, model_str='times', loc_type="iloc") # use iloc! to retrieve the first result
         return times
     
@@ -240,8 +248,8 @@ class SQLHandler():
         """given a dataframe of all agency times, get all unique ship counts, their values (datetime) and the string tags. returns a tuple (values,unique,counts)"""
         # optional: rounding
         if rounding is not None:
-            all_df_times.loc[:, query] = all_df_times.loc[:, query].dt.round(rounding) # e.g., 'min'
-            query_time_agency = times_agency[query].iloc[0].round(rounding)# e.g., 'min'
+            all_df_times.loc[:, query] = pd.to_datetime(all_df_times.loc[:, query]).dt.round(rounding) # e.g., 'min' ---  # correcting the error: 'AttributeError: Can only use .dt accessor with datetimelike values'
+            query_time_agency = pd.to_datetime(times_agency[query]).iloc[0].round(rounding)# e.g., 'min'
 
         # after rounding, filter {all_df_times}, so only those, which match the current query are of interest
         # takes 'times_agency' to sample, which value should match
diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 9bb2e94..e1c59ff 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -811,10 +811,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         Description: This validation rule checks, whether agency and terminal agree with their designated berth place by checking berth_id.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) == 0:
             return self.get_no_violation_default_output() # rule not applicable
 
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) == 0:
             return self.get_no_violation_default_output() # rule not applicable
         
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -847,10 +847,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         Description: This validation rule checks, whether agency and terminal agree with their designated pier side by checking pier_side.
         """
         # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) == 0:
             return self.get_no_violation_default_output() # rule not applicable
 
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
+        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) == 0:
             return self.get_no_violation_default_output() # rule not applicable
         
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)

From 9346920a97a9954c0893e015c751fec87900f8b6 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 21 Nov 2023 11:51:49 +0100
Subject: [PATCH 27/44] potentially solving the 'shipcall_id' error log

---
 src/server/BreCal/database/sql_handler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index f715b4b..f34f345 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -207,7 +207,8 @@ class SQLHandler():
         returns: participant_id_list, where every element is an int
         """
         df = self.df_dict.get("shipcall_participant_map")
-        df = df.set_index('shipcall_id', inplace=False)
+        if 'shipcall_id' in list(df.columns):
+            df = df.set_index('shipcall_id', inplace=False)
         
         # the 'if' call is needed to ensure, that no Exception is raised, when the shipcall_id is not present in the df
         participant_id_list = df.loc[shipcall_id, "participant_id"].tolist() if shipcall_id in list(df.index) else []

From fd0efe004670a03ecb5ea60e6f992964e2a2b724 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 21 Nov 2023 12:47:04 +0100
Subject: [PATCH 28/44] adding schedule routine jobs, which will be executed in
 a background thread within WSGI while running the Flask application.

---
 src/server/BreCal/__init__.py                 |  6 ++
 .../BreCal/services/schedule_routines.py      | 81 +++++++++++++++++++
 src/server/flaskapp.wsgi                      |  5 ++
 3 files changed, 92 insertions(+)
 create mode 100644 src/server/BreCal/services/schedule_routines.py

diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py
index c4cf995..4ee4bbf 100644
--- a/src/server/BreCal/__init__.py
+++ b/src/server/BreCal/__init__.py
@@ -31,6 +31,7 @@ from BreCal.stubs.times_tug import get_times_tug
 from BreCal.stubs.times_full import get_times_full_simple
 from BreCal.stubs.df_times import get_df_times
 
+from BreCal.services.schedule_routines import setup_schedule, run_schedule_permanently_in_background
 
 def create_app(test_config=None):
 
@@ -64,6 +65,11 @@ def create_app(test_config=None):
     local_db.initPool(os.path.dirname(app.instance_path))
     logging.info('App started')
 
+    # Setup Routine jobs (e.g., reevaluation of shipcalls)
+    setup_schedule(update_shipcalls_interval_in_minutes=60)
+    run_schedule_permanently_in_background(latency=30)
+    logging.info('Routine Jobs are defined.')
+
     return app
 
 __all__ = [
diff --git a/src/server/BreCal/services/schedule_routines.py b/src/server/BreCal/services/schedule_routines.py
new file mode 100644
index 0000000..a2c33dc
--- /dev/null
+++ b/src/server/BreCal/services/schedule_routines.py
@@ -0,0 +1,81 @@
+import logging
+import pydapper
+from BreCal.schemas import model
+from BreCal.local_db import getPoolConnection
+from BreCal.database.update_database import evaluate_shipcall_state
+
+import threading
+import schedule
+import time
+
+options = {'past_days':7}
+
+def UpdateShipcalls(options:dict = {'past_days':2}):
+    """
+    performs a single update step of every shipcall that matches the criteria.
+
+    1.) opens an SQL connection
+    2.) queries every shipcall that fulfills the {options} criteria
+    3.) iterates over each shipcall
+    4.) closes the SQL connection
+
+    options:
+        key: 'past_days'. Is used to execute a filtered query of all available shipcalls. Defaults to 2 (days)
+    """
+    try:
+        pooledConnection = getPoolConnection()
+        commands = pydapper.using(pooledConnection)
+        query = ("SELECT id, ship_id, type, eta, voyage, etd, arrival_berth_id, departure_berth_id, tug_required, pilot_required, "
+                "flags, pier_side, bunkering, replenishing_terminal, replenishing_lock, draft, tidal_window_from, tidal_window_to, rain_sensitive_cargo, recommended_tugs, "
+                "anchored, moored_lock, canceled, evaluation, evaluation_message, created, modified FROM shipcall WHERE ((type = 1 OR type = 3) AND eta >= DATE(NOW() - INTERVAL %d DAY)"
+                "OR (type = 2 AND etd >= DATE(NOW() - INTERVAL %d DAY))) "
+                "ORDER BY eta") % (options["past_days"], options["past_days"])
+
+        # obtain data from the MYSQL database
+        data = commands.query(query, model=model.Shipcall)
+
+        # get the shipcall ids, which are of interest
+        shipcall_ids = [dat.id for dat in data]
+
+        # iterate over each shipcall id and (re-) evaluate it
+        for shipcall_id in shipcall_ids:
+            # apply 'Traffic Light' evaluation to obtain 'GREEN', 'YELLOW' or 'RED' evaluation state. The function internally updates the mysql database
+            evaluate_shipcall_state(mysql_connector_instance=pooledConnection, shipcall_id=shipcall_id) # new_id (last insert id) refers to the shipcall id
+
+        pooledConnection.close()
+
+    except Exception as ex:
+        logging.error(ex)
+    return
+
+def add_function_to_schedule__update_shipcalls(interval_in_minutes:int, options:dict={'past_days':2}):
+    kwargs_ = {"options":options}
+    schedule.every(interval_in_minutes).minutes.do(UpdateShipcalls, **kwargs_)
+    return
+
+def setup_schedule(update_shipcalls_interval_in_minutes:int=60):
+    schedule.clear() # clear all routine jobs. This prevents jobs from being created multiple times
+
+    # update the evaluation state in every recent shipcall
+    add_function_to_schedule__update_shipcalls(update_shipcalls_interval_in_minutes)
+
+    # placeholder: create/send notifications
+    # add_function_to_schedule__send_notifications(...)
+    return
+
+
+def run_schedule_permanently(latency:int=30):
+    """permanently runs the scheduler. Any time a routine task is 'due', it will be executed. There is an interval between each iteration to reduce workload"""
+    while True:
+        schedule.run_pending()
+        time.sleep(latency)
+    return
+
+def run_schedule_permanently_in_background(latency:int=30, thread_name:str="run_schedule_in_background"):
+    """create a (daemon) thread in the background, which permanently executes the scheduled functions"""
+    thread_names = [thread_.name for thread_ in threading.enumerate()]
+    if not thread_name in thread_names:
+        bg_thread = threading.Thread(target=run_schedule_permanently, name=thread_name, kwargs={"latency":latency})
+        bg_thread.daemon = True # 'daemon': stops, when Python's main thread stops.
+        bg_thread.start()
+    return
diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index 1591b35..706e336 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,6 +2,9 @@ import os
 import sys
 import logging
 
+# import the schedule library, which handles routine jobs
+import schedule 
+
 sys.path.insert(0, '/var/www/brecal_devel/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
@@ -11,6 +14,8 @@ os.environ['SECRET_KEY'] = 'zdiTz8P3jXOc7jztIQAoelK4zztyuCpJ'
 # Set up logging
 logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
 
+# Set up Scheduled Jobs
+
 # Import and run the Flask app
 from BreCal import create_app
 application = create_app()
\ No newline at end of file

From 721baa3a0621e08c25f606abe0dce7e22f90f368 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 22 Nov 2023 10:48:27 +0100
Subject: [PATCH 29/44] moved schedule import after venv sitepackage path set

---
 src/server/flaskapp.wsgi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index 706e336..4a5f543 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,12 +2,11 @@ import os
 import sys
 import logging
 
-# import the schedule library, which handles routine jobs
-import schedule 
-
 sys.path.insert(0, '/var/www/brecal_devel/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
+import schedule
+
 # set the key
 os.environ['SECRET_KEY'] = 'zdiTz8P3jXOc7jztIQAoelK4zztyuCpJ'
 
@@ -18,4 +17,4 @@ logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
 
 # Import and run the Flask app
 from BreCal import create_app
-application = create_app()
\ No newline at end of file
+application = create_app()

From 5c6d41470caacc390a69a9e41cbc30e4be47ffe9 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 25 Nov 2023 11:39:45 +0100
Subject: [PATCH 30/44] created 0.9.7 version with some minor fixes

---
 misc/version.txt                              |  2 +-
 src/BreCalClient/BreCalClient.csproj          |  4 +-
 .../EditTimesAgencyIncomingControl.xaml       | 46 ++++++++-----------
 .../EditTimesAgencyIncomingControl.xaml.cs    | 12 ++---
 .../EditTimesAgencyOutgoingControl.xaml       | 46 ++++++++-----------
 .../EditTimesAgencyOutgoingControl.xaml.cs    | 13 +++---
 .../EditTimesAgencyShiftingControl.xaml       | 46 ++++++++-----------
 .../EditTimesAgencyShiftingControl.xaml.cs    | 14 +++---
 .../ClickOnceDevelProfile.pubxml              |  2 +-
 .../ClickOnceTestProfile.pubxml               |  2 +-
 src/BreCalClient/Resources/Resources.de.resx  |  2 +-
 11 files changed, 78 insertions(+), 111 deletions(-)

diff --git a/misc/version.txt b/misc/version.txt
index c2e8527..8467155 100644
--- a/misc/version.txt
+++ b/misc/version.txt
@@ -1 +1 @@
-0.9.6.0
\ No newline at end of file
+0.9.7.0
\ No newline at end of file
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 32c42c3..534a258 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>0.9.6.0</AssemblyVersion>
-    <FileVersion>0.9.6.0</FileVersion>
+    <AssemblyVersion>0.9.7.0</AssemblyVersion>
+    <FileVersion>0.9.7.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
index bf62a09..722041c 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
@@ -73,37 +73,27 @@
         <Label Content="{x:Static p:Resources.textAnchored}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right"/>
         <CheckBox x:Name="checkBoxAnchored" Grid.Column="3" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
         <Label Content="{x:Static p:Resources.textTugRequired}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right"/>
-        <Grid Grid.Column="3" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <CheckBox x:Name="checkBoxTugRequired" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <ComboBox Name="comboBoxTug" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-        </Grid>
+
+        <ComboBox Name="comboBoxTug" Grid.Column="3" Grid.Row="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+
         <Label Content="{x:Static p:Resources.textRecommendedTugs}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right"/>
         <xctk:IntegerUpDown x:Name="integerUpDownRecommendedTugs" Grid.Column="3" Grid.Row="2" Minimum="0" Margin="2" />
         <Label Content="{x:Static p:Resources.textPilotRequired}" Grid.Column="2" Grid.Row="3" HorizontalContentAlignment="Right" />
-        <Grid Grid.Column="3" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <CheckBox x:Name="checkBoxPilotRequired" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <ComboBox Name="comboBoxPilot" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-        </Grid>
+
+        <ComboBox Name="comboBoxPilot" Grid.Column="3" Grid.Row="3" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+
         <Label Content="{x:Static p:Resources.textMooring}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxMooring" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
             <ComboBox.ContextMenu>
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
index 093e20f..af88036 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
@@ -103,9 +103,9 @@ namespace BreCalClient
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
 
                 this.ShipcallModel.Shipcall.Anchored = this.checkBoxAnchored.IsChecked;
-                this.ShipcallModel.Shipcall.TugRequired = this.checkBoxTugRequired.IsChecked;
+                
                 this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
-                this.ShipcallModel.Shipcall.PilotRequired = this.checkBoxPilotRequired.IsChecked;
+                
                 this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
                 this.ShipcallModel.Shipcall.Bunkering = this.checkBoxBunkering.IsChecked;
                 this.ShipcallModel.Shipcall.ReplenishingTerminal = this.checkBoxReplenishingTerminal.IsChecked;
@@ -190,9 +190,9 @@ namespace BreCalClient
                 this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
 
                 this.checkBoxAnchored.IsChecked = this.ShipcallModel.Shipcall.Anchored ?? false;
-                this.checkBoxTugRequired.IsChecked = this.ShipcallModel.Shipcall.TugRequired ?? false;
+                
                 this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
-                this.checkBoxPilotRequired.IsChecked = this.ShipcallModel.Shipcall.PilotRequired ?? false;
+                
                                                
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 
@@ -250,10 +250,10 @@ namespace BreCalClient
             this.checkBoxCanceled.IsEnabled = isEnabled;
 
             this.checkBoxAnchored.IsEnabled = isEnabled;
-            this.checkBoxTugRequired.IsEnabled = isEnabled;
+            
             this.comboBoxTug.IsEnabled = isEnabled;
             this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;
-            this.checkBoxPilotRequired.IsEnabled = isEnabled;
+            
             this.comboBoxPilot.IsEnabled = isEnabled;
             this.comboBoxMooring.IsEnabled = isEnabled;
             this.checkBoxMooredLock.IsEnabled = isEnabled;
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index abfc91c..59f4348 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -67,37 +67,27 @@
         <CheckBox x:Name="checkBoxCanceled" Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
 
         <Label Content="{x:Static p:Resources.textTugRequired}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right"/>
-        <Grid Grid.Column="3" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <CheckBox x:Name="checkBoxTugRequired" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <ComboBox Name="comboBoxTug" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-        </Grid>
+
+        <ComboBox Name="comboBoxTug" Grid.Column="3" Grid.Row="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+
         <Label Content="{x:Static p:Resources.textRecommendedTugs}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right"/>
         <xctk:IntegerUpDown x:Name="integerUpDownRecommendedTugs" Grid.Column="3" Grid.Row="2" Minimum="0" Margin="2" />
         <Label Content="{x:Static p:Resources.textPilotRequired}" Grid.Column="2" Grid.Row="3" HorizontalContentAlignment="Right" />
-        <Grid Grid.Column="3" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <CheckBox x:Name="checkBoxPilotRequired" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <ComboBox Name="comboBoxPilot" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-        </Grid>
+
+        <ComboBox Name="comboBoxPilot" Grid.Column="3" Grid.Row="3" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+
         <Label Content="{x:Static p:Resources.textMooring}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxMooring" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
             <ComboBox.ContextMenu>
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index f0369b0..2fd703a 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -100,9 +100,9 @@ namespace BreCalClient
                 this.ShipcallModel.Shipcall.TidalWindowTo = this.datePickerTidalWindowTo.Value;
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
                 
-                this.ShipcallModel.Shipcall.TugRequired = this.checkBoxTugRequired.IsChecked;
+                
                 this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
-                this.ShipcallModel.Shipcall.PilotRequired = this.checkBoxPilotRequired.IsChecked;
+                
                 this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
                 this.ShipcallModel.Shipcall.RainSensitiveCargo = this.checkBoxRainsensitiveCargo.IsChecked;
                 if(!string.IsNullOrEmpty(this.textBoxRemarks.Text.Trim()))
@@ -183,9 +183,9 @@ namespace BreCalClient
                 this.datePickerTidalWindowTo.Value = this.ShipcallModel.Shipcall.TidalWindowTo;
                 this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
                 
-                this.checkBoxTugRequired.IsChecked = this.ShipcallModel.Shipcall.TugRequired ?? false;
+                
                 this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
-                this.checkBoxPilotRequired.IsChecked = this.ShipcallModel.Shipcall.PilotRequired ?? false;
+                
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
@@ -238,10 +238,9 @@ namespace BreCalClient
             this.datePickerTidalWindowTo.IsEnabled = isEnabled;
             this.checkBoxCanceled.IsEnabled = isEnabled;
 
-            this.checkBoxTugRequired.IsEnabled = isEnabled;
+            
             this.comboBoxTug.IsEnabled = isEnabled;
-            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;
-            this.checkBoxPilotRequired.IsEnabled = isEnabled;
+            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;            
             this.comboBoxPilot.IsEnabled = isEnabled;
             this.comboBoxMooring.IsEnabled = isEnabled;
             this.checkBoxMooredLock.IsEnabled = isEnabled;
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index 7bcb118..f7e52f3 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -103,37 +103,27 @@
 
 
         <Label Content="{x:Static p:Resources.textTugRequired}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right"/>
-        <Grid Grid.Column="3" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <CheckBox x:Name="checkBoxTugRequired" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <ComboBox Name="comboBoxTug" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-        </Grid>
+
+        <ComboBox Name="comboBoxTug" Grid.Column="3" Grid.Row="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+
         <Label Content="{x:Static p:Resources.textRecommendedTugs}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right"/>
         <xctk:IntegerUpDown x:Name="integerUpDownRecommendedTugs" Grid.Column="3" Grid.Row="2" Minimum="0" Margin="2" />
         <Label Content="{x:Static p:Resources.textPilotRequired}" Grid.Column="2" Grid.Row="3" HorizontalContentAlignment="Right" />
-        <Grid Grid.Column="3" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <CheckBox x:Name="checkBoxPilotRequired" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <ComboBox Name="comboBoxPilot" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-        </Grid>
+
+        <ComboBox Name="comboBoxPilot" Grid.Column="3" Grid.Row="3"  Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+
         <Label Content="{x:Static p:Resources.textMooring}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxMooring" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
             <ComboBox.ContextMenu>
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index adea08e..d17a50f 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -104,9 +104,9 @@ namespace BreCalClient
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
 
                 
-                this.ShipcallModel.Shipcall.TugRequired = this.checkBoxTugRequired.IsChecked;
+                
                 this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
-                this.ShipcallModel.Shipcall.PilotRequired = this.checkBoxPilotRequired.IsChecked;
+                
                 this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
                 this.ShipcallModel.Shipcall.RainSensitiveCargo = this.checkBoxRainsensitiveCargo.IsChecked;
                 if(!string.IsNullOrEmpty(this.textBoxRemarks.Text.Trim()))
@@ -197,11 +197,10 @@ namespace BreCalClient
                 this.doubleUpDownDraft.Value = this.ShipcallModel.Shipcall.Draft;
                 this.datePickerTidalWindowFrom.Value = this.ShipcallModel.Shipcall.TidalWindowFrom;
                 this.datePickerTidalWindowTo.Value = this.ShipcallModel.Shipcall.TidalWindowTo;
-                this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
+                this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;                
                 
-                this.checkBoxTugRequired.IsChecked = this.ShipcallModel.Shipcall.TugRequired ?? false;
                 this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
-                this.checkBoxPilotRequired.IsChecked = this.ShipcallModel.Shipcall.PilotRequired ?? false;
+                
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
@@ -255,10 +254,9 @@ namespace BreCalClient
             this.textBoxBerthRemarksArrival.IsEnabled = isEnabled;
             this.checkBoxCanceled.IsEnabled = isEnabled;
 
-            this.checkBoxTugRequired.IsEnabled = isEnabled;
+            
             this.comboBoxTug.IsEnabled = isEnabled;
-            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;
-            this.checkBoxPilotRequired.IsEnabled = isEnabled;
+            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;            
             this.comboBoxPilot.IsEnabled = isEnabled;
             this.comboBoxMooring.IsEnabled = isEnabled;
             this.checkBoxMooredLock.IsEnabled = isEnabled;
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index bd31a28..c9ff94f 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.6.0</ApplicationVersion>
+    <ApplicationVersion>0.9.7.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 3fcf4f2..7e658e3 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.6.*</ApplicationVersion>
+    <ApplicationVersion>0.9.7.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 5dbb002..e774907 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -182,7 +182,7 @@
     <value>Ändern</value>
   </data>
   <data name="textChangePassword" xml:space="preserve">
-    <value>Password ändern</value>
+    <value>Passwort ändern</value>
   </data>
   <data name="textClose" xml:space="preserve">
     <value>Schliessen</value>

From 56ade40aefd89b892575a6ef49923767cef41aea Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 25 Nov 2023 12:15:38 +0100
Subject: [PATCH 31/44] fixed creating new shipcalls and cleaned up logon error
 message display

---
 src/BreCalClient/EditShipcallControl.xaml    | 23 +++------
 src/BreCalClient/EditShipcallControl.xaml.cs | 51 ++++++++++++++------
 src/BreCalClient/MainWindow.xaml             |  2 +-
 src/BreCalClient/MainWindow.xaml.cs          | 10 +++-
 4 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 8f20e1b..ae2df90 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -65,24 +65,15 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <ComboBox Name="comboBoxArrivalBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
-            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-                <ComboBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
-                    </ContextMenu>
-                </ComboBox.ContextMenu>
-            </ComboBox>
+            <ComboBox Name="comboBoxArrivalBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id" SelectionChanged="comboBoxArrivalBerth_SelectionChanged"/>
+
+            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxDepartureBerth_SelectionChanged"/>
+
+
         </Grid>
         
-        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="2" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False"/>
-        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False"/>
+        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="2" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
 
         <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 9c157e7..2456bd9 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -66,8 +66,7 @@ namespace BreCalClient
         }
 
         private void comboBoxShip_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            this.buttonOK.IsEnabled = this.comboBoxShip.SelectedItem != null;
+        {            
             if (this.comboBoxShip.SelectedItem != null)
             {
                 Ship? ship = this.comboBoxShip.SelectedItem as Ship;
@@ -83,11 +82,13 @@ namespace BreCalClient
                 this.doubleUpDownLength.Value = null;
                 this.doubleUpDownWidth.Value = null;
             }
+            this.CheckForCompletion();
         }
 
         private void comboBoxAgency_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             this.EnableControls();
+            this.CheckForCompletion();
         }
 
         private void comboBoxCategories_SelectionChanged(object? sender, SelectionChangedEventArgs? e)
@@ -121,6 +122,7 @@ namespace BreCalClient
                         break;
                 }
             }
+            this.CheckForCompletion();
         }
 
         #endregion
@@ -132,22 +134,24 @@ namespace BreCalClient
             this.comboBoxAgency.SelectedIndex = -1;
             this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.AGENCY);
         }
-
-        private void contextMenuItemArrivalBerth_Click(object sender, RoutedEventArgs e)
-        {
-            this.comboBoxArrivalBerth.SelectedIndex = -1;
-            this.ShipcallModel.Berth = "";
-        }
-
-        private void contextMenuItemDepartureBerth_Click(object sender, RoutedEventArgs e)
-        {
-            this.comboBoxDepartureBerth.SelectedIndex -= 1;
-        }        
-
+        
         #endregion
 
         #region private methods
 
+        void CheckForCompletion()
+        {
+            bool isEnabled = true;
+
+            isEnabled &= this.comboBoxShip.SelectedItem != null;
+            isEnabled &= this.comboBoxCategories.SelectedItem != null;
+            isEnabled &= ((this.comboBoxArrivalBerth.SelectedItem != null) || (this.comboBoxDepartureBerth.SelectedItem != null));
+            isEnabled &= (this.datePickerETA.Value.HasValue || this.datePickerETD.Value.HasValue);
+            isEnabled &= this.comboBoxAgency.SelectedItem != null;
+
+            this.buttonOK.IsEnabled = isEnabled;
+        }
+
         private void CopyToModel()
         {
             if (this.ShipcallModel.Shipcall != null)
@@ -292,5 +296,24 @@ namespace BreCalClient
 
         #endregion
 
+        private void datePickerETA_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.CheckForCompletion();
+        }
+
+        private void datePickerETD_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.CheckForCompletion();
+        }
+
+        private void comboBoxArrivalBerth_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            this.CheckForCompletion();
+        }
+
+        private void comboBoxDepartureBerth_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            this.CheckForCompletion();
+        }
     }
 }
diff --git a/src/BreCalClient/MainWindow.xaml b/src/BreCalClient/MainWindow.xaml
index 39ba515..3d89272 100644
--- a/src/BreCalClient/MainWindow.xaml
+++ b/src/BreCalClient/MainWindow.xaml
@@ -36,7 +36,7 @@
                 <Label Content="{x:Static p:Resources.textPassword}" Grid.Row="2" VerticalContentAlignment="Center" />
                 <TextBox Name="textUsername" Grid.Row="1" Grid.Column="1" Margin="2" VerticalContentAlignment="Center" />
                 <PasswordBox Name="textPassword" Grid.Row="2" Grid.Column="1" Margin="2" VerticalContentAlignment="Center"  PasswordChar="*"/>
-                <Label Name="labelLoginResult" Grid.Row="3" Grid.ColumnSpan="2" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
+                <Label Name="labelLoginResult" Grid.Row="3" Grid.ColumnSpan="2" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" />
                 <Button Name="buttonLogin" Content="{x:Static p:Resources.textLogin}" Grid.Row="4" Grid.Column="0" Margin="2" Click="buttonLogin_Click" IsDefault="True" />
                 <Button Name="buttonExit" Content="{x:Static p:Resources.textExit}" Grid.Row="4" Grid.Column="1" Margin="2" Click="buttonExit_Click" />
             </Grid>
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index f9e31c6..3402794 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -17,6 +17,8 @@ using BreCalClient.misc.Model;
 
 using static BreCalClient.Extensions;
 using System.Collections.Concurrent;
+using Newtonsoft.Json;
+using System.Security.Principal;
 
 namespace BreCalClient
 {
@@ -129,7 +131,13 @@ namespace BreCalClient
             }
             catch (ApiException ex)
             {
-                this.labelLoginResult.Content = ex.Message;
+                if ((ex.ErrorContent != null && ((string)ex.ErrorContent).StartsWith("{"))) {
+                    Error? anError = JsonConvert.DeserializeObject<Error>((string)ex.ErrorContent);
+                    this.labelLoginResult.Content = anError?.Message ?? ex.Message;
+                }
+                else {
+                    this.labelLoginResult.Content = ex.Message;
+                }
                 labelGeneralStatus.Text = $"Connection {ConnectionStatus.FAILED}";
             }
             catch (Exception ex)

From 8d63fece15295879c0ac2152c1b84c65678851d6 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 25 Nov 2023 16:01:03 +0100
Subject: [PATCH 32/44] Version bump to 1.0.0.0

---
 misc/version.txt                                              | 2 +-
 src/BreCalClient/BreCalClient.csproj                          | 4 ++--
 .../Properties/PublishProfiles/ClickOnceDevelProfile.pubxml   | 2 +-
 .../Properties/PublishProfiles/ClickOnceTestProfile.pubxml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/misc/version.txt b/misc/version.txt
index 8467155..bd2666a 100644
--- a/misc/version.txt
+++ b/misc/version.txt
@@ -1 +1 @@
-0.9.7.0
\ No newline at end of file
+1.0.0.0
\ No newline at end of file
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 534a258..450df98 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>0.9.7.0</AssemblyVersion>
-    <FileVersion>0.9.7.0</FileVersion>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index c9ff94f..b0fc519 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.7.0</ApplicationVersion>
+    <ApplicationVersion>1.0.0.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 7e658e3..c82452e 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.9.7.*</ApplicationVersion>
+    <ApplicationVersion>1.0.0.*</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>

From 5b2d6db5d33ea8239c43ecf13dd1447afe37fadd Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 26 Nov 2023 17:05:32 +0100
Subject: [PATCH 33/44] set everything to red, meaning test version 1.0.0

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

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index 741fbf4..c52f38d 100644
--- a/misc/BreCalApi.cs
+++ b/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://brecaltest.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://brecaltest.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://brecaltest.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index f3c845c..738816a 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -14,7 +14,7 @@ info:
 
 servers:
     # tutorial: https://idratherbewriting.com/learnapidoc/pubapis_openapi_step3_servers_object.html
-    - url: "https://brecaldevel.bsmd-emswe.eu/"
+    - url: "https://brecaltest.bsmd-emswe.eu/"
       description: "Test server hosted on vcup"
 
 paths:
diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index c86f39a..0800667 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -11,10 +11,10 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecaldevel.bsmd-emswe.eu</value>
+                <value>https://brecaltest.bsmd-emswe.eu</value>
             </setting>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#1D751F</value>
+                <value>#751D1F</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
                 <value>!!Bremen calling Testversion!!</value>
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 450df98..0bcecc1 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -13,7 +13,7 @@
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalDevelClient</AssemblyName>
+    <AssemblyName>BreCalTestClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs
index 8e2d2d1..6f08fee 100644
--- a/src/BreCalClient/Properties/Settings.Designer.cs
+++ b/src/BreCalClient/Properties/Settings.Designer.cs
@@ -34,7 +34,7 @@ namespace BreCalClient.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings
index fdf2294..4833674 100644
--- a/src/BreCalClient/Properties/Settings.settings
+++ b/src/BreCalClient/Properties/Settings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">https://brecal.bsmd-emswe.eu</Value>
     </Setting>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#1D751F</Value>
+      <Value Profile="(Default)">#751D1F</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
       <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index c3b9155..eb07fe8 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient"             
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
              mc:Ignorable="d" 
              d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 50fee9e..0173bb7 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -174,13 +174,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:,,,/BreCalTestClient;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:,,,/BreCalTestClient;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:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -189,13 +189,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:,,,/BreCalTestClient;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:,,,/BreCalTestClient;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:,,,/BreCalTestClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
diff --git a/src/RoleEditor/App.config b/src/RoleEditor/App.config
index 51c1ce1..bd2b4e4 100644
--- a/src/RoleEditor/App.config
+++ b/src/RoleEditor/App.config
@@ -8,7 +8,7 @@
     <applicationSettings>
         <RoleEditor.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_devel;Port=33306</value>
+                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>
diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py
index 4ee4bbf..e8eb0c7 100644
--- a/src/server/BreCal/__init__.py
+++ b/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='brecaltest.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
     local_db.initPool(os.path.dirname(app.instance_path))
     logging.info('App started')
 
diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py
index 1619ff3..4afd51b 100644
--- a/src/server/BreCal/local_db.py
+++ b/src/server/BreCal/local_db.py
@@ -10,7 +10,7 @@ def initPool(instancePath):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,'../../../secure/connection_data_devel.json');
+            config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json');
 
         print (config_path)
 
diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index 4a5f543..9dec941 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,7 +2,7 @@ import os
 import sys
 import logging
 
-sys.path.insert(0, '/var/www/brecal_devel/src/server')
+sys.path.insert(0, '/var/www/brecal_test/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 import schedule

From 131528021d6ec955a17efdcd6e60cd65b534913d Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 26 Nov 2023 17:37:31 +0100
Subject: [PATCH 34/44] set everything to blue, meaning prod version 1.0.0

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

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index c52f38d..3e64937 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -3582,7 +3582,7 @@ namespace BreCalClient.misc.Client
         {
             Proxy = null;
             UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
-            BasePath = "https://brecaltest.bsmd-emswe.eu";
+            BasePath = "https://brecal.bsmd-emswe.eu";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
@@ -3590,7 +3590,7 @@ namespace BreCalClient.misc.Client
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://brecaltest.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://brecaltest.bsmd-emswe.eu") : this()
+            string basePath = "https://brecal.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index 738816a..917cd3a 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -14,7 +14,7 @@ info:
 
 servers:
     # tutorial: https://idratherbewriting.com/learnapidoc/pubapis_openapi_step3_servers_object.html
-    - url: "https://brecaltest.bsmd-emswe.eu/"
+    - url: "https://brecal.bsmd-emswe.eu/"
       description: "Test server hosted on vcup"
 
 paths:
diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index 0800667..9c0e112 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -11,13 +11,13 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecaltest.bsmd-emswe.eu</value>
+                <value>https://brecal.bsmd-emswe.eu</value>
             </setting>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#751D1F</value>
+                <value>#203864</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
-                <value>!!Bremen calling Testversion!!</value>
+                <value>Bremen calling</value>
             </setting>
             <setting name="LOGO_IMAGE_URL" serializeAs="String">
                 <value>https://www.textbausteine.net/</value>
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 0bcecc1..d691a03 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -13,7 +13,7 @@
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalTestClient</AssemblyName>
+    <AssemblyName>BreCalClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs
index 6f08fee..891919a 100644
--- a/src/BreCalClient/Properties/Settings.Designer.cs
+++ b/src/BreCalClient/Properties/Settings.Designer.cs
@@ -34,7 +34,7 @@ namespace BreCalClient.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#203864")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
@@ -43,7 +43,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"]));
diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings
index 4833674..8bb93c9 100644
--- a/src/BreCalClient/Properties/Settings.settings
+++ b/src/BreCalClient/Properties/Settings.settings
@@ -6,10 +6,10 @@
       <Value Profile="(Default)">https://brecal.bsmd-emswe.eu</Value>
     </Setting>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#751D1F</Value>
+      <Value Profile="(Default)">#203864</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
+      <Value Profile="(Default)">Bremen calling</Value>
     </Setting>
     <Setting Name="LOGO_IMAGE_URL" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://www.textbausteine.net/</Value>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index eb07fe8..63a7bcb 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"             
              mc:Ignorable="d" 
              d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 0173bb7..3f67dbb 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -174,13 +174,13 @@ namespace BreCalClient
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
                         case 1: // incoming
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_down_red.png"));
                             break;
                         case 2: // outgoing
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_up_blue.png"));
                             break;
                         case 3: // shifting
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -189,13 +189,13 @@ namespace BreCalClient
                     switch(this.ShipcallControlModel?.LightMode)
                     {
                         case ShipcallControlModel.TrafficLightMode.GREEN:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/check.png"));
                             break;
                         case ShipcallControlModel.TrafficLightMode.YELLOW:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/sign_warning.png"));
                             break;
                         case ShipcallControlModel.TrafficLightMode.RED:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
diff --git a/src/RoleEditor/App.config b/src/RoleEditor/App.config
index bd2b4e4..7c6ee29 100644
--- a/src/RoleEditor/App.config
+++ b/src/RoleEditor/App.config
@@ -8,7 +8,7 @@
     <applicationSettings>
         <RoleEditor.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306</value>
+                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling;Port=33306</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>
diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py
index 4afd51b..33e03e3 100644
--- a/src/server/BreCal/local_db.py
+++ b/src/server/BreCal/local_db.py
@@ -10,7 +10,7 @@ def initPool(instancePath):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json');
+            config_path = os.path.join(instancePath,'../../../secure/connection_data_prod.json');
 
         print (config_path)
 
diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi
index 9dec941..6296d8f 100644
--- a/src/server/flaskapp.wsgi
+++ b/src/server/flaskapp.wsgi
@@ -2,7 +2,7 @@ import os
 import sys
 import logging
 
-sys.path.insert(0, '/var/www/brecal_test/src/server')
+sys.path.insert(0, '/var/www/brecal/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 import schedule

From c3f8759c709c821ad6e69394dc652f0ec6ba7883 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 26 Nov 2023 18:08:38 +0100
Subject: [PATCH 35/44] fixed error in publish xml

---
 .../Properties/PublishProfiles/ClickOnceProfile.pubxml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index 94aa26d..d43a324 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.0</ApplicationVersion>
+    <ApplicationVersion>1.0.0.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>

From adaef9485448fe41a5f51549f98d4027c550d60b Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 28 Nov 2023 11:23:46 +0100
Subject: [PATCH 36/44] added trace output and fixed a bug when saving
 shipcalls without times

---
 src/server/BreCal/database/sql_handler.py | 2 ++
 src/server/BreCal/impl/shipcalls.py       | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index f34f345..c228e8c 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -218,6 +218,8 @@ class SQLHandler():
     
     def get_times_of_shipcall(self, shipcall)->pd.DataFrame:
         df_times = self.df_dict.get('times') # -> pd.DataFrame
+        if df_times is None:
+            return None
         df_times = df_times.loc[df_times["shipcall_id"]==shipcall.id]
         return df_times
     
diff --git a/src/server/BreCal/impl/shipcalls.py b/src/server/BreCal/impl/shipcalls.py
index dd9cc3f..452a8be 100644
--- a/src/server/BreCal/impl/shipcalls.py
+++ b/src/server/BreCal/impl/shipcalls.py
@@ -1,6 +1,6 @@
 import json
 import logging
-
+import traceback
 import pydapper
 
 from ..schemas import model
@@ -36,6 +36,7 @@ def GetShipcalls(options):
         pooledConnection.close()
 
     except Exception as ex:
+        logging.error(traceback.format_exc())
         logging.error(ex)
         print(ex)
         result = {}
@@ -115,6 +116,7 @@ def PostShipcalls(schemaModel):
         return json.dumps({"id" : new_id}), 201, {'Content-Type': 'application/json; charset=utf-8'}
 
     except Exception as ex:
+        logging.error(traceback.format_exc())
         logging.error(ex)
         print(ex)
         result = {}
@@ -199,6 +201,7 @@ def PutShipcalls(schemaModel):
         return json.dumps({"id" : schemaModel["id"]}), 200
 
     except Exception as ex:
+        logging.error(traceback.format_exc())
         logging.error(ex)
         print(ex)
         result = {}

From c0645566689d415aa43cafdef22d1f63e8ac74eb Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 28 Nov 2023 14:17:07 +0100
Subject: [PATCH 37/44] fixing the 'KeyError' when using an empty times
 dataframe. Returning 'green'

---
 src/server/BreCal/database/sql_handler.py        | 2 --
 src/server/BreCal/validators/validation_rules.py | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index c228e8c..f34f345 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -218,8 +218,6 @@ class SQLHandler():
     
     def get_times_of_shipcall(self, shipcall)->pd.DataFrame:
         df_times = self.df_dict.get('times') # -> pd.DataFrame
-        if df_times is None:
-            return None
         df_times = df_times.loc[df_times["shipcall_id"]==shipcall.id]
         return df_times
     
diff --git a/src/server/BreCal/validators/validation_rules.py b/src/server/BreCal/validators/validation_rules.py
index 2753446..febbff4 100644
--- a/src/server/BreCal/validators/validation_rules.py
+++ b/src/server/BreCal/validators/validation_rules.py
@@ -31,6 +31,9 @@ class ValidationRules(ValidationRuleFunctions):
         # prepare df_times, which every validation rule tends to use
         df_times = self.sql_handler.df_dict.get('times') # -> pd.DataFrame
 
+        if len(df_times)==0:
+            return (StatusFlags.GREEN.value, [])
+
         # filter by shipcall id
         df_times = self.sql_handler.get_times_of_shipcall(shipcall)
 

From 210252df2233cacbd99cd8eefb01e3293e2483e1 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 28 Nov 2023 14:26:38 +0100
Subject: [PATCH 38/44] minot adjustments & refactoring

---
 src/server/BreCal/validators/validation_rules.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rules.py b/src/server/BreCal/validators/validation_rules.py
index febbff4..ba808e8 100644
--- a/src/server/BreCal/validators/validation_rules.py
+++ b/src/server/BreCal/validators/validation_rules.py
@@ -46,15 +46,9 @@ class ValidationRules(ValidationRuleFunctions):
 
         # 'translate' all error codes into readable, human-understandable format.
         evaluation_results = [(state, self.describe_error_message(msg)) for (state, msg) in evaluation_results]
-
-        """ # deprecated
-        # check, if ANY of the evaluation results (evaluation_state) is larger than the .GREEN state. This means, that .YELLOW and .RED
-        # would return 'True'. Numpy arrays and functions are used to accelerate the comparison. 
-        # np.any returns a boolean. 
-        #evaluation_state = not np.any(np.greater(np.array([result[0] for result in evaluation_results]), ValidationRuleState.GREEN))
-        """
+        
         # check, what the maximum state flag is and return it
-        evaluation_state = np.max(np.array([result[0].value for result in evaluation_results])) if len(evaluation_results)>0 else 1
+        evaluation_state = np.max(np.array([result[0].value for result in evaluation_results])) if len(evaluation_results)>0 else StatusFlags.GREEN.value
         evaluation_verbosity = [result[1] for result in evaluation_results]
         return (evaluation_state, evaluation_verbosity)
     

From 287224eeb43b7053f8123fc5368aff015c6fc407 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 28 Nov 2023 14:49:40 +0100
Subject: [PATCH 39/44] ensuring that len(df_times) always works. Preventing
 'None' from occuring

---
 src/server/BreCal/validators/validation_rules.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/BreCal/validators/validation_rules.py b/src/server/BreCal/validators/validation_rules.py
index ba808e8..b90f691 100644
--- a/src/server/BreCal/validators/validation_rules.py
+++ b/src/server/BreCal/validators/validation_rules.py
@@ -29,7 +29,7 @@ class ValidationRules(ValidationRuleFunctions):
         returns: (evaluation_state, violations)
         """
         # prepare df_times, which every validation rule tends to use
-        df_times = self.sql_handler.df_dict.get('times') # -> pd.DataFrame
+        df_times = self.sql_handler.df_dict.get('times', pd.DataFrame()) # -> pd.DataFrame
 
         if len(df_times)==0:
             return (StatusFlags.GREEN.value, [])

From ecdf66bff20740d557212f67adf28f98c714a0bc Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 28 Nov 2023 16:48:20 +0100
Subject: [PATCH 40/44] updating check_time_delta_violation_query_time_to_now:
 no longer ignoring events of the past (delta<=0)

---
 src/server/BreCal/validators/validation_rule_functions.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index e1c59ff..c8f00c6 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -99,9 +99,8 @@ class ValidationRuleBaseFunctions():
         delta = self.time_logic.time_delta_from_now_to_tgt(tgt_time=query_time, unit="m")
 
         # a violation occurs, when the delta (in minutes) exceeds the specified threshold of a participant
-        # to prevent past-events from triggering violations, negative values are ignored
-        # Violation, if 0 <= delta <= threshold
-        violation_state = (delta >= 0) and (delta<=threshold)
+        # Violation, if delta <= threshold
+        violation_state = (delta<=threshold)
         return violation_state
     
     def check_participants_agree_on_estimated_time(self, shipcall, query, df_times, applicable_shipcall_type)->bool:

From d6a6cc00ff0d6cce78fa1d2d4af01cb8105bbd46 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Wed, 29 Nov 2023 08:52:37 +0100
Subject: [PATCH 41/44] updating validation rules 0001 A-M. Instead of
 filtering by times_df (which may not exist), the rules make use of the
 shipcall_participant_map. When one of the participants in a rule is not
 assigned, no violation is observed. When there are multiple entries of a
 participant (due to an input bug), the function still verifies properly. When
 critical time is observed, and there is not yet an entry for the respective
 key time, there will be a 'yellow' state.

---
 src/server/BreCal/database/sql_handler.py     |  60 ++++
 .../validators/validation_rule_functions.py   |  71 +++--
 .../test_validation_rule_functions.py         | 275 ++++++++++++++++++
 3 files changed, 375 insertions(+), 31 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index f34f345..188d98a 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -7,6 +7,19 @@ from BreCal.database.enums import ParticipantType
 def pandas_series_to_data_model():
     return 
 
+def set_participant_type(x, participant_df)->int:
+    """
+    when iterating over each row entry x in the shipcall_participant_map,
+    one can update the 'type' column by extracting the matching data from a participant dataframe
+
+    returns: participant_type
+    """
+    participant_id = x["participant_id"]
+    participant_type = participant_df.loc[participant_id, "type"]
+    return participant_type
+    
+
+
 class SQLHandler():
     """
     An object that reads SQL queries from the sql_connection and stores it in pandas DataFrames. The object can read all available tables
@@ -95,6 +108,9 @@ class SQLHandler():
 
         # update the 'participants' column in 'shipcall'
         self.initialize_shipcall_participant_list()
+
+        # update the 'type' in shipcall_participants_map
+        self.add_participant_type_to_map()
         return
 
     def build_full_mysql_df_dict(self, all_schemas):
@@ -121,6 +137,50 @@ class SQLHandler():
             lambda x: self.get_participants(x.name), 
             axis=1)
         return
+        
+    def add_participant_type_to_map(self):
+        """
+        applies a lambda function, where the 'type'-column in the shipcall_participant_map is updated by reading the
+        respective data from the participants. Updates the shipcall_participant_map inplace.
+        """
+        spm = self.df_dict["shipcall_participant_map"]
+        participant_df = self.df_dict["participant"]
+
+        spm.loc[:,"type"] = spm.loc[:].apply(lambda x: set_participant_type(x, participant_df=participant_df),axis=1)
+        self.df_dict["shipcall_participant_map"] = spm
+        return
+        
+    def get_assigned_participants(self, shipcall)->pd.DataFrame:
+        """return each participant of a respective shipcall, filtered by the shipcall id"""
+        # get the shipcall_participant_map
+        spm = self.df_dict["shipcall_participant_map"]
+        assigned_participants = spm.loc[spm["shipcall_id"]==shipcall.id]
+        return assigned_participants
+    
+    def get_assigned_participants_by_type(self, assigned_participants:pd.DataFrame, participant_type:ParticipantType):
+        """filters a dataframe of assigned_participants by the provided type enumerator"""
+        assigned_participants_of_type = assigned_participants.loc[assigned_participants["type"]==participant_type.value]
+        return assigned_participants_of_type
+        
+    def check_if_any_participant_of_type_is_unassigned(self, shipcall, *args:list[ParticipantType])->bool:
+        """
+        given a list of input arguments, where item is a participant type, the function determines, whether at least one participant
+        was assigned for the type. Function returns a boolean, whether any of the required participants in unassigned.
+
+        This method is extensively used for the validation rules 0001, where the header is checked beforehand to identify, whether
+        the respective participant type is assigned already.
+        """
+        print("verbosity of function check_if_any_participant_of_type_is_unassigned")
+        assigned_participants = self.get_assigned_participants(shipcall)
+
+        unassigned = [] # becomes a list of booleans
+        for participant_type in args:
+            assignments_of_type = self.get_assigned_participants_by_type(assigned_participants, participant_type=participant_type)
+            unassignment = len(assignments_of_type)==0 # a participant type does not exist, when there is no match
+            unassigned.append(unassignment)
+            print("participant type and unassigment state", participant_type, unassignment)
+        return any(unassigned) # returns a single boolean, whether ANY of the types is not assigned
+
     
     def standardize_model_str(self, model_str:str)->str:
         """check if the 'model_str' is valid and apply lowercasing to the string"""
diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index c8f00c6..7148254 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -210,8 +210,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_agency.eta_berth is filled in. 
             - Measures the difference between 'now' and 'shipcall.eta'.
         """
-        # check, if the header is filled in (agency)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -238,8 +239,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_agency.etd_berth is filled in. 
             - Measures the difference between 'now' and 'shipcall.etd'.
         """
-        # check, if the header is filled in (agency)
-        if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -266,10 +268,11 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_mooring.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
-        # check, if the header is filled in (agency & MOORING)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.MOORING])
+        if unassigned:
             return self.get_no_violation_default_output()
-        
+
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_mooring = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.MOORING.value)
@@ -296,10 +299,11 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_mooring.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
-        # check, if the header is filled in (agency & MOORING)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.MOORING])
+        if unassigned:
             return self.get_no_violation_default_output()
-        
+
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_mooring = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.MOORING.value)
@@ -326,8 +330,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_port_administration.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
-        # check, if the header is filled in (agency & PORT_ADMINISTRATION)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PORT_ADMINISTRATION])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -356,8 +361,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_port_administration.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
-        # check, if the header is filled in (agency & PORT_ADMINISTRATION)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PORT_ADMINISTRATION])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -386,8 +392,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_pilot.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
-        # check, if the header is filled in (agency & PILOT)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PILOT])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -416,8 +423,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_pilot.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
-        # check, if the header is filled in (agency & PILOT)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PILOT])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -446,8 +454,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_tug.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
-        # check, if the header is filled in (agency & TUG)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TUG])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -476,8 +485,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_tug.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
-        # check, if the header is filled in (agency & TUG)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value]) != 1):
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TUG])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
@@ -506,9 +516,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_terminal.operations_start is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
-        # check, if the header is filled in (agency & terminal)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1):
-            return self.get_no_violation_default_output() # rule not applicable
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TERMINAL])
+        if unassigned:
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
@@ -536,12 +547,10 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_terminal.operations_end is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
-        # check, if the header is filled in (agency & terminal)
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
-            return self.get_no_violation_default_output() # rule not applicable
-
-        if len(df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value]) != 1:
-            return self.get_no_violation_default_output() # rule not applicable
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TERMINAL])
+        if unassigned:
+            return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index 1847973..4b32acd 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -117,6 +117,19 @@ def test_validation_rule_fct_missing_time_agency_berth_eta__shipcall_eta_dangero
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -137,6 +150,19 @@ def test_validation_rule_fct_missing_time_agency_berth_eta__shipcall_eta_distant
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -157,6 +183,19 @@ def test_validation_rule_fct_missing_time_agency_berth_eta__shipcall_eta_is_unde
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -177,6 +216,19 @@ def test_validation_rule_fct_missing_time_agency_berth_etd__shipcall_etd_is_unde
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_agency_berth_etd(shipcall=shipcall, df_times=df_times)
 
@@ -197,6 +249,21 @@ def test_validation_rule_fct_missing_time_mooring_berth_eta__shipcall_soon_but_p
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    mooring_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":mooring_participant_id, "type":ParticipantType.MOORING.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_mooring_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -219,6 +286,21 @@ def test_validation_rule_fct_missing_time_mooring_berth_etd__shipcall_soon_but_p
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, "etd_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    mooring_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.MOORING.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":mooring_participant_id, "type":ParticipantType.MOORING.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_mooring_berth_etd(shipcall=shipcall, df_times=df_times)
 
@@ -241,6 +323,21 @@ def test_validation_rule_fct_missing_time_portadministration_berth_eta__shipcall
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    pa_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":pa_participant_id, "type":ParticipantType.PORT_ADMINISTRATION.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_portadministration_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -263,6 +360,21 @@ def test_validation_rule_fct_missing_time_portadministration_berth_etd__shipcall
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, "etd_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    pa_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":pa_participant_id, "type":ParticipantType.PORT_ADMINISTRATION.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_portadministration_berth_etd(shipcall=shipcall, df_times=df_times)
 
@@ -283,6 +395,21 @@ def test_validation_rule_fct_missing_time_pilot_berth_eta__shipcall_soon_but_par
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    pilot_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":pilot_participant_id, "type":ParticipantType.PILOT.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -303,6 +430,21 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_par
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "etd_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    pilot_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":pilot_participant_id, "type":ParticipantType.PILOT.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_etd(shipcall=shipcall, df_times=df_times)
 
@@ -310,7 +452,79 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_par
     assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
     return
 
+def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_participant_unassigned__return_green(build_sql_proxy_connection):
+    """0001-I validation_rule_fct_missing_time_pilot_berth_etd"""
+    vr = build_sql_proxy_connection['vr']
 
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PILOT-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "etd_berth"] = None
+
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+
+    vr.sql_handler.read_all(vr.sql_handler.all_schemas)
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.GREEN, f"function should return 'green', because the pilot is not assigned yet"
+    return
+
+def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_participant_estimated_time_undefined_multiple_pilot_assignments_due_to_bug(build_sql_proxy_connection):
+    """
+    0001-I validation_rule_fct_missing_time_pilot_berth_etd. Checks, whether the function still works in case of a buggy input. When there is more than one pilot
+    assignment, the validation rule should still work and return 'yellow' properly.
+    """
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PILOT-10)
+
+    # set times agency to be undetermined
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "etd_berth"] = None
+
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    pilot_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":pilot_participant_id, "type":ParticipantType.PILOT.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10003, "shipcall_id":shipcall.id, "participant_id":pilot_participant_id, "type":ParticipantType.PILOT.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10004, "shipcall_id":shipcall.id, "participant_id":pilot_participant_id, "type":ParticipantType.PILOT.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
 
 def test_validation_rule_fct_missing_time_tug_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
     """0001-J validation_rule_fct_missing_time_tug_berth_eta"""
@@ -325,6 +539,21 @@ def test_validation_rule_fct_missing_time_tug_berth_eta__shipcall_soon_but_parti
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, "eta_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    tug_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":tug_participant_id, "type":ParticipantType.TUG.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_tug_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -347,6 +576,21 @@ def test_validation_rule_fct_missing_time_tug_berth_etd__shipcall_soon_but_parti
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, "etd_berth"] = None
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    tug_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.TUG.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":tug_participant_id, "type":ParticipantType.TUG.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_tug_berth_etd(shipcall=shipcall, df_times=df_times)
 
@@ -369,6 +613,21 @@ def test_validation_rule_fct_missing_time_terminal_berth_eta__shipcall_soon_but_
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_start"] = None # previously: eta_berth, which does not exist in times_terminal
 
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    terminal_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":terminal_participant_id, "type":ParticipantType.TERMINAL.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_terminal_berth_eta(shipcall=shipcall, df_times=df_times)
 
@@ -391,6 +650,22 @@ def test_validation_rule_fct_missing_time_terminal_berth_etd__shipcall_soon_but_
     # set times agency to be undetermined
     df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "operations_end"] = None  # previously: etd_berth, which does not exist in times_terminal
 
+
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    terminal_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "participant_id"].iloc[0]
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":terminal_participant_id, "type":ParticipantType.TERMINAL.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
     # apply the validation rule
     (state, msg) = vr.validation_rule_fct_missing_time_terminal_berth_etd(shipcall=shipcall, df_times=df_times)
 

From efff2fdf827487ff59c8ea1f526e92cb92904db2 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Wed, 29 Nov 2023 15:21:20 +0100
Subject: [PATCH 42/44] removing verbosity in validation rule functions, and
 returning 'None', when a selected times dataframe is empty. In case of empty
 results, the function now properly computes the delta towards a query time
 and returns YELLOW, when a violation is observed. This should finally fix the
 bugs for 0001 A-M

---
 src/server/BreCal/database/sql_handler.py     |  6 +--
 .../validators/validation_rule_functions.py   | 45 ++++++++++---------
 .../test_validation_rule_functions.py         | 38 ++++++++++++++++
 3 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index 188d98a..e473a79 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -170,7 +170,6 @@ class SQLHandler():
         This method is extensively used for the validation rules 0001, where the header is checked beforehand to identify, whether
         the respective participant type is assigned already.
         """
-        print("verbosity of function check_if_any_participant_of_type_is_unassigned")
         assigned_participants = self.get_assigned_participants(shipcall)
 
         unassigned = [] # becomes a list of booleans
@@ -178,9 +177,7 @@ class SQLHandler():
             assignments_of_type = self.get_assigned_participants_by_type(assigned_participants, participant_type=participant_type)
             unassignment = len(assignments_of_type)==0 # a participant type does not exist, when there is no match
             unassigned.append(unassignment)
-            print("participant type and unassigment state", participant_type, unassignment)
         return any(unassigned) # returns a single boolean, whether ANY of the types is not assigned
-
     
     def standardize_model_str(self, model_str:str)->str:
         """check if the 'model_str' is valid and apply lowercasing to the string"""
@@ -240,6 +237,9 @@ class SQLHandler():
     def get_times_for_participant_type(self, df_times, participant_type:int):
         filtered_series = df_times.loc[df_times["participant_type"]==participant_type]
 
+        if len(filtered_series)==0:
+            return None
+
         if not len(filtered_series)<=1:
             # correcting the error: ERROR:root:found multiple results 
             # however, a warning will still be issued
diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 7148254..2769927 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -218,7 +218,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         query_time = shipcall.eta
-        key_time = times_agency.eta_berth
+        key_time = times_agency.eta_berth if times_agency is not None else None
         threshold = ParticipantwiseTimeDelta.AGENCY
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
@@ -247,7 +247,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         # preparation: obtain the correct times of the participant, define the query time and the key time
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         query_time = shipcall.etd
-        key_time = times_agency.etd_berth
+        key_time = times_agency.etd_berth if times_agency is not None else None
         threshold = ParticipantwiseTimeDelta.AGENCY
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
@@ -277,8 +277,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_mooring = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.MOORING.value)
 
-        query_time = times_agency.eta_berth
-        key_time = times_mooring.eta_berth
+        query_time = times_agency.eta_berth if times_agency is not None else None
+        key_time = times_mooring.eta_berth if times_mooring is not None else None
         threshold = ParticipantwiseTimeDelta.MOORING
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
@@ -308,8 +308,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_mooring = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.MOORING.value)
 
-        query_time = times_agency.etd_berth
-        key_time = times_mooring.etd_berth
+        query_time = times_agency.etd_berth if times_agency is not None else None
+        key_time = times_mooring.etd_berth if times_mooring is not None else None
         threshold = ParticipantwiseTimeDelta.MOORING
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
@@ -339,8 +339,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_port_administration = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.PORT_ADMINISTRATION.value)
 
-        query_time = times_agency.eta_berth
-        key_time = times_port_administration.eta_berth
+        query_time = times_agency.eta_berth if times_agency is not None else None
+        key_time = times_port_administration.eta_berth if times_port_administration is not None else None
         threshold = ParticipantwiseTimeDelta.PORT_ADMINISTRATION
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
@@ -367,11 +367,12 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time
+        # when there are no times, the function returns None
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_port_administration = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.PORT_ADMINISTRATION.value)
 
-        query_time = times_agency.etd_berth
-        key_time = times_port_administration.etd_berth
+        query_time = times_agency.etd_berth if times_agency is not None else None
+        key_time = times_port_administration.etd_berth if times_port_administration is not None else None
         threshold = ParticipantwiseTimeDelta.PORT_ADMINISTRATION
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
@@ -401,8 +402,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_pilot = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.PILOT.value)
 
-        query_time = times_agency.eta_berth
-        key_time = times_pilot.eta_berth
+        query_time = times_agency.eta_berth if times_agency is not None else None
+        key_time = times_pilot.eta_berth if times_pilot is not None else None
         threshold = ParticipantwiseTimeDelta.PILOT
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -432,8 +433,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_pilot = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.PILOT.value)
 
-        query_time = times_agency.etd_berth
-        key_time = times_pilot.etd_berth
+        query_time = times_agency.etd_berth if times_agency is not None else None
+        key_time = times_pilot.etd_berth if times_pilot is not None else None
         threshold = ParticipantwiseTimeDelta.PILOT
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -463,8 +464,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_tug = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TUG.value)
 
-        query_time = times_agency.eta_berth
-        key_time = times_tug.eta_berth
+        query_time = times_agency.eta_berth if times_agency is not None else None
+        key_time = times_tug.eta_berth if times_tug is not None else None
         threshold = ParticipantwiseTimeDelta.TUG
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -494,8 +495,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_tug = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TUG.value)
 
-        query_time = times_agency.etd_berth
-        key_time = times_tug.etd_berth
+        query_time = times_agency.etd_berth if times_agency is not None else None
+        key_time = times_tug.etd_berth if times_tug is not None else None
         threshold = ParticipantwiseTimeDelta.TUG
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -525,8 +526,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
-        query_time = times_agency.eta_berth
-        key_time = times_terminal.operations_start # eta_berth does not exist in times_terminal! Instead, it is called operations_start
+        query_time = times_agency.eta_berth if times_agency is not None else None
+        key_time = times_terminal.operations_start if times_terminal is not None else None # eta_berth does not exist in times_terminal! Instead, it is called operations_start
         threshold = ParticipantwiseTimeDelta.TERMINAL
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
@@ -556,8 +557,8 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_agency = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.AGENCY.value)
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
-        query_time = times_agency.etd_berth
-        key_time = times_terminal.operations_end # etd_berth does not exist in times_terminal! Instead, it is called operations_end
+        query_time = times_agency.etd_berth if times_agency is not None else None
+        key_time = times_terminal.operations_end if times_terminal is not None else None # etd_berth does not exist in times_terminal! Instead, it is called operations_end
         threshold = ParticipantwiseTimeDelta.TERMINAL
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index 4b32acd..ab85502 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -526,6 +526,44 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_par
     assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
     return
 
+def test_validation_rule_fct_missing_time_pilot_berth_etd__agency_and_pilot_assigned_pilot_no_times_returns_yellow(build_sql_proxy_connection):
+    """
+    0001-I validation_rule_fct_missing_time_pilot_berth_etd. Checks the default behaviour, where an agency's time might exist,
+    while a time by pilot may not exist. In these cases, a yellow state is expected.
+    """
+    vr = build_sql_proxy_connection['vr']
+
+    shipcall = get_shipcall_simple()
+    df_times = get_df_times(shipcall)
+
+    # according to the agency, a shipcall takes place soon (ETA/ETD)
+    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "etd_berth"] = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.PILOT-10)
+
+    # must adapt the shipcall_participant_map, so it suits the test
+    agency_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "participant_id"].iloc[0]
+    pilot_participant_id = df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value, "participant_id"].iloc[0]
+
+    # set times of PILOT: should not exist
+    df_times.loc[df_times["participant_type"]==ParticipantType.PILOT.value,"participant_type"] = ParticipantType.BSMD.value
+
+    spm = vr.sql_handler.df_dict["shipcall_participant_map"]
+    df = pd.DataFrame(
+        [
+            {"id":10001, "shipcall_id":shipcall.id, "participant_id":agency_participant_id, "type":ParticipantType.AGENCY.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None},
+            {"id":10002, "shipcall_id":shipcall.id, "participant_id":pilot_participant_id, "type":ParticipantType.PILOT.value, "created":pd.Timestamp(datetime.datetime.now().isoformat()), "modified":None}
+        ]
+    )
+    df.set_index("id", inplace=True)
+    spm = pd.concat([spm, df], axis=0, ignore_index=True)
+    vr.sql_handler.df_dict["shipcall_participant_map"] = spm
+
+    # apply the validation rule
+    (state, msg) = vr.validation_rule_fct_missing_time_pilot_berth_etd(shipcall=shipcall, df_times=df_times)
+
+    # expectation: green state, no msg
+    assert state==StatusFlags.YELLOW, f"function should return 'yellow', because the participant did not provide a time and the shipcall takes place soon (according to the agency)"
+    return
+
 def test_validation_rule_fct_missing_time_tug_berth_eta__shipcall_soon_but_participant_estimated_time_undefined(build_sql_proxy_connection):
     """0001-J validation_rule_fct_missing_time_tug_berth_eta"""
     vr = build_sql_proxy_connection['vr']

From a0785d012cb2f2c8a91ff08098518648f3050dac Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Thu, 30 Nov 2023 15:53:42 +0100
Subject: [PATCH 43/44] changing the ParticipantType to an IntFlag, so multiple
 roles are possible. Adapting every validation rule (0001, 0003, 0004, 0005),
 which may be affected by this change. Changing the filter for a participant
 type to properly include the change. Changing the pier_side rule (0006B),
 which uses the shipcall and times_terminal. New shipcalls should now be
 evaluated properly, unless no participant is assigned at all. If the ladder
 case can occur, the validation rules 0001N+0001O will be added (held back for
 now).

---
 src/server/BreCal/database/enums.py           |  4 +-
 src/server/BreCal/database/sql_handler.py     | 41 +++++++++++++++----
 .../validators/validation_rule_functions.py   |  6 +--
 .../BreCal/validators/validation_rules.py     |  4 ++
 .../test_validation_rule_functions.py         | 15 ++++---
 5 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/server/BreCal/database/enums.py b/src/server/BreCal/database/enums.py
index e038643..3092fd8 100644
--- a/src/server/BreCal/database/enums.py
+++ b/src/server/BreCal/database/enums.py
@@ -1,6 +1,6 @@
-from enum import Enum
+from enum import Enum, IntFlag
 
-class ParticipantType(Enum):
+class ParticipantType(IntFlag):
     """determines the type of a participant"""
     NONE = 0
     BSMD = 1
diff --git a/src/server/BreCal/database/sql_handler.py b/src/server/BreCal/database/sql_handler.py
index e473a79..59497e3 100644
--- a/src/server/BreCal/database/sql_handler.py
+++ b/src/server/BreCal/database/sql_handler.py
@@ -1,6 +1,7 @@
 import numpy as np
 import pandas as pd
 import datetime
+import typing
 from BreCal.schemas.model import Shipcall, Ship, Participant, Berth, User, Times
 from BreCal.database.enums import ParticipantType
 
@@ -110,7 +111,8 @@ class SQLHandler():
         self.initialize_shipcall_participant_list()
 
         # update the 'type' in shipcall_participants_map
-        self.add_participant_type_to_map()
+        # fully deprecated
+        # self.add_participant_type_to_map()
         return
 
     def build_full_mysql_df_dict(self, all_schemas):
@@ -143,11 +145,12 @@ class SQLHandler():
         applies a lambda function, where the 'type'-column in the shipcall_participant_map is updated by reading the
         respective data from the participants. Updates the shipcall_participant_map inplace.
         """
-        spm = self.df_dict["shipcall_participant_map"]
-        participant_df = self.df_dict["participant"]
+        raise Exception("deprecated! Overwriting the shipcall_participant_map may cause harm, as a participant with multi-flag might be wrongfully assigned to multiple roles simultaneously.")
+        #spm = self.df_dict["shipcall_participant_map"]
+        #participant_df = self.df_dict["participant"]
 
-        spm.loc[:,"type"] = spm.loc[:].apply(lambda x: set_participant_type(x, participant_df=participant_df),axis=1)
-        self.df_dict["shipcall_participant_map"] = spm
+        #spm.loc[:,"type"] = spm.loc[:].apply(lambda x: set_participant_type(x, participant_df=participant_df),axis=1)
+        #self.df_dict["shipcall_participant_map"] = spm
         return
         
     def get_assigned_participants(self, shipcall)->pd.DataFrame:
@@ -159,7 +162,11 @@ class SQLHandler():
     
     def get_assigned_participants_by_type(self, assigned_participants:pd.DataFrame, participant_type:ParticipantType):
         """filters a dataframe of assigned_participants by the provided type enumerator"""
-        assigned_participants_of_type = assigned_participants.loc[assigned_participants["type"]==participant_type.value]
+        if isinstance(participant_type,int):
+            participant_type = ParticipantType(participant_type)
+
+        assigned_participants_of_type = assigned_participants.loc[[participant_type in ParticipantType(int(pt_)) for pt_ in list(assigned_participants["type"].values)]]
+        #assigned_participants_of_type = assigned_participants.loc[assigned_participants["type"]==participant_type.value]
         return assigned_participants_of_type
         
     def check_if_any_participant_of_type_is_unassigned(self, shipcall, *args:list[ParticipantType])->bool:
@@ -234,8 +241,25 @@ class SQLHandler():
         data = data_model(**data)
         return data
     
+    def filter_df_by_participant_type(self, df, participant_type:typing.Union[int, ParticipantType])->pd.DataFrame:
+        """
+        As ParticipantTypes are Flag objects, a dataframe's integer might resemble multiple participant types simultaneously.
+        This function allows for more complex filters, as the IntFlag allows more complex queries
+
+        e.g.:
+            ParticipantType(6) is 2,4 (2+4 = 6)
+
+            Participant(2) in Participant(6) = True # 6 is both, 2 and 4
+            Participant(1) in Participant(6) = False # 6 is both, 2 and 4, but not 1
+        """
+        if isinstance(participant_type,int):
+            participant_type = ParticipantType(participant_type)
+        filtered_df = df.loc[[participant_type in ParticipantType(df_pt) for df_pt in list(df["participant_type"].values)]]
+        return filtered_df
+    
     def get_times_for_participant_type(self, df_times, participant_type:int):
-        filtered_series = df_times.loc[df_times["participant_type"]==participant_type]
+        filtered_series = self.filter_df_by_participant_type(df_times, participant_type)
+        #filtered_series = df_times.loc[df_times["participant_type"]==participant_type]
 
         if len(filtered_series)==0:
             return None
@@ -299,7 +323,8 @@ class SQLHandler():
             df_times = df_times.loc[~df_times[non_null_column].isnull()] # NOT null filter
 
         # filter by the agency participant_type
-        times_agency = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
+        times_agency = self.filter_df_by_participant_type(df_times, ParticipantType.AGENCY.value)
+        #times_agency = df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]
         return times_agency
     
     def filter_df_by_key_value(self, df, key, value)->pd.DataFrame:
diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 2769927..a7993cd 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -866,18 +866,18 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         times_terminal = self.sql_handler.get_times_for_participant_type(df_times, participant_type=ParticipantType.TERMINAL.value)
 
         # when one of the two values is null, the state is GREEN
-        if (times_agency.pier_side is None) or (times_terminal.pier_side is None):
+        if (shipcall.pier_side is None) or (times_terminal.pier_side is None):
             return self.get_no_violation_default_output()
         
         # when one of the two values is null, the state is GREEN
-        if (pd.isnull(times_agency.pier_side)) or (pd.isnull(times_terminal.pier_side)):
+        if (pd.isnull(shipcall.pier_side)) or (pd.isnull(times_terminal.pier_side)):
             return self.get_no_violation_default_output()
         
         # only incoming shipcalls matter. The other ones are not relevant for the pier_side selection
         if shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
             return self.get_no_violation_default_output()
 
-        violation_state = bool(times_agency.pier_side)!=bool(times_terminal.pier_side)
+        violation_state = bool(shipcall.pier_side)!=bool(times_terminal.pier_side)
 
         if violation_state:
             validation_name = "validation_rule_fct_agency_and_terminal_pier_side_disagreement"
diff --git a/src/server/BreCal/validators/validation_rules.py b/src/server/BreCal/validators/validation_rules.py
index b90f691..cabe5ec 100644
--- a/src/server/BreCal/validators/validation_rules.py
+++ b/src/server/BreCal/validators/validation_rules.py
@@ -33,6 +33,10 @@ class ValidationRules(ValidationRuleFunctions):
 
         if len(df_times)==0:
             return (StatusFlags.GREEN.value, [])
+        
+        spm = self.sql_handler.df_dict["shipcall_participant_map"]
+        if len(spm.loc[spm["shipcall_id"]==shipcall.id])==0:
+            return (StatusFlags.GREEN.value, [])
 
         # filter by shipcall id
         df_times = self.sql_handler.get_times_of_shipcall(shipcall)
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index ab85502..5c4e3a0 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -1114,7 +1114,8 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_
     vr = build_sql_proxy_connection['vr']
     shipcall = get_shipcall_simple()
     df_times = get_df_times(shipcall)
-    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    shipcall.pier_side = True
+    # df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
     df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = True
 
     (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
@@ -1126,7 +1127,8 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_
     vr = build_sql_proxy_connection['vr']
     shipcall = get_shipcall_simple()
     df_times = get_df_times(shipcall)
-    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    shipcall.pier_side = True
+    #df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
     df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = False
 
     (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
@@ -1138,7 +1140,8 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement__agency_
     vr = build_sql_proxy_connection['vr']
     shipcall = get_shipcall_simple()
     df_times = get_df_times(shipcall)
-    df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
+    shipcall.pier_side = True
+    # df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value, "pier_side"] = True
     df_times.loc[df_times["participant_type"]==ParticipantType.TERMINAL.value, "pier_side"] = None
 
     (code, msg) = vr.validation_rule_fct_agency_and_terminal_pier_side_disagreement(shipcall=shipcall, df_times=df_times)
@@ -1178,7 +1181,8 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_agreement(build_sql_p
     t2.participant_type = ParticipantType.TERMINAL.value
 
     # agreement
-    t1.pier_side = True
+    shipcall.pier_side = True
+    # t1.pier_side = True
     t2.pier_side = True
 
     time_objects = [t1, t2]
@@ -1209,7 +1213,8 @@ def test_validation_rule_fct_agency_and_terminal_pier_side_disagreement(build_sq
     t2.participant_type = ParticipantType.TERMINAL.value
 
     # disagreement
-    t1.pier_side = True
+    shipcall.pier_side = True
+    # t1.pier_side = True
     t2.pier_side = False
 
     time_objects = [t1, t2]

From 377ec85ce98e70fa159537fbbd069484821ba0f8 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Thu, 30 Nov 2023 17:34:44 +0100
Subject: [PATCH 44/44] more concise evaluation messages for 0001. Adding
 newlines (works on Windows) when multiple evaluation messages are shown.
 Properly adding the ShipcallType filters for each rule (whether incoming,
 outgoing or shifting). Added a regular expression to abbreviate an evaluation
 message when 512 characters are exceeded.

---
 .../validators/validation_rule_functions.py   | 72 +++++++++++++++----
 .../BreCal/validators/validation_rules.py     | 19 ++++-
 .../test_validation_rule_functions.py         | 13 ++++
 3 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index a7993cd..92bf24e 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -10,18 +10,18 @@ from BreCal.database.enums import StatusFlags
 # a human interpretable dictionary for error messages. In this case, the English language is preferred
 error_message_dict = {
     # 0001 A-M
-    "validation_rule_fct_missing_time_agency_berth_eta":"The shipcall arrives in less than 20 hours, but there are still missing times by the agency. Please add the estimated time of arrival (ETA) {Rule #0001A}", # A
-    "validation_rule_fct_missing_time_agency_berth_etd":"The shipcall departs in less than 20 hours, but there are still missing times by the agency. Please add the estimated time of departure (ETD) {Rule #0001B}", # B
-    "validation_rule_fct_missing_time_mooring_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the mooring. Please add the estimated time of arrival (ETA) {Rule #0001C}", # C
-    "validation_rule_fct_missing_time_mooring_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the mooring. Please add the estimated time of departure (ETD) {Rule #0001D}", # D
-    "validation_rule_fct_missing_time_portadministration_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the port administration. Please add the estimated time of arrival (ETA) {Rule #0001F}", # F
-    "validation_rule_fct_missing_time_portadministration_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the port administration. Please add the estimated time of departure (ETD)  {Rule #0001G}", # G
-    "validation_rule_fct_missing_time_pilot_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the pilot. Please add the estimated time of arrival (ETA) {Rule #0001H}", # H
-    "validation_rule_fct_missing_time_pilot_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the pilot. Please add the estimated time of departure (ETD)  {Rule #0001I}", # I
-    "validation_rule_fct_missing_time_tug_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the tugs. Please add the estimated time of arrival (ETA) {Rule #0001J}", # J
-    "validation_rule_fct_missing_time_tug_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the tugs. Please add the estimated time of departure (ETD)  {Rule #0001K}", # K
-    "validation_rule_fct_missing_time_terminal_berth_eta":"The shipcall arrives in less than 16 hours, but there are still missing times by the terminal. Please add the estimated time of arrival (ETA) {Rule #0001L}", # L
-    "validation_rule_fct_missing_time_terminal_berth_etd":"The shipcall departs in less than 16 hours, but there are still missing times by the terminal. Please add the estimated time of departure (ETD)  {Rule #0001M}", # M
+    "validation_rule_fct_missing_time_agency_berth_eta":"Shipcall arrives soon (<20 hours). The agency did not provide a time yet (ETA) {Rule #0001A}", # A
+    "validation_rule_fct_missing_time_agency_berth_etd":"Shipcall departs soon (<20 hours). The agency did not provide a time yet (ETD) {Rule #0001B}", # B
+    "validation_rule_fct_missing_time_mooring_berth_eta":"Shipcall arrives soon (<16 hours). The mooring did not provide a time yet (ETA) {Rule #0001C}", # C
+    "validation_rule_fct_missing_time_mooring_berth_etd":"Shipcall departs soon (<16 hours). The mooring did not provide a time yet (ETD) {Rule #0001D}", # D
+    "validation_rule_fct_missing_time_portadministration_berth_eta":"Shipcall arrives soon (<16 hours). The port administration did not provide a time yet (ETA) {Rule #0001F}", # F
+    "validation_rule_fct_missing_time_portadministration_berth_etd":"Shipcall departs soon (<20 hours). The port administration did not provide a time yet (ETD)  {Rule #0001G}", # G
+    "validation_rule_fct_missing_time_pilot_berth_eta":"Shipcall arrives soon (<16 hours). The pilot did not provide a time yet (ETA) {Rule #0001H}", # H
+    "validation_rule_fct_missing_time_pilot_berth_etd":"Shipcall departs soon (<20 hours). The pilot did not provide a time yet (ETD)  {Rule #0001I}", # I
+    "validation_rule_fct_missing_time_tug_berth_eta":"Shipcall arrives soon (<16 hours). The tugs did not provide a time yet (ETA) {Rule #0001J}", # J
+    "validation_rule_fct_missing_time_tug_berth_etd":"Shipcall departs soon (<20 hours). The tugs did not provide a time yet (ETD)  {Rule #0001K}", # K
+    "validation_rule_fct_missing_time_terminal_berth_eta":"Shipcall arrives soon (<16 hours). The terminal did not provide a time yet (ETA) {Rule #0001L}", # L
+    "validation_rule_fct_missing_time_terminal_berth_etd":"Shipcall departs soon (<20 hours). The terminal did not provide a time yet (ETD)  {Rule #0001M}", # M
 
     # 0002 A+B+C
     "validation_rule_fct_shipcall_incoming_participants_disagree_on_eta":"There are deviating times between agency, mooring, port authority, pilot and tug for the estimated time of arrival (ETA) {Rule #0002A}",
@@ -210,6 +210,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_agency.eta_berth is filled in. 
             - Measures the difference between 'now' and 'shipcall.eta'.
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY])
         if unassigned:
@@ -239,6 +242,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_agency.etd_berth is filled in. 
             - Measures the difference between 'now' and 'shipcall.etd'.
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY])
         if unassigned:
@@ -268,6 +274,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_mooring.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.MOORING])
         if unassigned:
@@ -299,6 +308,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_mooring.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.MOORING])
         if unassigned:
@@ -330,6 +342,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_port_administration.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PORT_ADMINISTRATION])
         if unassigned:
@@ -361,6 +376,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_port_administration.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PORT_ADMINISTRATION])
         if unassigned:
@@ -393,6 +411,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_pilot.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PILOT])
         if unassigned:
@@ -424,6 +445,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_pilot.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PILOT])
         if unassigned:
@@ -455,6 +479,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_tug.eta_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TUG])
         if unassigned:
@@ -486,6 +513,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_tug.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TUG])
         if unassigned:
@@ -517,6 +547,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_terminal.operations_start is filled in. 
             - Measures the difference between 'now' and 'times_agency.eta_berth'.
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TERMINAL])
         if unassigned:
@@ -548,6 +581,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_terminal.operations_end is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in
         unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.TERMINAL])
         if unassigned:
@@ -660,6 +696,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         query time: eta_berth (times_agency)
         start_time & end_time: operations_start & operations_end (times_terminal)
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in (agency & terminal)
         if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
             return self.get_no_violation_default_output() # rule not applicable
@@ -692,6 +731,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         query time: eta_berth (times_agency)
         start_time & end_time: operations_start & operations_end (times_terminal)
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in (agency & terminal)
         if len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1:
             return self.get_no_violation_default_output() # rule not applicable
@@ -724,6 +766,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         query time: eta_berth (times_agency)
         start_time & end_time: tidal_window_from & tidal_window_to (shipcall)
         """
+        if not shipcall.type in [ShipcallType.INCOMING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in (agency)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
             return self.get_no_violation_default_output()
@@ -752,6 +797,9 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         query time: eta_berth (times_agency)
         start_time & end_time: tidal_window_from & tidal_window_to (shipcall)
         """
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
         # check, if the header is filled in (agency)
         if len(df_times.loc[df_times["participant_type"].isin([ParticipantType.AGENCY.value])]) != 1:
             return self.get_no_violation_default_output()
diff --git a/src/server/BreCal/validators/validation_rules.py b/src/server/BreCal/validators/validation_rules.py
index cabe5ec..aa2ef22 100644
--- a/src/server/BreCal/validators/validation_rules.py
+++ b/src/server/BreCal/validators/validation_rules.py
@@ -1,4 +1,5 @@
 import copy
+import re
 import numpy as np
 import pandas as pd
 from BreCal.database.enums import StatusFlags
@@ -75,11 +76,27 @@ class ValidationRules(ValidationRuleFunctions):
 
         # unbundle individual results. evaluation_state becomes an integer, violation 
         evaluation_state = [StatusFlags(res[0]).value for res in results]
-        violations = [",".join(res[1]) if len(res[1])>0 else None for res in results]
+        violations = [",\r\n".join(res[1]) if len(res[1])>0 else None for res in results]
+        violations = [self.concise_evaluation_message_if_too_long(violation) for violation in violations]
 
         shipcall_df.loc[:,"evaluation"] = evaluation_state
         shipcall_df.loc[:,"evaluation_message"] = violations
         return shipcall_df
+
+    def concise_evaluation_message_if_too_long(self, violation):
+        """
+        when many validation rules are violated at once, the resulting evaluation message may exceed 512 characters (which the mysql database allows)
+        in these cases, use a regular expression to provide a concise message, where the 'concise' description is only the list of violated rools
+        """
+        if violation is None:
+            return violation
+        
+        if len(violation)>=512:
+            concise = re.findall(r'{(.*?)\}', violation)
+
+            # e.g.: Evaluation message too long. Violated Rules: ['Rule #0001C', 'Rule #0001H', 'Rule #0001F', 'Rule #0001G', 'Rule #0001L', 'Rule #0001M', 'Rule #0001J', 'Rule #0001K']
+            violation = f"Evaluation message too long. Violated Rules: {concise}"
+        return violation
             
     def determine_validation_state(self) -> str:
         """
diff --git a/src/server/tests/validators/test_validation_rule_functions.py b/src/server/tests/validators/test_validation_rule_functions.py
index 5c4e3a0..2593e85 100644
--- a/src/server/tests/validators/test_validation_rule_functions.py
+++ b/src/server/tests/validators/test_validation_rule_functions.py
@@ -211,6 +211,7 @@ def test_validation_rule_fct_missing_time_agency_berth_etd__shipcall_etd_is_unde
     df_times = get_df_times(shipcall)
 
     # the shipcall etd is 'soon'
+    shipcall.type = ShipcallType.OUTGOING.value
     shipcall.etd = datetime.datetime.now() + datetime.timedelta(minutes=ParticipantwiseTimeDelta.AGENCY-10)
 
     # set times agency to be undetermined
@@ -278,6 +279,7 @@ def test_validation_rule_fct_missing_time_mooring_berth_etd__shipcall_soon_but_p
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -352,6 +354,7 @@ def test_validation_rule_fct_missing_time_portadministration_berth_etd__shipcall
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.SHIFTING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -422,6 +425,7 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_par
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -457,6 +461,7 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_par
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -494,6 +499,7 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__shipcall_soon_but_par
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -534,6 +540,7 @@ def test_validation_rule_fct_missing_time_pilot_berth_etd__agency_and_pilot_assi
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -569,6 +576,7 @@ def test_validation_rule_fct_missing_time_tug_berth_eta__shipcall_soon_but_parti
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.INCOMING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -606,6 +614,7 @@ def test_validation_rule_fct_missing_time_tug_berth_etd__shipcall_soon_but_parti
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -680,6 +689,7 @@ def test_validation_rule_fct_missing_time_terminal_berth_etd__shipcall_soon_but_
     vr = build_sql_proxy_connection['vr']
 
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     # according to the agency, a shipcall takes place soon (ETA/ETD)
@@ -915,6 +925,7 @@ def test_validation_rule_fct_etd_time_not_in_operation_window__times_dont_match(
     """0003-B validation_rule_fct_etd_time_not_in_operation_window"""
     vr = build_sql_proxy_connection['vr']
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.SHIFTING.value
     df_times = get_df_times(shipcall)
 
     t0_time = datetime.datetime.now() # reference time for easier readability
@@ -936,6 +947,7 @@ def test_validation_rule_fct_eta_time_not_in_operation_window_and_validation_rul
     vr = build_sql_proxy_connection['vr']
     import random
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.SHIFTING.value
     df_times = get_df_times(shipcall)
 
     t0_time = datetime.datetime.now()
@@ -1031,6 +1043,7 @@ def test_validation_rule_fct_etd_time_not_in_tidal_window__etd_outside_tidal_win
     """0004-B validation_rule_fct_etd_time_not_in_tidal_window"""
     vr = build_sql_proxy_connection['vr']
     shipcall = get_shipcall_simple()
+    shipcall.type = ShipcallType.OUTGOING.value
     df_times = get_df_times(shipcall)
 
     t0_time = datetime.datetime.now()