From 96a311ba1863c23f2a61cd43b70bb628f351cdcd Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 3 Feb 2026 10:00:04 +0100
Subject: [PATCH] Updated packages, added new table WASExemption and a editor
 control for it. The editor has no functionality yet

---
 ENI2/App.config                            |   8 +-
 ENI2/Controls/WASExemptionsControl.xaml    |  63 ++++++++++
 ENI2/Controls/WASExemptionsControl.xaml.cs |  53 +++++++++
 ENI2/ENI2.csproj                           | 108 +++++++++--------
 ENI2/MainWindow.xaml                       |  13 ++-
 ENI2/MainWindow.xaml.cs                    |  37 +++---
 ENI2/Properties/Resources.Designer.cs      |   9 ++
 ENI2/Properties/Resources.resx             |   3 +
 ENI2/packages.config                       |  30 ++---
 SQL/Update_To_7.2.15.sql                   |  17 +++
 bsmd.database/WASExemption.cs              | 130 +++++++++++++++++++++
 bsmd.database/bsmd.database.csproj         |   7 +-
 12 files changed, 391 insertions(+), 87 deletions(-)
 create mode 100644 ENI2/Controls/WASExemptionsControl.xaml
 create mode 100644 ENI2/Controls/WASExemptionsControl.xaml.cs
 create mode 100644 SQL/Update_To_7.2.15.sql
 create mode 100644 bsmd.database/WASExemption.cs

diff --git a/ENI2/App.config b/ENI2/App.config
index 8d424cb1..94b79aa4 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -85,7 +85,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -121,7 +121,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -129,11 +129,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="DocumentFormat.OpenXml.Framework" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.4.1.0" newVersion="3.4.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.4.1.0" newVersion="3.4.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.HashCode" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/ENI2/Controls/WASExemptionsControl.xaml b/ENI2/Controls/WASExemptionsControl.xaml
new file mode 100644
index 00000000..103ccb1b
--- /dev/null
+++ b/ENI2/Controls/WASExemptionsControl.xaml
@@ -0,0 +1,63 @@
+<UserControl x:Class="ENI2.Controls.WASExemptionsControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.Controls"
+             xmlns:p="clr-namespace:ENI2.Properties"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Label Grid.Row="0" Content="{x:Static p:Resources.textWASExemptions}" />
+        <GroupBox Name="groupBoxRP" Header="" Grid.Row="1">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="28" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="40" />
+                        <ColumnDefinition Width="120" />
+                        <ColumnDefinition Width="40" />
+                        <ColumnDefinition Width="120" />
+                        <ColumnDefinition Width="50" />
+                        <ColumnDefinition Width="30" />
+                        <ColumnDefinition Width="120" />
+                        <ColumnDefinition Width="80" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="140" />
+                        
+                    </Grid.ColumnDefinitions>
+                                        
+                    <Button x:Name="buttonSave" Grid.Column="6" Margin="2" Content="Save all changes" Click="buttonSave_Click" />
+                    <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="{x:Static p:Resources.textImportFromExcel}" Click="buttonImport_Click" />
+
+                </Grid>
+                <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridWASExemptions" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                       SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridWASExemptions_CellEditEnding" CanUserAddRows="False"
+                       MouseDoubleClick="dataGridWASExemptions_MouseDoubleClick" BeginningEdit="dataGridWASExemptions_BeginningEdit">
+                    <local:ENIDataGrid.RowStyle>
+                        <Style TargetType="DataGridRow">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Value}" Value="*">
+                                    <Setter Property="Background" Value="Pink"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </local:ENIDataGrid.RowStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn x:Name="columnIMO"  Header="IMO" Binding="{Binding IMO, Mode=TwoWay}" IsReadOnly="False" />
+                        <DataGridTextColumn x:Name="columnShipName" Header="Ship name" Binding="{Binding ShipName, Mode=TwoWay}" IsReadOnly="False" />
+                        <DataGridTextColumn x:Name="columnPort" Header="Port" Binding="{Binding Port, Mode=TwoWay}" IsReadOnly="False" />
+                        <DataGridTextColumn x:Name="columnValidUntil" Header="ValidUntil" Binding="{Binding ValidUntil, Mode=TwoWay}" IsReadOnly="False" />
+                    </DataGrid.Columns>
+                </local:ENIDataGrid>
+            </Grid>
+        </GroupBox>
+    </Grid>
+</UserControl>
diff --git a/ENI2/Controls/WASExemptionsControl.xaml.cs b/ENI2/Controls/WASExemptionsControl.xaml.cs
new file mode 100644
index 00000000..6823695f
--- /dev/null
+++ b/ENI2/Controls/WASExemptionsControl.xaml.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.Controls
+{
+    /// <summary>
+    /// Interaction logic for WASExemptionsControl.xaml
+    /// </summary>
+    public partial class WASExemptionsControl : UserControl
+    {
+        public WASExemptionsControl()
+        {
+            InitializeComponent();
+        }
+
+        private void buttonSave_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void buttonImport_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void dataGridWASExemptions_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
+        {
+
+        }
+
+        private void dataGridWASExemptions_BeginningEdit(object sender, DataGridBeginningEditEventArgs e)
+        {
+
+        }
+
+        private void dataGridWASExemptions_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 079da1f6..41e3e71f 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -140,11 +140,11 @@
     <Reference Include="ClosedXML.Parser, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d5f7376574c51ec, processorArchitecture=MSIL">
       <HintPath>packages\ClosedXML.Parser.2.0.0\lib\netstandard2.0\ClosedXML.Parser.dll</HintPath>
     </Reference>
-    <Reference Include="DocumentFormat.OpenXml, Version=3.3.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>packages\DocumentFormat.OpenXml.3.3.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.4.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>packages\DocumentFormat.OpenXml.3.4.1\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
-    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.3.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>packages\DocumentFormat.OpenXml.Framework.3.3.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>packages\DocumentFormat.OpenXml.Framework.3.4.1\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
     <Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
       <HintPath>packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
@@ -152,68 +152,68 @@
     <Reference Include="log4net, Version=3.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.10.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.10.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.Cryptography.10.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.Cryptography, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.Cryptography.10.0.2\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.10.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=10.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.DependencyInjection.10.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=10.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.10.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging, Version=10.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.10.0.2\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.10.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=10.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Options.10.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options, Version=10.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Options.10.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Primitives.10.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=10.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Primitives.10.0.2\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.DocumentObjectModel, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.3\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll</HintPath>
+    <Reference Include="MigraDoc.DocumentObjectModel, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.4\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.Rendering, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.3\lib\netstandard2.0\MigraDoc.Rendering.dll</HintPath>
+    <Reference Include="MigraDoc.Rendering, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.4\lib\netstandard2.0\MigraDoc.Rendering.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.RtfRendering, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.3\lib\netstandard2.0\MigraDoc.RtfRendering.dll</HintPath>
+    <Reference Include="MigraDoc.RtfRendering, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.4\lib\netstandard2.0\MigraDoc.RtfRendering.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.dll</HintPath>
+    <Reference Include="PdfSharp, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.BarCodes, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.BarCodes.dll</HintPath>
+    <Reference Include="PdfSharp.BarCodes, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.BarCodes.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Charting, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.Charting.dll</HintPath>
+    <Reference Include="PdfSharp.Charting, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.Charting.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Cryptography, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.Cryptography.dll</HintPath>
+    <Reference Include="PdfSharp.Cryptography, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Quality, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.Quality.dll</HintPath>
+    <Reference Include="PdfSharp.Quality, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.Quality.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Shared, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.Shared.dll</HintPath>
+    <Reference Include="PdfSharp.Shared, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.Shared.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Snippets, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.Snippets.dll</HintPath>
+    <Reference Include="PdfSharp.Snippets, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.Snippets.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.System, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.System.dll</HintPath>
+    <Reference Include="PdfSharp.System, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.System.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.WPFonts, Version=6.2.3.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.3\lib\netstandard2.0\PdfSharp.WPFonts.dll</HintPath>
+    <Reference Include="PdfSharp.WPFonts, Version=6.2.4.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.4\lib\netstandard2.0\PdfSharp.WPFonts.dll</HintPath>
     </Reference>
     <Reference Include="RBush, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c77e27b81f4d0187, processorArchitecture=MSIL">
       <HintPath>packages\RBush.Signed.4.0.0\lib\net47\RBush.dll</HintPath>
@@ -231,12 +231,12 @@
     <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.10.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Diagnostics.DiagnosticSource.10.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Formats.Asn1.10.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
+    <Reference Include="System.Formats.Asn1, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Formats.Asn1.10.0.2\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -251,8 +251,8 @@
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.Cryptography.Pkcs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.Pkcs.10.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=10.0.0.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Security.Cryptography.Pkcs.10.0.2\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
@@ -261,6 +261,7 @@
       <HintPath>packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -329,6 +330,9 @@
     <Compile Include="Controls\ValueMappingsControl.xaml.cs">
       <DependentUpon>ValueMappingsControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\WASExemptionsControl.xaml.cs">
+      <DependentUpon>WASExemptionsControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="EditControls\ChangePasswordDialog.xaml.cs">
       <DependentUpon>ChangePasswordDialog.xaml</DependentUpon>
     </Compile>
@@ -645,6 +649,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\WASExemptionsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ControlTemplates.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml
index e71b66a4..94750ceb 100644
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@@ -92,7 +92,18 @@
                 </MenuItem>
                 <MenuItem x:Name="menuItemNotifications" Header="{x:Static p:Resources.textNotifications}" Click="radioButton_Click" Background="LightBlue"/>
                 <MenuItem x:Name="menuItemStatus" Header="{x:Static p:Resources.textServerStatus}" Click="radioButton_Click" />
-                <MenuItem x:Name="menuItemUserAdministration" Header="{x:Static p:Resources.textUserAdministration}" Click="radioButton_Click" Visibility="Hidden"/>
+                <MenuItem x:Name="menuItemAdmin" Header="_Admin" Visibility="Hidden">
+                    <MenuItem x:Name="menuItemUserAdministration" Header="{x:Static p:Resources.textUserAdministration}" Click="radioButton_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/user_edit.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem x:Name="menuItemWASExemptions" Header="{x:Static p:Resources.textWASExemptions}" Click="radioButton_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/garbage.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
                 <MenuItem x:Name="menuItemMaersk" Header="{x:Static p:Resources.textPOLists}" Click="radioButton_Click" Visibility="Hidden" />
                 <MenuItem x:Name="menuItemValueMappings" Header="{x:Static p:Resources.textExcelValueMappings}" Click="radioButton_Click" Visibility="Hidden" />
                 <MenuItem x:Name="menuItemEasyPeasy" Header="{x:Static p:Resources.textEasyPeasy}" Click="radioButton_Click" Visibility="Hidden" />
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index d8d4cd0f..089bc403 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -40,7 +40,8 @@ namespace ENI2
         private readonly SucheControl sucheControl;
         private CompareExcelDialog compareExcelDialog;
         private EasyPeasyControl easyPeasyControl;
-        
+        private WASExemptionsControl wasExemptionsControl;
+
         private bool dbConnected;
         private readonly ScaleTransform _transform = new ScaleTransform(1.0, 1.0);
         private readonly Dictionary<Guid, ClosableTabItem> openTabs = new Dictionary<Guid, ClosableTabItem>();
@@ -284,12 +285,12 @@ namespace ENI2
             _selectedMenuItem = mi;
             _selectedMenuItem.Background = Brushes.LightBlue;
 
-            if(sender == this.menuItemNotifications)
+            if (sender == this.menuItemNotifications)
             {
                 this.rootContainer.Children.Add(this.mainFrame);
-            
+
             }
-            else if(sender == this.menuItemUserAdministration)
+            else if (sender == this.menuItemUserAdministration)
             {
                 if (this.rpControl == null)
                 {
@@ -299,7 +300,7 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(this.rpControl);
             }
-            else if(sender == this.menuItemMaersk)
+            else if (sender == this.menuItemMaersk)
             {
                 if (this.moControl == null)
                 {
@@ -309,29 +310,37 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(moControl);
             }
-            else if(sender == this.menuItemStatus)
+            else if (sender == this.menuItemStatus)
             {
-                if(this.statusControl == null)
+                if (this.statusControl == null)
                 {
                     this.statusControl = new ServerStatusControl();
                 }
                 this.rootContainer.Children.Add(this.statusControl);
             }
-            else if(sender == this.menuItemValueMappings)
+            else if (sender == this.menuItemValueMappings)
             {
-                if(this.vmControl == null)
+                if (this.vmControl == null)
                 {
                     this.vmControl = new ValueMappingsControl();
                 }
                 this.rootContainer.Children.Add(this.vmControl);
             }
-            else if(sender == this.menuItemEasyPeasy)
+            else if (sender == this.menuItemEasyPeasy)
             {
-                if(this.easyPeasyControl == null)
+                if (this.easyPeasyControl == null)
                 {
                     this.easyPeasyControl = new EasyPeasyControl();
                 }
-                this.rootContainer.Children.Add(this.easyPeasyControl);                
+                this.rootContainer.Children.Add(this.easyPeasyControl);
+            }
+            else if (sender == this.menuItemWASExemptions)
+            {
+                if(this.wasExemptionsControl == null)
+                {
+                    this.wasExemptionsControl = new WASExemptionsControl();
+                }
+                this.rootContainer.Children.Add(this.wasExemptionsControl);
             }
         }
 
@@ -704,7 +713,7 @@ namespace ENI2
                     this.menuItemEasyPeasy.Visibility = Visibility.Visible;
                     if (this.userEntity.IsAdmin)
                     {
-                        this.menuItemUserAdministration.Visibility = Visibility.Visible;
+                        this.menuItemAdmin.Visibility = Visibility.Visible;
                         this.sucheControl.AdminMode = true;
                     }
                     this.menuItemValueMappings.Visibility = this.userEntity.IsEditor ? Visibility.Visible : Visibility.Hidden;
@@ -763,8 +772,8 @@ namespace ENI2
             }
         }
 
-        #endregion
 
+        #endregion
         
     }
 }
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index e423d5a4..48f71e7b 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -6327,6 +6327,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to WAS exemptions.
+        /// </summary>
+        public static string textWASExemptions {
+            get {
+                return ResourceManager.GetString("textWASExemptions", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Waste.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index bf0d9719..0681e5df 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -2268,4 +2268,7 @@ Proceed?</value>
   <data name="textEasyPeasy" xml:space="preserve">
     <value>Easy Peasy 🍋</value>
   </data>
+  <data name="textWASExemptions" xml:space="preserve">
+    <value>WAS exemptions</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/packages.config b/ENI2/packages.config
index a8b21ac6..b5c1be0f 100644
--- a/ENI2/packages.config
+++ b/ENI2/packages.config
@@ -2,33 +2,33 @@
 <packages>
   <package id="ClosedXML" version="0.105.0" targetFramework="net48" />
   <package id="ClosedXML.Parser" version="2.0.0" targetFramework="net48" />
-  <package id="DocumentFormat.OpenXml" version="3.3.0" targetFramework="net481" />
-  <package id="DocumentFormat.OpenXml.Framework" version="3.3.0" targetFramework="net481" />
+  <package id="DocumentFormat.OpenXml" version="3.4.1" targetFramework="net481" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.4.1" targetFramework="net481" />
   <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
   <package id="Extended.Wpf.Toolkit" version="5.0.0" targetFramework="net48" />
   <package id="log4net" version="3.2.0" targetFramework="net48" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="10.0.0" targetFramework="net481" />
-  <package id="Microsoft.Bcl.Cryptography" version="10.0.0" targetFramework="net481" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="10.0.2" targetFramework="net481" />
+  <package id="Microsoft.Bcl.Cryptography" version="10.0.2" targetFramework="net481" />
   <package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net481" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="10.0.0" targetFramework="net481" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="10.0.0" targetFramework="net481" />
-  <package id="Microsoft.Extensions.Logging" version="10.0.0" targetFramework="net481" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="10.0.0" targetFramework="net481" />
-  <package id="Microsoft.Extensions.Options" version="10.0.0" targetFramework="net481" />
-  <package id="Microsoft.Extensions.Primitives" version="10.0.0" targetFramework="net481" />
-  <package id="PDFsharp" version="6.2.3" targetFramework="net481" />
-  <package id="PDFsharp-MigraDoc" version="6.2.3" targetFramework="net481" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="10.0.2" targetFramework="net481" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="10.0.2" targetFramework="net481" />
+  <package id="Microsoft.Extensions.Logging" version="10.0.2" targetFramework="net481" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="10.0.2" targetFramework="net481" />
+  <package id="Microsoft.Extensions.Options" version="10.0.2" targetFramework="net481" />
+  <package id="Microsoft.Extensions.Primitives" version="10.0.2" targetFramework="net481" />
+  <package id="PDFsharp" version="6.2.4" targetFramework="net481" />
+  <package id="PDFsharp-MigraDoc" version="6.2.4" targetFramework="net481" />
   <package id="RBush.Signed" version="4.0.0" targetFramework="net48" />
   <package id="SixLabors.Fonts" version="1.0.0" targetFramework="net481" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
   <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="10.0.0" targetFramework="net481" />
-  <package id="System.Formats.Asn1" version="10.0.0" targetFramework="net481" />
+  <package id="System.Diagnostics.DiagnosticSource" version="10.0.2" targetFramework="net481" />
+  <package id="System.Formats.Asn1" version="10.0.2" targetFramework="net481" />
   <package id="System.Memory" version="4.6.3" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
-  <package id="System.Security.Cryptography.Pkcs" version="10.0.0" targetFramework="net481" />
+  <package id="System.Security.Cryptography.Pkcs" version="10.0.2" targetFramework="net481" />
   <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/SQL/Update_To_7.2.15.sql b/SQL/Update_To_7.2.15.sql
new file mode 100644
index 00000000..cd04457e
--- /dev/null
+++ b/SQL/Update_To_7.2.15.sql
@@ -0,0 +1,17 @@
+
+
+PRINT N'Creating [dbo].[WASExemption] if missing...';
+GO
+IF OBJECT_ID(N'dbo.WASExemption', N'U') IS NULL
+BEGIN
+    CREATE TABLE [dbo].[WASExemption] (
+        [Id] UNIQUEIDENTIFIER NOT NULL,
+        [IMO] NCHAR (7) NOT NULL,
+        [ShipName] NVARCHAR (100) NULL,
+        [Port] NCHAR (70) NOT NULL,
+        [ValidUntil] DATETIME NOT NULL,
+        PRIMARY KEY CLUSTERED ([Id] ASC)
+    );
+    PRINT N'Table [dbo].[WASExemption] created.';
+END
+GO
diff --git a/bsmd.database/WASExemption.cs b/bsmd.database/WASExemption.cs
new file mode 100644
index 00000000..9ccf420d
--- /dev/null
+++ b/bsmd.database/WASExemption.cs
@@ -0,0 +1,130 @@
+// Copyright (c) 2026-present schick Informatik
+// Description: WAS Exemption entries
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace bsmd.database
+{
+    public class WASExemption : DatabaseEntityAsync, IComparable
+    {
+        #region Construction
+
+        public WASExemption()
+        {
+            this.tablename = "[dbo].[WASExemption]";
+        }
+
+        #endregion
+
+        #region Properties
+
+        [MaxLength(7)]
+        public string IMO { get; set; }
+
+        [MaxLength(100)]
+        public string ShipName { get; set; }
+
+        [MaxLength(70)]
+        public string Port { get; set; }
+
+        public DateTime ValidUntil { get; set; }
+
+        #endregion
+
+        #region DatabaseEntity implementation
+
+        public override void PrepareSave(IDbCommand cmd)
+        {
+            SqlCommand scmd = cmd as SqlCommand;
+
+            if (this.IMO != null) scmd.Parameters.AddWithValue("@P1", this.IMO);
+            else scmd.Parameters.AddWithValue("@P1", DBNull.Value);
+            if (this.ShipName != null) scmd.Parameters.AddWithValue("@P2", this.ShipName);
+            else scmd.Parameters.AddWithValue("@P2", DBNull.Value);
+            if (this.Port != null) scmd.Parameters.AddWithValue("@P3", this.Port);
+            else scmd.Parameters.AddWithValue("@P3", DBNull.Value);
+            scmd.Parameters.AddWithValue("@P4", this.ValidUntil);
+
+            if (this.IsNew)
+            {
+                this.CreateId();
+                scmd.Parameters.AddWithValue("@ID", this.Id);
+                cmd.CommandText = string.Format(
+                    "INSERT INTO {0} (Id, IMO, ShipName, Port, ValidUntil) VALUES (@ID, @P1, @P2, @P3, @P4)",
+                    this.Tablename);
+            }
+            else
+            {
+                cmd.CommandText = string.Format(
+                    "UPDATE {0} SET IMO = @P1, ShipName = @P2, Port = @P3, ValidUntil = @P4 WHERE Id = @ID",
+                    this.Tablename);
+                scmd.Parameters.AddWithValue("@ID", this.Id);
+            }
+        }
+
+        public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
+        {
+            string query = string.Format("SELECT Id, IMO, ShipName, Port, ValidUntil FROM {0}", this.Tablename);
+
+            switch (filter)
+            {
+                case Message.LoadFilter.ALL:
+                default:
+                    break;
+            }
+            cmd.CommandText = query;
+        }
+
+        public override List<DatabaseEntity> LoadList(IDataReader reader)
+        {
+            List<DatabaseEntity> result = new List<DatabaseEntity>();
+
+            while (reader.Read())
+            {
+                WASExemption was = new WASExemption();
+                was.id = reader.GetGuid(0);
+                if (!reader.IsDBNull(1)) was.IMO = reader.GetString(1);
+                if (!reader.IsDBNull(2)) was.ShipName = reader.GetString(2);
+                if (!reader.IsDBNull(3)) was.Port = reader.GetString(3);
+                if (!reader.IsDBNull(4)) was.ValidUntil = reader.GetDateTime(4);
+
+                result.Add(was);
+            }
+            reader.Close();
+            return result;
+        }
+
+        protected override DatabaseEntityAsync ReadRowFromReader(IDataReader reader)
+        {
+            WASExemption was = null;
+            if (reader != null)
+            {
+                was = new WASExemption();
+                was.id = reader.GetGuid(0);
+                if (!reader.IsDBNull(1)) was.IMO = reader.GetString(1);
+                if (!reader.IsDBNull(2)) was.ShipName = reader.GetString(2);
+                if (!reader.IsDBNull(3)) was.Port = reader.GetString(3);
+                if (!reader.IsDBNull(4)) was.ValidUntil = reader.GetDateTime(4);
+            }
+            return was;
+        }
+
+        #endregion
+
+        #region IComparable implementation
+
+        public int CompareTo(object obj)
+        {
+            if (obj is WASExemption exemption)
+            {
+                return this.ShipName?.CompareTo(exemption.ShipName ?? "") ?? 0;
+            }
+            return 0;
+        }
+
+        #endregion
+    }
+}
diff --git a/bsmd.database/bsmd.database.csproj b/bsmd.database/bsmd.database.csproj
index 27c20bb7..e7cae5ee 100644
--- a/bsmd.database/bsmd.database.csproj
+++ b/bsmd.database/bsmd.database.csproj
@@ -193,8 +193,9 @@
     <Compile Include="ValidationCondition.cs" />
     <Compile Include="ValidationRule.cs" />
     <Compile Include="ValueMapping.cs" />
-    <Compile Include="WAS.cs" />
-    <Compile Include="Waste.cs" />
+    <Compile Include="WAS.cs" />
+    <Compile Include="WASExemption.cs" />
+    <Compile Include="Waste.cs" />
     <Compile Include="WasteDisposalServiceProvider.cs" />
     <Compile Include="WasteDisposalServiceProvider_Template.cs" />
     <Compile Include="WasteReceived.cs" />
@@ -219,4 +220,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>