ENI2/AnmeldungenControl.xaml.cs

@@ -1,8 +1,20 @@
 // Copyright (c) 2017 Informatibüro Daniel Schick
+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;
 
 using bsmd.database;
-using System.Windows.Controls;
-using System.Windows.Input;
 
 namespace ENI2
 {
@@ -31,9 +43,10 @@ namespace ENI2
             {
                 DataGrid grid = sender as DataGrid;
                 if(grid?.SelectedItems?.Count == 1)
-                {                    
+                {
-                    MessageCore selectedCore = grid.SelectedItem as MessageCore;
+                    DataGridRow dgr = grid.ItemContainerGenerator.ContainerFromItem(grid.SelectedItem) as DataGridRow;
-                    this.DisplayCore(selectedCore);
+                    MessageCore selectedCore = grid.SelectedItem as MessageCore;                    
+                    this.DisplayCore(selectedCore);                                        
                 }
             }
         }
@@ -50,7 +63,7 @@ namespace ENI2
         {
             if((this.MessageCoreSelected != null) && (aMessageCore != null))
             {
-                this.MessageCoreSelected(aMessageCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
+                this.MessageCoreSelected(aMessageCore);
             }
         }
 

ENI2/App.config

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 (c) 2017-present Informatikbüro Daniel Schick
 -->
 <configuration>
     <configSections>
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="ENI2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+            <section name="ENI2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="ENI2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="ENI2.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
-    <startup>
+    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
     <applicationSettings>
         <ENI2.Properties.Settings>
@@ -23,106 +23,31 @@
                 <value>60</value>
             </setting>
             <setting name="changeTimerTimeout" serializeAs="String">
-                <value>1000</value>
+                <value>5000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-                <value>http://192.168.2.24/LockingService/LockingService.svc</value>
+				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
-            </setting>
-            <setting name="ReportAuthor" serializeAs="String">
-                <value>BSMD ReportGenerator</value>
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
+				<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
     <userSettings>
         <ENI2.Properties.Settings>
             <setting name="MainWindowPlacement" serializeAs="String">
-                <value />
+                <value/>
-            </setting>
-            <setting name="Width" serializeAs="String">
-                <value>825</value>
-            </setting>
-            <setting name="Height" serializeAs="String">
-                <value>450</value>
-            </setting>
-            <setting name="W1Left" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W1Top" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W2Left" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W2Top" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W3Left" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W3Top" serializeAs="String">
-                <value>0</value>
             </setting>
         </ENI2.Properties.Settings>
     </userSettings>
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
-                <binding name="BasicHttpBinding_IService" maxReceivedMessageSize="2147483647" />
+                <binding name="BasicHttpBinding_IService" maxReceivedMessageSize="2147483647"/>
             </basicHttpBinding>
         </bindings>
         <client>
-            <endpoint address="http://localhost:11651/LockingService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IService" contract="LockingServiceReference.IService" name="BasicHttpBinding_IService" />
+            <endpoint address="http://localhost:11651/LockingService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IService" contract="LockingServiceReference.IService" name="BasicHttpBinding_IService"/>
         </client>
     </system.serviceModel>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.2" newVersion="6.0.0.2" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

ENI2/App.xaml.cs

@@ -6,8 +6,6 @@ using System.Windows;
 using System.Windows.Markup;
 
 using bsmd.database;
-using log4net;
-
 using System.Windows.Controls;
 using System.Windows.Input;
 using System;
@@ -15,16 +13,13 @@ using System.Net;
 using ENI2.LockingServiceReference;
 using ENI2.Util;
 using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Office.Interop.Excel;
-using System.Drawing.Drawing2D;
 
 namespace ENI2
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : System.Windows.Application
+    public partial class App : Application
     {
         // "global" statics, da gibt es sicher noch einen eleganteren Weg..
         private static ServiceClient _lockingServiceClient = null;
@@ -35,8 +30,6 @@ namespace ENI2
         private ManualResetEvent ResetSplashCreated;
         private Thread _splashThread;
 
-        private readonly ILog _log = LogManager.GetLogger(typeof(App).Name);
-
         public App() : base()
         {
             this.Dispatcher.UnhandledException += Dispatcher_UnhandledException;
@@ -75,10 +68,11 @@ namespace ENI2
             // initialize static / localized lookups from sqlite database
 
             string langKey = CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
+
             Dictionary<int, string> cargoHandlingDict = LocalizedLookup.getLADGCargoHandlingStrings(langKey);
             foreach (int key in cargoHandlingDict.Keys)
                LADG.CargoHandlingDict.Add(key, cargoHandlingDict[key]);
-            LADG.MVSHLocodes.AddRange(LocalizedLookup.getMVSHLocodes());
+
             EventManager.RegisterClassHandler(typeof(DatePicker), DatePicker.PreviewKeyDownEvent, new KeyEventHandler(this.DatePicker_PreviewKeyDown));
             CREW.NationalityDict = LocalizedLookup.getNationalities();
             STAT.VesselTypeDict = LocalizedLookup.getVesselTypes();
@@ -88,8 +82,8 @@ namespace ENI2
             LADG.CargoCodesNST = LocalizedLookup.getCargoCodesNST();
             LADG.CargoCodesNST3 = LocalizedLookup.getCargoCodesNST3();
 
-            // Load import value mappings            
+            // Load import value mappings
-            Task.Run(async () => await ValueMapping.LoadDicts());
+            ValueMapping.LoadDicts();
 
             // Preload validation fields
             List<ValidationField> vFields = bsmd.database.ValidationRule.ValidationFields;
@@ -159,9 +153,9 @@ namespace ENI2
         private void Dispatcher_UnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             string errorMessage = string.Format("An unhandled exception occurred: {0}\r\n{1}", e.Exception.Message, e.Exception.StackTrace);
-            Xceed.Wpf.Toolkit.MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);            
+            MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            // TODO: Dieser Fehler muss irgendwohin gesendet / gespeichert werden
             e.Handled = true;
-            _log.Error(errorMessage);
         }
 
         private void DatePicker_PreviewKeyDown(object sender, KeyEventArgs e)

ENI2/ControlTemplates.xaml

@@ -56,33 +56,6 @@
         </Grid>
     </ControlTemplate>
 
-
-
-
-    <!-- Validation Error Template for a DataGrid Row -->
-
-    <Style TargetType="{x:Type DataGridRow}">
-        <Setter Property="ValidationErrorTemplate">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Grid Margin="0,-2,0,-2"
-      ToolTip="{Binding RelativeSource={RelativeSource
-      FindAncestor, AncestorType={x:Type DataGridRow}},
-      Path=(Validation.Errors)[0].ErrorContent}">
-                        <Ellipse StrokeThickness="0" Fill="Red" 
-        Width="{TemplateBinding FontSize}" 
-        Height="{TemplateBinding FontSize}" />
-                        <TextBlock Text="!" FontSize="{TemplateBinding FontSize}" 
-        FontWeight="Bold" Foreground="White" 
-        HorizontalAlignment="Center"  />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-
     <Style TargetType="{x:Type ToolTip}" >
 
         <Setter Property="OverridesDefaultStyle" Value="true" />

ENI2/Controls/ClosableTabItem.cs

@@ -8,7 +8,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Threading;
 
 namespace ENI2.Controls
 {
@@ -162,9 +161,8 @@ namespace ENI2.Controls
                     }
                     if (!abort)
                     {
-                        var tabControl = Parent as TabControl;
+                        var tabControl = Parent as ItemsControl;
-                        tabControl.SelectedItem = null;
+                        tabControl.Items.Remove(this);
-                        _ = Dispatcher.BeginInvoke(new Action(() => tabControl.Items.Remove(this)), DispatcherPriority.Background);                        
                     }
                 };
             dockPanel.Children.Add(closeButton);

ENI2/Controls/ENIDataGrid.cs

@@ -56,7 +56,6 @@ namespace ENI2.Controls
         // das hier bildet 1:1 das Kontext-Menü des ANSW ab
 
         public event Action<DatabaseEntity> EditRequested;
-        public event Action<List<DatabaseEntity>> MultiEditRequested;
         public event Action<DatabaseEntity> DeleteRequested;
         public event Action CreateRequested;
         public event Action RefreshGrid;
@@ -204,17 +203,9 @@ namespace ENI2.Controls
         {
             if((this.SelectedItems != null) && (this.SelectedItems.Count == 1) && !this.IsReadOnly)
             {
-                if (this.SelectedItems[0] is DatabaseEntity selectedEntity)                
+                if (this.SelectedItems[0] is DatabaseEntity selectedEntity)
                     this.EditRequested?.Invoke(selectedEntity);
             }
-
-            if((this.SelectedItems != null) && (this.SelectedItems.Count > 1) && !this.IsReadOnly)
-            {
-                List<DatabaseEntity> databaseEntities = new List<DatabaseEntity>();
-                foreach(DatabaseEntity databaseEntity in this.SelectedItems) 
-                    databaseEntities.Add(databaseEntity);
-                this.MultiEditRequested?.Invoke(databaseEntities);                
-            }
         }
 
         protected void printItem(object sender, RoutedEventArgs e)

ENI2/Controls/EasyPeasyControl.xaml

@@ -1,113 +0,0 @@
-<UserControl x:Class="ENI2.Controls.EasyPeasyControl"
-             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"
-             mc:Ignorable="d" 
-             d:DesignHeight="650" d:DesignWidth="1024" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded">
-
-
-    <DockPanel>
-        <!-- Header with logo -->
-        <Border DockPanel.Dock="Top" Padding="10" Background="#FFFDF6">
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" >
-                <!-- Embed SVG via Image (optional): place your SVG as a DrawingImage in resources, or replace with PNG -->
-                <TextBlock Text="🍋 easy-peasy" FontSize="20" FontWeight="Bold" Margin="0,0,16,0"/>
-                <TextBlock Text="Edit • Paste • Export XML" VerticalAlignment="Center"/>
-            </StackPanel>
-        </Border>
-
-        <ScrollViewer VerticalScrollBarVisibility="Auto">
-            <StackPanel Margin="12" Orientation="Vertical" >
-                <!-- Top-level fields -->
-                <UniformGrid Columns="4" Rows="3" Margin="0,0,0,12" Height="84">
-                    <TextBlock Text="Art der Identification (Vertreter)"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
-                    <TextBox Text="{Binding DelegateIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                    <TextBlock Text="Art der Identifikation (Kunde)" VerticalAlignment="Center"  Margin="0,0,4,0" TextAlignment="Right" />
-                    <TextBox Text="{Binding TraderIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-
-                    <TextBlock Text="LRN" TextAlignment="Right"  Margin="0,0,4,0" VerticalAlignment="Center"/>
-                    <TextBox Text="{Binding LRN, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                    <TextBlock Text="Identifikationsnummer (Kunde)"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right" />
-                    <TextBox Text="{Binding TraderIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-
-                    <TextBlock Text="Land" TextAlignment="Right" Margin="0,0,4,0"  VerticalAlignment="Center"/>
-                    <TextBox Text="{Binding Country, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                    <TextBlock Text="Identifikationsnummer (Vertreter)"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
-                    <TextBox Text="{Binding DelegateIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                </UniformGrid>
-
-                <!-- ProofInformation -->
-                <GroupBox Header="Kennung des Antrags auf Nachweis TZ2L(F)">
-                    <StackPanel Margin="8">
-                        <UniformGrid Columns="4" Rows="4" Margin="0,0,0,12" >
-                            <TextBlock Text="Zuständige Zollstelle"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.CompetentCustomsOffice, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                            <TextBlock Text="Art der Anmeldung"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-
-                            <TextBlock TextWrapping="Wrap" Text="Datum Anmeldung
-                                       (yyyy-MM-ddTHH:mm:ss)"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationDate, StringFormat={}{0:yyyy-MM-ddTHH:mm:ss}, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center" />
-                            <TextBlock Text="Gesamtrohmasse (kg)"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                            <TextBox x:Name="textBoxTotalGrossMass" Text="{Binding ProofInformationT2LT2LF.TotalGrossMassKg, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-
-                            <TextBlock TextWrapping="Wrap" Text="Antrag auf Gültigkeitsdauer des Nachweises (in Tagen)"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                            <TextBlock Text="Art des Antrags"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
-                        </UniformGrid>
-
-                        <GroupBox Header="Warenort">
-                            <UniformGrid Columns="6" Margin="8" Height="28">
-                                <TextBlock Text="Art des Ortes"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.TypeOfLocation}" Margin="2" VerticalContentAlignment="Center"/>
-                                <TextBlock Text="Art der Ortsbestimmung"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.QualifierOfIdentification}" Margin="2" VerticalContentAlignment="Center"/>
-                                <TextBlock Text="UNLocode"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.UNLocode}" Margin="2" VerticalContentAlignment="Center"/>
-                            </UniformGrid>
-                        </GroupBox>
-
-                        <CheckBox Content="In Containern beförderte Waren" Margin="8"
-                                  IsChecked="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.ContainerIndication}"/>
-
-                        <!-- Goods Items grid (paste target) -->
-                        <TextBlock Text="Warenpositionen (Paste tab/CSV with columns: HS, Item#, Description, Gross, Net, Pkgs, Type, Marks)" Margin="4,12,0,4"/>
-                        <DataGrid ItemsSource="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF}"
-                                  AutoGenerateColumns="False" SelectionMode="Extended" x:Name="dataGridGoodsItems" CanUserAddRows="False"
-                                  PreviewKeyDown="DataGrid_PreviewKeyDown" Focusable="True" MinHeight="80" IsTabStop="True" MaxHeight="320">
-                            <DataGrid.Columns>
-                                <DataGridTextColumn Header="HS Code" Binding="{Binding Commodity.HarmonizedSystemSubHeadingCode}"/>
-                                <DataGridTextColumn Header="Item #" Binding="{Binding GoodsItemNumber}"/>
-                                <DataGridTextColumn Header="Description" Binding="{Binding DescriptionOfGoods}" Width="2*"/>
-                                <DataGridTextColumn Header="Gross" Binding="{Binding GoodsMeasure.GrossMass}"/>
-                                <DataGridTextColumn Header="Net" Binding="{Binding GoodsMeasure.NetMass}"/>
-                                <DataGridTextColumn Header="Pkgs" Binding="{Binding Packaging.NumberOfPackages}"/>
-                                <DataGridTextColumn Header="Type" Binding="{Binding Packaging.TypeOfPackages}"/>
-                                <DataGridTextColumn Header="Marks" Binding="{Binding Packaging.ShippingMarks}" Width="*"/>
-                            </DataGrid.Columns>
-                        </DataGrid>
-
-                        <GroupBox Header="Dokumente" Margin="0,12,0,0">
-                            <UniformGrid Columns="4" Margin="8" Height="28">
-                                <TextBlock Text="Art des Dokuments"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.Type}" Margin="2" VerticalContentAlignment="Center"/>
-                                <TextBlock Text="Referenznummer"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.ReferenceNumber}" Margin="2" VerticalContentAlignment="Center" />
-                            </UniformGrid>
-                        </GroupBox>
-                    </StackPanel>
-                </GroupBox>
-
-                <!-- Actions -->
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,16,0,0">
-                    <Button x:Name="buttonImport" Content="Import" Width="100" Margin="0,0,8,0" Click="buttonImport_Click" />
-                    <Button x:Name="buttonClear" Content="Clear" Width="100" Margin="0,0,8,0" Click="buttonClear_Click"/>
-                    <Button x:Name="buttonExport" Content="Export" Width="120" Click="buttonExport_Click"/>
-                </StackPanel>
-            </StackPanel>
-        </ScrollViewer>
-    </DockPanel>
-</UserControl>

ENI2/Controls/EasyPeasyControl.xaml.cs

@@ -1,506 +0,0 @@
-// Copyright (c) 2017- schick Informatik
-// Description: Display dialog for customs XML data upload app
-//
-
-using bsmd.database.EasyPeasy;
-using ENI2.Util;
-using Microsoft.Win32;
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace ENI2.Controls
-{
-    /// <summary>
-    /// Interaction logic for EasyPeasyControl.xaml
-    /// </summary>
-    public partial class EasyPeasyControl : UserControl
-    {
-
-        private ProofRequest _vm;
-
-        #region Construction
-
-        public EasyPeasyControl()
-        {
-            InitializeComponent();
-
-            this.dataGridGoodsItems.ContextMenu = new ContextMenu();
-
-            MenuItem addItem = new MenuItem();
-            addItem.Header = Properties.Resources.textAdd;
-            addItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/add.png")) };
-            addItem.Click += AddItem_Click;
-            this.dataGridGoodsItems.ContextMenu.Items.Add(addItem);
-
-            MenuItem deleteItem = new MenuItem();
-            deleteItem.Header = Properties.Resources.textDelete;
-            deleteItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/delete.png")) };
-            deleteItem.Click += DeleteItem_Click;
-            this.dataGridGoodsItems.ContextMenu.Items.Add(deleteItem);
-
-            // Add separator and paste option
-            this.dataGridGoodsItems.ContextMenu.Items.Add(new Separator());
-
-            MenuItem pasteItem = new MenuItem();
-            pasteItem.Header = "Paste";
-            pasteItem.Click += (s, e) => HandlePasteOperation();
-            this.dataGridGoodsItems.ContextMenu.Items.Add(pasteItem);
-
-            // Add command bindings for proper keyboard handling
-            this.dataGridGoodsItems.CommandBindings.Add(new CommandBinding(
-                ApplicationCommands.Paste,
-                (s, e) => HandlePasteOperation(),
-                (s, e) => e.CanExecute = Clipboard.ContainsText()));
-
-        }
-
-        #endregion
-
-        public void SaveState()
-        {
-            try
-            {
-                EasyPeasyState.Save(_vm);
-            }
-            catch { }
-        }
-
-        #region context menu event handler
-
-        private void AddItem_Click(object sender, RoutedEventArgs e)
-        {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF == null) return;
-            var list = _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF;
-            int nextItemNo = list.Any() ? list.Max(x => x.GoodsItemNumber) + 1 : 1;
-            var item = new GoodsItemForT2LT2LF
-            {
-                GoodsItemNumber = nextItemNo
-            };
-            list.Add(item);
-        }
-
-        private void DeleteItem_Click(object sender, RoutedEventArgs e)
-        {
-            foreach(GoodsItemForT2LT2LF item in this.dataGridGoodsItems.SelectedItems.Cast<GoodsItemForT2LT2LF>().ToArray())
-            {
-                if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF == null) return;
-                var list = _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF;
-                list.Remove(item);
-            }            
-        }
-
-        #endregion
-
-        #region button event handler
-
-        private void buttonClear_Click(object sender, RoutedEventArgs e)
-        {
-            CleanupAutoCalculation();
-
-            this._vm = EasyPeasyState.CreateDefault();            
-            if (_vm.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF == null)            
-                _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF = new ObservableCollection<GoodsItemForT2LT2LF>();
-
-            _vm.ProofInformationT2LT2LF.DeclarationDate = DateTime.Now; // reset to today
-            _vm.ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays = 90; // default 90 days
-
-            this.DataContext = this._vm;
-            SetupAutoCalculation();
-        }
-
-        private void buttonExport_Click(object sender, RoutedEventArgs e)
-        {
-            var dlg = new SaveFileDialog
-            {
-                FileName = "proofRequest.xml",
-                Filter = "XML file|*.xml",
-                OverwritePrompt = true
-            };
-            if (dlg.ShowDialog() == true)
-            {
-                try
-                {
-                    var ser = new XmlSerializer(typeof(ProofRequest));
-
-                    // Namespaces (if needed)
-                    // var ns = new XmlSerializerNamespaces();
-                    // ns.Add("xsd", "http://www.w3.org/2001/XMLSchema");
-                    // ns.Add("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-
-                    var settings = new XmlWriterSettings
-                    {
-                        Indent = true,
-                        OmitXmlDeclaration = true
-                    };
-
-                    using (var fs = File.Create(dlg.FileName))
-                    using (var xw = XmlWriter.Create(fs, settings))
-                    {
-                        ser.Serialize(xw, _vm); //, ns);
-                    }
-
-                    MessageBox.Show("Exported successfully.", "easy-peasy", MessageBoxButton.OK, MessageBoxImage.Information);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("Export failed:\n" + ex.Message, "easy-peasy", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-        }
-
-        private void buttonImport_Click(object sender, RoutedEventArgs e)
-        {
-            OpenFileDialog ofd = new OpenFileDialog();
-            ofd.Filter = "XML file|*.xml";
-            ofd.RestoreDirectory = true;
-            ofd.Multiselect = false;
-
-            if (ofd.ShowDialog() == true)
-            {
-                using (var fs = File.OpenRead(ofd.FileName))
-                {
-                    CleanupAutoCalculation();
-                    var ser = new XmlSerializer(typeof(ProofRequest));
-                    _vm = (ProofRequest)ser.Deserialize(fs);
-                    // after loading/creating _vm
-                    if (_vm.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF == null)                    
-                        _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF = new ObservableCollection<GoodsItemForT2LT2LF>();
-
-                    _vm.ProofInformationT2LT2LF.DeclarationDate = DateTime.Now; // reset to today
-                    if(_vm.ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays == 9)
-                        _vm.ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays = 90; // default 90 days
-
-                    this.DataContext = _vm;
-                    SetupAutoCalculation();
-                }
-            }
-        }
-
-        #endregion
-
-        #region loaded/unloaded event handler
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            _vm = EasyPeasyState.LoadOrCreate();
-            if (_vm.ProofInformationT2LT2LF == null)
-                _vm.ProofInformationT2LT2LF = new ProofInformationT2LT2LF();
-            if (_vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF == null)
-                _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF = new GoodsShipmentForT2LT2LF
-                {
-                    LocationOfGoods = new LocationOfGoods(),
-                    TransportDocuments = new TransportDocuments()
-                };
-            _vm.ProofInformationT2LT2LF.DeclarationDate = DateTime.Now; // reset to today
-            this.DataContext = _vm;
-
-            SetupAutoCalculation();
-        }
-
-        private void UserControl_Unloaded(object sender, RoutedEventArgs e)
-        {
-            CleanupAutoCalculation();
-
-            try
-            {
-                EasyPeasyState.Save(_vm);
-            }
-            catch { }
-        }
-
-        #endregion
-
-        #region auto calculation total gross mass
-
-        private void SetupAutoCalculation()
-        {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF != null)
-            {
-                // Subscribe to collection changes (add/remove items)
-                _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF.CollectionChanged += GoodsItems_CollectionChanged;
-
-                // Subscribe to DataGrid cell changes
-                dataGridGoodsItems.CellEditEnding += DataGridGoodsItems_CellEditEnding;
-
-                // Calculate initial total
-                CalculateTotalGrossMass();
-            }
-        }
-
-        private void CleanupAutoCalculation()
-        {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF != null)
-            {
-                // Unsubscribe from collection changes
-                _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF.CollectionChanged -= GoodsItems_CollectionChanged;
-                dataGridGoodsItems.CellEditEnding -= DataGridGoodsItems_CellEditEnding;
-            }
-        }
-
-        private void DataGridGoodsItems_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
-        {
-            // Check if the edited column is GrossMass
-            if (e.Column.Header.ToString() == "Gross")
-            {
-                // Delay calculation to allow the binding to update
-                Dispatcher.BeginInvoke(new Action(() => {
-                    CalculateTotalGrossMass();
-                }), System.Windows.Threading.DispatcherPriority.Background);
-            }
-        }
-
-        private void GoodsItems_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {            
-            // Recalculate total after any collection change
-            CalculateTotalGrossMass();
-        }
-
-        private void CalculateTotalGrossMass()
-        {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF?.GoodsItemsForT2LT2LF != null)
-            {
-                var total = _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF
-                    .Sum(item => item.GoodsMeasure?.GrossMass ?? 0m);
-
-                _vm.ProofInformationT2LT2LF.TotalGrossMassKg = total;
-
-                // Force UI update by refreshing the binding
-                var binding = BindingOperations.GetBindingExpression(
-                    FindTotalGrossMassTextBox(), TextBox.TextProperty);
-                binding?.UpdateTarget();
-            }
-        }
-
-        // Simple property changed notification helper
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        private TextBox FindTotalGrossMassTextBox()
-        {
-            // Find the TextBox that displays TotalGrossMassKg
-            return this.FindName("textBoxTotalGrossMass") as TextBox ??
-                   this.GetTemplateChild("textBoxTotalGrossMass") as TextBox;
-        }
-
-        #endregion
-
-        #region cut & paste logic
-
-        private void HandlePasteOperation()
-        {
-            if (Clipboard.ContainsText())
-            {
-                var text = Clipboard.GetText();
-                if (!TryPaste_EspHsPkgsGross(text))
-                    PasteGoodsItems(text);
-            }
-        }
-
-        private void DataGrid_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.V && (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
-            {
-                if (Clipboard.ContainsText())
-                {
-                    var text = Clipboard.GetText();
-
-                    if(!TryPaste_EspHsPkgsGross(text))
-                        PasteGoodsItems(text);
-                    e.Handled = true;
-                }
-            }
-        }
-
-        private void PasteGoodsItems(string text)
-        {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF == null) return;
-
-            var lines = text.Replace("\r\n", "\n").Replace('\r', '\n')
-                            .Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-
-            foreach (var line in lines)
-            {
-                // Split by tab first; if only one column, try CSV
-                var cells = line.Split('\t');
-                if (cells.Length == 1) cells = SplitCsv(line);
-
-                // Expected order: HS, Item#, Description, Gross, Net, Pkgs, Type, Marks
-                var item = new GoodsItemForT2LT2LF();
-
-                if (cells.Length > 0) item.Commodity.HarmonizedSystemSubHeadingCode = cells[0].Trim();
-                if (cells.Length > 1 && int.TryParse(cells[1], out var n)) item.GoodsItemNumber = n;
-                if (cells.Length > 2) item.DescriptionOfGoods = cells[2].Trim();
-                if (cells.Length > 3 && decimal.TryParse(cells[3], out var gross)) item.GoodsMeasure.GrossMass = gross;
-                if (cells.Length > 4 && decimal.TryParse(cells[4], out var net)) item.GoodsMeasure.NetMass = net;
-                if (cells.Length > 5 && int.TryParse(cells[5], out var pkgs)) item.Packaging.NumberOfPackages = pkgs;
-                if (cells.Length > 6) item.Packaging.TypeOfPackages = cells[6].Trim();
-                if (cells.Length > 7) item.Packaging.ShippingMarks = cells[7].Trim();                
-
-                _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF.Add(item);
-            }
-        }
-
-        // Very small CSV splitter (handles quotes)
-        private static string[] SplitCsv(string line)
-        {
-            var res = new System.Collections.Generic.List<string>();
-            var sb = new StringBuilder();
-            bool inQuotes = false;
-            for (int i = 0; i < line.Length; i++)
-            {
-                char c = line[i];
-                if (c == '\"')
-                {
-                    if (inQuotes && i + 1 < line.Length && line[i + 1] == '\"')
-                    { sb.Append('\"'); i++; }
-                    else { inQuotes = !inQuotes; }
-                }
-                else if (c == ',' && !inQuotes)
-                { res.Add(sb.ToString()); sb.Clear(); }
-                else { sb.Append(c); }
-            }
-            res.Add(sb.ToString());
-            return res.ToArray();
-        }
-
-        private bool TryPaste_EspHsPkgsGross(string text)
-        {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF == null) return false;
-
-            // Normalize and split lines
-            var lines = text.Replace("\r\n", "\n").Replace('\r', '\n')
-                            .Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-            if (lines.Length == 0) return false;
-
-            // Determine next item number
-            var list = _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF;
-            int nextItemNo = list.Any() ? list.Max(x => x.GoodsItemNumber) + 1 : 1;
-
-            bool anyAdded = false;
-            bool countrySeen = false;
-
-            foreach (var raw in lines)
-            {
-                var line = raw; // do not Trim() entirely; keep leading tab as empty first cell
-                var cells = line.Split('\t'); // keeps empty entries
-
-                // Expected:
-                //  - 4 cells: [ESP or ""], [HS], [Pkgs], [Gross]
-                //  - 3 cells: [HS], [Pkgs], [Gross]
-                string hs = null, pkgs = null, gross = null;
-
-                if (cells.Length >= 4)
-                {
-                    string c0 = cells[0]?.Trim();
-                    // Optionally capture the first token like "ESP" (country tag),
-                    // only once and only if alphabetic (won't throw if numeric)
-                    if (!countrySeen && !string.IsNullOrWhiteSpace(c0) && c0.All(ch => char.IsLetter(ch)))
-                    {
-                        // If you decide later this should set a field, uncomment:
-                        // if (string.IsNullOrWhiteSpace(_vm.Country)) _vm.Country = c0;
-                        countrySeen = true;
-                    }
-
-                    hs = (cells.Length > 1 ? cells[1] : null);
-                    pkgs = (cells.Length > 2 ? cells[2] : null);
-                    gross = (cells.Length > 3 ? cells[3] : null);
-                }
-                else if (cells.Length == 3)
-                {
-                    hs = cells[0];
-                    pkgs = cells[1];
-                    gross = cells[2];
-                }
-                else
-                {
-                    // Not enough data for this format; skip the row
-                    continue;
-                }
-
-                if (string.IsNullOrWhiteSpace(hs)) continue;
-
-                var item = new GoodsItemForT2LT2LF
-                {
-                    GoodsItemNumber = nextItemNo++,
-                    DescriptionOfGoods = "" // per spec
-                };
-                item.Commodity.HarmonizedSystemSubHeadingCode = hs.Trim();
-
-                if (TryParseIntFlexible(pkgs, out var pk))
-                    item.Packaging.NumberOfPackages = pk;
-
-                if (TryParseDecimalFlexible(gross, out var g))
-                {
-                    item.GoodsMeasure.GrossMass = g;
-                    var net = g; //  - 1m; // now net mass equals gross mass (no deduction)
-                    if (net < 0m) net = 0m;
-                    item.GoodsMeasure.NetMass = net;
-                }
-
-                item.DescriptionOfGoods = "Brand New Vehicles"; // per spec
-                item.Packaging.TypeOfPackages = "UN"; // per spec
-                item.Packaging.ShippingMarks = "-"; // per spec                
-
-                list.Add(item);
-                anyAdded = true;
-            }
-
-            return anyAdded;
-        }
-
-
-
-        #endregion
-
-        #region static utils
-
-        // this will go somewhere else later
-
-        // Try parse decimal with current culture, invariant, and comma/dot flip
-        private static bool TryParseDecimalFlexible(string s, out decimal value)
-        {
-            s = (s ?? "").Trim();
-            // 1) current culture
-            if (decimal.TryParse(s, NumberStyles.Number, CultureInfo.CurrentCulture, out value)) return true;
-            // 2) invariant
-            if (decimal.TryParse(s, NumberStyles.Number, CultureInfo.InvariantCulture, out value)) return true;
-            // 3) flip comma/dot and retry (helps when clipboard mixes locales)
-            string flipped = s.Contains(",") ? s.Replace(",", ".") : s.Replace(".", ",");
-            if (decimal.TryParse(flipped, NumberStyles.Number, CultureInfo.CurrentCulture, out value)) return true;
-            if (decimal.TryParse(flipped, NumberStyles.Number, CultureInfo.InvariantCulture, out value)) return true;
-            value = 0m;
-            return false;
-        }
-
-        private static bool TryParseIntFlexible(string s, out int value)
-        {
-            s = (s ?? "").Trim();
-            // Extract leading integer if something like "12 pcs"
-            var digits = new string(s.TakeWhile(ch => char.IsDigit(ch) || ch == '-' || ch == '+').ToArray());
-            if (string.IsNullOrEmpty(digits)) digits = s;
-            return int.TryParse(digits, NumberStyles.Integer, CultureInfo.CurrentCulture, out value)
-                || int.TryParse(digits, NumberStyles.Integer, CultureInfo.InvariantCulture, out value);
-        }
-
-        #endregion
-
-    }
-
-}
-

ENI2/Controls/EditWindowBase.cs

@@ -12,8 +12,6 @@ using Xceed.Wpf.Toolkit;
 
 using bsmd.database;
 using ENI2.Util;
-using System.Windows.Data;
-using System.Xml.Linq;
 
 namespace ENI2.Controls
 {
@@ -49,12 +47,6 @@ namespace ENI2.Controls
                         cancelButton.Click += (s, e) => { if (this.IsModal()) DialogResult = false; CancelClicked?.Invoke(); this.Close(); };
                         addButton.Click += (s, e) => AddClicked?.Invoke();
                         this.Closing += Window_Closing;
-
-                        SettingBindingExtension stBinding = new SettingBindingExtension("W1Top");
-                        BindingOperations.SetBinding(this, Window.TopProperty, stBinding);
-
-                        SettingBindingExtension slBinding = new SettingBindingExtension("W1Left");
-                        BindingOperations.SetBinding(this, Window.LeftProperty, slBinding);
                     };
         }
 
@@ -63,17 +55,10 @@ namespace ENI2.Controls
             get { var addButton = (Button)Template.FindName("buttonAdd", this); return addButton.Visibility == Visibility.Visible; }
             set
             {
-                var addButton = (Button)Template.FindName("buttonAdd", this);
+                var addButton = (Button)Template.FindName("buttonAdd", this); addButton.Visibility = value ? Visibility.Visible : Visibility.Hidden;
-                if (addButton != null)
-                {
-                    addButton.Visibility = value ? Visibility.Visible : Visibility.Hidden;
-                }
                 var okButton = (Button)Template.FindName("buttonOK", this);
-                if (okButton != null)
+                if (okButton.Visibility == Visibility.Hidden)
-                {
+                    okButton.Width = 1; // we are in a DockPanel, try to collapse okButton to place addButton more to the right
-                    if (okButton.Visibility == Visibility.Hidden)
-                        okButton.Width = 1; // we are in a DockPanel, try to collapse okButton to place addButton more to the right
-                }
             }
         }
 

ENI2/Controls/LocodeControl.xaml.cs

@@ -79,11 +79,6 @@ namespace ENI2.Controls
                         portName = LocodeDB.PortNameFromLocode(value); break;
                     case RuleEngine.LocodeMode.SSN:
                         portName = LocodeDB.SSNPortNameFromLocode(value); break;
-                    case RuleEngine.LocodeMode.OLD:
-                        portName = LocodeDB.PortNameFromLocode(value);
-                        if ((portName == null) && value.Equals("DEWHV"))
-                            portName = "Stadthafen Wilhelmshaven";
-                        break;
                 }                
                 LocodeState locodeState = portName.IsNullOrEmpty() ? LocodeState.INVALID : LocodeState.OK;
                 this.SetLocodeStateImage(this.imageLocodeState, locodeState);
@@ -169,18 +164,6 @@ namespace ENI2.Controls
                                  portname = LocodeDB.PortNameFromLocode(directLocode); break;
                             case RuleEngine.LocodeMode.SSN:
                                 portname = LocodeDB.SSNPortNameFromLocode(directLocode); break;
-                            case RuleEngine.LocodeMode.OLD:
-                                {
-                                    if (directLocode.Equals("DEWHV"))
-                                    {
-                                        portname = "Stadthafen Wilhelmshaven";
-                                    }
-                                    else
-                                    {
-                                        portname = LocodeDB.PortNameFromLocode(directLocode);
-                                    }
-                                }
-                                break;
                         }
                         
                         bool isLocode = !portname.IsNullOrEmpty();
@@ -208,8 +191,6 @@ namespace ENI2.Controls
                                 locodeEntries = LocodeDB.AllLocodesForCityNameAsEntries(lookupString); break;
                             case RuleEngine.LocodeMode.SSN:
                                 locodeEntries = LocalizedLookup.SSNAllLocodesForCityNameAsEntries(lookupString); break;
-                            case RuleEngine.LocodeMode.OLD:
-                                locodeEntries = LocodeDB.AllLocodesForCityNameAsEntries(lookupString); break;
                         }                        
                         locodeEntries.Sort();
 

ENI2/Controls/MaerskListControl.xaml.cs

@@ -290,10 +290,24 @@ namespace ENI2.Controls
                 }
             }
             this.TimeFilterItemSource();
-            
+            // this.SortItemSource();
             this.dataGridPOCores.SelectedItem = null;
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
-        }        
+        }
+
+        private string ReadFieldAsString(IExcelDataReader reader, int fieldNum)
+        {
+            if (fieldNum >= reader.FieldCount) return null;
+            if (reader.GetFieldType(fieldNum) == typeof(string))
+                return reader.GetString(fieldNum).Clean();
+            if (reader.GetFieldType(fieldNum) == typeof(DateTime))
+                return reader.GetDateTime(fieldNum).ToString();
+            if (reader.GetFieldType(fieldNum) == typeof(int))
+                return reader.GetInt32(fieldNum).ToString();
+            if (reader.GetFieldType(fieldNum) == typeof(double))
+                return ((int) reader.GetDouble(fieldNum)).ToString();            
+            return null;
+        }
 
         private void TimeFilterItemSource()
         {
@@ -316,7 +330,16 @@ namespace ENI2.Controls
 
             foreach (MaerskData md in removeList)
                 this.maerskDataList.Remove(md);
-        }        
+        }
+
+        private void SortItemSource()
+        {
+            ObservableCollection<MaerskData> temp;
+            temp = new ObservableCollection<MaerskData>(this.maerskDataList.OrderBy(p => p.ColA));
+            this.maerskDataList.Clear();
+            foreach (MaerskData md in temp)
+                this.maerskDataList.Add(md);
+        }
 
         #endregion
 
@@ -386,28 +409,28 @@ namespace ENI2.Controls
                                     if (DateTime.TryParse(md.ColA, out DateTime aDateTime))
                                         md.ETA = aDateTime;
                                 }
-                            }
+                            }                            
-                            if (!reader.IsDBNull(1)) md.ColB = reader.ReadAsString(1);
+                            if (!reader.IsDBNull(1)) md.ColB = ReadFieldAsString(reader, 1);
-                            if (!reader.IsDBNull(2)) md.ColC = reader.ReadAsString(2);
+                            if (!reader.IsDBNull(2)) md.ColC = ReadFieldAsString(reader, 2);
-                            if (!reader.IsDBNull(3)) md.ColD = reader.ReadAsString(3);
+                            if (!reader.IsDBNull(3)) md.ColD = ReadFieldAsString(reader, 3);
-                            if (!reader.IsDBNull(4)) md.ColE = reader.ReadAsString(4);
+                            if (!reader.IsDBNull(4)) md.ColE = ReadFieldAsString(reader, 4);
-                            if (!reader.IsDBNull(5)) md.ColF = reader.ReadAsString(5);
+                            if (!reader.IsDBNull(5)) md.ColF = ReadFieldAsString(reader, 5);
-                            if (!reader.IsDBNull(6)) md.ColG = reader.ReadAsString(6);
+                            if (!reader.IsDBNull(6)) md.ColG = ReadFieldAsString(reader, 6);
-                            if (!reader.IsDBNull(7)) md.ColH = reader.ReadAsString(7);
+                            if (!reader.IsDBNull(7)) md.ColH = ReadFieldAsString(reader, 7);
-                            if (!reader.IsDBNull(8)) md.ColI = reader.ReadAsString(8);
+                            if (!reader.IsDBNull(8)) md.ColI = ReadFieldAsString(reader, 8);
                             if (md.ColI != null)
                             {
                                 if ((md.ColI.Contains("bremerhaven", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEWVN")) ||
                                     (md.ColI.Contains("eurogate", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEBRV")))
                                     throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
                             }
-                            if (!reader.IsDBNull(9)) md.ColJ = reader.ReadAsString(9);
+                            if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
                             if (md.ColJ == null) continue;
                             if (!(md.ColJ.Equals("msk", StringComparison.OrdinalIgnoreCase) || md.ColJ.Equals("sgl", StringComparison.OrdinalIgnoreCase))) continue; // skip operator we are not interested in
-                            if (!reader.IsDBNull(10)) md.ColK = reader.ReadAsString(10);
+                            if (!reader.IsDBNull(10)) md.ColK = ReadFieldAsString(reader, 10);
-                            if (!reader.IsDBNull(11)) md.ColL = reader.ReadAsString(11);
+                            if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
-                            if (!reader.IsDBNull(12)) md.ColM = reader.ReadAsString(12);
+                            if (!reader.IsDBNull(12)) md.ColM = ReadFieldAsString(reader, 12);
-                            if (!reader.IsDBNull(13)) md.Remark = reader.ReadAsString(13);
+                            if (!reader.IsDBNull(13)) md.Remark = ReadFieldAsString(reader, 13);
                             
                             if(!md.ColF.IsNullOrEmpty())
                             {
@@ -492,7 +515,8 @@ namespace ENI2.Controls
                                 maerskDataList.Add(md);
                             }
                         }
-                        this.TimeFilterItemSource();                        
+                        this.TimeFilterItemSource();
+                        // this.SortItemSource();
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
 
                         this.dataGridPOCores.Items.Refresh();
@@ -607,7 +631,7 @@ namespace ENI2.Controls
                     MaerskData md = grid.SelectedItem as MaerskData;
                     if(md.MessageCore != null) {
                         Util.UIHelper.SetBusyState();
-                        this.MessageCoreSelected?.Invoke(md.MessageCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
+                        this.MessageCoreSelected?.Invoke(md.MessageCore);
                     }
                 }
             }

ENI2/Controls/ServerStatusControl.xaml

@@ -16,8 +16,12 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Orientation="Horizontal">
+                <Label Content="Excel:" />
+                <Label Name="labelStatusExcel" Content="?" FontWeight="Bold" />
                 <Label Content="Transmitter:" />
                 <Label Name="labelStatusTransmitter" Content="?" FontWeight="Bold" />
+                <Label Content="Report:" />
+                <Label Name="labelStatusReport" Content="?" FontWeight="Bold" />
                 <Button Name="refreshButton" Content="{x:Static p:Resources.textRefresh}" Margin="4" Background="Transparent" Click="refreshButton_Click"/>
             </StackPanel>
             <local:ENIDataGrid Grid.Row="1"

ENI2/Controls/ServerStatusControl.xaml.cs

@@ -27,14 +27,13 @@ namespace ENI2.Controls
         private readonly static ILog _log = LogManager.GetLogger("ServerStatus");
         private ProgressBar _updateProgressBar;
         private TextBlock _updateTextBlock;
-        private bool _isUpdating = false;
-        private readonly static Dictionary<Guid, string> coreIdVisitIdMap = new Dictionary<Guid, string>();
 
         public ServerStatusControl()
         {
             InitializeComponent();
             this.dataGridStatus.ItemsSource = this.entries;
             this.Loaded += ServerStatusControl_Loaded;
+            
         }
 
         private void ServerStatusControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
@@ -44,8 +43,6 @@ namespace ENI2.Controls
 
         internal void Update(LockingServiceReference.ServerStatus serverStatus)
         {
-            if (this._isUpdating) return;
-            _isUpdating = true;
             int totalNum = serverStatus.IMPFiles.Length + serverStatus.READYFiles.Length + serverStatus.CORRUPTFiles.Length;            
             entries.Clear();
             BackgroundWorker bgWorker = new BackgroundWorker();
@@ -98,20 +95,24 @@ namespace ENI2.Controls
 
                 System.Windows.Application.Current.Dispatcher.Invoke(delegate {
                     foreach (StatusEntry se in tmpList)
-                      entries.Add(se);
+                    entries.Add(se);
                 });
             };
 
             bgWorker.RunWorkerCompleted += (o, e) =>
-            {
+            {                
 
                 // Enumeration parsen und text ausgeben
+                ServiceControllerStatus excel = (ServiceControllerStatus)serverStatus.Excel;
+                this.labelStatusExcel.Content = excel.ToString();
+
+                ServiceControllerStatus report = (ServiceControllerStatus)serverStatus.Report;
+                this.labelStatusReport.Content = report.ToString();
+
                 ServiceControllerStatus transmitter = (ServiceControllerStatus)serverStatus.Transmitter;
                 this.labelStatusTransmitter.Content = transmitter.ToString();
 
                 this.busyIndicator.IsBusy = false;
-
-                _isUpdating = false;
             };
 
             this.busyIndicator.IsBusy = true;
@@ -146,23 +147,15 @@ namespace ENI2.Controls
 
                         string guidString = m.Groups[2].Value;
 
-                        string idString = "";
                         if (!guidIdDict.ContainsKey(guidString))
                         {
+                            string idString = "";
                             if (Guid.TryParse(m.Groups[2].Value, out Guid coreId))
                             {
-                                if (!coreIdVisitIdMap.ContainsKey(coreId))
+                                MessageCore aCore = DBManager.Instance.GetMessageCoreById(coreId);
+                                if (aCore != null)
                                 {
-                                    MessageCore aCore = DBManager.Instance.GetMessageCoreById(coreId);
+                                    idString = aCore.DisplayId;
-                                    if (aCore != null)
-                                    {
-                                        coreIdVisitIdMap[coreId] = aCore.DisplayId;
-                                        idString = aCore.DisplayId;
-                                    }
-                                }
-                                else
-                                {
-                                    idString = coreIdVisitIdMap[coreId];
                                 }
                             }
                             guidIdDict[guidString] = idString;

ENI2/Controls/StatusWindowBase.cs

@@ -8,13 +8,12 @@ using System.Windows;
 using System.Windows.Controls;
 using System.ComponentModel;
 using ENI2.Util;
-using System.Windows.Data;
 
 namespace ENI2.Controls
 {
 
     [TemplatePart(Name = "buttonRefresh", Type = typeof(Button))]
-    [TemplatePart(Name = "buttonClose", Type = typeof(Button))]
+    [TemplatePart(Name = "buttonClose", Type = typeof(Button))]    
     public class StatusWindowBase : Window
     {
 
@@ -35,23 +34,9 @@ namespace ENI2.Controls
 
                 closeButton.Click += (s, e) => { if (this.IsModal()) DialogResult = true; CloseClicked?.Invoke(); this.Close(); };
                 refreshButton.Click += (s, e) => { RefreshClicked?.Invoke(); };
-
+                
-                string topProperty = "W2Top";
+            };            
-                string leftProperty = "W2Left";
+        }        
-                if(this.GetType().Name == "ViolationListDialog")
-                {
-                    topProperty = "W3Top";
-                    leftProperty = "W3Left";
-                }
-
-
-                SettingBindingExtension stBinding = new SettingBindingExtension(topProperty);
-                this.SetBinding(Window.TopProperty, stBinding);
-
-                SettingBindingExtension slBinding = new SettingBindingExtension(leftProperty);
-                this.SetBinding (Window.LeftProperty, slBinding);
-            };
-        }
 
         public bool RefreshVisible
         {

ENI2/Controls/ValueMappingsControl.xaml.cs

@@ -69,22 +69,16 @@ namespace ENI2.Controls
 
         private async void DelItem_Click(object sender, RoutedEventArgs e)
         {
-            if (this.dataGridValueMappings.SelectedItems.Count > 0)
+            if (this.dataGridValueMappings.SelectedItem is ValueMapping vm)
             {
-                if (MessageBox.Show($"Are you sure to delete the selected values?", Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) ==
+                if (MessageBox.Show($"Are you sure to delete {vm.Key} -> {vm.Value}?", Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) ==
-                        MessageBoxResult.Yes)
+                    MessageBoxResult.Yes)
                 {
-                    var selectedItems = new List<ValueMapping>();
+                    int result = await DBManagerAsync.DeleteAsync(vm);
-                    foreach(ValueMapping vm in this.dataGridValueMappings.SelectedItems)
+                    if (result == 1)
-                        selectedItems.Add(vm);
-                    foreach(ValueMapping vm in selectedItems)
                     {
-                        int result = await DBManagerAsync.DeleteAsync(vm);
+                        _mappings.Remove(vm);
-                        if (result == 1)
+                    }
-                        {
-                            _mappings.Remove(vm);
-                        }                        
-                    }                    
                 }
             }
         }

ENI2/CustomCommands.cs

@@ -34,7 +34,8 @@ namespace ENI2
             if (parentObject == null) return null;
 
             //check if the parent matches the type we're looking for
-            if (parentObject is T parent)
+            T parent = parentObject as T;
+            if (parent != null)
                 return parent;
             else
                 return FindParent<T>(parentObject);

ENI2/DetailBaseControl.cs

@@ -33,7 +33,6 @@ namespace ENI2
         private DependencyPropertyDescriptor _dpComboboxValue;
         private DependencyPropertyDescriptor _dpNumericUpdown;
         private DependencyPropertyDescriptor _dpIntUpdown;
-        
         private readonly Dictionary<Object, Message.NotificationClass> _controlClassDict = new Dictionary<object, Message.NotificationClass>();
         private readonly Dictionary<Message.NotificationClass, Message> _typeMessageDict = new Dictionary<Message.NotificationClass, Message>();
 
@@ -70,7 +69,7 @@ namespace ENI2
         /// <summary>
         /// Damit kann ein Listenelement eine Validierung der gesamten Anmeldung auslösen (inkl. Highlighting) (auf Knopfdruck)
         /// </summary>
-        public event Action<bool> RequestValidate;
+        public event Action RequestValidate;
 
         /// <summary>
         /// Alle Meldeklassen die auf "zu versenden" stehen werden validiert und falls die Validierung scheitert auf "SUSPEND" gestellt
@@ -90,7 +89,7 @@ namespace ENI2
         /// <summary>
         /// Eine in der Detailansicht enthaltene Meldeklasse hat sich geändert
         /// </summary>
-        public event Action<Message.NotificationClass?> NotificationClassChanged;
+        public event Action<Message.NotificationClass> NotificationClassChanged;
 
         /// <summary>
         /// Eine Maske soll neu erzeugt werden weil sich dort "indirekt" etwas geändert hat durch eine Änderung in einer anderen Maske.
@@ -133,7 +132,8 @@ namespace ENI2
             _dpComboboxIndex = DependencyPropertyDescriptor.FromProperty(ComboBox.SelectedIndexProperty, typeof(ComboBox));
             _dpComboboxValue = DependencyPropertyDescriptor.FromProperty(ComboBox.SelectedValueProperty, typeof(ComboBox));
             _dpNumericUpdown = DependencyPropertyDescriptor.FromProperty(Xceed.Wpf.Toolkit.DoubleUpDown.ValueProperty, typeof(Xceed.Wpf.Toolkit.DoubleUpDown));
-            _dpIntUpdown = DependencyPropertyDescriptor.FromProperty(Xceed.Wpf.Toolkit.IntegerUpDown.ValueProperty, typeof(Xceed.Wpf.Toolkit.IntegerUpDown));            
+            _dpIntUpdown = DependencyPropertyDescriptor.FromProperty(Xceed.Wpf.Toolkit.IntegerUpDown.ValueProperty, typeof(Xceed.Wpf.Toolkit.IntegerUpDown));
+            
 
             foreach(Message message in this.Messages)
             {
@@ -160,9 +160,9 @@ namespace ENI2
             this.RequestReload?.Invoke(coreId);
         }
 
-        protected virtual void OnRequestValidate(bool showDialog)
+        protected virtual void OnRequestValidate()
         {
-            this.RequestValidate?.Invoke(showDialog);
+            this.RequestValidate?.Invoke();
         }
 
         protected virtual void OnRequestSendValidation()
@@ -185,17 +185,6 @@ namespace ENI2
             this.ResetControlCache?.Invoke(messageGroupName);
         }
 
-        protected virtual void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
-        {
-            ScrollViewer scv = (ScrollViewer)sender;
-            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-            e.Handled = true;
-        }
-
-        public virtual int SelectedTabIndex { get; set; } = -1;
-
-        #endregion
-
         #region event handling for control content changes (signal dirty etc)
 
         protected void RegisterTextboxChange(TextBox textBox, Message.NotificationClass notificationClass)
@@ -257,7 +246,7 @@ namespace ENI2
         {
             this._dpIntUpdown.AddValueChanged(intUpDown, this.controlContentChanged);
             this._controlClassDict[intUpDown] = notificationClass;
-        }        
+        }
 
         protected void SublistElementChanged(Message.NotificationClass notificationClass)
         {
@@ -269,17 +258,12 @@ namespace ENI2
                     {
                         _typeMessageDict[notificationClass].IsDirty = true;
                         // signal this notification class changed..
-                        this.OnNotificationClassChanged(notificationClass);
+                        this.NotificationClassChanged?.Invoke(notificationClass);
                     }
                 }
             }
         }
 
-        protected void OnNotificationClassChanged(Message.NotificationClass? notificationClass)
-        {
-            this.NotificationClassChanged?.Invoke(notificationClass);
-        }
-
         #region "BHV Spezial" Datetime Parsing..
 
         protected void DateTimePicker_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
@@ -349,7 +333,9 @@ namespace ENI2
             GlobalStructures.FilterCombobox(cmb, e.Key);
         }
 
-        #endregion        
+        #endregion
+
+        #endregion
 
         #region IHighlightControlContainer implementation
 

ENI2/DetailRootControl.xaml

@@ -15,7 +15,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="220" x:Name="leftColumnDefinition"/>
+            <ColumnDefinition Width="220" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         
@@ -28,7 +28,7 @@
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="0" >
                 <xctk:AutoSelectTextBox x:Name="displayIdLabel" Width="Auto" VerticalContentAlignment="Center" FontWeight="Bold" IsReadOnly="True" BorderThickness="0" AutoSelectBehavior="OnFocus" />
-                <Label Margin="10,0,0,0" Content="{x:Static p:Resources.textShipEmail}" VerticalContentAlignment="Center" />
+                <Label Margin="10,0,0,0" Content="Ship e-mail:" VerticalContentAlignment="Center" />
                 <xctk:AutoSelectTextBox Width="400" x:Name="shipEMailLabel" VerticalContentAlignment="Center" FontWeight="Normal" IsReadOnly="True" BorderThickness="0" AutoSelectBehavior="OnFocus" />
             </StackPanel>
             <Button Name="buttonSave" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSave_Click" BorderThickness="0" Background="Transparent" Visibility="Hidden">

ENI2/DetailRootControl.xaml.cs

@@ -15,8 +15,6 @@ using ENI2.Util;
 
 using ENI2.EditControls;
 using System.Windows.Input;
-using System.Linq;
-using ENI2.SheetDisplayControls;
 
 namespace ENI2
 {
@@ -31,7 +29,7 @@ namespace ENI2
         private readonly List<MessageGroup> _listBoxList = new List<MessageGroup>();
         private List<Message> _messages;
         private readonly Dictionary<string, DetailBaseControl> controlCache = new Dictionary<string, DetailBaseControl>();
-        // private readonly Dictionary<Message.NotificationClass, string> messageClassControlDict = new Dictionary<Message.NotificationClass, string>();
+        // private readonly Dictionary<Message.NotificationClass, string> messageClassControlDict = new Dictionary<Message.NotificationClass, string>();        
         private readonly object messageListLock = new object();
         private readonly HighlightService highlightService = new HighlightService();
 
@@ -43,7 +41,7 @@ namespace ENI2
 
         #region Properties
 
-        public MessageCore Core { get; private set; }        
+        public MessageCore Core { get; private set; }
 
         public bool LockedByOtherUser { get; set; }
 
@@ -65,7 +63,7 @@ namespace ENI2
             get
             {
                 // Bedingung:
-                // wenn in einer Meldeklasse zwar Daten vorhanden sind, eingespielt durch Excel import oder
+                // wenn in einer Meldeklasse zwar Daten vorhanden sind, eingespielt durch Excel import oder 
                 // Handeingabe, diese aber NICHT gesendet wurden.
                 // TODO: Hier wird noch ein Flag benötigt, dass die erfolgte Anzeige des Warndialogs speichert
                 List<string> result = new List<string>();
@@ -74,7 +72,7 @@ namespace ENI2
                 {
                     if (((aMessage.InternalStatus == Message.BSMDStatus.UPDATED) ||
                         (aMessage.InternalStatus == Message.BSMDStatus.SAVED)) && // ||
-                        // (aMessage.InternalStatus == Message.BSMDStatus.EXCEL)) &&
+                        // (aMessage.InternalStatus == Message.BSMDStatus.EXCEL)) &&                        
                         !aMessage.UnsentMessageWarningShown)
                     {
                         aMessage.UnsentMessageWarningShown = true;
@@ -82,7 +80,7 @@ namespace ENI2
                         result.Add(aMessage.MessageNotificationClassDisplay);
                     }
                 }
-
+                
                 return result;
             }
         }
@@ -108,89 +106,55 @@ namespace ENI2
             }
         }
 
-        public bool HasCriticalInfoMissing(out string messageText, string locode)
+        public bool HasCriticalInfoMissing(out string messageText)
         {
             messageText = "";
             // Hier haben wir Logik für Spezialfälle, z.B. dass für BRE und BRV bestimmte Meldeklassen gesendet werden *müssen*
 
-            switch (locode)
+            if(this.Core.PoC.Equals("DEBRV") || this.Core.PoC.Equals("DEBRE"))
             {
-                case "DEBRV":
+                foreach(Message aMessage in _messages)
-                case "DEBRE":
+                {
-                    {
+                    if((aMessage.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "NOA_NOD"; return true; }
-                        foreach (Message aMessage in _messages)
+                    if ((aMessage.MessageNotificationClass == Message.NotificationClass.AGNT) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "AGNT"; return true; }
-                        {
+                    if ((aMessage.MessageNotificationClass == Message.NotificationClass.INFO) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "INFO"; return true; }
-                            if ((aMessage.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "NOA_NOD"; return true; }
+                    if ((aMessage.MessageNotificationClass == Message.NotificationClass.SEC) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "SEC"; return true; }
-                            if ((aMessage.MessageNotificationClass == Message.NotificationClass.AGNT) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "AGNT"; return true; }
+                    if ((aMessage.MessageNotificationClass == Message.NotificationClass.TIEFA) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "TIEFA"; return true; }
-                            if ((aMessage.MessageNotificationClass == Message.NotificationClass.INFO) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "INFO"; return true; }
+                }
-                            if ((aMessage.MessageNotificationClass == Message.NotificationClass.SEC) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "SEC"; return true; }
+            }
-                            if ((aMessage.MessageNotificationClass == Message.NotificationClass.TIEFA) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "TIEFA"; return true; }
-                        }
-                    }
-                    break;
-                case "DEHAM":
-                    foreach (Message aMessage in _messages)
-                    {
-                        if ((aMessage.MessageNotificationClass == Message.NotificationClass.SERV) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "SERV"; return true; }
-                    }
-                    break;
-                default:
-                    break;
-            }            
 
             return false;
         }
 
-
         #endregion
 
         #region Construction
 
-        public DetailRootControl(MessageCore aCore, ReportingParty.ShipcallDisplayModeEnum displayMode)
+        public DetailRootControl(MessageCore aCore)
         {
             Core = aCore;
             InitializeComponent();
             shipNameLabel.Text = aCore.Shipname;
             shipEMailLabel.Text = aCore.HerbergEmailContactReportingVessel;
             displayIdLabel.Text = aCore.DisplayId;
+            
 
-            // Unterscheidung in welchem Darstellungs-Mode der Anlauf dargestellt wird (Classic oder Formblatt)
+            // Listbox befüllen
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textOverview, MessageGroupControlType = typeof(OverViewDetailControl), ImagePath = "Resources/documents.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPortCall, MessageGroupControlType = typeof(PortCallDetailControl), ImagePath = "Resources/eye_blue.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPortNotification, MessageGroupControlType = typeof(PortNotificationDetailControl), ImagePath = "Resources/anchor.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textWaste, MessageGroupControlType = typeof(WasteDetailControl), ImagePath = "Resources/garbage.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textArrivalNotification, MessageGroupControlType = typeof(ArrivalNotificationDetailControl), ImagePath = "Resources/arrow_down_right_red.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textSecurity, MessageGroupControlType = typeof(SecurityDetailControl), ImagePath = "Resources/shield_yellow.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPSC72h, MessageGroupControlType = typeof(PSC72hDetailControl), ImagePath = "Resources/alarmclock.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textMDH, MessageGroupControlType = typeof(MaritimeHealthDeclarationDetailControl), ImagePath = "Resources/medical_bag.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDepartureNotification, MessageGroupControlType = typeof(DepartureNotificationDetailControl), ImagePath = "Resources/arrow_up_right_green.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textShipData, MessageGroupControlType = typeof(ShipDataDetailControl), ImagePath = "Resources/containership.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textBorderPolice, MessageGroupControlType = typeof(BorderPoliceDetailControl), ImagePath = "Resources/policeman_german.png" });            
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDGArrival, MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDGDeparture, MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textTowage, MessageGroupControlType = typeof(TowageDetailControl), ImagePath = "Resources/ship2.png" });
 
-            if (displayMode == ReportingParty.ShipcallDisplayModeEnum.CLASSIC)
-            {
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textOverview, MessageGroupControlType = typeof(OverViewDetailControl), ImagePath = "Resources/documents.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPortCall, MessageGroupControlType = typeof(PortCallDetailControl), ImagePath = "Resources/eye_blue.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPortNotification, MessageGroupControlType = typeof(PortNotificationDetailControl), ImagePath = "Resources/anchor.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textWaste, MessageGroupControlType = typeof(WasteDetailControl), ImagePath = "Resources/garbage.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textArrivalNotification, MessageGroupControlType = typeof(ArrivalNotificationDetailControl), ImagePath = "Resources/arrow_down_right_red.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textSecurity, MessageGroupControlType = typeof(SecurityDetailControl), ImagePath = "Resources/shield_yellow.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPSC72h, MessageGroupControlType = typeof(PSC72hDetailControl), ImagePath = "Resources/alarmclock.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textMDH, MessageGroupControlType = typeof(MaritimeHealthDeclarationDetailControl), ImagePath = "Resources/medical_bag.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDepartureNotification, MessageGroupControlType = typeof(DepartureNotificationDetailControl), ImagePath = "Resources/arrow_up_right_green.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textShipData, MessageGroupControlType = typeof(ShipDataDetailControl), ImagePath = "Resources/containership.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textBorderPolice, MessageGroupControlType = typeof(BorderPoliceDetailControl), ImagePath = "Resources/policeman_german.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDGArrival, MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDGDeparture, MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textTowage, MessageGroupControlType = typeof(TowageDetailControl), ImagePath = "Resources/ship2.png" });
-            }
-            else
-            {
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textOverview, MessageGroupControlType = typeof(OverViewDetailControl), ImagePath = "Resources/documents.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text1Voyage, MessageGroupControlType = typeof(VoyageControl), ImagePath = "Resources/ship2.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text2PortCall, MessageGroupControlType = typeof(PortControl), ImagePath = "Resources/anchor.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text3PreArrival, MessageGroupControlType = typeof(PreArrivalControl), ImagePath = "Resources/arrow_down_right_red.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text4PreDeparture, MessageGroupControlType = typeof(PreDepartureControl), ImagePath = "Resources/arrow_up_right_green.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text5ShipData, MessageGroupControlType = typeof(ShipDataControl), ImagePath = "Resources/containership.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text6CrewDataOnArrival, MessageGroupControlType = typeof(CrewPreArrivalControl), ImagePath = "Resources/arrival_worker.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text7CrewDeparture, MessageGroupControlType = typeof(CrewDepartureControl), ImagePath = "Resources/departure_worker.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text8PassengerArrival, MessageGroupControlType = typeof(PassengerPreArrivalControl), ImagePath = "Resources/arrival_user.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text9PassengerDeparture, MessageGroupControlType = typeof(PassengerDepartureControl), ImagePath = "Resources/departure_user.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text10DangerousCargoArrival, MessageGroupControlType = typeof(DangerousCargoControl), ImagePath = "Resources/sign_warning_radiation.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text11DangerousCargoDeparture, MessageGroupControlType = typeof(DangerousCargoControl), ImagePath = "Resources/sign_warning_radiation.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text12ATAATD, MessageGroupControlType = typeof(ATAControl), ImagePath = "Resources/clock.png" });
-                this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.text13WasteReceipts, MessageGroupControlType = typeof(WasteReceiptsControl), ImagePath = "Resources/garbage.png" });
-                this.leftColumnDefinition.Width = new GridLength(260);
-            }
 
             this.listBoxMessages.ItemsSource = this._listBoxList;
 
@@ -199,7 +163,7 @@ namespace ENI2
             _messages.AddRange(missingMessages);
 
             BindingOperations.EnableCollectionSynchronization(_messages, this.messageListLock);
-            Dispatcher.BeginInvoke((System.Action)(() => this.listBoxMessages.SelectedIndex = 0));
+            Dispatcher.BeginInvoke((Action)(() => this.listBoxMessages.SelectedIndex = 0));
 
             RoutedCommand saveCmd = new RoutedCommand();
             saveCmd.InputGestures.Add(new KeyGesture(Key.S, ModifierKeys.Control));
@@ -226,8 +190,7 @@ namespace ENI2
         public void CoreChanged(MessageCore newCore)
         {
             this.Core = newCore;
-            this.ReloadCore();
+            Application.Current.Dispatcher.Invoke(delegate
-            System.Windows.Application.Current.Dispatcher.Invoke(delegate
             {
                 if(controlCache.ContainsKey(Properties.Resources.textOverview))
                 {
@@ -273,8 +236,6 @@ namespace ENI2
                     // Spezial-Balkon für die Wiederverwendung von HAZD / HAZA als ein Control (es tut mir leid :D)
                     if (mg.MessageGroupName.Equals(Properties.Resources.textDGDeparture))
                         ((DangerousGoodsDetailControl)detailControl).IsDeparture = true;
-                    if (mg.MessageGroupName.Equals(Properties.Resources.text11DangerousCargoDeparture))
-                        ((DangerousCargoControl)detailControl).IsDeparture = true;
                     detailControl.Core = Core;
                     detailControl.Messages = _messages;
                     detailControl.LockedByOtherUser = this.LockedByOtherUser;
@@ -300,7 +261,7 @@ namespace ENI2
                     detailControl.SetEnabled(isEnabled);
 
                     if (!isEnabled && (detailControl is OverViewDetailControl control) && !(Core.Cancelled ?? false))
-                        control.ShowLockedBy(this.LockedBy);
+                        control.ShowLockedBy(this.LockedBy);                    
 
                     controlCache.Add(mg.MessageGroupName, detailControl);
                     this.buttonSave.Visibility = Visibility.Hidden;
@@ -334,7 +295,7 @@ namespace ENI2
             MessageCore newCore = new MessageCore();
             cdd.NewCore = newCore;
             cdd.OldCore = this.Core;
-
+            
             cdd.Closed += (senderDialog, closeArgs) =>
             {
                 CopyDeclarationDialog closedDialog = senderDialog as CopyDeclarationDialog;
@@ -367,19 +328,19 @@ namespace ENI2
 
                     if(existingCore != null)
                     {
-                        if(MessageBox.Show(Properties.Resources.textDeclarationAlreadyExists, Properties.Resources.textCaptionExists,
+                        if(MessageBox.Show(Properties.Resources.textDeclarationAlreadyExists, Properties.Resources.textCaptionExists, 
                             MessageBoxButton.OKCancel, MessageBoxImage.Question) == MessageBoxResult.OK)
                         {
                             List<Message> existingMessages = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessagesForCore(existingCore, DBManager.MessageLoad.ALL);
                             foreach(Message existingMessage in existingMessages)
                             {
-                                if((existingMessage.InternalStatus == Message.BSMDStatus.SENT) &&
+                                if((existingMessage.InternalStatus == Message.BSMDStatus.SENT) && 
                                 (existingMessage.MessageNotificationClass != Message.NotificationClass.VISIT) &&
                                     (existingMessage.MessageNotificationClass != Message.NotificationClass.TRANSIT))
                                 {
                                     MessageBox.Show(Properties.Resources.textMessagesAlreadySent, Properties.Resources.textCaptionError, MessageBoxButton.OK, MessageBoxImage.Stop);
                                     return;
-                                }
+                                }                                
                             }
 
                             // delete all existing data of core
@@ -393,7 +354,7 @@ namespace ENI2
                                 // Bearbeitungsinformationen für bestehende ID-Beantragung beibehalten, falls bereits vorhanden
 
                                 if(existingCore.IsTransit &&
-                                (existingMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) &&
+                                (existingMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) && 
                                 (existingMessage.InternalStatus == Message.BSMDStatus.CONFIRMED))
                                 {
                                     skipCopyTransit = true;
@@ -425,7 +386,7 @@ namespace ENI2
 
                     DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(newCore);
 
-                    // Meldeklassen für neuen Anlauf erzeugen
+                    // Meldeklassen für neuen Anlauf erzeugen                    
                     List<Message> newMessages = new List<Message>();
                     foreach (Message oldMessage in this._messages)
                     {
@@ -453,7 +414,6 @@ namespace ENI2
                         newMessage.SaveElements();
                     }
 
-                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).LoadXtraData(newCore); // reload data from DB and set all rel properites
                     this.OnOpenNewCoreRequested(newCore);
                 }
             };
@@ -464,12 +424,12 @@ namespace ENI2
         {
             this.LockedByOtherUser = true; // fake flag
 
-            // clear existing controls
+            // clear existing controls            
             this.detailView.Children.Clear();
             this.controlCache.Clear();
 
             // return to "new" overview
-            Dispatcher.BeginInvoke((System.Action)(() => this.listBoxMessages_SelectionChanged(this, null)));
+            Dispatcher.BeginInvoke((Action)(() => this.listBoxMessages_SelectionChanged(this, null)));
         }
 
         private void DetailControl_ResetControlCache(string messageGroupName)
@@ -481,13 +441,12 @@ namespace ENI2
 
         private void buttonSave_Click(object sender, RoutedEventArgs e)
         {
-            MessageBoxResult result = MessageBox.Show(Properties.Resources.textQuestionSavePage, Properties.Resources.textConfirmation,
+            MessageBoxResult result = MessageBox.Show(Properties.Resources.textQuestionSavePage, Properties.Resources.textConfirmation, 
                 MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
 
                 Util.UIHelper.SetBusyState();
-                int currentMainTabIndex = -1;
 
                 if (this.detailView.Children[0] is DetailBaseControl currentControl)
                 {
@@ -502,24 +461,10 @@ namespace ENI2
                         // ggf. hat sich die Ticketnr geändert..
                         DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);
                     }
-
-                    currentMainTabIndex = currentControl.SelectedTabIndex;
                 }
-
-                this.DetailControl_RequestReload(this.Core.Id.Value);
-
-                System.Action<int> SetTabAction = x =>
-                {
-                    // this hopefully happens *after* the view was completely reloaded
-                    if (this.detailView.Children[0] is DetailBaseControl currentNewControl)
-                    {
-                        currentNewControl.SelectedTabIndex = x;
-                    }
-                };
-
-                if (currentMainTabIndex >= 0)
-                    Dispatcher.BeginInvoke(SetTabAction, currentMainTabIndex);
             }
+
+            this.DetailControl_RequestReload(this.Core.Id.Value);
         }
 
         private void SaveMessage(Message message)
@@ -528,14 +473,9 @@ namespace ENI2
             {
                 if ((message.Status == Message.MessageStatus.ACCEPTED) &&
                     ((message.InternalStatus == Message.BSMDStatus.CONFIRMED) || (message.InternalStatus == Message.BSMDStatus.VIOLATION)))
-                {
                     message.InternalStatus = Message.BSMDStatus.UPDATED;
-                    message.Status = null; // reset send status
-                }
                 else
-                {
                     message.InternalStatus = Message.BSMDStatus.SAVED;
-                }
 
                 string userName = "?";
                 if(App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
@@ -552,7 +492,7 @@ namespace ENI2
 
                 if(message.MessageNotificationClass == Message.NotificationClass.ATA)
                 {
-                    DetailBaseControl currentControl = this.detailView.Children[0] as DetailBaseControl;
+                    DetailBaseControl currentControl = this.detailView.Children[0] as DetailBaseControl;                    
                     // ggf. hat sich die Ticketnr geändert..
                     DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);
                 }
@@ -569,13 +509,12 @@ namespace ENI2
 
         private void buttonSaveAll_Click(object sender, RoutedEventArgs e)
         {
-            MessageBoxResult result = MessageBox.Show(Properties.Resources.textQuestionSaveAll, Properties.Resources.textConfirmation,
+            MessageBoxResult result = MessageBox.Show(Properties.Resources.textQuestionSaveAll, Properties.Resources.textConfirmation, 
                 MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
 
                 Util.UIHelper.SetBusyState();
-                int currentMainTabIndex = -1;
 
                 foreach (Message message in this._messages)
                 {
@@ -586,33 +525,16 @@ namespace ENI2
                 if (currentControl is OverViewDetailControl)
                 {
                     // ggf. hat sich die Ticketnr geändert..
-                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);                    
+                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);
                 }
 
-                currentMainTabIndex = currentControl.SelectedTabIndex;
-                Trace.WriteLine($"Last selected tab index: {currentMainTabIndex}");
-
                 this.buttonSaveAll.Visibility = Visibility.Hidden;
                 this.buttonSave.Visibility = Visibility.Hidden;
-
-                this.DetailControl_RequestReload(this.Core.Id.Value);
-
-                Action<int> SetTabAction = x =>
-                {
-                    // this hopefully happens *after* the view was completely reloaded
-                    if (this.detailView.Children[0] is DetailBaseControl currentNewControl)
-                    {
-                        currentNewControl.SelectedTabIndex = x;
-                    }
-                };
-
-                if(currentMainTabIndex >= 0)
-                    Dispatcher.BeginInvoke(SetTabAction, currentMainTabIndex);
             }
-            
+            this.DetailControl_RequestReload(this.Core.Id.Value);
         }
 
-        private void DetailControl_NotificationClassChanged(Message.NotificationClass? notificationClass)
+        private void DetailControl_NotificationClassChanged(Message.NotificationClass notificationClass)
         {
             // in der Übersicht die Meldeklasse als geändert markieren..?
             this.buttonSaveAll.Visibility = Visibility.Visible;
@@ -664,7 +586,7 @@ namespace ENI2
 
         private void ShortCutValidate(object sender, ExecutedRoutedEventArgs e)
         {
-            this.DetailControl_RequestValidate(true);
+            this.DetailControl_RequestValidate();
         }
 
         private void DetailControl_RequestReload(Guid id)
@@ -684,15 +606,12 @@ namespace ENI2
                 this.detailView.Children.Clear();
                 this.controlCache.Clear();
 
-                int currentIndex = this.listBoxMessages.SelectedIndex;
+                // return to "new" overviewdan
-
+                Dispatcher.BeginInvoke((Action)(() =>
-                // return to "new" overview 
-                Dispatcher.BeginInvoke((System.Action)(() =>
                 {
                     this.listBoxMessages_SelectionChanged(this, null);
                     shipNameLabel.Text = this.Core.Shipname;
                     shipEMailLabel.Text = this.Core.HerbergEmailContactReportingVessel;
-                    this.listBoxMessages.SelectedIndex = currentIndex;
                 }
                 ));
 
@@ -777,16 +696,16 @@ namespace ENI2
             }
         }
 
-        private void DetailControl_RequestValidate(bool showDialog)
+        private void DetailControl_RequestValidate()
         {
-            this.Validate(showDialog, out _, out _);
+            this.Validate(true, out _, out _);
         }
 
         private void Validate(bool showMessages, out List<MessageViolation> vViolations, out List<MessageError> vErrors)
         {
             vViolations = new List<MessageViolation>();
             vErrors = new List<MessageError>();
-
+            
             // TODO: clear highlighting
 
             Util.UIHelper.SetBusyState();
@@ -794,27 +713,17 @@ namespace ENI2
             RuleEngine ruleEngine = new RuleEngine();
             foreach (Message aMessage in _messages)
             {
-                if (!aMessage.EvaluateForValidation(this.Core.IsTransit)) continue;
+                // XXX : TODO wegmachen wenn CREWD/PASD kommt
+                if ((aMessage.MessageNotificationClass == Message.NotificationClass.PASD) ||
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD))
+                    continue;                
 
+                if (!aMessage.EvaluateForValidation(this.Core.IsTransit)) continue;
+                    
                 List<MessageError> errors = new List<MessageError>();
                 List<MessageViolation> violations = new List<MessageViolation>();
                 ruleEngine.ValidateMessage(aMessage, out errors, out violations);
 
-                if (errors.Count > 0)
-                    aMessage.ErrorCount = errors.Count;
-                else
-                    aMessage.ErrorCount = null;
-                if (violations.Count > 0)
-                {
-                    aMessage.ViolationCount = violations.Count;
-                    aMessage.PositionViolationCount = violations.Count(v => !v.Identifier.IsNullOrEmpty());
-                }
-                else
-                {
-                    aMessage.ViolationCount = null;
-                    aMessage.PositionViolationCount = null;
-                }
-
                 string messageGroup = this.MessageGroupForMessage(aMessage);
 
                 if (messageGroup != null)
@@ -829,22 +738,17 @@ namespace ENI2
                 vViolations.AddRange(violations);
             }
 
-            #region 12.11.18 / 6.3.21 / 23.5.22 / 26.10.24: globale Plausi-Prüfungen
+            #region 12.11.18 / 6.3.21 / 23.5.22: globale Plausi-Prüfungen
-
+            Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREW);
-            Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWA);
             Message crewdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWD);
-            Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASA);
+            Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PAS);
             Message pasdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASD);
             Message pobaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.POBA);
-            Message pobdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.POBD);
             Message secMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.SEC);
             Message noanodMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.NOA_NOD);
             Message mdhMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.MDH);
             Message was_rcptMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.WAS_RCPT);
             Message wasMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.WAS);
-            Message servMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.SERV);
-            Message statMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.STAT);
-            Message pre72hMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PRE72H);
 
             #region CREW / PAS Count Plausibility
 
@@ -852,43 +756,29 @@ namespace ENI2
             {
                 POBA poba = pobaMessage.Elements[0] as POBA;
 
-                if (crewaMessage.Elements.Count != (poba.TotalCrewMembersOnBoardUponArrival ?? 0))
+                if (crewaMessage.Elements.Count != poba.TotalCrewMembersOnBoardUponArrival)
                 {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBA crew member count different from CREW count!", null, "Crew count mismatch", null, "CREWA");
+                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBA crew member count different from CREW count!", null, "Crew count mismatch", null, "CREW");
                     mv.MessageGroupName = Properties.Resources.textOverview;
                     vViolations.Add(mv);
                 }
 
-                if(pasaMessage.Elements.Count != (poba.TotalPassengersOnBoardUponArrival ?? 0))
+                if(pasaMessage.Elements.Count != poba.TotalPassengersOnBoardUponArrival)
                 {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBA passenger count different from PAS count!", null, "Passenger count mismatch", null, "PASA");
+                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBA passenger count different from PAS count!", null, "Passenger count mismatch", null, "PAS");
                     mv.MessageGroupName = Properties.Resources.textOverview;
                     vViolations.Add(mv);
                 }
-
-                POBD pobd = pobdMessage.Elements[0] as POBD;
-
-                if (crewdMessage.Elements.Count != (pobd.TotalCrewMembersOnBoardUponDeparture ?? 0))
-                {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBD crew member count different from CREW count!", null, "Crew count mismatch", null, "CREWD");
-                    mv.MessageGroupName = Properties.Resources.textOverview;
-                    vViolations.Add(mv);
-                }
-
-                if (pasdMessage.Elements.Count != (pobd.TotalPassengersOnBoardUponDeparture ?? 0))
-                {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBD passenger count different from PAS count!", null, "Passenger count mismatch", null, "PASD");
-                    mv.MessageGroupName = Properties.Resources.textOverview;
-                    vViolations.Add(mv);
-                }
-
             }
 
             #endregion
 
             #region CREW/PAS Schengen Plausibility
 
-            // Wir können davon ausgehen, dass bei allen Unterelementen die Flags gleich gesetzt sind. Das wird im Import und BorderPoliceDetailControl sichergestellt.
+            // Wir können davon ausgehen, dass bei allen Unterelementen die Flags gleich gesetzt sind. Das wird im Import und BorderPoliceDetailControl sichergestellt.                       
+
+            // XXX : TODO auskommentiert bis CREWD/PASD kommt
+            /*
 
             if(crewaMessage.Elements.Count > 0)
             {
@@ -896,7 +786,19 @@ namespace ENI2
                 bool crewaIsSchengen = crewaFirst.NotificationSchengen ?? false;
                 if (!((crewaFirst.NotificationPAX ?? false) || crewaIsSchengen)) // mindestens eins der beiden
                 {
-                    vErrors.Add(RuleEngine.CreateError(ValidationCode.V181, "Pax / Schengen: one must be set", null, Properties.Resources.textOverview, null, "CREWA")); ;
+                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V181, "Wrong selection", null, "CREWA", null, "CREWA");
+                    mv.MessageGroupName = Properties.Resources.textOverview;
+                    vViolations.Add(mv);
+                }
+
+                foreach(CREW crewa in crewaMessage.Elements)
+                {
+                    if(crewaIsSchengen && !crewa.HasSchengenDetails)
+                    {
+                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V182, "No Schengen details", null, "CREWA", crewa.Identifier, "CREWA");
+                        mv.MessageGroupName = Properties.Resources.textOverview;
+                        vViolations.Add(mv);
+                    }
                 }
             }
 
@@ -908,7 +810,19 @@ namespace ENI2
                     bool crewdIsSchengen = crewdFirst.NotificationSchengen ?? false;
                     if (!((crewdFirst.NotificationPAX ?? false) || crewdIsSchengen)) // mindestens eins der beiden
                     {
-                        vErrors.Add(RuleEngine.CreateError(ValidationCode.V181, "Pax / Schengen: one must be set", null, Properties.Resources.textOverview, null, "CREWD")); ;
+                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V181, "Wrong selection", null, "CREWD", null, "CREWD");
+                        mv.MessageGroupName = Properties.Resources.textOverview;
+                        vViolations.Add(mv);
+                    }
+
+                    foreach (CREWD crewd in crewdMessage.Elements)
+                    {
+                        if (crewdIsSchengen && !crewd.HasSchengenDetails)
+                        {
+                            MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V182, "No Schengen details", null, "CREWD", crewd.Identifier, "CREWD");
+                            mv.MessageGroupName = Properties.Resources.textOverview;
+                            vViolations.Add(mv);
+                        }
                     }
                 }
             }
@@ -920,7 +834,25 @@ namespace ENI2
                 bool pasIsPAX = pasFirst.NotificationPAX ?? false;
                 if (!(pasIsPAX || pasIsSchengen)) // mindestens eins der beiden
                 {
-                    vErrors.Add(RuleEngine.CreateError (ValidationCode.V201, "Pax / Schengen: one must be set", null, Properties.Resources.textOverview, null, "PASA"));
+                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V201, "Wrong selection", null, "PASA", null, "PASA");
+                    mv.MessageGroupName = Properties.Resources.textOverview;
+                    vViolations.Add(mv);
+                }
+
+                foreach (PAS pasa in pasaMessage.Elements)
+                {
+                    if (pasIsSchengen && !pasa.HasSchengenDetails)
+                    {
+                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V202, "No Schengen details", null, "PASA", pasa.Identifier, "PASA");
+                        mv.MessageGroupName = Properties.Resources.textOverview;
+                        vViolations.Add(mv);
+                    }
+                    if(pasIsPAX && !pasa.HasPAXDetails)
+                    {
+                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V203, "No PAX details", null, "PASA", pasa.Identifier, "PASA");
+                        mv.MessageGroupName = Properties.Resources.textOverview;
+                        vViolations.Add(mv);
+                    }
                 }
             }
 
@@ -933,55 +865,31 @@ namespace ENI2
                     bool pasdIsPAX = pasdFirst.NotificationPAX ?? false;
                     if (!(pasdIsPAX || pasdIsSchengen)) // mindestens eins der beiden
                     {
-                        vErrors.Add(RuleEngine.CreateError(ValidationCode.V201, "Pax / Schengen: one must be set", null, Properties.Resources.textOverview, null, "PASD"));
+                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V201, "Wrong selection", null, "PASD", null, "PASD");
-                    }
+                        mv.MessageGroupName = Properties.Resources.textOverview;
-                }
-            }
-
-            #endregion
-
-            #region 7.11.23 > 12 Passagiere in PASA oder PASD -> CREW* und PAS* muss NotificationPAX gesetzt haben
-
-            if ((pasaMessage != null) && (pasaMessage.Elements.Count > 12))
-            {
-                PAS firstPASA = pasaMessage.Elements[0] as PAS;
-                if(!(firstPASA.NotificationPAX ?? false))
-                {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.NO_PAX, "No PAX set (PASA > 12)", null, Properties.Resources.textOverview, null, "PASA");
-                    vViolations.Add(mv);
-                }
-
-                if((crewaMessage != null) && (crewaMessage.Elements.Count > 0))
-                {
-                    CREW firstCREW = crewaMessage.Elements[0] as CREW;
-                    if(!(firstCREW.NotificationPAX ?? false))
-                    {
-                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.NO_PAX, "No PAX set (PASA > 12)", null, Properties.Resources.textOverview, null, "CREWA");
                         vViolations.Add(mv);
                     }
-                }
-            }
 
-            if((pasdMessage != null) && (pasdMessage.Elements.Count > 12))
+                    foreach (PASD pasd in pasdMessage.Elements)
-            {
-                PASD firstPASD = pasdMessage.Elements[0] as PASD;
-                if(!(firstPASD.NotificationPAX ?? false))
-                {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.NO_PAX, "No PAX set (PASD > 12)", null, Properties.Resources.textOverview, null, "PASD");
-                    vViolations.Add(mv);
-                }
-
-                if ((crewdMessage != null) && (crewdMessage.Elements.Count > 0))
-                {
-                    CREWD firstCREW = crewdMessage.Elements[0] as CREWD;
-                    if(!(firstCREW.NotificationPAX ?? false))
                     {
-                        MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.NO_PAX, "No PAX set (PASD > 12)", null, Properties.Resources.textOverview, null, "CREWD");
+                        if (pasdIsSchengen && !pasd.HasSchengenDetails)
-                        vViolations.Add(mv);
+                        {
+                            MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V202, "No Schengen details", null, "PASD", pasd.Identifier, "PASD");
+                            mv.MessageGroupName = Properties.Resources.textOverview;
+                            vViolations.Add(mv);
+                        }
+                        if (pasdIsPAX && !pasd.HasPAXDetails)
+                        {
+                            MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.V203, "No PAX details", null, "PASD", pasd.Identifier, "PASD");
+                            mv.MessageGroupName = Properties.Resources.textOverview;
+                            vViolations.Add(mv);
+                        }
                     }
                 }
             }
 
+            */
+
             #endregion
 
             #region 4.1.23 no CREW effects warning for DE
@@ -992,8 +900,8 @@ namespace ENI2
                     crewaMessage.ViolationList.Remove(mv);
             }
 
-            if(crewdMessage != null)
+            if(crewdMessage != null) 
-            {
+            { 
                 MessageViolation mvd = crewdMessage.ViolationList.Find((x) => x.PropertyName.Equals("Effects") && (x.ViolationCode == (int)ValidationCode.TRUNCATE));
                 if ((mvd != null) && !Core.IsDK)
                     crewdMessage.ViolationList.Remove(mvd);
@@ -1004,7 +912,7 @@ namespace ENI2
 
             Dictionary<string, string> identDict = new Dictionary<string, string>();
 
-            foreach (WAS_RCPT was_rcpt in was_rcptMessage.Elements.Cast<WAS_RCPT>())
+            foreach (WAS_RCPT was_rcpt in was_rcptMessage.Elements)
             {
                 if (!was_rcpt.IdentificationNumber.IsNullOrEmpty())
                 {
@@ -1138,7 +1046,7 @@ namespace ENI2
                                 {
                                     if (poc30d.PortOfCallLast30DaysDateOfDeparture.HasValue && !poc30d.PortOfCallLast30DaysLocode.IsNullOrEmpty())
                                     {
-                                        if((poc30d.PortOfCallLast30DaysDateOfDeparture.Value.Date == l10c.PortFacilityDateOfDeparture.Value.Date) &&
+                                        if((poc30d.PortOfCallLast30DaysDateOfDeparture.Value.Date == l10c.PortFacilityDateOfDeparture.Value.Date) && 
                                             poc30d.PortOfCallLast30DaysLocode.Equals(l10c.PortFacilityPortLoCode, StringComparison.OrdinalIgnoreCase))
                                         {
                                             matchIsFound = true;
@@ -1182,36 +1090,6 @@ namespace ENI2
 
             #endregion
 
-            #region SERV existence for DEHAM / DEBRE / DEBRV
-
-            if ((!this.Core.DisplayId.IsNullOrEmpty() && this.Core.DisplayId.StartsWith("DEHAM")) || this.Core.PoC.Equals("DEHAM") ||
-                 (!this.Core.DisplayId.IsNullOrEmpty() && this.Core.DisplayId.StartsWith("DEBRE")) || this.Core.PoC.Equals("DEBRE") ||
-                 (!this.Core.DisplayId.IsNullOrEmpty() && this.Core.DisplayId.StartsWith("DEBRV")) || this.Core.PoC.Equals("DEBRV"))
-            {
-                if (servMessage.Elements.Count == 0)
-                {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.LIST_EMPTY, "No entry for SERV found", null, "SERV service provider", null, "SERV");
-                    mv.MessageGroupName = Properties.Resources.textPortNotification;
-                    vViolations.Add(mv);
-                }
-            }
-
-            #endregion
-
-            #region Tanker validation STAT/PRE72H
-
-            if ((statMessage.Elements[0] is STAT stat) && (pre72hMessage.Elements[0] is PRE72H pre72h))
-            {
-                if((pre72h.Tanker ?? false) != (stat.IsTanker ?? false)) 
-                {
-                    MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.LIST_EMPTY, "Tanker: Please check PRE72H / STAT", null, "PRE72H / STAT", null, "STAT");
-                    mv.MessageGroupName = Properties.Resources.textPortNotification;
-                    vViolations.Add(mv);
-                }
-            }
-
-            #endregion
-
             #endregion
 
             foreach (MessageError me in vErrors)
@@ -1263,8 +1141,8 @@ namespace ENI2
                         this._errorListDialog.Loaded += (o, e) => this._errorListDialog.RefreshVisible = true;
                         this._errorListDialog.ErrorSelected += _errorListDialog_ErrorSelected;
                         this._errorListDialog.RefreshClicked += _errorListDialog_RefreshClicked;
-                        this._errorListDialog.Show();
+                        this._errorListDialog.Show();                        
-                    }
+                    } 
                     else
                     {
                         this._errorListDialog.BringUp();
@@ -1276,19 +1154,19 @@ namespace ENI2
                 {
                     if(this._violationListDialog == null)
                     {
-                        this._violationListDialog = new ViolationListDialog();
+                        this._violationListDialog = new ViolationListDialog();                        
                         this._violationListDialog.Closed += (o, e) => this._violationListDialog = null;
                         this._violationListDialog.Loaded += (o, e) => this._violationListDialog.RefreshVisible = true;
                         this._violationListDialog.ViolationSelected += _errorListDialog_ErrorSelected;
                         this._violationListDialog.RefreshClicked += _errorListDialog_RefreshClicked;
-                        this._violationListDialog.Show();
+                        this._violationListDialog.Show();                        
                     }
                     else
                     {
                         this._violationListDialog.BringUp();
                     }
                     _violationListDialog.Violations = vViolations;
-                }                
+                }
 
                 if((vErrors.Count == 0) && (vViolations.Count == 0))
                 {
@@ -1300,7 +1178,7 @@ namespace ENI2
 
         private void _errorListDialog_RefreshClicked()
         {
-            DetailControl_RequestValidate(true);
+            DetailControl_RequestValidate();
         }
 
         private void _errorListDialog_ErrorSelected(DatabaseEntity obj)
@@ -1365,9 +1243,9 @@ namespace ENI2
                 case Message.NotificationClass.BKRA:
                     return Properties.Resources.textArrivalNotification;
                 case Message.NotificationClass.BPOL:
-                case Message.NotificationClass.CREWA:
+                case Message.NotificationClass.CREW:
                 case Message.NotificationClass.CREWD:
-                case Message.NotificationClass.PASA:
+                case Message.NotificationClass.PAS:
                 case Message.NotificationClass.PASD:
                     return Properties.Resources.textBorderPolice;
                 case Message.NotificationClass.HAZA:

ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml

@@ -71,24 +71,8 @@
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textBunkerType}" Width="0.2*">
+                        <DataGridTextColumn Header="{x:Static p:Resources.textBunkerType}" Binding="{Binding BunkerFuelType}" IsReadOnly="True" Width="0.2*" />
-                                <DataGridTextColumn.Binding>
+                        <DataGridTextColumn Header="{x:Static p:Resources.textBunkerQuantity}" Binding="{Binding BunkerFuelQuantity_TNE, Mode=TwoWay}" IsReadOnly="True" Width="0.8*" />
-                                    <Binding Path="BunkerFuelType" Mode="TwoWay">
-                                        <Binding.ValidationRules>
-                                            <util:StringValidationRule MaxLength="25" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Header="{x:Static p:Resources.textBunkerQuantity}" IsReadOnly="False" Width="0.8*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="BunkerFuelQuantity_TNE" Mode="TwoWay">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="10000"/>
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
                     </DataGrid.Columns>
                 </enictrl:ENIDataGrid>
             </GroupBox>

ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs

@@ -38,8 +38,7 @@ namespace ENI2.DetailViewControls
             this.RegisterIntegerUpDownChange(this.integerUpDownCrewMemberOnBoard, Message.NotificationClass.POBA);
             this.RegisterIntegerUpDownChange(this.integerUpDownPassengersOnBoard, Message.NotificationClass.POBA);
             this.RegisterIntegerUpDownChange(this.integerUpDownPersonsOnBoard, Message.NotificationClass.POBA);
-            this.RegisterIntegerUpDownChange(this.integerUpDownStowawaysOnBoard, Message.NotificationClass.POBA);            
+            this.RegisterIntegerUpDownChange(this.integerUpDownStowawaysOnBoard, Message.NotificationClass.POBA);
-            this.dataGridBKRA.CellEditEnding += (obj, ev) => { this.SublistElementChanged(Message.NotificationClass.BKRA); };
             startupComplete = true;
         }
 
@@ -184,8 +183,6 @@ namespace ENI2.DetailViewControls
 
         private void DataGridBKRA_CreateRequested()
         {
-            this.dataGridBKRA.CancelEdit();
-            this.dataGridBKRA.CancelEdit();
             EditBKRDialog ebd = new EditBKRDialog();
             ebd.BRKA = new BRKA();
             ebd.BRKA.Identifier = BRKA.GetNewIdentifier(this._bkraMessage.Elements);
@@ -218,8 +215,6 @@ namespace ENI2.DetailViewControls
         {
             if (obj is BRKA brka)
             {
-                this.dataGridBKRA.CancelEdit();
-                this.dataGridBKRA.CancelEdit();
                 // are you sure dialog is in base class
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(brka);
                 this._bkraMessage.Elements.Remove(brka);
@@ -230,12 +225,8 @@ namespace ENI2.DetailViewControls
         }
 
         private void DataGridBKRA_EditRequested(DatabaseEntity obj)
-        {
+        {            
-            // I am not shitting you: this has to be called TWICE(!) in a row in order to work
+
-            // see: https://stackoverflow.com/questions/20204592/wpf-datagrid-refresh-is-not-allowed-during-an-addnew-or-edititem-transaction-m
-            this.dataGridBKRA.CancelEdit(DataGridEditingUnit.Row);                       
-            this.dataGridBKRA.CommitEdit(DataGridEditingUnit.Row, true);
-            
             EditBKRDialog eld = new EditBKRDialog();
             eld.IsDeparture = false;
             eld.BRKA = obj as BRKA;
@@ -245,8 +236,7 @@ namespace ENI2.DetailViewControls
                 eld.CopyValuesToEntity();
                 if(!_bkraMessage.Elements.Contains(eld.BRKA))
                     _bkraMessage.Elements.Add(eld.BRKA);
-                this.dataGridBKRA.ItemsSource = null;
+                this.dataGridBKRA.Items.Refresh();
-                this.dataGridBKRA.ItemsSource = this._bkraMessage.Elements;
                 eld.BRKA = new BRKA();
                 eld.BRKA.Identifier = BRKA.GetNewIdentifier(this._bkraMessage.Elements);
                 eld.BRKA.MessageHeader = _bkraMessage;
@@ -257,8 +247,7 @@ namespace ENI2.DetailViewControls
             {
                 if (!_bkraMessage.Elements.Contains(eld.BRKA))
                     _bkraMessage.Elements.Add(eld.BRKA);
-                this.dataGridBKRA.ItemsSource = null;
+                this.dataGridBKRA.Items.Refresh();
-                this.dataGridBKRA.ItemsSource = this._bkraMessage.Elements;
                 this.SublistElementChanged(Message.NotificationClass.BKRA);
             }
         }
@@ -288,7 +277,18 @@ namespace ENI2.DetailViewControls
             if (this._tiefaMessage.HasViolations) this.tiefaGroupBox.BorderBrush = Brushes.Yellow;
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
 
         #region special datetimepicker validation popup (OMG)
 

ENI2/DetailViewControls/BorderPoliceDetailControl.xaml

@@ -49,7 +49,7 @@
                 </ScrollViewer>
             </GroupBox>
         </TabItem>
-        <TabItem Header="{x:Static p:Resources.textCrewArrival}" Name="tabCrewArrival">
+        <TabItem Header="{x:Static p:Resources.textCrew}" Name="tabCrewArrival">
             <GroupBox Name="groupBoxCrewList" Header="{x:Static p:Resources.textTabCrewList}">
                 <Grid>
                     <Grid.RowDefinitions>
@@ -60,14 +60,13 @@
                         <Button Name="buttonImportExcelCrew" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelCrew_Click" />
                         <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumCrewEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/>
                         <Label Name="labelCrewEntryCount" Content="{x:Static p:Resources.textEntries}" />
-                       
+                        <!--
                         <CheckBox Name="checkBoxCrewNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationSchengen_Click"/>
                         <Label Name="labelCrewNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" />
                         <CheckBox Name="checkBoxCrewNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationPAX_Click"/>
                         <Label Name="labelCrewNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" />
-                        <Button Name="buttonDeleteAllCrewA" Margin="2" Content="{x:Static p:Resources.textDeleteAllEntries}" Background="Transparent" Click="buttonDeleteAllCrewA_Click"/>
                         <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="CREWA" VerticalAlignment="Center" />
-                        
+                        -->
                     </StackPanel>
                     <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" x:Name="dataGridCrewList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
@@ -79,7 +78,7 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textCrewFunctionOnBoard}" Binding="{Binding CrewMemberDuty, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding CrewMemberNationality, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding CrewMemberPlaceOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding CrewMemberCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                            <!--<DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding CrewMemberCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />--> <!-- XXX: TODO -->
                             <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding CrewMemberDateOfBirth, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding CrewMemberIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding CrewMemberIdentityDocumentId, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
@@ -92,7 +91,7 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        
+        <!-- XXX : TODO
         <TabItem Header="{x:Static p:Resources.textCrewDeparture}" Name="tabCrewDeparture">
             <GroupBox Name="groupBoxCrewListDeparture" Header="{x:Static p:Resources.textTabCrewList}">
                 <Grid>
@@ -108,7 +107,6 @@
                         <Label Name="labelCrewNotificationSchengenDeparture" Content="{x:Static p:Resources.textNotificationSchengen}" />
                         <CheckBox Name="checkBoxCrewNotificationPAXDeparture" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationPAXDeparture_Click"/>
                         <Label Name="labelCrewNotificationPAXDeparture" Content="{x:Static p:Resources.textNotificationPAX}" />
-                        <Button Name="buttonDeleteAllCrewD" Margin="2" Content="{x:Static p:Resources.textDeleteAllEntries}" Background="Transparent" Click="buttonDeleteAllCrewD_Click"/>
                         <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="CREWD" VerticalAlignment="Center" />
                     </StackPanel>
                     <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" x:Name="dataGridCrewListDeparture" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
@@ -133,8 +131,8 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-
+        --> 
-        <TabItem Header="{x:Static p:Resources.textPasArrival}" Name="tabPassengerList">
+        <TabItem Header="{x:Static p:Resources.textPas}" Name="tabPassengerList">
             <GroupBox Name="groupBoxPassengerList" Header="{x:Static p:Resources.textTabPassengerList}">
                 <Grid>
                     <Grid.RowDefinitions>
@@ -145,12 +143,13 @@
                         <Button Name="buttonImportExcelPassenger" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelPassenger_Click" />
                         <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumPasEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/>
                         <Label Name="labelPasEntryCount" Content="{x:Static p:Resources.textEntries}" />
+                        <!--
                         <CheckBox Name="checkBoxPasNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationSchengen_Click"/>
                         <Label Name="labelPasNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" />
                         <CheckBox Name="checkBoxPasNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationPAX_Click"/>
                         <Label Name="labelPasNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" />
-                        <Button Name="buttonDeleteAllPasA" Margin="2" Content="{x:Static p:Resources.textDeleteAllEntries}" Background="Transparent" Click="buttonDeleteAllPasA_Click"/>
+                        <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASA" VerticalAlignment="Center" />
-                        <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASA" VerticalAlignment="Center" />                        
+                        -->
                     </StackPanel>
                     <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPassengerList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
@@ -164,22 +163,22 @@
                             <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTransitPassenger}" Binding="{Binding PassengerInTransit}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding PassengerNationality}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding PassengerPlaceOfBirth}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding PassengerCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                            <!--<DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding PassengerCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />-->
                             <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding PassengerIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding PassengerIdentityDocumentId}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDocumentIssuingState}" Binding="{Binding PassengerIdentityDocumentIssuingState}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDocumentExpiryDate}" Binding="{Binding PassengerIdentityDocumentExpiryDate, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding PassengerVisaNumber}" IsReadOnly="True" Width="0.1*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyCare}" Binding="{Binding EmergencyCare, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                            <!--<DataGridTextColumn Header="{x:Static p:Resources.textEmergencyCare}" Binding="{Binding EmergencyCare, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />--> <!-- XXX : TODO -->
-                            <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyContactNumber}" Binding="{Binding EmergencyContactNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                            <!-- <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyContactNumber}" Binding="{Binding EmergencyContactNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" /> -->
                             
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
                 </Grid>
             </GroupBox>
         </TabItem>
-         
+        <!-- XXX : TODO 
         <TabItem Header="{x:Static p:Resources.textPasDeparture}" Name="tabPassengerListDeparture">
             <GroupBox Name="groupBoxPassengerListDeparture" Header="{x:Static p:Resources.textTabPassengerList}">
                 <Grid>
@@ -195,7 +194,6 @@
                         <Label Name="labelPasNotificationSchengenDeparture" Content="{x:Static p:Resources.textNotificationSchengen}" />
                         <CheckBox Name="checkBoxPasNotificationPAXDeparture" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationPAXDeparture_Click"/>
                         <Label Name="labelPasNotificationPAXDeparture" Content="{x:Static p:Resources.textNotificationPAX}" />
-                        <Button Name="buttonDeleteAllPasD" Margin="2" Content="{x:Static p:Resources.textDeleteAllEntries}" Background="Transparent" Click="buttonDeleteAllPasD_Click"/>
                         <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASD" VerticalAlignment="Center" />
                     </StackPanel>
                     <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPassengerListDeparture" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
@@ -224,7 +222,7 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        
+        -->
     </TabControl>
     
 </src:DetailBaseControl>

ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs

@@ -13,8 +13,6 @@ using ENI2.Util;
 using ENI2.Locode;
 using ExcelDataReader;
 using bsmd.database;
-using System.Windows.Media.Imaging;
-using System.Linq;
 
 namespace ENI2.DetailViewControls
 {
@@ -52,8 +50,8 @@ namespace ENI2.DetailViewControls
             foreach (Message aMessage in this.Messages)
             {
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.BPOL) { this._bpolMessage = aMessage; this.ControlMessages.Add(aMessage); }
-                if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWA) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.CREW) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
-                if (aMessage.MessageNotificationClass == Message.NotificationClass.PASA) { this._pasMessage = aMessage; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.PAS) { this._pasMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) { this._crewdMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD) { this._pasdMessage = aMessage; this.ControlMessages.Add(aMessage); }
 
@@ -101,7 +99,7 @@ namespace ENI2.DetailViewControls
 
             if (this._crewMessage == null)
             {
-                this._crewMessage = this.Core.CreateMessage(Message.NotificationClass.CREWA);
+                this._crewMessage = this.Core.CreateMessage(Message.NotificationClass.CREW);
                 this.Messages.Add(this._crewMessage);
             }
 
@@ -114,27 +112,19 @@ namespace ENI2.DetailViewControls
             this.dataGridCrewList.DeleteRequested += DataGridCrewList_DeleteRequested;
             this.dataGridCrewList.CreateRequested += DataGridCrewList_CreateRequested;
             this.dataGridCrewList.RefreshGrid += DataGridCrewList_RefreshGrid;
-            this.dataGridCrewList.MultiEditRequested += DataGridCrewList_MultiEditRequested;
+            /* XXX : TODO
-            
             if(this._crewMessage.Elements.Count > 0)
             {
                 this.checkBoxCrewNotificationSchengen.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationSchengen;
                 this.checkBoxCrewNotificationPAX.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationPAX;
             }
-
+            */
-            // extra menu copy to CREWD
-            {
-                this.dataGridCrewList.ContextMenu.Items.Add(new Separator());
-                MenuItem copyCREWAItem = new MenuItem();
-                copyCREWAItem.Header = Properties.Resources.textCopyToCREWD;
-                copyCREWAItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
-                copyCREWAItem.Click += CopyCREWAItem_Click;
-                this.dataGridCrewList.ContextMenu.Items.Add(copyCREWAItem);
-            }
 
             #endregion
 
-            #region init CREWD            
+            #region init CREWD
+
+            /* XXX : TODO
 
             if (this._crewdMessage == null)
             {
@@ -151,7 +141,6 @@ namespace ENI2.DetailViewControls
             this.dataGridCrewListDeparture.DeleteRequested += DataGridCrewListDeparture_DeleteRequested;
             this.dataGridCrewListDeparture.CreateRequested += DataGridCrewListDeparture_CreateRequested;
             this.dataGridCrewListDeparture.RefreshGrid += DataGridCrewListDeparture_RefreshGrid;
-            this.dataGridCrewListDeparture.MultiEditRequested += DataGridCrewListDeparture_MultiEditRequested;
 
             if (this._crewdMessage.Elements.Count > 0)
             {
@@ -159,15 +148,7 @@ namespace ENI2.DetailViewControls
                 this.checkBoxCrewNotificationPAXDeparture.IsChecked = ((CREWD)this._crewdMessage.Elements[0]).NotificationPAX;
             }
 
-            // extra menu copy to CREWA
+            */
-            {
-                this.dataGridCrewListDeparture.ContextMenu.Items.Add(new Separator());
-                MenuItem copyCREWDItem = new MenuItem();
-                copyCREWDItem.Header = Properties.Resources.textCopyToCREWA;
-                copyCREWDItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
-                copyCREWDItem.Click += CopyCREWDItem_Click;
-                this.dataGridCrewListDeparture.ContextMenu.Items.Add(copyCREWDItem);
-            }
 
             #endregion
 
@@ -175,7 +156,7 @@ namespace ENI2.DetailViewControls
 
             if (this._pasMessage == null)
             {
-                this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PASA);
+                this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PAS);
                 this.Messages.Add(this._pasMessage);
             }
 
@@ -188,7 +169,8 @@ namespace ENI2.DetailViewControls
             this.dataGridPassengerList.DeleteRequested += DataGridPassengerList_DeleteRequested;
             this.dataGridPassengerList.CreateRequested += DataGridPassengerList_CreateRequested;
             this.dataGridPassengerList.RefreshGrid += DataGridPassengerList_RefreshGrid;
-            this.dataGridPassengerList.MultiEditRequested += DataGridPassengerList_MultiEditRequested;
+
+            /* XXX : TODO
 
             if (this._pasMessage.Elements.Count > 0)
             {
@@ -196,19 +178,13 @@ namespace ENI2.DetailViewControls
                 this.checkBoxPasNotificationPAX.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationPAX;
             }
 
-            // extra menu copy to PASD
+            */
-            {
-                this.dataGridPassengerList.ContextMenu.Items.Add(new Separator());
-                MenuItem copyPASAItem = new MenuItem();
-                copyPASAItem.Header = Properties.Resources.textCopyToPASD;
-                copyPASAItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
-                copyPASAItem.Click += CopyPASAItem_Click;
-                this.dataGridPassengerList.ContextMenu.Items.Add(copyPASAItem);
-            }
 
             #endregion
 
-            #region init PASD            
+            #region init PASD
+
+            /* XXX : TODO
 
             if (this._pasdMessage == null)
             {
@@ -225,7 +201,6 @@ namespace ENI2.DetailViewControls
             this.dataGridPassengerListDeparture.DeleteRequested += DataGridPassengerListDeparture_DeleteRequested;
             this.dataGridPassengerListDeparture.CreateRequested += DataGridPassengerListDeparture_CreateRequested;
             this.dataGridPassengerListDeparture.RefreshGrid += DataGridPassengerListDeparture_RefreshGrid;
-            this.dataGridPassengerListDeparture.MultiEditRequested += DataGridPassengerListDeparture_MultiEditRequested;
 
             if (this._pasdMessage.Elements.Count > 0)
             {
@@ -233,177 +208,11 @@ namespace ENI2.DetailViewControls
                 this.checkBoxPasNotificationPAXDeparture.IsChecked = ((PASD)this._pasdMessage.Elements[0]).NotificationPAX;
             }
 
-            // extra menu copy to PASA
+            */
-            {
-                this.dataGridPassengerListDeparture.ContextMenu.Items.Add(new Separator());
-                MenuItem copyPASDItem = new MenuItem();
-                copyPASDItem.Header = Properties.Resources.textCopyToPASA;
-                copyPASDItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
-                copyPASDItem.Click += CopyPASDItem_Click;
-                this.dataGridPassengerListDeparture.ContextMenu.Items.Add(copyPASDItem);
-            }
 
             #endregion
         }
 
-        public override int SelectedTabIndex
-        {
-            get { return this.mainFrame.SelectedIndex; }
-            set { this.mainFrame.SelectedIndex = value; }
-        }
-
-        #region Grid copy handlers
-
-        private void CopyPASDItem_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.dataGridPassengerListDeparture.SelectedItems != null)
-            {
-                foreach (PASD pasd in this.dataGridPassengerListDeparture.SelectedItems)
-                {
-                    PAS pasa = new PAS();
-                    pasa.MessageHeader = this._pasMessage;
-                    pasa.CopyFromPAS(pasd);
-                    pasa.IsDeparture = false;
-                    pasa.Identifier = DatabaseEntity.GetNewIdentifier(this._pasMessage.Elements);
-                    this._pasMessage.Elements.Add(pasa);
-                    this.SublistElementChanged(Message.NotificationClass.PASA);
-                }
-                this.CheckPASA();
-            }
-        }
-
-        private void CopyPASAItem_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.dataGridPassengerList.SelectedItems != null)
-            {
-                foreach (PAS pasa in this.dataGridPassengerList.SelectedItems)
-                {
-                    PASD pasd = new PASD();
-                    pasd.MessageHeader = this._pasdMessage;
-                    pasd.CopyFromPAS(pasa);
-                    pasd.IsDeparture = true;
-                    pasd.Identifier = DatabaseEntity.GetNewIdentifier(this._pasdMessage.Elements);
-                    this._pasdMessage.Elements.Add(pasd);
-                    this.SublistElementChanged(Message.NotificationClass.PASD);
-                }
-                this.CheckPASD();
-            }
-        }
-
-        private void CopyCREWDItem_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.dataGridCrewListDeparture.SelectedItems != null)
-            {
-                foreach (CREWD crewd in this.dataGridCrewListDeparture.SelectedItems)
-                {
-                    CREW crewa = new CREW();
-                    crewa.MessageHeader = this._crewMessage;
-                    crewa.CopyFromCREW(crewd);
-                    crewa.IsDeparture = false;
-                    crewa.Identifier = DatabaseEntity.GetNewIdentifier(this._crewMessage.Elements);
-                    this._crewMessage.Elements.Add(crewa);
-                    this.SublistElementChanged(Message.NotificationClass.CREWA);
-                }
-                this.CheckCREWA();
-            }
-        }        
-
-        private void CopyCREWAItem_Click(object sender, RoutedEventArgs e)
-        {
-            if(this.dataGridCrewList.SelectedItems != null)
-            {
-                foreach(CREW crewa in this.dataGridCrewList.SelectedItems)
-                {
-                    CREWD crewd = new CREWD();
-                    crewd.MessageHeader = this._crewdMessage;
-                    crewd.CopyFromCREW(crewa);
-                    crewd.IsDeparture = true;
-                    crewd.Identifier = DatabaseEntity.GetNewIdentifier(this._crewdMessage.Elements);
-                    this._crewdMessage.Elements.Add(crewd);
-                    this.SublistElementChanged(Message.NotificationClass.CREWD);
-                }
-                this.CheckCREWD();
-            }
-        }
-
-        #endregion
-
-        #region Check Schengen / PAX flags and sync
-
-        private void CheckCREWA()
-        {
-            if (this._crewMessage.Elements.Count == 0) return;
-            CREW firstCREW = this._crewMessage.Elements[0] as CREW;
-            if (this._crewMessage.Elements.Count == 1)
-            {
-                firstCREW.NotificationSchengen = true;
-                this.checkBoxCrewNotificationSchengen.IsChecked = true;
-            }
-            else
-            {
-                for (int i = 1; i < this._crewMessage.Elements.Count; i++)
-                {
-                    ((CREW)this._crewMessage.Elements[i]).NotificationSchengen = firstCREW.NotificationSchengen;
-                }
-            }
-        }
-
-        private void CheckCREWD()
-        {
-            if (this._crewdMessage.Elements.Count == 0) return;
-            CREWD firstCREW = this._crewdMessage.Elements[0] as CREWD;
-            if (this._crewdMessage.Elements.Count == 1)
-            {
-                firstCREW.NotificationSchengen = true;
-                this.checkBoxCrewNotificationSchengenDeparture.IsChecked = true;
-            }
-            else
-            {
-                for (int i = 1; i < this._crewdMessage.Elements.Count; i++)
-                {
-                    ((CREWD)this._crewdMessage.Elements[i]).NotificationSchengen = firstCREW.NotificationSchengen;
-                }
-            }
-        }
-
-        private void CheckPASA()
-        {
-            if(this._pasMessage.Elements.Count == 0) return;
-            PAS firstPAS = this._pasMessage.Elements[0] as PAS;
-            if(this._pasMessage.Elements.Count == 1)
-            {
-                firstPAS.NotificationSchengen = true;
-                this.checkBoxPasNotificationSchengen.IsChecked = true;
-            }
-            else
-            {
-                for (int i = 1; i < this._pasMessage.Elements.Count; i++)
-                {
-                    ((PAS)this._pasMessage.Elements[i]).NotificationSchengen = firstPAS.NotificationSchengen;
-                }
-            }
-        }
-
-        private void CheckPASD()
-        {
-            if(this._pasdMessage.Elements.Count == 0) return;
-            PASD firstPAS = this._pasdMessage.Elements[0] as PASD;
-            if (this._pasdMessage.Elements.Count == 1)
-            {
-                firstPAS.NotificationSchengen = true;
-                this.checkBoxPasNotificationSchengenDeparture.IsChecked = true;
-            }
-            else
-            {
-                for (int i = 1; i < this._pasdMessage.Elements.Count; i++)
-                {
-                    ((PASD)this._pasdMessage.Elements[i]).NotificationSchengen = firstPAS.NotificationSchengen;
-                }
-            }
-        }
-
-        #endregion
-
         #region SetEnabled
 
         public override void SetEnabled(bool enabled)
@@ -555,29 +364,23 @@ namespace ENI2.DetailViewControls
             epd.AddClicked += () =>
             {
                 epd.CopyValuesToEntity();
-                if (!this._pasMessage.Elements.Contains(epd.PAS))
+                if(!this._pasMessage.Elements.Contains(epd.PAS))
-                {
                     this._pasMessage.Elements.Add(epd.PAS);
-                    this.CheckPASA();
-                }
                 this.dataGridPassengerList.Items.Refresh();
                 epd.PAS = new PAS
                 {
                     MessageHeader = this._pasMessage,
                     Identifier = PAS.GetNewIdentifier(_pasMessage.Elements)
                 };
-                this.SublistElementChanged(Message.NotificationClass.PASA);
+                this.SublistElementChanged(Message.NotificationClass.PAS);
             };
 
             if (epd.ShowDialog() ?? false)
             {
-                if (!this._pasMessage.Elements.Contains(epd.PAS))
+                if(!this._pasMessage.Elements.Contains(epd.PAS))
-                {
                     _pasMessage.Elements.Add(epd.PAS);
-                    this.CheckPASA();
-                }
                 this.dataGridPassengerList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.PASA);
+                this.SublistElementChanged(Message.NotificationClass.PAS);
             }
         }
 
@@ -594,7 +397,7 @@ namespace ENI2.DetailViewControls
         private void DataGridPassengerList_RefreshGrid()
         {
             DatabaseEntity.ResetIdentifiers(_pasMessage.Elements);
-            this.SublistElementChanged(Message.NotificationClass.PASA);
+            this.SublistElementChanged(Message.NotificationClass.PAS);
             this.dataGridPassengerList.Items.Refresh();
         }
 
@@ -608,30 +411,24 @@ namespace ENI2.DetailViewControls
             epd.AddClicked += () =>
             {
                 epd.CopyValuesToEntity();
-                if (!_pasMessage.Elements.Contains(epd.PAS))
+                if(!_pasMessage.Elements.Contains(epd.PAS))
-                {
                     _pasMessage.Elements.Add(epd.PAS);
-                    this.CheckPASA();
-                }
                 this.dataGridPassengerList.Items.Refresh();
                 epd.PAS = new PAS
                 {
                     Identifier = PAS.GetNewIdentifier(_pasMessage.Elements),
                     MessageHeader = _pasMessage
                 };
-                this.SublistElementChanged(Message.NotificationClass.PASA);
+                this.SublistElementChanged(Message.NotificationClass.PAS);
             };
 
             if (epd.ShowDialog() ?? false)
             {
                 if (!_pasMessage.Elements.Contains(epd.PAS))
-                {
                     _pasMessage.Elements.Add(epd.PAS);
-                    this.CheckPASA();
-                }
                 epd.PAS.IsDirty = true;
                 this.dataGridPassengerList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.PASA);
+                this.SublistElementChanged(Message.NotificationClass.PAS);
             }
         }
 
@@ -640,29 +437,9 @@ namespace ENI2.DetailViewControls
             this.DataGridPassengerList_CreateRequested();
         }
 
-        private void DataGridPassengerList_MultiEditRequested(List<DatabaseEntity> databaseEntities)
+        #endregion
-        {
-            List<PAS> pasList = new List<PAS>();
-            foreach (PAS apas in databaseEntities.Cast<PAS>())
-                pasList.Add(apas);
 
-            // write common values of all PAS entities to template entity
+        /*  XXX : TODO
-            PAS pas = PAS.CreateCommon(pasList);
-
-            EditPASDialog dialog = new EditPASDialog();
-            dialog.PAS = pas;
-            dialog.AddVisible = false;
-            if (dialog.ShowDialog() ?? false)
-            {
-                // write back changed values from pas to all entities and mark them as changed
-                PAS.WriteTemplateToList(pas, pasList);
-
-                this.SublistElementChanged(Message.NotificationClass.PASA);
-                this.dataGridPassengerList.Items.Refresh();
-            }
-        }
-
-        #endregion        
 
         #region passenger grid departure
 
@@ -680,11 +457,8 @@ namespace ENI2.DetailViewControls
             {
                 epd.CopyValuesToEntity();
                 if (!this._pasdMessage.Elements.Contains(epd.PAS))
-                {
                     this._pasdMessage.Elements.Add(epd.PAS);
-                    this.CheckPASD();
+                this.dataGridPassengerList.Items.Refresh();
-                }
-                this.dataGridPassengerListDeparture.Items.Refresh();
                 epd.PAS = new PASD
                 {
                     IsDeparture = true,
@@ -697,10 +471,7 @@ namespace ENI2.DetailViewControls
             if (epd.ShowDialog() ?? false)
             {
                 if (!this._pasdMessage.Elements.Contains(epd.PAS))
-                {
                     _pasdMessage.Elements.Add(epd.PAS);
-                    this.CheckPASD();
-                }
                 this.dataGridPassengerListDeparture.Items.Refresh();
                 this.SublistElementChanged(Message.NotificationClass.PASD);
             }
@@ -734,11 +505,8 @@ namespace ENI2.DetailViewControls
             {
                 epd.CopyValuesToEntity();
                 if (!_pasMessage.Elements.Contains(epd.PAS))
-                {
                     _pasMessage.Elements.Add(epd.PAS);
-                    this.CheckPASD();
+                this.dataGridPassengerList.Items.Refresh();
-                }
-                this.dataGridPassengerListDeparture.Items.Refresh();
                 epd.PAS = new PASD
                 {
                     IsDeparture = true,
@@ -751,10 +519,7 @@ namespace ENI2.DetailViewControls
             if (epd.ShowDialog() ?? false)
             {
                 if (!_pasdMessage.Elements.Contains(epd.PAS))
-                {
                     _pasdMessage.Elements.Add(epd.PAS);
-                    this.CheckPASD();
-                }
                 epd.PAS.IsDirty = true;
                 this.dataGridPassengerListDeparture.Items.Refresh();
                 this.SublistElementChanged(Message.NotificationClass.PASD);
@@ -766,29 +531,9 @@ namespace ENI2.DetailViewControls
             this.DataGridPassengerListDeparture_CreateRequested();
         }
 
-        private void DataGridPassengerListDeparture_MultiEditRequested(List<DatabaseEntity> databaseEntities)
+        #endregion
-        {
-            List<PAS> pasList = new List<PAS>();
-            foreach (PAS apas in databaseEntities.Cast<PAS>())
-                pasList.Add(apas);
 
-            // write common values of all PAS entities to template entity
+        */
-            PAS pas = PAS.CreateCommon(pasList);
-
-            EditPASDialog dialog = new EditPASDialog();
-            dialog.PAS = pas;
-            dialog.AddVisible = false;
-            if (dialog.ShowDialog() ?? false)
-            {
-                // write back changed values from pas to all entities and mark them as changed
-                PAS.WriteTemplateToList(pas, pasList);
-
-                this.SublistElementChanged(Message.NotificationClass.PASD);
-                this.dataGridPassengerListDeparture.Items.Refresh();
-            }
-        }
-
-        #endregion        
 
         #region crew grid arrival
 
@@ -804,29 +549,23 @@ namespace ENI2.DetailViewControls
             ecd.AddClicked += () =>
             {
                 ecd.CopyValuesToEntity();
-                if (!this._crewMessage.Elements.Contains(ecd.CREW))
+                if(!this._crewMessage.Elements.Contains(ecd.CREW))
-                {
                     this._crewMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWA();
+                this.dataGridCrewList.Items.Refresh();
-                }
-                this.dataGridCrewList.Items.Refresh();                
                 ecd.CREW = new CREW
                 {
                     MessageHeader = this._crewMessage,
                     Identifier = CREW.GetNewIdentifier(_crewMessage.Elements)
                 };
-                this.SublistElementChanged(Message.NotificationClass.CREWA);
+                this.SublistElementChanged(Message.NotificationClass.CREW);
             };
 
             if (ecd.ShowDialog() ?? false)
             {
-                if (!this._crewMessage.Elements.Contains(ecd.CREW))
+                if(!this._crewMessage.Elements.Contains(ecd.CREW))
-                {
+                    _crewMessage.Elements.Add(ecd.CREW);                
-                    _crewMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWA();
-                }
                 this.dataGridCrewList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.CREWA);
+                this.SublistElementChanged(Message.NotificationClass.CREW);
             }
         }
 
@@ -843,7 +582,7 @@ namespace ENI2.DetailViewControls
         private void DataGridCrewList_RefreshGrid()
         {
             DatabaseEntity.ResetIdentifiers(_crewMessage.Elements);
-            this.SublistElementChanged(Message.NotificationClass.CREWA);
+            this.SublistElementChanged(Message.NotificationClass.CREW);
             this.dataGridCrewList.Items.Refresh();
         }
 
@@ -857,30 +596,24 @@ namespace ENI2.DetailViewControls
             ecd.AddClicked += () =>
             {
                 ecd.CopyValuesToEntity();
-                if (!_crewMessage.Elements.Contains(ecd.CREW))
+                if(!_crewMessage.Elements.Contains(ecd.CREW))
-                {
                     _crewMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWA();
-                }
                 this.dataGridCrewList.Items.Refresh();
                 ecd.CREW = new CREW
                 {
                     Identifier = CREW.GetNewIdentifier(_crewMessage.Elements),
                     MessageHeader = _crewMessage
                 };
-                this.SublistElementChanged(Message.NotificationClass.CREWA);
+                this.SublistElementChanged(Message.NotificationClass.CREW);
             };
 
             if (ecd.ShowDialog() ?? false)
             {
                 if (!_crewMessage.Elements.Contains(ecd.CREW))
-                {
                     _crewMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWA();
-                }
                 ecd.CREW.IsDirty = true;
                 this.dataGridCrewList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.CREWA);
+                this.SublistElementChanged(Message.NotificationClass.CREW);
             }
         }
 
@@ -889,29 +622,9 @@ namespace ENI2.DetailViewControls
             this.DataGridCrewList_CreateRequested();
         }
 
-        private void DataGridCrewList_MultiEditRequested(List<DatabaseEntity> databaseEntities)
+        #endregion
-        {
-            List<CREW> crewList = new List<CREW>();
-            foreach (CREW acrew in databaseEntities.Cast<CREW>())
-                crewList.Add(acrew);
 
-            // write common values of all CREW entities to template entity
+        /* XXX : TODO
-            CREW crew = CREW.CreateCommon(crewList);                       
-
-            EditCREWDialog dialog = new EditCREWDialog();
-            dialog.CREW = crew;
-            dialog.AddVisible = false;
-            if(dialog.ShowDialog() ?? false)
-            {
-                // write back changed values from crew to all entities and mark them as changed
-                CREW.WriteTemplateToList(crew, crewList);
-
-                this.SublistElementChanged(Message.NotificationClass.CREWA);
-                this.dataGridCrewList.Items.Refresh();
-            }            
-        }
-
-        #endregion        
 
         #region crew grid departure
 
@@ -929,10 +642,7 @@ namespace ENI2.DetailViewControls
             {
                 ecd.CopyValuesToEntity();
                 if (!this._crewdMessage.Elements.Contains(ecd.CREW))
-                {
                     this._crewdMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWD();
-                }
                 this.dataGridCrewListDeparture.Items.Refresh();
                 ecd.CREW = new CREWD
                 {
@@ -946,10 +656,7 @@ namespace ENI2.DetailViewControls
             if (ecd.ShowDialog() ?? false)
             {
                 if (!this._crewdMessage.Elements.Contains(ecd.CREW))
-                {
                     _crewdMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWD();
-                }
                 this.dataGridCrewListDeparture.Items.Refresh();
                 this.SublistElementChanged(Message.NotificationClass.CREWD);
             }
@@ -960,7 +667,7 @@ namespace ENI2.DetailViewControls
             if (obj is CREWD crewd)
             {
                 // are you sure dialog is in base class
-                _crewdMessage.Elements.Remove(crewd);
+                _crewMessage.Elements.Remove(crewd);
                 DBManager.Instance.Delete(crewd);
             }
         }
@@ -983,10 +690,7 @@ namespace ENI2.DetailViewControls
             {
                 ecd.CopyValuesToEntity();
                 if (!_crewdMessage.Elements.Contains(ecd.CREW))
-                {
                     _crewdMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWD();
-                }
                 this.dataGridCrewListDeparture.Items.Refresh();
                 ecd.CREW = new CREWD
                 {
@@ -1000,10 +704,7 @@ namespace ENI2.DetailViewControls
             if (ecd.ShowDialog() ?? false)
             {
                 if (!_crewdMessage.Elements.Contains(ecd.CREW))
-                {
                     _crewdMessage.Elements.Add(ecd.CREW);
-                    this.CheckCREWD();
-                }
                 ecd.CREW.IsDirty = true;
                 this.dataGridCrewListDeparture.Items.Refresh();
                 this.SublistElementChanged(Message.NotificationClass.CREWD);
@@ -1015,32 +716,23 @@ namespace ENI2.DetailViewControls
             this.DataGridCrewListDeparture_CreateRequested();
         }
 
-        private void DataGridCrewListDeparture_MultiEditRequested(List<DatabaseEntity> databaseEntities)
+        #endregion
+
+        */
+
+        #region Excel import
+
+        private string getValueAsString(IExcelDataReader reader, int index)
         {
-            List<CREW> crewList = new List<CREW>();
+            Type fieldType = reader.GetFieldType(index);
-            foreach (CREW acrew in databaseEntities.Cast<CREW>())
+            if (fieldType == null) return null;
-                crewList.Add(acrew);
+            if (fieldType == typeof(double))
-
+                return reader.GetDouble(index).ToString();
-            // write common values of all CREW entities to template entity
+            if (fieldType == typeof(int))
-            CREW crew = CREW.CreateCommon(crewList);
+                return reader.GetInt32(index).ToString();
-
+            return reader.GetString(index);
-            EditCREWDialog dialog = new EditCREWDialog();
-            dialog.CREW = crew;
-            dialog.AddVisible = false;
-            if (dialog.ShowDialog() ?? false)
-            {
-                // write back changed values from crew to all entities and mark them as changed
-                CREW.WriteTemplateToList(crew, crewList);
-
-                this.SublistElementChanged(Message.NotificationClass.CREWD);
-                this.dataGridCrewListDeparture.Items.Refresh();
-            }
         }
 
-        #endregion        
-
-        #region Excel import        
-
         private void buttonImportExcelCrew_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog ofd = new OpenFileDialog
@@ -1086,10 +778,10 @@ namespace ENI2.DetailViewControls
                                 if (!reader.IsDBNull(6)) crew.CrewMemberCountryOfBirth = reader.GetString(6).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(7)) crew.CrewMemberDateOfBirth = reader.GetDateTime(7);
                                 if (!reader.IsDBNull(8)) crew.CrewMemberIdentityDocumentType = GlobalStructures.ReadIdentityDocumentType(reader.GetString(8));
-                                if (!reader.IsDBNull(9)) crew.CrewMemberIdentityDocumentId = reader.ReadAsString(9).Clean();
+                                if (!reader.IsDBNull(9)) crew.CrewMemberIdentityDocumentId = this.getValueAsString(reader, 9).Clean();
                                 if (!reader.IsDBNull(10)) crew.CrewMemberIdentityDocumentIssuingState = reader.GetString(10).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(11)) crew.CrewMemberIdentityDocumentExpiryDate = reader.GetDateTime(11);
-                                if (!reader.IsDBNull(12)) crew.CrewMemberVisaNumber = reader.ReadAsString(12).Clean();
+                                if (!reader.IsDBNull(12)) crew.CrewMemberVisaNumber = this.getValueAsString(reader, 12).Clean();
 
                                 crew.MessageHeader = this._crewMessage;
                                 crew.IsDirty = true;
@@ -1106,15 +798,17 @@ namespace ENI2.DetailViewControls
 
                     if (importCrew.Count > 0)
                     {                        
-                        this.dataGridCrewList.Items.Refresh();
+                        this.dataGridCrewList.Items.Refresh();                        
-                        this.SublistElementChanged(Message.NotificationClass.CREWA);
+                        this.SublistElementChanged(Message.NotificationClass.CREW);
                         MessageBox.Show(String.Format(Properties.Resources.textCrewImported, importCrew.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
                     }                                                                
                }
 
                 stream.Close();
             }
-        }        
+        }
+
+        /* XXX : TODO
 
         private void buttonImportExcelCrewDeparture_Click(object sender, RoutedEventArgs e)
         {
@@ -1157,18 +851,18 @@ namespace ENI2.DetailViewControls
                                 if (crew.CrewMemberLastName.Equals("Family Name") || (crew.CrewMemberLastName.Trim().Length == 0)) continue;
                                 if (!reader.IsDBNull(1)) crew.CrewMemberFirstName = reader.GetString(1);
                                 if (!reader.IsDBNull(2)) crew.CrewMemberGender = GlobalStructures.ParseGender(reader.GetString(2));
-                                if (!reader.IsDBNull(3)) crew.CrewMemberDuty = reader.GetString(3).Clean();
+                                if (!reader.IsDBNull(3)) crew.CrewMemberDuty = reader.GetString(3);
                                 if (!reader.IsDBNull(4)) crew.CrewMemberNationality = reader.GetString(4).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(5)) crew.CrewMemberPlaceOfBirth = reader.GetString(5);
                                 if (!reader.IsDBNull(6)) crew.CrewMemberCountryOfBirth = reader.GetString(6).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(7)) crew.CrewMemberDateOfBirth = reader.GetDateTime(7);
                                 if (!reader.IsDBNull(8)) crew.CrewMemberIdentityDocumentType = GlobalStructures.ReadIdentityDocumentType(reader.GetString(8));
-                                if (!reader.IsDBNull(9)) crew.CrewMemberIdentityDocumentId = reader.ReadAsString(9);
+                                if (!reader.IsDBNull(9)) crew.CrewMemberIdentityDocumentId = this.getValueAsString(reader, 9);
                                 if (!reader.IsDBNull(10)) crew.CrewMemberIdentityDocumentIssuingState = reader.GetString(10).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(11)) crew.CrewMemberIdentityDocumentExpiryDate = reader.GetDateTime(11);
-                                if (!reader.IsDBNull(12)) crew.CrewMemberVisaNumber = reader.ReadAsString(12);
+                                if (!reader.IsDBNull(12)) crew.CrewMemberVisaNumber = this.getValueAsString(reader, 12);
 
-                                crew.MessageHeader = this._crewdMessage;
+                                crew.MessageHeader = this._crewMessage;
                                 crew.IsDirty = true;
                                 crew.Identifier = CREWD.GetNewIdentifier(this._crewdMessage.Elements);
                                 this._crewdMessage.Elements.Add(crew);
@@ -1191,7 +885,9 @@ namespace ENI2.DetailViewControls
 
                 stream.Close();
             }
-        }        
+        }
+
+        */
 
         private void buttonImportExcelPassenger_Click(object sender, RoutedEventArgs e)
         {
@@ -1245,12 +941,12 @@ namespace ENI2.DetailViewControls
                                 if (!reader.IsDBNull(8)) pas.PassengerCountryOfBirth = reader.GetString(8).Substring(0, 2).ToUpper().Clean();
                                 if (!reader.IsDBNull(9)) pas.PassengerDateOfBirth = reader.GetDateTime(9);
                                 if (!reader.IsDBNull(10)) pas.PassengerIdentityDocumentType = GlobalStructures.ReadIdentityDocumentType(reader.GetString(10));
-                                if (!reader.IsDBNull(11)) pas.PassengerIdentityDocumentId = reader.ReadAsString(11).Clean();
+                                if (!reader.IsDBNull(11)) pas.PassengerIdentityDocumentId = this.getValueAsString(reader, 11).Clean();
                                 if (!reader.IsDBNull(12)) pas.PassengerIdentityDocumentIssuingState = reader.GetString(12).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(13)) pas.PassengerIdentityDocumentExpiryDate = reader.GetDateTime(13);
-                                if (!reader.IsDBNull(14)) pas.PassengerVisaNumber = reader.ReadAsString(14).Clean();
+                                if (!reader.IsDBNull(14)) pas.PassengerVisaNumber = this.getValueAsString(reader, 14).Clean();
                                 if (!reader.IsDBNull(15)) pas.EmergencyCare = reader.GetString(15).Clean();
-                                if (!reader.IsDBNull(16)) pas.EmergencyContactNumber = reader.ReadAsString(16).Clean();
+                                if (!reader.IsDBNull(16)) pas.EmergencyContactNumber = this.getValueAsString(reader, 16).Clean();
 
                                 pas.MessageHeader = this._pasMessage;
                                 pas.IsDirty = true;
@@ -1268,13 +964,15 @@ namespace ENI2.DetailViewControls
                     if (importPassenger.Count > 0)
                     {
                         this.dataGridPassengerList.Items.Refresh();
-                        this.SublistElementChanged(Message.NotificationClass.PASA);
+                        this.SublistElementChanged(Message.NotificationClass.PAS);
                         MessageBox.Show(String.Format(Properties.Resources.textPassengerImported, importPassenger.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                 }
                 stream.Close();
             }
-        }        
+        }
+
+        /*
 
         private void buttonImportExcelPassengerDeparture_Click(object sender, RoutedEventArgs e)
         {
@@ -1328,12 +1026,12 @@ namespace ENI2.DetailViewControls
                                 if (!reader.IsDBNull(8)) pas.PassengerCountryOfBirth = reader.GetString(8).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(9)) pas.PassengerDateOfBirth = reader.GetDateTime(9);
                                 if (!reader.IsDBNull(10)) pas.PassengerIdentityDocumentType = GlobalStructures.ReadIdentityDocumentType(reader.GetString(10));
-                                if (!reader.IsDBNull(11)) pas.PassengerIdentityDocumentId = reader.ReadAsString(11);
+                                if (!reader.IsDBNull(11)) pas.PassengerIdentityDocumentId = this.getValueAsString(reader, 11);
                                 if (!reader.IsDBNull(12)) pas.PassengerIdentityDocumentIssuingState = reader.GetString(12).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(13)) pas.PassengerIdentityDocumentExpiryDate = reader.GetDateTime(13);
-                                if (!reader.IsDBNull(14)) pas.PassengerVisaNumber = reader.ReadAsString(14);
+                                if (!reader.IsDBNull(14)) pas.PassengerVisaNumber = this.getValueAsString(reader, 14);
                                 if (!reader.IsDBNull(15)) pas.EmergencyCare = reader.GetString(15);
-                                if (!reader.IsDBNull(16)) pas.EmergencyContactNumber = reader.ReadAsString(16);
+                                if (!reader.IsDBNull(16)) pas.EmergencyContactNumber = this.getValueAsString(reader, 16);
 
                                 pas.MessageHeader = this._pasMessage;
                                 pas.IsDirty = true;
@@ -1357,7 +1055,9 @@ namespace ENI2.DetailViewControls
                 }
                 stream.Close();
             }
-        }       
+        }
+
+        */
 
         #endregion
 
@@ -1383,32 +1083,45 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.groupBoxPassengerList, HighlightService.HighlightStyle.VIOLATION, this._pasMessage);
         }
 
-        #endregion        
+        #endregion
 
-        #region Schengen/PAX checkboxes changed event handler    
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
+        #region Schengen/PAX checkboxes changed event handler
+
+        /* XXX : TODO
 
         private void checkBoxCrewNotificationSchengen_Click(object sender, RoutedEventArgs e)
         {
-            foreach(CREW crew in _crewMessage.Elements.Cast<CREW>())
+            foreach(CREW crew in _crewMessage.Elements)
             {
                 crew.NotificationSchengen = checkBoxCrewNotificationSchengen.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.CREWA);
+            this.SublistElementChanged(Message.NotificationClass.CREW);
         }
 
         private void checkBoxCrewNotificationPAX_Click(object sender, RoutedEventArgs e)
         {
 
-            foreach (CREW crew in _crewMessage.Elements.Cast<CREW>())
+            foreach (CREW crew in _crewMessage.Elements)
             {
                 crew.NotificationPAX = checkBoxCrewNotificationPAX.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.CREWA);
+            this.SublistElementChanged(Message.NotificationClass.CREW);
         }
 
         private void checkBoxCrewNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e)
         {
-            foreach(CREWD crewd in _crewdMessage.Elements.Cast<CREWD>())
+            foreach(CREWD crewd in _crewdMessage.Elements)
             {
                 crewd.NotificationSchengen = checkBoxCrewNotificationSchengenDeparture.IsChecked;
             }
@@ -1417,7 +1130,7 @@ namespace ENI2.DetailViewControls
 
         private void checkBoxCrewNotificationPAXDeparture_Click(object sender, RoutedEventArgs e)
         {
-            foreach (CREWD crewd in _crewdMessage.Elements.Cast<CREWD>())
+            foreach (CREWD crewd in _crewdMessage.Elements)
             {
                 crewd.NotificationPAX = checkBoxCrewNotificationPAXDeparture.IsChecked;
             }
@@ -1426,25 +1139,25 @@ namespace ENI2.DetailViewControls
 
         private void checkBoxPasNotificationSchengen_Click(object sender, RoutedEventArgs e)
         {
-            foreach(PAS pas in _pasMessage.Elements.Cast<PAS>())
+            foreach(PAS pas in _pasMessage.Elements)
             {
                 pas.NotificationSchengen = checkBoxPasNotificationSchengen.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.PASA);
+            this.SublistElementChanged(Message.NotificationClass.PAS);
         }
 
         private void checkBoxPasNotificationPAX_Click(object sender, RoutedEventArgs e)
         {
-            foreach(PAS pas in _pasMessage.Elements.Cast<PAS>())
+            foreach(PAS pas in _pasMessage.Elements)
             {
                 pas.NotificationPAX = checkBoxPasNotificationPAX.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.PASA);
+            this.SublistElementChanged(Message.NotificationClass.PAS);
         }
 
         private void checkBoxPasNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e)
         {
-            foreach(PASD pasd in _pasdMessage.Elements.Cast<PASD>())
+            foreach(PASD pasd in _pasdMessage.Elements)
             {
                 pasd.NotificationSchengen = checkBoxPasNotificationSchengenDeparture.IsChecked;
             }
@@ -1453,72 +1166,14 @@ namespace ENI2.DetailViewControls
 
         private void checkBoxPasNotificationPAXDeparture_Click(object sender, RoutedEventArgs e)
         {
-            foreach(PASD pasd in _pasdMessage.Elements.Cast<PASD>())
+            foreach(PASD pasd in _pasdMessage.Elements)
             {
                 pasd.NotificationPAX = checkBoxPasNotificationPAXDeparture.IsChecked;
             }
             this.SublistElementChanged(Message.NotificationClass.PASD);
         }
 
-        #endregion
+        */
-
-        #region Buttons to delete all entries from CREWA CREWD PASA PASD
-
-        private async void buttonDeleteAllCrewA_Click(object sender, RoutedEventArgs e)
-        {
-            if(MessageBox.Show(Properties.Resources.textConfimDeleteAllEntries, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-            {
-                foreach(CREW crewa in this._crewMessage.Elements.Cast<CREW>())
-                {
-                    await DBManagerAsync.DeleteAsync(crewa);
-                }
-                this._crewMessage.Elements.Clear();
-                this.dataGridCrewList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.CREWA);
-            }
-        }
-
-        private async void buttonDeleteAllCrewD_Click(object sender, RoutedEventArgs e)
-        {
-            if (MessageBox.Show(Properties.Resources.textConfimDeleteAllEntries, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-            {
-                foreach (CREWD crewd in this._crewdMessage.Elements.Cast<CREWD>())
-                {
-                    await DBManagerAsync.DeleteAsync(crewd);
-                }
-                this._crewdMessage.Elements.Clear();
-                this.dataGridCrewListDeparture.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.CREWD);
-            }
-        }
-
-        private async void buttonDeleteAllPasA_Click(object sender, RoutedEventArgs e)
-        {
-            if (MessageBox.Show(Properties.Resources.textConfimDeleteAllEntries, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-            {
-                foreach (PAS pasa in this._pasMessage.Elements.Cast<PAS>())
-                {
-                    await DBManagerAsync.DeleteAsync(pasa);
-                }
-                this._pasMessage.Elements.Clear();
-                this.dataGridPassengerList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.PASA);
-            }
-        }
-
-        private async void buttonDeleteAllPasD_Click(object sender, RoutedEventArgs e)
-        {
-            if (MessageBox.Show(Properties.Resources.textConfimDeleteAllEntries, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-            {
-                foreach (PASD pasd in this._pasdMessage.Elements.Cast<PASD>())
-                {
-                    await DBManagerAsync.DeleteAsync(pasd);
-                }
-                this._pasdMessage.Elements.Clear();
-                this.dataGridPassengerListDeparture.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.PASD);
-            }
-        }
 
         #endregion
 

ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs

@@ -197,12 +197,6 @@ namespace ENI2.DetailViewControls
             this._initialized = true;
         }
 
-        public override int SelectedTabIndex
-        {
-            get { return this.tabControlPositions.SelectedIndex; }
-            set { this.tabControlPositions.SelectedIndex = value; }
-        }
-
         #region SetEnabled
 
         public override void SetEnabled(bool enabled)
@@ -330,7 +324,24 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        #endregion        
+        #endregion
+
+        /// <summary>
+        /// Beim Hinzufügen der allerersten Gefahrgutposition sollen die Flags vorbelegt werden
+        /// </summary>
+        void SetHAZGlobalFlags()
+        {
+            HAZ haz = this.IsDeparture ? this.hazd : this.haza;
+            
+            int totalCount = haz.MARPOLPositions.Count + haz.IMDGPositions.Count + haz.IGCPositions.Count + haz.IBCPositions.Count + haz.IMSBCPositions.Count;
+            if(totalCount == 1)
+            {
+                if (!(this.checkBoxDangerousGoodsOnBoard.IsChecked ?? false)) this.checkBoxDangerousGoodsOnBoard.IsChecked = true;
+                if (this.checkBoxMoUBaltic.IsChecked ?? true) this.checkBoxMoUBaltic.IsChecked = false;
+                haz.NoDPGOnBoardOnArrival = false;
+                haz.MOUBaltic = false;
+            }
+        }
 
         #region MARPOL datagrid handlers
 
@@ -887,26 +898,5 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
-        #region private methods
-
-        /// <summary>
-        /// Beim Hinzufügen der allerersten Gefahrgutposition sollen die Flags vorbelegt werden
-        /// </summary>
-        void SetHAZGlobalFlags()
-        {
-            HAZ haz = this.IsDeparture ? this.hazd : this.haza;
-
-            int totalCount = haz.MARPOLPositions.Count + haz.IMDGPositions.Count + haz.IGCPositions.Count + haz.IBCPositions.Count + haz.IMSBCPositions.Count;
-            if (totalCount == 1)
-            {
-                if (!(this.checkBoxDangerousGoodsOnBoard.IsChecked ?? false)) this.checkBoxDangerousGoodsOnBoard.IsChecked = true;
-                if (this.checkBoxMoUBaltic.IsChecked ?? true) this.checkBoxMoUBaltic.IsChecked = false;
-                haz.NoDPGOnBoardOnArrival = false;
-                haz.MOUBaltic = false;
-            }
-        }
-
-        #endregion
-
     }
 }

ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml

@@ -70,24 +70,8 @@
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textBunkerType}" Width="0.2*">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textBunkerType}" Binding="{Binding BunkerFuelType}" IsReadOnly="True" Width="0.2*" />
-                                <DataGridTextColumn.Binding>
+                            <DataGridTextColumn Header="{x:Static p:Resources.textBunkerQuantity}" Binding="{Binding BunkerFuelQuantity_TNE, Mode=TwoWay}" IsReadOnly="True" Width="0.8*" />
-                                    <Binding Path="BunkerFuelType" Mode="TwoWay">
-                                        <Binding.ValidationRules>
-                                            <util:StringValidationRule MaxLength="25" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Header="{x:Static p:Resources.textBunkerQuantity}" IsReadOnly="False" Width="0.8*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="BunkerFuelQuantity_TNE" Mode="TwoWay">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="10000" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
                 </GroupBox>

ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs

@@ -40,7 +40,6 @@ namespace ENI2.DetailViewControls
             this.RegisterIntegerUpDownChange(this.integerUpDownPassengersOnBoard, Message.NotificationClass.POBD);
             this.RegisterIntegerUpDownChange(this.integerUpDownPersonsOnBoard, Message.NotificationClass.POBD);
             this.RegisterIntegerUpDownChange(this.integerUpDownStowawaysOnBoard, Message.NotificationClass.POBD);
-            this.dataGridBKRD.CellEditEnding += (obj, ev) => { this.SublistElementChanged(Message.NotificationClass.BKRD); };
             startupComplete = true;
         }
 
@@ -168,8 +167,6 @@ namespace ENI2.DetailViewControls
 
         private void DataGridBKRD_CreateRequested()
         {
-            this.dataGridBKRD.CancelEdit();
-            this.dataGridBKRD.CancelEdit();
             EditBKRDialog ebd = new EditBKRDialog();
             ebd.IsDeparture = true;
             ebd.BRKD = new BRKD();
@@ -202,8 +199,6 @@ namespace ENI2.DetailViewControls
         {
             if (obj is BRKD brkd)
             {
-                this.dataGridBKRD.CancelEdit();
-                this.dataGridBKRD.CancelEdit();
                 // are you sure dialog is in base class
                 this._bkrdMessage.Elements.Remove(brkd);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(brkd);
@@ -215,8 +210,6 @@ namespace ENI2.DetailViewControls
 
         private void DataGridBKRD_EditRequested(DatabaseEntity obj)
         {
-            this.dataGridBKRD.CancelEdit(DataGridEditingUnit.Row);
-            this.dataGridBKRD.CommitEdit(DataGridEditingUnit.Row, true);
             EditBKRDialog eld = new EditBKRDialog();
             eld.IsDeparture = true;
             eld.BRKD = obj as BRKD;
@@ -237,8 +230,7 @@ namespace ENI2.DetailViewControls
             {
                 if (!_bkrdMessage.Elements.Contains(eld.BRKD))
                     _bkrdMessage.Elements.Add(eld.BRKD);
-                this.dataGridBKRD.ItemsSource = null;
+                this.dataGridBKRD.Items.Refresh();
-                this.dataGridBKRD.ItemsSource = this._bkrdMessage.Elements;
                 this.SublistElementChanged(Message.NotificationClass.BKRD);
             }
         }
@@ -298,7 +290,18 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.bkrdGroupBox, HighlightService.HighlightStyle.VIOLATION, this._bkrdMessage);
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
        
         #region special datetimepicker validation popup (OMG)
 

ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs

@@ -130,12 +130,6 @@ namespace ENI2.DetailViewControls
 
         }
 
-        public override int SelectedTabIndex
-        {
-            get { return this.mainFrame.SelectedIndex; }
-            set { this.mainFrame.SelectedIndex = value; }
-        }
-
         #region SetEnabled
 
         public override void SetEnabled(bool enabled)
@@ -607,7 +601,18 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.mdhGroupBox, HighlightService.HighlightStyle.VIOLATION, this._mdhMessage);
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
         
     }
 }

ENI2/DetailViewControls/OverViewDetailControl.xaml

@@ -11,7 +11,7 @@
              xmlns:data="clr-namespace:bsmd.database;assembly=bsmd.database"
              xmlns:local="clr-namespace:ENI2.DetailViewControls"
              mc:Ignorable="d" 
-             d:DesignHeight="768" d:DesignWidth="1024">
+             d:DesignHeight="300" d:DesignWidth="800">
     <xctk:BusyIndicator Name="busyIndicator">
         <xctk:BusyIndicator.ProgressBarStyle>
             <Style TargetType="ProgressBar">
@@ -26,144 +26,104 @@
             </StackPanel>
         </xctk:BusyIndicator.BusyContent>
 
-        <GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textOverview}">
+        <GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textVisitTransit}">
             <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-
                 <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="4" />
+                        <RowDefinition Height="32" />
+                        <RowDefinition Height="32" />
+                        <RowDefinition Height="4" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="400" />
+                        <ColumnDefinition Width="1*" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="1*" />
                     </Grid.ColumnDefinitions>
-
+                    <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" Margin="0,0,10,0"/>
-                    <Grid>
+                    <enictrl:LocodeControl Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" IsEnabled="False" />
-                        <Grid.ColumnDefinitions>
+                    <!--Grid Grid.Column="1" Grid.Row="0" Width="Auto">
-                            <ColumnDefinition Width="2*" />
+                <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
+                </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
+                <xctk:WatermarkComboBox Grid.Column="0" x:Name="comboBoxPoC" Margin="2" IsEditable="True" Watermark="Type for Locode.." TextBoxBase.TextChanged="ComboBox_TextChanged" ItemsSource="{Binding LocodePoCList, Mode=TwoWay}" SelectedItem="{Binding PoC, Mode=TwoWay}" />
-                            <RowDefinition Height="28" />
+                <Image Name="imagePoCState" Grid.Column="1" Source="../Resources/bullet_ball_grey.png" />
-                            <RowDefinition Height="28" />
+            </-->
-                            <RowDefinition Height="28" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="3" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
-                            <RowDefinition Height="28" />
+                    <TextBox Name="textBoxDisplayId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
-                            <RowDefinition Height="28" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" Margin="0,0,10,0" />
-                            <RowDefinition Height="28" />
+                    <TextBox Name="textBoxIMO" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1" Text="{Binding IMO, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
-                            <RowDefinition Height="28" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textENI}" Margin="0,0,10,0" />
-                            <RowDefinition Height="28" />
+                    <TextBox Name="textBoxENI" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Text="{Binding ENI, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
-                            <RowDefinition Height="28" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
-                            <RowDefinition Height="28" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="3" Content="{x:Static p:Resources.textETDPortOfCall}" Margin="0,0,10,0" />
-                            
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textATAPortOfCall}" Margin="0,0,10,0" />
-                            <RowDefinition Height="4" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="3" Content="{x:Static p:Resources.textATDPortOfCall}" Margin="0,0,10,0" />
-                            <RowDefinition Height="36" />
+                    <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" />
-                            
+                    <xctk:DateTimePicker Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="2" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-                            <RowDefinition Height="4" />
+                    <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-                            <RowDefinition Height="28" />
+                    <xctk:DateTimePicker Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="3" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-                            <RowDefinition Height="28" />
+                    <Label HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
-                            
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
-                            <RowDefinition Height="4" />
+                    <Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
-                            <RowDefinition Height="28" />
+                    <Button Name="buttonFormblattNeu" Grid.Column="4" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
-                            <RowDefinition Height="28" />
+                        <StackPanel Orientation="Horizontal">
-                            <RowDefinition Height="28" />
+                            <TextBlock Text="Formblatt neu"></TextBlock>
-                            <RowDefinition Height="28" />
+                            <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
-                            <RowDefinition Height="28" />
-                            <RowDefinition Height="28" />
-                            <RowDefinition Height="28" />
-                            
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-
-                        <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
-                        <TextBox Name="textBoxDisplayId" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
-
-                        <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" Margin="0,0,10,0"/>
-                        <enictrl:LocodeControl Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" IsEnabled="False" />
-                                                
-                        <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" Margin="0,0,10,0" />
-                        <TextBox Name="textBoxIMO" Grid.Row="2" Grid.ColumnSpan="2" Grid.Column="1" Text="{Binding IMO, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
-                        
-                        <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textENI}" Margin="0,0,10,0" />
-                        <TextBox Name="textBoxENI" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding ENI, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" IsReadOnly="True" VerticalContentAlignment="Center"/>
-                        
-                        <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
-                        <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Value="{Binding ETAToPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" />
-                        
-                        <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textETDPortOfCall}" Margin="0,0,10,0" />
-                        <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="5" Value="{Binding ETDFromPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerETD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-                        
-                        <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textATAPortOfCall}" Margin="0,0,10,0" />
-                        <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="6" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-
-                        <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textATDPortOfCall}" Margin="0,0,10,0" />
-                        <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
-                        
-                        <Label HorizontalAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" Margin="0,0,10,0" />
-                        <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="8" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
-                        
-                        <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
-                        <Label Name="labelCreated" Grid.Column="1" Grid.Row="9" Margin="2, 0, 0, 0" />
-
-                        <Label Grid.Column="2" Grid.Row="9" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelBSMDStatusInternal" Content="{Binding BSMDStatusInternal, StringFormat={}{0}}" VerticalContentAlignment="Center" FontWeight="Bold" />
-
-                        <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="11">
-                            <Button Name="buttonRefresh" Margin="2" Click="buttonRefresh_Click" BorderThickness="0" Background="Transparent" ToolTip="{x:Static p:Resources.textTooltipRefresh}">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="../Resources/nav_refresh_blue.png" Margin="0,0,5,0" Height="24"/>
-                                    <!--TextBlock Text="{x:Static p:Resources.textRefresh}" VerticalAlignment="Center"/-->
-                                </StackPanel>
-                            </Button>
-                            <Button Name="buttonInfoCore" Margin="2" Click="buttonInfoCore_Click" BorderThickness="0" Background="Transparent" ToolTip="{x:Static p:Resources.textTooltipDetails}">
-                                <Image Source="../Resources/document_view.png" Margin="0,0,5,0" Height="24" />
-                            </Button>
-
-                            <Button Name="buttonValidate" Margin="2" Click="buttonValidate_Click" BorderThickness="0" Background="Transparent" ToolTip="{x:Static p:Resources.textTooltipValidation}">
-                                <Image Source="../Resources/hand_point.png" Margin="0,0,5,0" Height="24" />
-                            </Button>
-                            <!--
-                            <Button Name="buttonWarnings" Margin="2" Click="buttonWarnings_Click" BorderThickness="0" Background="Transparent" Visibility="Hidden">
-                                <Image Source="../Resources/sign_warning.png" Margin="0,0,5,0" Height="24" />
-                            </Button>
-                            -->
                         </StackPanel>
-                        <StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="11" Visibility="Hidden" Name="stackPanelLock">
+                    </Button>
-                            <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
+                    <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
-                            <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
+
+                    <Label Grid.Column="0" Grid.Row="6" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelBSMDStatusInternal" Content="{Binding BSMDStatusInternal, StringFormat={}{0}}" VerticalContentAlignment="Center" FontWeight="Bold" />
+                    <Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}" Background="Red"/>
+                    <Button IsEnabled="True" Name="buttonCopy" Grid.Column="2" Grid.Row="6" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
+                    <Button IsEnabled="True" Name="buttonSendPDF" Grid.Column="3" Grid.Row="6" Margin="2" Click="buttonSendPDF_Click">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{x:Static p:Resources.textCreatePDF}"></TextBlock>
+                            <Image Source="../Resources/document_pdf.png" Margin="10,0,5,0" Height="16"/>
                         </StackPanel>
-
+                    </Button>
-                        <Label Grid.Column="0" Grid.Row="13" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelHIS" VerticalContentAlignment="Center" Content="{x:Static p:Resources.textSendToHIS}" />
+                    <Button Name="buttonQueryHIS" Grid.Column="4" Grid.Row="6" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
-                        <ComboBox Grid.Column="1" Grid.Row="13" Margin="2" Name="comboBoxInitialHis" VerticalContentAlignment="Center" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding Path=InitialHIS}" />
+                    <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="6">
-
+                        <Button Name="buttonRefresh" Margin="2" Click="buttonRefresh_Click" BorderThickness="0" Background="Transparent" ToolTip="{x:Static p:Resources.textTooltipRefresh}">
-                        <Button IsEnabled="True" Name="buttonSendAll" Grid.Column="1" Grid.Row="14" Content="{x:Static p:Resources.textSendAll}" Margin="2" Click="buttonSendAll_Click" />
-
-                        <Button Grid.Column="1" Grid.Row="16" Margin="2" Name="buttonExcelImport" Click="buttonExcelImport_Click">
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Static p:Resources.textExcelImport}"></TextBlock>
+                                <Image Source="../Resources/nav_refresh_blue.png" Margin="0,0,5,0" Height="24"/>
-                                <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
+                                <!--TextBlock Text="{x:Static p:Resources.textRefresh}" VerticalAlignment="Center"/-->
                             </StackPanel>
                         </Button>
-
+                        <Button Name="buttonInfoCore" Margin="2" Click="buttonInfoCore_Click" BorderThickness="0" Background="Transparent" ToolTip="{x:Static p:Resources.textTooltipDetails}">
-                        <Button IsEnabled="True" Name="buttonSendPDF" Grid.Column="1" Grid.Row="17" Margin="2" Click="buttonSendPDF_Click">
+                            <Image Source="../Resources/document_view.png" Margin="0,0,5,0" Height="24" />
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Static p:Resources.textCreatePDF}"></TextBlock>
-                                <Image Source="../Resources/document_pdf.png" Margin="10,0,5,0" Height="16"/>
-                            </StackPanel>
                         </Button>
 
-                        <Button Name="buttonQueryHIS" Grid.Column="1" Grid.Row="18" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
+                        <Button Name="buttonValidate" Margin="2" Click="buttonValidate_Click" BorderThickness="0" Background="Transparent" ToolTip="{x:Static p:Resources.textTooltipValidation}">
-                        <Button IsEnabled="True" Name="buttonCopy" Grid.Column="1" Grid.Row="19" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
+                            <Image Source="../Resources/hand_point.png" Margin="0,0,5,0" Height="24" />
-
-                        <Button Name="buttonFormblattNeu" Grid.Column="1" Grid.Row="20" Margin="2" Click="buttonFormblattNeu_Click" >
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="Formblatt neu"></TextBlock>
-                                <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
-                            </StackPanel>
                         </Button>
-
-                        <Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="22" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}" Background="Red"/>
-                        <Label Grid.Column="2" Grid.Row="21" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelCancelled" VerticalContentAlignment="Center" FontWeight="Bold" />
-                        
-                        
-                        
                         <!--
+                    <Button Name="buttonWarnings" Margin="2" Click="buttonWarnings_Click" BorderThickness="0" Background="Transparent" Visibility="Hidden">
+                        <Image Source="../Resources/sign_warning.png" Margin="0,0,5,0" Height="24" />
+                    </Button>
+                    -->
+                    </StackPanel>
+                    <Label Grid.Column="0" Grid.Row="7" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelCancelled" VerticalContentAlignment="Center" FontWeight="Bold" />
+                    <Label Grid.Column="1" Grid.Row="7" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelHIS" VerticalContentAlignment="Center" Content="{x:Static p:Resources.textSendToHIS}" />
+                    <ComboBox Grid.Column="2" Grid.Row="7" Margin="2" Name="comboBoxInitialHis" VerticalContentAlignment="Center" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding Path=InitialHIS}" />
+                    <Button Grid.Column="3" Grid.Row="7" Margin="2" Name="buttonExcelImport" Click="buttonExcelImport_Click">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{x:Static p:Resources.textExcelImport}"></TextBlock>
+                            <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
+                        </StackPanel>
+                    </Button>
+                    <!--
                 <Button Grid.Column="4" Grid.Row="7" Margin="2" Name="buttonExcelExport" Click="buttonExcelExport_Click">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="{x:Static p:Resources.textExcelExport}"></TextBlock>
@@ -171,64 +131,14 @@
                     </StackPanel>
                 </Button>
                 -->
-                        
+                    <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="4" Visibility="Hidden" Name="stackPanelLock">
-                        
+                        <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
-                    </Grid>
+                        <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
+                    </StackPanel>
+
                     <!-- Data Grid -->
-                    <DataGrid Grid.Row="0" Grid.ColumnSpan="1" Grid.Column="1" Margin="2" x:Name="dataGridMessages" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" CanUserAddRows="False"
+                    <DataGrid Grid.Row="9" Grid.ColumnSpan="6" Margin="0,8,0,0" x:Name="dataGridMessages" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" CanUserAddRows="False"
-SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_MouseDoubleClick" PreviewKeyDown="dataGrid_PreviewKeyDown">
+                  SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_MouseDoubleClick" PreviewKeyDown="dataGrid_PreviewKeyDown">
-                        <DataGrid.Resources>
-
-                            <Style TargetType="{x:Type DataGridColumnHeadersPresenter}">
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
-                                            <Grid Background="Transparent" Grid.IsSharedSizeScope="True">
-                                                <!-- 3 header rows: 0 = main title, 1 = group headers, 2 = real column headers -->
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto"/>
-                                                    <RowDefinition Height="Auto"/>
-                                                </Grid.RowDefinitions>
-
-                                                <!-- One ColumnDefinition per DataGridTextColumn (or shared‐size groups) -->
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="{Binding Columns[0].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[1].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[2].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[3].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[4].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[5].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[6].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[7].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[8].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[9].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[10].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[11].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[12].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[13].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[14].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <ColumnDefinition Width="{Binding Columns[15].ActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                                                    <!-- …add as many as you need… -->
-                                                </Grid.ColumnDefinitions>
-
-                                                <!-- Row 0: A single big header across all columns -->
-                                                <!--TextBlock Grid.Row="0" Grid.ColumnSpan="4" Text="Main Application" HorizontalAlignment="Center" FontWeight="Bold"/ -->
-
-                                                <!-- Row 1: your “banded” group headers -->
-                                                <TextBlock Grid.Row="0" Grid.Column="5" Grid.ColumnSpan="2" Text="{x:Static p:Resources.textENIStatus}" HorizontalAlignment="Stretch" TextAlignment="Center" Padding="0,2,0,4" Background="AntiqueWhite" />
-                                                <TextBlock Grid.Row="0" Grid.Column="7" Grid.ColumnSpan="9" Text="{x:Static p:Resources.textNSWStatus}" HorizontalAlignment="Stretch" TextAlignment="Center" Padding="0,2,0,4" Background="AliceBlue"/>
-
-                                                <!-- Row 2: the real column headers -->
-                                                <!-- This invisible filler ensures the layout lines up -->
-                                                <DataGridColumnHeader x:Name="PART_FillerColumnHeader" Grid.Row="1" Grid.ColumnSpan="14" IsHitTestVisible="False"/>
-                                                <!-- And here the ItemsPresenter will place each DataGridColumnHeader -->
-                                                <ItemsPresenter Grid.Row="1" Grid.ColumnSpan="16"/>
-                                            </Grid>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </DataGrid.Resources>
                         <DataGrid.RowStyle>
                             <Style TargetType="DataGridRow">
                                 <Style.Triggers>
@@ -241,51 +151,26 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
                                             <Condition Binding="{Binding Path=Elements, Converter={util:CutoffConverter}, ConverterParameter=0}" Value="True" />
-                                            <Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PASA}" />
+                                            <Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PAS}" />
                                         </MultiDataTrigger.Conditions>
                                         <Setter Property="Background" Value="Yellow" />
                                     </MultiDataTrigger>
-                                    <MultiDataTrigger>
-                                        <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding Path=Elements, Converter={util:CutoffConverter}, ConverterParameter=0}" Value="True" />
-                                            <Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PASD}" />
-                                        </MultiDataTrigger.Conditions>
-                                        <Setter Property="Background" Value="Yellow" />
-                                    </MultiDataTrigger>
-                                    <DataTrigger Binding="{Binding SendSuccess}" Value="True">
-                                        <Setter Property="Background" Value="#92F592"></Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding InternalStatus}" Value="UPDATED">
-                                        <Setter Property="Background" Value="#DFFDDF"></Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding InternalStatus}" Value="TOSEND">
-                                        <Setter Property="Background" Value="#BFFDBF"></Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding InternalStatus}" Value="SENT">
-                                        <Setter Property="Background" Value="#BFFDBF"></Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding HasSystemErrors}" Value="True">
-                                        <Setter Property="Background" Value="MistyRose"></Setter>
-                                    </DataTrigger>
-                                    <!--DataTrigger Binding="{Binding HasErrors}" Value="True">
-                                        <Setter Property="Background" Value="PaleVioletRed"></Setter>
-                                    </DataTrigger-->
                                 </Style.Triggers>
                             </Style>
                         </DataGrid.RowStyle>
                         <DataGrid.Columns>
-
                             <DataGridTemplateColumn Header=" " Width="SizeToCells" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <!--Image Source="{Binding src:Util.ImageDict[ENINotificationDetailGroup]}" /-->
                                         <!--Image Source="{Binding Source={x:Static src:Util.ImageDict}, Path=[ENINotificationDetailGroup]}"></-->
-                                        <Image Source="{Binding ENINotificationIconString, Converter={util:NullImageConverter}}" Height="24" />
+                                        <Image Source="{Binding ENINotificationIconString, Converter={util:NullImageConverter}}" />
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-
+                            
-                            <DataGridTextColumn Header="{x:Static p:Resources.textNotificationClass}" Binding="{Binding MessageNotificationClassDisplay}" IsReadOnly="True" Width="0.1*" FontWeight="Bold">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textNotificationClass}" Binding="{Binding MessageNotificationClassDisplay}" 
+                                            IsReadOnly="True" Width="0.075*" FontWeight="Bold">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -293,75 +178,6 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                     </Style>
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textStatus}" Binding="{Binding BSMDStatusOverviewDisplay}" IsReadOnly="True" Width="0.1*">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textChangedBy}" Binding="{Binding ChangedBy}" IsReadOnly="True" Width="0.2*">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textChanged}" Binding="{Binding Changed}" IsReadOnly="True" Width="0.15*">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textErrors}" IsReadOnly="True" Width="0.06*" Binding="{Binding ErrorCount}">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                        <Setter Property="HorizontalAlignment" Value="Center" />
-                                        <Setter Property="FontWeight" Value="DemiBold" />
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textViolations}" IsReadOnly="True" Width="0.06*" Binding="{Binding ViolationCount}">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                        <Setter Property="HorizontalAlignment" Value="Center" />
-                                        <Setter Property="FontWeight" Value="DemiBold" />
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="HIS" Binding="{Binding HISOverviewDisplay}" IsReadOnly="True" Width="0.06*">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textReceivedAt}" Binding="{Binding ReceivedAt}" IsReadOnly="True" Width="0.15*">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-
-                            <DataGridTextColumn Header="{x:Static p:Resources.textSentBy}" Binding="{Binding SentBy}" IsReadOnly="True" Width="0.1*">
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="VerticalAlignment" Value="Center"/>
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-                            
                             <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -399,29 +215,29 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
                             <!--DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
-          <DataGridTemplateColumn.CellTemplate>
+                            <DataGridTemplateColumn.CellTemplate>
-              <DataTemplate>
+                                <DataTemplate>
-                  <Image x:Name="imageHasUpdate"/>
+                                    <Image x:Name="imageHasUpdate"/>
-                  <DataTemplate.Triggers>
+                                    <DataTemplate.Triggers>
-                      <DataTrigger Binding="{Binding Path=HasUpdates}" Value="True">
+                                        <DataTrigger Binding="{Binding Path=HasUpdates}" Value="True">
-                          <Setter Property="Source" Value="/Resources/recycle.png" TargetName="imageHasUpdate"/>
+                                            <Setter Property="Source" Value="/Resources/recycle.png" TargetName="imageHasUpdate"/>
-                      </DataTrigger>
+                                        </DataTrigger>
-                  </DataTemplate.Triggers>
+                                    </DataTemplate.Triggers>
-              </DataTemplate>
+                                </DataTemplate>
-          </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
-      </-->
+                        </-->
                             <!--DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
-          <DataGridTemplateColumn.CellTemplate>
+                            <DataGridTemplateColumn.CellTemplate>
-              <DataTemplate>
+                                <DataTemplate>
-                  <Image x:Name="imageHasReminder"/>
+                                    <Image x:Name="imageHasReminder"/>
-                  <DataTemplate.Triggers>
+                                    <DataTemplate.Triggers>
-                      <DataTrigger Binding="{Binding Path=HasReminder}" Value="True">
+                                        <DataTrigger Binding="{Binding Path=HasReminder}" Value="True">
-                          <Setter Property="Source" Value="/Resources/hand_point.png" TargetName="imageHasReminder"/>
+                                            <Setter Property="Source" Value="/Resources/hand_point.png" TargetName="imageHasReminder"/>
-                      </DataTrigger>
+                                        </DataTrigger>
-                  </DataTemplate.Triggers>
+                                    </DataTemplate.Triggers>
-              </DataTemplate>
+                                </DataTemplate>
-          </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
-      </-->
+                        </-->
                             <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -434,7 +250,6 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            
                             <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -447,7 +262,41 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                                                        
+                            <DataGridTextColumn Header="{x:Static p:Resources.textChanged}" Binding="{Binding Changed}" IsReadOnly="True" Width="0.15*">
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Header="{x:Static p:Resources.textReceivedAt}" Binding="{Binding ReceivedAt}" IsReadOnly="True" Width="0.15*">
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Header="{x:Static p:Resources.textStatus}" Binding="{Binding InternalStatus}" IsReadOnly="True" Width="0.1*">
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Header="HIS" Binding="{Binding HIS}" IsReadOnly="True" Width="0.1*">
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Header="{x:Static p:Resources.textSentBy}" Binding="{Binding SentBy}" IsReadOnly="True" Width="0.1*">
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
                             <DataGridTextColumn Header="{x:Static p:Resources.textStatusInfo}" Binding="{Binding StatusInfo}" IsReadOnly="True" Width="0.2*">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
@@ -455,7 +304,13 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                     </Style>
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
-                            
+                            <DataGridTextColumn Header="{x:Static p:Resources.textChangedBy}" Binding="{Binding ChangedBy}" IsReadOnly="True" Width="0.2*">
+                                <DataGridTextColumn.ElementStyle>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                    </Style>
+                                </DataGridTextColumn.ElementStyle>
+                            </DataGridTextColumn>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Grid>

ENI2/DetailViewControls/OverViewDetailControl.xaml.cs

@@ -19,10 +19,6 @@ using System.Collections.Generic;
 using System.Windows.Media;
 using Microsoft.Win32;
 using System.Diagnostics;
-using System.ComponentModel;
-using static bsmd.database.Message;
-using PdfSharp.Fonts;
-using System.Linq;
 
 namespace ENI2.DetailViewControls
 {
@@ -31,9 +27,6 @@ namespace ENI2.DetailViewControls
     /// </summary>
     public partial class OverViewDetailControl : DetailBaseControl
     {
-
-        #region Fields
-
         private Message _message = null;
         private Message _ataMessage;
         private Message _atdMessage;
@@ -43,29 +36,21 @@ namespace ENI2.DetailViewControls
         private readonly object _collectionLock = new object();
         // private MessageSendStatusDialog mssd = null;
 
-        #endregion
-
-        #region Construction
-
         public OverViewDetailControl()
         {
             InitializeComponent();
             this.Loaded += OverViewDetailControl_Loaded;
         }
 
-        #endregion                
-
-        #region Initialize
-
         private void OverViewDetailControl_Loaded(object sender, RoutedEventArgs e)
         {
             // die Controls nach Änderungen monitoren
             // diese Einträge gehen auf core
-            this.textBoxTicketNo.TextChanged += CoreTextBox_TextChanged;
+            this.RegisterTextboxChange(this.textBoxTicketNo, Message.NotificationClass.ATA);
-            this.textBoxDisplayId.TextChanged += CoreTextBox_TextChanged;
+            this.RegisterTextboxChange(this.textBoxDisplayId, Message.NotificationClass.ATA);
-            this.textBoxIMO.TextChanged += CoreTextBox_TextChanged;
+            this.RegisterTextboxChange(this.textBoxIMO, Message.NotificationClass.ATA);
-            this.textBoxENI.TextChanged += CoreTextBox_TextChanged;
+            this.RegisterTextboxChange(this.textBoxENI, Message.NotificationClass.ATA);
-            this.locodePoC.PropertyChanged += CoreLocode_LocodeChanged;
+            this.RegisterLocodeChange(this.locodePoC, Message.NotificationClass.ATA);
 
             this.RegisterDateTimePickerChange(this.dateTimePickerATA, Message.NotificationClass.ATA);
             this.RegisterDateTimePickerChange(this.dateTimePickerATD, Message.NotificationClass.ATD);
@@ -73,6 +58,8 @@ namespace ENI2.DetailViewControls
             this.RegisterDateTimePickerChange(this.dateTimePickerETD, Message.NotificationClass.NOA_NOD);
         }
 
+        #region Initialize
+
         public override void Initialize()
         {
             bool iAmAdmin = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsAdmin;
@@ -198,7 +185,13 @@ namespace ENI2.DetailViewControls
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD)
                     pasdMessage = aMessage;
             }
-            
+
+            // XXX : TODO remove this
+
+            this.Messages.Remove(crewdMessage);
+            this.Messages.Remove(pasdMessage);
+
+
             #endregion
 
             #region init ATA
@@ -317,9 +310,7 @@ namespace ENI2.DetailViewControls
 
             BindingOperations.EnableCollectionSynchronization(this.Messages, _collectionLock);
             this.dataGridMessages.ItemsSource = this.Messages;
-
+            
-            this.OnRequestValidate(false);
-
             base.Initialize(); // wenn Meldeklassen erst bei der Init. erzeugt werden, fehlen die Handler, die hier erneut festgelegt werden
             this._initialized = true;
         }        
@@ -357,9 +348,6 @@ namespace ENI2.DetailViewControls
 
             this.buttonExcelImport.IsEnabled = !this.Core.DisplayId.IsNullOrEmpty();
 
-            this.dataGridMessages.ItemsSource = null;
-            this.dataGridMessages.ItemsSource = this.Messages;
-
             //MessageBox.Show(string.Format("Visit/Transit ID updated: {0}", this.Core.DisplayId));
             //ShowIdDialog sid = new ShowIdDialog(this.Core)
             //{
@@ -437,50 +425,44 @@ namespace ENI2.DetailViewControls
             MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmSend, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
-                this.SendMessages(this.dataGridMessages.SelectedItems.Cast<Message>());
+                bool somethingsNotSaved = false;
-            }
+                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
-        }
-
-        private void SendMessages(IEnumerable<Message> messages)
-        {
-            bool somethingsNotSaved = false;
-
-            foreach (Message selectedMessage in messages)
-            {
-                if (selectedMessage.IsDirty) somethingsNotSaved = true;
-            }
-
-            if (somethingsNotSaved)
-            {
-                if (MessageBox.Show(Properties.Resources.textUnsavedChangesSendAnyWay, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
-                    return;
-            }
-
-            List<Message> watchList = new List<Message>();
-            foreach (Message selectedMessage in messages)
-            {
-                if (selectedMessage.Reset) selectedMessage.Reset = false; // "nochmal" Versenden ist möglich
-                selectedMessage.InternalStatus = Message.BSMDStatus.TOSEND;
-                string userName = "?";
-                if (App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
                 {
-                    userName = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].Logon;
+                    if (selectedMessage.IsDirty) somethingsNotSaved = true;
                 }
-                selectedMessage.ChangedBy = string.Format("{0} at {1} (Send)", userName, DateTime.Now);
-                selectedMessage.StatusInfo = string.Format(Properties.Resources.textMessageSentAt, DateTime.Now);
-                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
-                watchList.Add(selectedMessage);
-            }
 
-            // komplette Anmeldung auf "zu versenden" stellen
+                if(somethingsNotSaved)
-            this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                {
-            this.Core.DefaultReportingPartyId = App.UserId;
+                    if (MessageBox.Show(Properties.Resources.textUnsavedChangesSendAnyWay, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
+                        return;
+                }
 
-            DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); // löst auch den Watchdog aus
+                List<Message> watchList = new List<Message>();
-            this.OnRequestSendValidation();
+                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
-            this.dataGridMessages.Items.Refresh();
+                {
+                    if (selectedMessage.Reset) selectedMessage.Reset = false; // "nochmal" Versenden ist möglich
+                    selectedMessage.InternalStatus = Message.BSMDStatus.TOSEND;
+                    string userName = "?";
+                    if (App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
+                    {
+                        userName = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].Logon;
+                    }
+                    selectedMessage.ChangedBy = string.Format("{0} at {1} (Send)", userName, DateTime.Now);
+                    selectedMessage.StatusInfo = string.Format(Properties.Resources.textMessageSentAt, DateTime.Now);
+                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
+                    watchList.Add(selectedMessage);
+                }
 
-            /*
+                // komplette Anmeldung auf "zu versenden" stellen
+                this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                this.Core.DefaultReportingPartyId = App.UserId;
+
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); // löst auch den Watchdog aus
+                this.OnRequestSendValidation();
+                this.dataGridMessages.Items.Refresh();
+
+
+                /*
                 if (this.mssd == null)
                 {
                     this.mssd = new MessageSendStatusDialog(this.Core);
@@ -500,6 +482,7 @@ namespace ENI2.DetailViewControls
                 this.mssd.Activate(); // bring to foreground
                 this.mssd.AddMessages(watchList);                
                 */
+            }
         }
 
         private void contextResetMessage(object sender, RoutedEventArgs e)
@@ -585,13 +568,7 @@ namespace ENI2.DetailViewControls
                 if (sfd.ShowDialog() ?? false)
                 {
                     Util.UIHelper.SetBusyState();
-                    ReportManager rm = new ReportManager();
+                    ReportManager rm = new ReportManager();                    
-
-                    // TODO!!
-                    // https://docs.pdfsharp.net/PDFsharp/Topics/Fonts/Font-Resolving.html
-                    // https://docs.pdfsharp.net/MigraDoc/DOM/Document/MigraDocSettings.html
-                    GlobalFontSettings.UseWindowsFontsUnderWindows = true;
-                    GlobalFontSettings.UseWindowsFontsUnderWsl2 = true;
 
                     // create PDF from message classes
                     if (rm.Create(sfd.FileName, this.Core, sicd.SelectedClasses, out string importResultText))
@@ -633,16 +610,6 @@ namespace ENI2.DetailViewControls
 
         #region event handler        
 
-        private void CoreLocode_LocodeChanged(object sender, PropertyChangedEventArgs e)
-        {
-            this.OnNotificationClassChanged(null);
-        }
-
-        private void CoreTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            this.OnNotificationClassChanged(null);
-        }
-
         private void _checkStatusTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
             bool? statusFlag = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoreQueryStatusFlag(this.Core.Id.Value);
@@ -751,7 +718,7 @@ namespace ENI2.DetailViewControls
 
         private void buttonValidate_Click(object sender, RoutedEventArgs e)
         {
-            this.OnRequestValidate(true);
+            this.OnRequestValidate();
         }
 
         /// <summary>
@@ -781,7 +748,7 @@ namespace ENI2.DetailViewControls
                         this.OnRequestReload(this.Core.Id.Value);
 
                         // validate all selected import classes (Finger with "selection")
-                        this.OnRequestValidate(true);
+                        this.OnRequestValidate();
 
                     }
                     else
@@ -835,74 +802,18 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        private void buttonSendAll_Click(object sender, RoutedEventArgs e)
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
         {
-            SelectImportClassesDialog sicd = new SelectImportClassesDialog();
+            ScrollViewer scv = (ScrollViewer)sender;
-            List<Message.NotificationClass> readyToSendMessages = new List<Message.NotificationClass>();
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-
+            e.Handled = true;
-            // Evaluate a number of criteria for messages that should not be preselected for sending
-            bool addToSend;
-            foreach (Message message in this.Messages)
-            {
-                addToSend = true;
-
-                // if ((message.ErrorCount ?? 0) > 0) continue; // skip selection if there are any errors left
-
-                switch(message.MessageNotificationClass)
-                {
-                    case NotificationClass.HAZA:
-                        addToSend = XtraSendLogic.ShouldSendMessage(message); break;
-                    case NotificationClass.HAZD:
-                        addToSend = XtraSendLogic.ShouldSendMessage(message); break;
-                    case NotificationClass.BPOL:
-                        if (message.Elements.Count > 0)
-                        {
-                            if (message.Elements[0] is BPOL bpol)
-                            {
-                                if (bpol.PortOfItineraries.Count == 0) addToSend = false;
-                            }                            
-                        }
-                        break;                    
-                    case NotificationClass.WAS_RCPT:
-                        addToSend = false;
-                        break;                    
-                    case NotificationClass.INFO:
-                        if (Core.PoC == "DEHAM") addToSend = false;                        
-                        break;
-                     default:                        
-                        if(Message.IsListClass(message.MessageNotificationClass) && (message.Elements.Count == 0)) addToSend = false;                        
-                        break;
-                }
-
-                if(addToSend)
-                    readyToSendMessages.Add(message.MessageNotificationClass);
-            }
-
-            sicd.Messages = this.Messages;
-            sicd.PreselectedClasses.AddRange(readyToSendMessages);
-            sicd.IsTransit = this.Core.IsTransit;
-            sicd.IsImportMode = false;
-
-            if ((sicd.ShowDialog() ?? false) && (sicd.SelectedClasses.Count > 0))
-            {
-                // now send all selected messages
-                List<Message> toSendMessages = new List<Message>();
-                foreach(NotificationClass notificationClass in sicd.SelectedClasses)
-                {
-                    Message selectedMessage = this.Messages.Find(x => x.MessageNotificationClass == notificationClass);
-                    if (selectedMessage != null)
-                    {
-                        toSendMessages.Add(selectedMessage);
-                    }                    
-                }
-                if (toSendMessages.Count > 0)
-                {
-                    this.SendMessages(toSendMessages);
-                }
-            }
         }
 
         #endregion
-
+        
     }
 }

ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs

@@ -18,13 +18,13 @@ namespace ENI2.DetailViewControls
 
         private Message _pre72hMessage;
 
-        private static readonly string[] hullConfiguration = {
+        private static string[] hullConfiguration = {
             Properties.Resources.textSingleHull,
             Properties.Resources.textSingleHullBallast,
             Properties.Resources.textDoubleHull
         };
 
-        private static readonly string[] conditionCargoTanks =
+        private static string[] conditionCargoTanks =
         {
             Properties.Resources.textFull,
             Properties.Resources.textEmpty,
@@ -116,7 +116,18 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.groupBoxPre72H, HighlightService.HighlightStyle.VIOLATION, this._pre72hMessage);
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
 
     }
 

ENI2/DetailViewControls/PortCallDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <GroupBox Name="portCallGroupBox" Header="{x:Static p:Resources.textPortCall}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="300" />
@@ -92,9 +92,8 @@
                         <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_AgentPhone"  Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_AgentEMail" Margin="0,0,10,0" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textCity}" Name="label_AgentCity" Margin="0,0,10,0" />
-                        <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textFax}" Name="label_AgentFax" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="2" Content="{x:Static p:Resources.textFax}" Name="label_AgentFax" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="2" Content="{x:Static p:Resources.textWasteDisposalServiceProvider}" Margin="0,0,10,0" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textCountry}" Name="label_AgentCountry" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textAgentTemplate}" Name="labelAgentTemplate" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="2" Content="{x:Static p:Resources.textTitle}" Name="labelAgentTemplateTitle" Margin="0,0,10,0" Visibility="Hidden" />
@@ -105,11 +104,10 @@
                         <TextBox Grid.Row="3" Grid.Column="3" Name="textBox_AgentCity" MaxLength="99" Margin="2" Text="{Binding AgentCity, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <TextBox Grid.Row="3" Grid.Column="1" Name="textBox_AgentCountry" MaxLength="99" Margin="2" Text="{Binding AgentCountry, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
                         <TextBox Grid.Row="5" Grid.Column="1" Name="textBox_AgentLastName" MaxLength="99" Margin="2" Text="{Binding AgentLastName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                        <TextBox Grid.Row="5" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                        <TextBox Grid.Row="6" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <TextBox Grid.Row="6" Grid.Column="1" Name="textBox_AgentPhone" MaxLength="99" Margin="2" Text="{Binding AgentPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                        <TextBox Grid.Row="6" Grid.Column="3" Name="textBox_AgentFax" MaxLength="99" Margin="2" Text="{Binding AgentFax, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                        <TextBox Grid.Row="7" Grid.Column="3" Name="textBox_AgentFax" MaxLength="99" Margin="2" Text="{Binding AgentFax, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <TextBox Grid.Row="7" Grid.Column="1" Name="textBox_AgentEMail" MaxLength="99" Margin="2" Text="{Binding AgentEMail, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                        <TextBox Grid.Row="7" Grid.Column="3" Name="textBox_WasteDisposalServiceProvider" MaxLength="99" Margin="2" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         
                         <ComboBox Grid.Row="0" Grid.Column="3" Name="comboBox_AgentTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="AgentTitle" SelectionChanged="comboBox_AgentTemplate_SelectionChanged" />
                         <Grid Grid.Column="2" Grid.Row="1" HorizontalAlignment="Right">

ENI2/DetailViewControls/PortCallDetailControl.xaml.cs

@@ -25,7 +25,6 @@ namespace ENI2.DetailViewControls
 
         private NOA_NOD _noa_nod;
         private AGNT _agnt;
-        private WAS _was;
         private static List<AGNT_Template> _agntTemplates = null;
         private AGNT_Template _currentTemplate;
         private AGNT_Template _undoTemplate;
@@ -69,14 +68,11 @@ namespace ENI2.DetailViewControls
             this.RegisterTextboxChange(this.textBox_AgentStreetAndNumber, Message.NotificationClass.AGNT);
             this.RegisterTextboxChange(this.textBox_AgentCountry, Message.NotificationClass.AGNT);
 
-            // WAS
-            this.RegisterTextboxChange(this.textBox_WasteDisposalServiceProvider, Message.NotificationClass.WAS);
-
             this.buttonSaveTemplate.IsEnabled = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor;
             this.buttonDeleteTemplate.IsEnabled = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor;
         }
 
-        public async override void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
 
@@ -99,16 +95,6 @@ namespace ENI2.DetailViewControls
                         _agnt = new AGNT();
                     this.ControlMessages.Add(aMessage);
                 }
-
-                if(aMessage.MessageNotificationClass == Message.NotificationClass.WAS)
-                {
-                    if (aMessage.Elements.Count > 0)
-                        _was = aMessage.Elements[0] as WAS;
-                    else
-                        _was = new WAS();
-                    this.ControlMessages.Add(aMessage);
-                }
-
             }
 
             this.dateTimePicker_ETAToKielCanal.IsEnabled = this.Core.IsTransit;
@@ -137,13 +123,11 @@ namespace ENI2.DetailViewControls
             this.dateTimePicker_ETDFromLastPort.DataContext = _noa_nod;
             this.dateTimePicker_ETDFromPortOfCall.DataContext = _noa_nod;
 
-            this.textBox_WasteDisposalServiceProvider.DataContext = _was;
-
             this.checkBox_IsAnchored.IsEnabled = this.Core.IsDK;
 
             if(_agntTemplates == null)
             {
-                _agntTemplates = await DBManagerAsync.GetAGNTTemplatesAsync(); // inital full load
+                _agntTemplates = DBManager.Instance.GetAGNTTemplates(); // inital full load
                 _agntTemplates.Sort();
                 Trace.WriteLine(string.Format("{0} agent templates loaded", _agntTemplates.Count));
             }
@@ -258,6 +242,17 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
         #region AGNT templates combo
 
         private void comboBox_AgentTemplate_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -284,7 +279,7 @@ namespace ENI2.DetailViewControls
                     DBManager.Instance.Delete(_currentTemplate);
                     _agntTemplates.Remove(_currentTemplate);
                     this.textBoxTemplateTitle.Text = null;
-                    this.buttonDeleteTemplate.IsEnabled = false;
+                    this.buttonDeleteTemplate.IsEnabled = false;                    
                     this.comboBox_AgentTemplate.ItemsSource = _agntTemplates;
                     this.buttonSetTemplate.IsEnabled = false;
                 }
@@ -353,8 +348,6 @@ namespace ENI2.DetailViewControls
             this.textBox_AgentPostalCode.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentStreetAndNumber.Text = this._undoTemplate.AgentStreetAndNumber;
             this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
-            this.textBox_WasteDisposalServiceProvider.Text = this._undoTemplate.WasteDisposalServiceProviderName;
-            this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();
 
             this.buttonUndoTemplate.IsEnabled = false; // can't undo after undo
         }
@@ -363,13 +356,6 @@ namespace ENI2.DetailViewControls
         {
             if (this._currentTemplate == null) return;
 
-            // confirm overwrite of waste disposal service provider
-            if (this.textBox_WasteDisposalServiceProvider.Text.Length > 0)
-            {
-                string message = string.Format(Properties.Resources.textConfirmWSDPOverwrite, this.textBox_WasteDisposalServiceProvider.Text, this._currentTemplate.WasteDisposalServiceProviderName);
-                if (MessageBox.Show(message, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No) { return; }
-            }
-
             this._undoTemplate = createFromCurrentText(null, null);
 
             this.textBox_AgentCity.Text = this._currentTemplate.AgentCity;
@@ -381,7 +367,7 @@ namespace ENI2.DetailViewControls
             this.textBox_AgentEMail.Text = this._currentTemplate.AgentEMail;
             this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFax.Text = this._currentTemplate.AgentFax;
-            this.textBox_AgentFax.GetBindingExpression (TextBox.TextProperty).UpdateSource();
+            this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFirstName.Text = this._currentTemplate.AgentFirstName;
             this.textBox_AgentFirstName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentLastName.Text = this._currentTemplate.AgentLastName;
@@ -392,11 +378,6 @@ namespace ENI2.DetailViewControls
             this.textBox_AgentPostalCode.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentStreetAndNumber.Text = this._currentTemplate.AgentStreetAndNumber;
             this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
-            if ((this._currentTemplate.WasteDisposalServiceProviderName ?? "").Trim() != (this.textBox_WasteDisposalServiceProvider.Text ?? "").Trim())
-            {
-                this.textBox_WasteDisposalServiceProvider.Text = this._currentTemplate.WasteDisposalServiceProviderName;
-                this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();
-            }
 
             this.buttonUndoTemplate.IsEnabled = true;
             this.buttonSetTemplate.IsEnabled = false;
@@ -410,7 +391,7 @@ namespace ENI2.DetailViewControls
             AGNT_Template at = new AGNT_Template();
             if (existingTemplate != null)
                 at = existingTemplate;
-
+            
             at.AgentTitle = title;
             at.AgentCity = this.textBox_AgentCity.Text;
             at.AgentCompanyName = this.textBox_AgentCompanyName.Text;
@@ -422,7 +403,6 @@ namespace ENI2.DetailViewControls
             at.AgentPhone = this.textBox_AgentPhone.Text;
             at.AgentPostalCode = this.textBox_AgentPostalCode.Text;
             at.AgentStreetAndNumber = textBox_AgentStreetAndNumber.Text;
-            at.WasteDisposalServiceProviderName = textBox_WasteDisposalServiceProvider.Text;
 
             return at;
         }

ENI2/DetailViewControls/PortNotificationDetailControl.xaml

@@ -19,16 +19,14 @@
             <col:DictionaryEntry Key="SeaGo BHV" Value="2" />
             <col:DictionaryEntry Key="SeaGo WHV" Value="4" />
             <col:DictionaryEntry Key="Hoegh BHV" Value="8" />
-            <col:DictionaryEntry Key="Elbe Bulk" Value="16" />
-            <col:DictionaryEntry Key="Fct Junge" Value="32" />
         </col:ArrayList>
     </UserControl.Resources>
     <GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="50" />
-                    <RowDefinition Height="194" />
+                    <RowDefinition Height="220" />
                     <RowDefinition Height="200" />
                     <RowDefinition Height="200" />
                 </Grid.RowDefinitions>
@@ -36,12 +34,10 @@
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="4*" />
+                            <ColumnDefinition Width="5*" />
-                            <ColumnDefinition Width="1*" />
                         </Grid.ColumnDefinitions>
                         <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textNameMaster}" Name="label_nameMaster" Margin="0,0,10,0"/>
                         <TextBox Grid.Row="0" Grid.Column="1" Name="textBox_NameMaster" MaxLength="100" Margin="2" Text="{Binding NameOfMaster, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" VerticalAlignment="Center"/>
-                        <Button x:Name="buttonCopyNameFromCREWA" Grid.Row="0" Grid.Column="2" Margin="2" Content="{x:Static p:Resources.textCopyFromCREWA}" Click="buttonCopyNameFromCREWA_Click"/>
                     </Grid>
                 </GroupBox>
                 <GroupBox Name="infoGroupBox" Header="{x:Static p:Resources.textInfo}" Grid.Row="1" Margin="0,5,0,5">
@@ -59,84 +55,32 @@
                             <RowDefinition Height="26" />
                             <RowDefinition Height="26" />
                             <RowDefinition Height="26" />
+                            <RowDefinition Height="26" />
                         </Grid.RowDefinitions>
                         <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textShippingArea}" Name="label_INFOShippingArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        
+                        <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textMaerskSeago}" Name="label_MaerskSeaGo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textPortArea}" Name="label_INFOPortArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        
                         <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textRequestedPositionInPortOfCall}" Name="label_INFORequestedBerth" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textBowThrusterPower}" Name="label_INFOBowThrusterPower" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textSternThrusterPower}" Name="label_INFOSternThrusterPower" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <ComboBox Grid.Row="0" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
-                        
+                        <ComboBox Grid.Row="0" Grid.Column="3" x:Name="comboBoxGroup" Margin="0,2,4,2" ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectionChanged="comboBoxGroup_SelectionChanged"/>
-                        <Grid Grid.Row="1" Grid.Column="1">
+                        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="110" />
-                            </Grid.ColumnDefinitions>
-                            <ComboBox Grid.Column="0" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
-                            <Button Grid.Column="1" x:Name="buttonSearchPortArea" Margin="2" Content="Lookup port area" Click="buttonSearchPortArea_Click" />
-                        </Grid>
-                        
                         <TextBox Grid.Row="2" Grid.Column="1" Name="textRequestedPostionInPortOfCall" Margin="2" Text="{Binding RequestedPositionInPortOfCall, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <TextBox Grid.Row="3" Grid.Column="1" Name="textBowThrusterPower" Margin="2" Text="{Binding BowThrusterPower, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <TextBox Grid.Row="4" Grid.Column="1" Name="textSternThrusterPower" Margin="2" Text="{Binding SternThrusterPower, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <CheckBox Grid.Row="5" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
-                        <xctk:DoubleUpDown Grid.Row="0" Grid.Column="3" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
+                        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
-                        <TextBox Grid.Row="1" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top" />
+                        <TextBox Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                        <TextBox Grid.Row="3" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top"/>
+                        <TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     </Grid>
                 </GroupBox>
                 <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="2">
-                    <Grid>
+                    <enictrl:ENIDataGrid x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="28" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid Grid.Row="0">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width=".1*" />
-                                <ColumnDefinition Width=".2*" />
-                                <ColumnDefinition Width="26" />
-                                <ColumnDefinition Width="26" />
-                                <ColumnDefinition Width="26" />
-                                <ColumnDefinition Width="26" />
-                                <ColumnDefinition Width="26" />
-                                
-                                <ColumnDefinition Width=".2*" />
-                            </Grid.ColumnDefinitions>
-                            <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textSERVTemplate}" Name="label_MaerskSeaGo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                            <ComboBox Grid.Row="0" Grid.Column="1" x:Name="comboBoxGroup" Margin="2,2,4,2"  DisplayMemberPath="ServiceName"
-                                      SelectionChanged="comboBoxGroup_SelectionChanged" ContextMenu="{DynamicResource ClearContextMenu}" />
-                            <Button Name="buttonSetTemplate" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" Grid.Column="2"
-                                    ToolTip="Apply template" HorizontalContentAlignment="Right" IsEnabled="False">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="../Resources/check.png" Margin="0,0,0,0" Height="20" Width="20" />
-                                </StackPanel>
-                            </Button>
-                            
-                            <Button Name="buttonEditTemplate" Grid.Column="4" Grid.Row="0" Margin="2"  Click="buttonEditTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Edit template">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="../Resources/pencil.png" Margin="0,0,0,0" Height="20" Width="20" />
-                                </StackPanel>
-                            </Button>
-                            <Button Name="buttonNewTemplate" Grid.Column="5" Grid.Row="0" Margin="2"  Click="buttonNewTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="New template">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="../Resources/document_plain_new.png" Margin="0,0,0,0" Height="20" Width="20" />
-                                </StackPanel>
-                            </Button>
-                            <Button Name="buttonDeleteTemplate" Grid.Column="6" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="../Resources/delete.png" Margin="0,0,0,0" Height="20" Width="20" />
-                                </StackPanel>
-                            </Button>
-
-                        </Grid>
-                    <enictrl:ENIDataGrid Grid.Row="1" x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -145,7 +89,7 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textServiceInvoiceRecipient}" Binding="{Binding ServiceInvoiceRecipient, Mode=TwoWay}" IsReadOnly="True" Width="0.4*" />
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
-                    </Grid>
+
                 </GroupBox>
                 <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="3">
                     <enictrl:ENIDataGrid x:Name="dataGridLADG" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
@@ -156,27 +100,8 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textLACodes}" Binding="{Binding CargoLACode, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textCargoCodeNST}" Binding="{Binding CargoCodeNST, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textCargoCodeNST3}" Binding="{Binding CargoCodeNST_3, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
-
+                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoNumberOfItems}" Binding="{Binding CargoNumberOfItems, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoNumberOfItems}" IsReadOnly="False" Width="0.15*">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoGrossQuantity}" Binding="{Binding CargoGrossQuantity_TNE, Mode=TwoWay, StringFormat={}{0:N3}}" IsReadOnly="True" Width="0.15*" />
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="CargoNumberOfItems" Mode="TwoWay">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="9999999" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
-                            
-                            <DataGridTextColumn Header="{x:Static p:Resources.textCargoGrossQuantity}" IsReadOnly="False" Width="0.15*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="CargoGrossQuantity_TNE" Mode="TwoWay" StringFormat="N3">
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="1000000" MinValue="0" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
-
                             <DataGridTextColumn Header="{x:Static p:Resources.textCargoPortOfLoading}" Binding="{Binding PortOfLoading, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textCargoPortOfDischarge}" Binding="{Binding PortOfDischarge, Mode=TwoWay}" IsReadOnly="True" Width="0.15*" />
                         </DataGrid.Columns>

ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs

@@ -1,6 +1,4 @@
-// Copyright (c) 2017- schick Informatik
+// Copyright (c) 2017 schick Informatik
-// Description:
-//
 
 // Description: Detailansicht Gruppe Port Notification
 //
@@ -8,7 +6,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -16,8 +13,6 @@ using ENI2.EditControls;
 using ENI2.Util;
 
 using bsmd.database;
-using System.Threading.Tasks;
-using System.Diagnostics;
 
 namespace ENI2.DetailViewControls
 {
@@ -27,18 +22,10 @@ namespace ENI2.DetailViewControls
     public partial class PortNotificationDetailControl : DetailBaseControl
     {
 
-        #region Fields
-
         private Message _nameMessage;
         private Message _infoMessage;
         private Message _servMessage;
         private Message _ladgMessage;
-        private Message _crewaMessage;
-        private Dictionary<string, string> portAreas = null;
-        private static List<SERV_Template> _servTemplates = null;
-        private SERV_Template _currentTemplate;        
-
-        #endregion
 
         private static readonly string[] shippingAreas = {
             Properties.Resources.textShippingAreaNORTHBALTIC,
@@ -65,10 +52,10 @@ namespace ENI2.DetailViewControls
             this.RegisterDoubleUpDownChange(this.doubleUpDownDisplacementSummerDraught, Message.NotificationClass.INFO);
             this.RegisterTextboxChange(this.textSpecialRequirements, Message.NotificationClass.INFO);
             this.RegisterTextboxChange(this.textConstructionCharacteristics, Message.NotificationClass.INFO);
-            this.dataGridLADG.CellEditEnding += (obj, ev) => { this.OnNotificationClassChanged(Message.NotificationClass.LADG); };
+
         }
 
-        public override async void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
 
@@ -78,7 +65,6 @@ namespace ENI2.DetailViewControls
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.INFO) { this._infoMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.SERV) { this._servMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.LADG) { this._ladgMessage = aMessage; this.ControlMessages.Add(aMessage); }
-                if(aMessage.MessageNotificationClass == Message.NotificationClass.CREWA) { this._crewaMessage = aMessage;}
             }
 
             #region init NAME
@@ -123,11 +109,11 @@ namespace ENI2.DetailViewControls
                 _infoMessage.Elements.Add(info);
             }
 
-            portAreas = LocalizedLookup.getPortAreasForLocode(this.Core.PoC);
+            Dictionary<string, string> portAreas = LocalizedLookup.getPortAreasForLocode(this.Core.PoC);
             this.comboBoxPortArea.ItemsSource = portAreas;
 
             this.comboBoxShippingArea.ItemsSource = shippingAreas;
-            this.infoGroupBox.DataContext = info;
+            this.infoGroupBox.DataContext = info;            
 
 
 
@@ -165,38 +151,27 @@ namespace ENI2.DetailViewControls
             this.dataGridLADG.DeleteRequested += DataGridLADG_DeleteRequested;
             this.dataGridLADG.CreateRequested += DataGridLADG_CreateRequested;
 
-            #endregion            
-
-            #region init SERV templates
-
-            if(_servTemplates == null)
-            {
-                _servTemplates = await DBManagerAsync.GetSERVTemplatesAsync(); // initial load
-                _servTemplates.Sort();
-                Trace.WriteLine($"{_servTemplates.Count} SERV templates loaded");                
-            }
-
-            this.comboBoxGroup.ItemsSource = _servTemplates;
-
-            this.buttonDeleteTemplate.Visibility = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor ? Visibility.Visible : Visibility.Hidden;
-            this.buttonEditTemplate.Visibility = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor ? Visibility.Visible : Visibility.Hidden;
-            this.buttonNewTemplate.Visibility = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor ? Visibility.Visible : Visibility.Hidden;
-
             #endregion
 
+            #region init helper Maersk / SeaGo Field
+
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.comboBoxGroup.SelectedIndex = 1;
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.comboBoxGroup.SelectedIndex = 2;
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.comboBoxGroup.SelectedIndex = 3;
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.comboBoxGroup.SelectedIndex = 4;
+
+            #endregion
         }
 
         #region datagrid LADG
 
         private void DataGridLADG_CreateRequested()
-        {
+        {            
-            this.dataGridLADG.CancelEdit();
-            this.dataGridLADG.CancelEdit();
             EditLADGDialog eld = new EditLADGDialog();
             eld.LADG = new LADG();
             eld.LADG.MessageHeader = _ladgMessage;
             eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);
-            eld.Core = this.Core;
+            eld.Core = this.Core;                        
 
             eld.AddClicked += () =>
             {
@@ -204,7 +179,7 @@ namespace ENI2.DetailViewControls
                 if (!this._ladgMessage.Elements.Contains(eld.LADG))
                     this._ladgMessage.Elements.Add(eld.LADG);
                 this.dataGridLADG.Items.Refresh();
-
+                               
                 eld.LADG = new LADG();
                 eld.LADG.MessageHeader = _ladgMessage;
                 eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);
@@ -213,7 +188,7 @@ namespace ENI2.DetailViewControls
 
             if (eld.ShowDialog() ?? false)
             {
-                if(!_ladgMessage.Elements.Contains(eld.LADG))
+                if(!_ladgMessage.Elements.Contains(eld.LADG))                                
                     _ladgMessage.Elements.Add(eld.LADG);
                 this.dataGridLADG.Items.Refresh();
                 this.SublistElementChanged(Message.NotificationClass.LADG);
@@ -224,8 +199,6 @@ namespace ENI2.DetailViewControls
         {
             if (obj is LADG ladg)
             {
-                this.dataGridLADG.CancelEdit();
-                this.dataGridLADG.CancelEdit();
                 // are you sure dialog is in base class
                 this._ladgMessage.Elements.Remove(ladg);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(ladg);
@@ -237,9 +210,6 @@ namespace ENI2.DetailViewControls
 
         private void DataGridLADG_EditRequested(DatabaseEntity obj)
         {
-            this.dataGridLADG.CancelEdit();
-            this.dataGridLADG.CancelEdit();
-
             LADG ladg = obj as LADG;
 
             EditLADGDialog eld = new EditLADGDialog();
@@ -254,7 +224,7 @@ namespace ENI2.DetailViewControls
                 this.dataGridLADG.Items.Refresh();
 
                 eld.LADG = new LADG();
-                eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);
+                eld.LADG.Identifier = LADG.GetNewIdentifier(_ladgMessage.Elements);                
                 eld.LADG.MessageHeader = _ladgMessage;
                 this.SublistElementChanged(Message.NotificationClass.LADG);
             };
@@ -279,7 +249,7 @@ namespace ENI2.DetailViewControls
         #region datagrid SERV
 
         private void DataGridSERV_CreateRequested()
-        {
+        {            
             EditSERVDialog esd = new EditSERVDialog();
             esd.SERV = new SERV();
             esd.SERV.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
@@ -289,7 +259,7 @@ namespace ENI2.DetailViewControls
             {
                 esd.CopyValuesToEntity();
                 if(!_servMessage.Elements.Contains(esd.SERV))
-                    _servMessage.Elements.Add(esd.SERV);
+                    _servMessage.Elements.Add(esd.SERV);                
                 this.dataGridSERV.Items.Refresh();
                 esd.SERV = new SERV();
                 esd.SERV.MessageHeader = _servMessage;
@@ -320,7 +290,7 @@ namespace ENI2.DetailViewControls
         }
 
         private void DataGridSERV_EditRequested(DatabaseEntity obj)
-        {
+        {            
             EditSERVDialog esd = new EditSERVDialog();
             esd.SERV = obj as SERV;
 
@@ -332,7 +302,7 @@ namespace ENI2.DetailViewControls
                 this.dataGridSERV.Items.Refresh();
 
                 esd.SERV = new SERV();
-                esd.SERV.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
+                esd.SERV.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);                
                 esd.SERV.MessageHeader = _servMessage;
                 this.SublistElementChanged(Message.NotificationClass.SERV);
             };
@@ -357,7 +327,7 @@ namespace ENI2.DetailViewControls
 
         public override void HighlightErrorMessageContainer()
         {
-            if (this._nameMessage.HasErrors)
+            if (this._nameMessage.HasErrors)            
                 HighlightService.HighlightControl(this.nameGroupBox, HighlightService.HighlightStyle.ERROR, this._nameMessage);
             if (this._infoMessage.HasErrors)
                 HighlightService.HighlightControl(this.infoGroupBox, HighlightService.HighlightStyle.ERROR, this._infoMessage);
@@ -379,143 +349,114 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.ladgGroupBox, HighlightService.HighlightStyle.VIOLATION, this._ladgMessage);
         }
 
-        #endregion        
+        #endregion
 
-        #region SERV template event handler
+        #region mouse wheel
 
-        private void comboBoxGroup_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
         {
-            if(this.comboBoxGroup.SelectedItem is SERV_Template st)
+            ScrollViewer scv = (ScrollViewer)sender;
-            {                
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
-                this.buttonDeleteTemplate.IsEnabled = true;
+            e.Handled = true;
-                this.buttonSetTemplate.IsEnabled = true;
-                this._currentTemplate = st;
-            }
-        }
-
-        private void buttonSetTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.comboBoxGroup.SelectedItem is SERV_Template st)
-            {
-                bool found = false;
-                foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
-                {
-                    if (serv.ServiceName.Equals(st.ServiceName))
-                    {
-                        found = true; break;
-                    }
-                }
-
-                if (!found)
-                {
-                    SERV newServ = new SERV();
-                    newServ.ServiceName = st.ServiceName;
-                    newServ.ServiceBeneficiary = st.ServiceBeneficiary;
-                    newServ.ServiceInvoiceRecipient = st.ServiceInvoiceRecipient;
-
-                    newServ.MessageHeader = this._servMessage;
-                    newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
-                    this._servMessage.Elements.Add(newServ);
-                    this.dataGridSERV.Items.Refresh();
-                    this.SublistElementChanged(Message.NotificationClass.SERV);
-                }
-            }
-        }
-
-        private void buttonNewTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            SERV_Template newTemplate = new SERV_Template();
-            EditSERVDialog esd = new EditSERVDialog();
-            esd.AddVisible = false;
-            esd.SERV_Template = newTemplate;
-            if(esd.ShowDialog() ?? false)
-            {
-                _ = DBManagerAsync.SaveAsync(esd.SERV_Template);
-                this.comboBoxGroup.ItemsSource = null;
-                _servTemplates.Add(newTemplate);
-                _servTemplates.Sort();
-                this.comboBoxGroup.ItemsSource = _servTemplates;
-            }
-        }
-
-        private void buttonEditTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.comboBoxGroup.SelectedItem is SERV_Template st)
-            {
-                EditSERVDialog editSERVDialog = new EditSERVDialog();
-                editSERVDialog.AddVisible = false;
-                editSERVDialog.SERV_Template = st;
-                if (editSERVDialog.ShowDialog() ?? false)
-                {
-                    _ = DBManagerAsync.SaveAsync(st);
-                    this.comboBoxGroup.ItemsSource = null;
-                    _servTemplates.Sort();
-                    this.comboBoxGroup.ItemsSource = _servTemplates;
-                }
-            }            
-        }        
-
-        private void buttonDeleteTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            if (_currentTemplate != null)
-            {
-                if (MessageBox.Show("Delete this template?", "Confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-                {
-                    this.comboBoxGroup.SelectedItem = null;
-                    this.comboBoxGroup.ItemsSource = null;
-                    _ = DBManagerAsync.DeleteAsync(_currentTemplate);
-                    _servTemplates.Remove(_currentTemplate);                    
-                    this.buttonDeleteTemplate.IsEnabled = false;
-                    this.comboBoxGroup.ItemsSource = _servTemplates;
-                    this.buttonSetTemplate.IsEnabled = false;
-                }
-            }
         }
 
         #endregion
 
-        #region other event handler
+        #region Spezialbalkon für die Gruppenauswahl im Core (Maersk BHV / Seago usw.)
 
-        private void buttonSearchPortArea_Click(object sender, RoutedEventArgs e)
+        private void comboBoxGroup_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (portAreas != null)
+            // clear all
+            this.Core.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
+            this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
+            this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
+            this.Core.SetFlag(false, MessageCore.CoreFlags.HOEGH);
+
+            DictionaryEntry selectedItem = (DictionaryEntry) this.comboBoxGroup.SelectedItem;
+            if(Int32.TryParse((string)selectedItem.Value, out int selectedValue))
             {
-                SelectPortAreaDialog spad = new SelectPortAreaDialog(this.Core.PoC);
+                if (selectedValue == (int)MessageCore.CoreFlags.MAERSK_BHV) CheckServiceEntryMaerskBHV();
-                if (spad.ShowDialog() ?? false)
+                if (selectedValue == (int)MessageCore.CoreFlags.SEAGO_BHV) CheckServiceEntrySeaGoBHV();
-                {
+                if (selectedValue == (int)MessageCore.CoreFlags.HOEGH) CheckServiceEntryHoegh();
-                    if (spad.SelectedArea != null)
+                this.Core.SetFlag(true, (MessageCore.CoreFlags)selectedValue);
-                    {
+                DBManager.Instance.Save(this.Core);
-                        if (portAreas.ContainsKey(spad.SelectedArea))
+            }                                                    
-                        {
+        }
-                            var pair = portAreas.SingleOrDefault(p => p.Key == spad.SelectedArea);
+
-                            this.comboBoxPortArea.SelectedItem = pair;
+        #endregion
-                        }
+
-                    }
+        #region special entry ship service check
-                }
+
+        private void CheckServiceEntryMaerskBHV()
+        {
+            bool found = false;
+            foreach(SERV serv in this._servMessage.Elements)
+            {
+                if (serv.ServiceBeneficiary.Equals("Maersk A/S, Esplanaden 50, DK-1263 Copenhagen K, VAT-ID: DK53139655"))
+                    found = true;
+            }
+
+            if(!found)
+            {
+                SERV newServ = new SERV();
+                newServ.ServiceBeneficiary = "Maersk A/S, Esplanaden 50, DK-1263 Copenhagen K, VAT-ID: DK53139655";
+                newServ.ServiceInvoiceRecipient = "Maersk Deutschland A/S & Co.KG, Ericusspitze 2-4, 20457 Hamburg";
+                newServ.ServiceName = "Maersk BHV";
+                newServ.MessageHeader = this._servMessage;
+                newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
+                this._servMessage.Elements.Add(newServ);
+                this.dataGridSERV.Items.Refresh();
+                this.SublistElementChanged(Message.NotificationClass.SERV);
+            }            
+        }
+
+        private void CheckServiceEntrySeaGoBHV()
+        {
+            bool found = false;
+            foreach (SERV serv in this._servMessage.Elements)
+            {
+                if (serv.ServiceBeneficiary.Equals("Sealand Europe A/S, Dampfaergevej 10, 3.tv, DK- 2100 Copenhagen, VAT-ID: DK53139655"))
+                    found = true;
+            }
+
+            if (!found)
+            {
+                SERV newServ = new SERV();
+                newServ.ServiceBeneficiary = "Sealand Europe A/S, Dampfaergevej 10, 3.tv, DK- 2100 Copenhagen, VAT-ID: DK53139655";
+                newServ.ServiceInvoiceRecipient = "Maersk Deutschland A/S & Co. KG on behalf of Sealand Europe A/S, Ericusspitze 2-4, 20457 Hamburg";
+                newServ.ServiceName = "SeaGo BHV";
+                newServ.MessageHeader = this._servMessage;
+                newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
+                this._servMessage.Elements.Add(newServ);
+                this.dataGridSERV.Items.Refresh();
+                this.SublistElementChanged(Message.NotificationClass.SERV);
             }
         }
 
-        private void buttonCopyNameFromCREWA_Click(object sender, RoutedEventArgs e)
+        private void CheckServiceEntryHoegh()
         {
-            CREW crewA = null;
+            bool found = false;
-            if (this._crewaMessage.Elements.Count > 0)
+            foreach (SERV serv in this._servMessage.Elements)
             {
-                crewA = this._crewaMessage.Elements[0] as CREW;
+                if (serv.ServiceBeneficiary.Equals("Höegh Autoliners AS, Oslo, Norway"))
+                    found = true;
             }
 
-            SelectCrewMemberDialog scmd = new SelectCrewMemberDialog();
+            if (!found)
-            scmd.CREW = crewA;
-            scmd.AddVisible = false;
-
-            if (scmd.ShowDialog() ?? false)
             {
-                this.textBox_NameMaster.Text = $"{crewA.CrewMemberFirstName} {crewA.CrewMemberLastName}";
+                SERV newServ = new SERV();
-                this.SublistElementChanged(Message.NotificationClass.NAME);
+                newServ.ServiceBeneficiary = "Höegh Autoliners AS, Oslo, Norway";
-                var binding = textBox_NameMaster.GetBindingExpression(TextBox.TextProperty);
+                newServ.ServiceInvoiceRecipient = " PWL Port Services GmbH & Co. KG";
-                binding?.UpdateSource();
+                newServ.ServiceName = "HOEGH BHV";
+                newServ.MessageHeader = this._servMessage;
+                newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
+                this._servMessage.Elements.Add(newServ);
+                this.dataGridSERV.Items.Refresh();
+                this.SublistElementChanged(Message.NotificationClass.SERV);
             }
         }
 
+
         #endregion
 
     }

ENI2/DetailViewControls/SecurityDetailControl.xaml.cs

@@ -116,12 +116,6 @@ namespace ENI2.DetailViewControls
 
         }
 
-        public override int SelectedTabIndex
-        {
-            get { return this.mainFrame.SelectedIndex; }
-            set { this.mainFrame.SelectedIndex = value; }
-        }
-
         #region SetEnabled
 
         public override void SetEnabled(bool enabled)
@@ -508,7 +502,18 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.secGroupBox, HighlightService.HighlightStyle.VIOLATION, this._secMessage);
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
         
     }
 }

ENI2/DetailViewControls/ShipDataDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <GroupBox Name="shipDataGroupBox" Header="{x:Static p:Resources.textShipData}" >
-        
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="260" />
@@ -104,6 +104,6 @@
                     </Grid>
                 </GroupBox>
             </Grid>
-        
+        </ScrollViewer>
     </GroupBox>
 </src:DetailBaseControl>

ENI2/DetailViewControls/ShipDataDetailControl.xaml.cs

@@ -5,8 +5,10 @@
 using System.Windows;
 
 using bsmd.database;
+using ENI2.EditControls;
+using System.Windows.Media;
 using ENI2.Util;
-
+using System.Windows.Controls;
 
 namespace ENI2.DetailViewControls
 {
@@ -102,7 +104,18 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.shipDataGroupBox, HighlightService.HighlightStyle.VIOLATION, this._statMessage);
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
 
     }
 }

ENI2/DetailViewControls/TowageDetailControl.xaml.cs

@@ -71,7 +71,7 @@ namespace ENI2.DetailViewControls
 
         private void copyItemToTOWA(object sender, RoutedEventArgs e)
         {
-            // aus dem aktuell selektierten TOWD Element ein neues TOWA Element machen
+            // aus dem aktuell selektierten TOWA Element ein neues TOWD Element machen
             if (this.dataGridTowageOnDeparture.SelectedItems != null)
             {
                 foreach (TOWD selectedTOWD in this.dataGridTowageOnDeparture.SelectedItems)
@@ -166,7 +166,8 @@ namespace ENI2.DetailViewControls
 
         private void DataGridTowageOnDeparture_DeleteRequested(DatabaseEntity obj)
         {
-            if (obj is TOWD towd)
+            TOWD towd = obj as TOWD;
+            if (towd != null)
             {
                 // are you sure dialog is in base class
                 this._towdMessage.Elements.Remove(towd);
@@ -244,7 +245,8 @@ namespace ENI2.DetailViewControls
 
         private void DataGridTowageOnArrival_DeleteRequested(DatabaseEntity obj)
         {
-            if (obj is TOWA towa)
+            TOWA towa = obj as TOWA;
+            if (towa != null)
             {
                 // are you sure dialog is in base class
                 this._towaMessage.Elements.Remove(towa);
@@ -308,7 +310,18 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.groupBoxTowageOnDeparture, HighlightService.HighlightStyle.VIOLATION, this._towdMessage);
         }
 
-        #endregion        
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
 
     }
 }

ENI2/DetailViewControls/WasteDetailControl.xaml

@@ -45,7 +45,7 @@
                             <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textValidExemption}" Name="label_ValidExemption" Margin="0,0,10,0"/>
                             <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness, Mode=TwoWay}" />
                             <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption, Mode=TwoWay}" />
-                            
+                            <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlNextWastePort" LocodeValue="{Binding NextWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
                             <DatePicker Grid.Row="1" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/1800" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
                                 <DatePicker.BlackoutDates>
                                     <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
@@ -53,9 +53,7 @@
                                 </DatePicker.BlackoutDates>
                             </DatePicker>
                             <enictrl:LocodeControl Grid.Row="2" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
-                            <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlNextWastePort" LocodeValue="{Binding NextWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
                             <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="2" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" Margin="2" />
-                            
                             <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
                             <Button Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
                         </Grid>
@@ -153,12 +151,10 @@
                     </enictrl:ENIDataGrid>
                     <Grid Grid.Row="1">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="120" />
                             <ColumnDefinition Width="120" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
                         <Button Grid.Row="0" Grid.Column="0" Name="buttonWasteReceivedAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonWasteReceivedAddMissingEntries_Click"/>
-                        <Button Grid.Row="0" Grid.Column="1" Name="buttonCopyFromWAS" Content="{x:Static p:Resources.textCopyFromWAS}" Margin="2" Click="buttonCopyFromWAS_Click"/>
                     </Grid>
                     <enictrl:ENIDataGrid x:Name="dataGridWasteReceived" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="2" CanUserAddRows="False">
@@ -166,7 +162,7 @@
                             <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding WasteDescription}" IsReadOnly="True" Width="0.3*" />
-                            <!--DataGridTemplateColumn IsReadOnly="True" Width="0.15*">
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.15*">
                                 <DataGridTemplateColumn.HeaderTemplate>
                                     <DataTemplate>
                                         <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textAmountWasteReceived_MTQ}" FontSize="10"/>
@@ -177,16 +173,7 @@
                                         <TextBlock TextAlignment="Center" Text="{Binding AmountWasteReceived_MTQ, StringFormat={}{0:N3}}" />
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn-->
+                            </DataGridTemplateColumn>
-                            <DataGridTextColumn Header="{x:Static p:Resources.textAmountWasteReceived_MTQ}" IsReadOnly="False" Width="0.15*">
-                                <DataGridTextColumn.Binding>
-                                    <Binding Path="AmountWasteReceived_MTQ" Mode="TwoWay" StringFormat="N3" >
-                                        <Binding.ValidationRules>
-                                            <util:NumberValidationRule MaxValue="10000" MinValue="0" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </DataGridTextColumn.Binding>
-                            </DataGridTextColumn>
                         </DataGrid.Columns>
 
                     </enictrl:ENIDataGrid>

ENI2/DetailViewControls/WasteDetailControl.xaml.cs

@@ -22,14 +22,17 @@ namespace ENI2.DetailViewControls
     public partial class WasteDetailControl : DetailBaseControl
     {
 
-        #region Fields
-
         private Message _wasMessage;
         private WAS _was;
         private Message _wasRcptMessage;
         private WAS_RCPT _selectedWAS_RCPT;
 
-        #endregion
+        private static readonly string[] _wasteDeliveryList =
+        {
+            "ALL",
+            "SOME",
+            "NONE"
+        };
 
         public WasteDetailControl()
         {
@@ -44,9 +47,9 @@ namespace ENI2.DetailViewControls
             this.RegisterLocodeChange(this.locodeCtrlNextWastePort, Message.NotificationClass.WAS);
             this.RegisterCheckboxChange(this.checkBoxAccurateCorrectDetails, Message.NotificationClass.WAS);
             this.RegisterCheckboxChange(this.checkBoxValidExemption, Message.NotificationClass.WAS);
-            this.RegisterDatePickerChange(this.datePickerDateLastDisposal, Message.NotificationClass.WAS);
+            this.RegisterDatePickerChange(this.datePickerDateLastDisposal, Message.NotificationClass.WAS);            
             this.RegisterTextboxChange(this.textBoxWasteDisposalServiceProviders, Message.NotificationClass.WAS);
-            this.dataGridWasteReceived.CellEditEnding += (obj, ev) => { this.SublistElementChanged(Message.NotificationClass.WAS_RCPT); };
+            
         }
 
         private void CheckBoxValidExemption_Checked(object sender, RoutedEventArgs e)
@@ -75,7 +78,7 @@ namespace ENI2.DetailViewControls
                     WasteCapacity_MTQ = 0,
                     WasteDescription = "",
                     WasteDisposalAmount_MTQ = 0,
-                    WasteDisposalPort = "ZZUKN"
+                    WasteDisposalPort = "ZZUKN"                    
                 };
                 this._was.Waste.Add(newWaste);
             }
@@ -121,7 +124,7 @@ namespace ENI2.DetailViewControls
                 was.MessageCore = this.Core;
                 was.MessageHeader = this._wasMessage;
                 _wasMessage.Elements.Add(was);
-            }
+            } 
             else
             {
                 // remove "old" Waste Entries from display (not deleted in the DB!)
@@ -129,14 +132,14 @@ namespace ENI2.DetailViewControls
                 {
                     if (was.Waste[i].WasteType > 999)
                         was.Waste.RemoveAt(i);
-                }
+                }                
             }
 
             this.wasGroupBox.DataContext = was;
             this._was = was;
 
             this.dataGridWaste.Initialize();
-            this.dataGridWaste.ItemsSource = was.Waste;
+            this.dataGridWaste.ItemsSource = was.Waste;            
             this.dataGridWaste.AddingNewItem += DataGridWaste_AddingNewItem;
             this.dataGridWaste.EditRequested += DataGridWaste_EditRequested;
             this.dataGridWaste.DeleteRequested += DataGridWaste_DeleteRequested;
@@ -177,12 +180,6 @@ namespace ENI2.DetailViewControls
 
         }
 
-        public override int SelectedTabIndex
-        {
-            get { return this.mainFrame.SelectedIndex; }
-            set { this.mainFrame.SelectedIndex = value; }
-        }
-
         #region Waste receipt grid event handler
 
         private void DataGridWasteReceipt_CreateRequested()
@@ -213,11 +210,9 @@ namespace ENI2.DetailViewControls
                 this.dataGridWasteReceipt.Items.Refresh();
                 this.dataGridWasteReceipt.SelectedItem = epd.WAS_RCPT;
                 this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
-                this.dataGridWasteReceived.ItemsSource = null;
+                this.dataGridWasteReceived.ItemsSource = null;                
                 dataGridWasteReceipt_SelectionChanged(this, null);
             }
-
-         
         }
 
         private void DataGridWasteReceipt_DeleteRequested(DatabaseEntity obj)
@@ -259,11 +254,10 @@ namespace ENI2.DetailViewControls
                 if (!_wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
                     _wasRcptMessage.Elements.Add(epd.WAS_RCPT);
             }
-            this.dataGridWasteReceipt.SelectedItem = epd.WAS_RCPT;
+            this.dataGridWasteReceipt.SelectedItem = epd.WAS_RCPT;            
             this.dataGridWasteReceipt.Items.Refresh();
             this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
             dataGridWasteReceipt_SelectionChanged(this, null);
-            
         }
 
         private void DataGridWasteReceipt_AddingNewItem(object sender, AddingNewItemEventArgs e)
@@ -288,8 +282,7 @@ namespace ENI2.DetailViewControls
         {
             if (obj is WasteReceived wasteReceived)
             {
-                this.dataGridWasteReceived.CancelEdit();
+
-                this.dataGridWasteReceived.CancelEdit();
                 // are you sure dialog is in base class
                 _selectedWAS_RCPT.WasteReceived.Remove(wasteReceived);
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(wasteReceived);
@@ -301,9 +294,6 @@ namespace ENI2.DetailViewControls
 
         private void DataGridWasteReceived_CreateRequested()
         {
-            if (_selectedWAS_RCPT == null) return;
-            this.dataGridWasteReceived.CancelEdit();
-            this.dataGridWasteReceived.CancelEdit();
             EditWasteReceivedDialog ewrd = new EditWasteReceivedDialog();
             ewrd.WasteReceived = new WasteReceived();
             ewrd.WasteReceived.WAS_RCPT = _selectedWAS_RCPT;
@@ -337,9 +327,6 @@ namespace ENI2.DetailViewControls
 
         private void DataGridWasteReceived_EditRequested(DatabaseEntity obj)
         {
-            this.dataGridWasteReceived.CancelEdit();
-            this.dataGridWasteReceived.CancelEdit();
-
             EditWasteReceivedDialog ewrd = new EditWasteReceivedDialog();
             ewrd.WasteReceived = obj as WasteReceived;
 
@@ -415,7 +402,7 @@ namespace ENI2.DetailViewControls
             {
                 // are you sure dialog is in base class
                 _was.Waste.Remove(waste);
-                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(waste);
+                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Delete(waste);                
                 DatabaseEntity.ResetIdentifiers(new List<DatabaseEntity>(_was.Waste));
                 this.SublistElementChanged(Message.NotificationClass.WAS);
                 this.dataGridWaste.Items.Refresh();
@@ -475,6 +462,17 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
         #region Excel file import
 
         private void buttonImportFromExcel_Click(object sender, RoutedEventArgs e)
@@ -490,7 +488,7 @@ namespace ENI2.DetailViewControls
                 }
                 catch (Exception ex)
                 {
-                    MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);                    
                     return;
                 }
 
@@ -517,7 +515,7 @@ namespace ENI2.DetailViewControls
                                 if (reader.FieldCount < 9)
                                 {
                                     throw new InvalidDataException("Sheet must have 9 Columns of data");
-                                }
+                                }                                
 
                                 if (!reader.IsDBNull(1)) o = reader.GetValue(1); else o = null;
                                 if ((o != null) && Int32.TryParse(o.ToString(), out int wasteType))
@@ -580,38 +578,8 @@ namespace ENI2.DetailViewControls
             }
         }
 
-
-        #endregion        
-
-        #region Copy WAS to WAS_RCPT handler
-
-        private void buttonCopyFromWAS_Click(object sender, RoutedEventArgs e)
-        {
-            if (_selectedWAS_RCPT == null) return;
-
-            if(MessageBox.Show(Properties.Resources.textCopyToWASConfirmation, Properties.Resources.textConfirmation,
-                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-            {
-                foreach(Waste waste in _was.Waste)
-                {
-                    if(waste.WasteDisposalAmount_MTQ.HasValue && waste.WasteDisposalAmount_MTQ > 0)
-                    {
-                        // find matching WAS_RCPT entry
-                        foreach(WasteReceived wasteReceived in _selectedWAS_RCPT.WasteReceived)
-                        {
-                            if(wasteReceived.WasteCode.Equals(waste.WasteType.ToString()))
-                            {
-                                wasteReceived.AmountWasteReceived_MTQ = waste.WasteDisposalAmount_MTQ;
-                                break;
-                            }
-                        }
-                    }
-                }
-                this.dataGridWasteReceived.Items.Refresh();
-            }
-        }
-
         #endregion
 
+       
     }
 }

ENI2/ENI2.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ENI2</RootNamespace>
-    <AssemblyName>ENI2Test</AssemblyName>
+    <AssemblyName>ENI2</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>7</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
-    <ApplicationVersion>7.2.12.7</ApplicationVersion>
+    <ApplicationVersion>7.12.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -62,8 +62,7 @@
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>0</WarningLevel>
+    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>ENI2.App</StartupObject>
@@ -85,13 +84,14 @@
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
-    <ManifestCertificateThumbprint>C5FD306818D481FBECE3B2E74D7A912F515191E0</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>62DE8527C377957850DB503DA52FF66F664BD459</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>ENI2_7_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 64|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -134,115 +134,43 @@
     <CodeAnalysisRuleSet>..\code.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ExcelDataReader, Version=3.8.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
+    <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDataReader.3.8.0\lib\net462\ExcelDataReader.dll</HintPath>
+      <HintPath>packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=3.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
+      <HintPath>packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.9.0.9\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.Cryptography.9.0.9\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.9.0.9\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.9\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.9.0.9\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.9.0.9\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Options.9.0.9\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Primitives.9.0.9\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="MigraDoc.DocumentObjectModel, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+    <Reference Include="MigraDoc.DocumentObjectModel-gdi, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll</HintPath>
+      <HintPath>packages\PDFsharp-MigraDoc-gdi.1.50.5147\lib\net20\MigraDoc.DocumentObjectModel-gdi.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.Rendering, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+    <Reference Include="MigraDoc.Rendering-gdi, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.Rendering.dll</HintPath>
+      <HintPath>packages\PDFsharp-MigraDoc-gdi.1.50.5147\lib\net20\MigraDoc.Rendering-gdi.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.RtfRendering, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+    <Reference Include="MigraDoc.RtfRendering-gdi, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.RtfRendering.dll</HintPath>
+      <HintPath>packages\PDFsharp-MigraDoc-gdi.1.50.5147\lib\net20\MigraDoc.RtfRendering-gdi.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+    <Reference Include="PdfSharp-gdi, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.dll</HintPath>
+      <HintPath>packages\PDFsharp-MigraDoc-gdi.1.50.5147\lib\net20\PdfSharp-gdi.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.BarCodes, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+    <Reference Include="PdfSharp.Charting-gdi, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.BarCodes.dll</HintPath>
+      <HintPath>packages\PDFsharp-MigraDoc-gdi.1.50.5147\lib\net20\PdfSharp.Charting-gdi.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.Charting, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Charting.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.Cryptography, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Cryptography.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.Quality, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Quality.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.Shared, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Shared.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.Snippets, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Snippets.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.System, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.System.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.WPFonts, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.WPFonts.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SQLite, Version=1.0.117.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>
+      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.9.0.9\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Formats.Asn1, Version=9.0.0.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Formats.Asn1.9.0.9\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">
-      <HintPath>packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.9, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Cryptography.Pkcs.9.0.9\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <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.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -257,20 +185,20 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.Toolkit, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -297,9 +225,6 @@
     <Compile Include="Controls\ConditionGroupControl.xaml.cs">
       <DependentUpon>ConditionGroupControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\EasyPeasyControl.xaml.cs">
-      <DependentUpon>EasyPeasyControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\EditWindowBase.cs" />
     <Compile Include="Controls\ENIDataGrid.cs" />
     <Compile Include="Controls\IHighlightControlContainer.cs" />
@@ -312,9 +237,6 @@
     <Compile Include="Controls\ValueMappingsControl.xaml.cs">
       <DependentUpon>ValueMappingsControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="EditControls\ChangePasswordDialog.xaml.cs">
-      <DependentUpon>ChangePasswordDialog.xaml</DependentUpon>
-    </Compile>
     <Compile Include="EditControls\CompareExcelDialog.xaml.cs">
       <DependentUpon>CompareExcelDialog.xaml</DependentUpon>
     </Compile>
@@ -330,12 +252,6 @@
     <Compile Include="EditControls\NewDGItemDialog.xaml.cs">
       <DependentUpon>NewDGItemDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="EditControls\SelectCrewMemberDialog.xaml.cs">
-      <DependentUpon>SelectCrewMemberDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EditControls\SelectPortAreaDialog.xaml.cs">
-      <DependentUpon>SelectPortAreaDialog.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Excel\DakosyUtil.cs" />
     <Compile Include="Excel\ExcelBase.cs" />
     <Compile Include="Excel\ExcelComparer.cs" />
@@ -515,42 +431,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
-    <Compile Include="SheetDisplayControls\ATAControl.xaml.cs">
-      <DependentUpon>ATAControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\CrewDepartureControl.xaml.cs">
-      <DependentUpon>CrewDepartureControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\CrewPreArrivalControl.xaml.cs">
-      <DependentUpon>CrewPreArrivalControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\DangerousCargoControl.xaml.cs">
-      <DependentUpon>DangerousCargoControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\PassengerDepartureControl.xaml.cs">
-      <DependentUpon>PassengerDepartureControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\PassengerPreArrivalControl.xaml.cs">
-      <DependentUpon>PassengerPreArrivalControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\PortControl.xaml.cs">
-      <DependentUpon>PortControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\PreArrivalControl.xaml.cs">
-      <DependentUpon>PreArrivalControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\PreDepartureControl.xaml.cs">
-      <DependentUpon>PreDepartureControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\ShipDataControl.xaml.cs">
-      <DependentUpon>ShipDataControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\VoyageControl.xaml.cs">
-      <DependentUpon>VoyageControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SheetDisplayControls\WasteReceiptsControl.xaml.cs">
-      <DependentUpon>WasteReceiptsControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SplashScreenWindow.xaml.cs">
       <DependentUpon>SplashScreenWindow.xaml</DependentUpon>
     </Compile>
@@ -561,23 +441,21 @@
     <Compile Include="Util\ByteConverter.cs" />
     <Compile Include="Util\CutoffConverter.cs" />
     <Compile Include="Util\DatabaseEntityWatchdog.cs" />
-    <Compile Include="Util\EasyPeasyState.cs" />
     <Compile Include="Util\EnumHelper.cs" />
     <Compile Include="Util\EnumToBooleanConverter.cs" />
     <Compile Include="Util\EnumToCollectionConverter.cs" />
     <Compile Include="Util\ExpandableListConverter.cs" />
-    <Compile Include="Util\Extensions.cs" />
     <Compile Include="Util\GlobalStructures.cs" />
     <Compile Include="Util\HighlightService.cs" />
     <Compile Include="Util\InverseBooleanConverter.cs" />
     <Compile Include="Util\NullImageConverter.cs" />
-    <Compile Include="Util\NumberValidationRule.cs" />
-    <Compile Include="Util\SettingBindingExtension.cs" />
-    <Compile Include="Util\StringValidationRule.cs" />
     <Compile Include="Util\TrimStringConverter.cs" />
     <Compile Include="Util\UIHelper.cs" />
     <Compile Include="Util\UtcToLocalDateTimeConverter.cs" />
     <Compile Include="Util\ValidationContext.cs" />
+    <Compile Include="VorgaengeControl.xaml.cs">
+      <DependentUpon>VorgaengeControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WindowPlacement.cs" />
     <Page Include="AnmeldungenControl.xaml">
       <SubType>Designer</SubType>
@@ -591,10 +469,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\EasyPeasyControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Controls\LocodeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -691,10 +565,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EditControls\ChangePasswordDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EditControls\CompareExcelDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -823,18 +693,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EditControls\SelectCrewMemberDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EditControls\SelectImportClassesDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EditControls\SelectPortAreaDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EditControls\ShowIdDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -870,54 +732,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="SheetDisplayControls\ATAControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\CrewDepartureControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\CrewPreArrivalControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\DangerousCargoControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\PassengerDepartureControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\PassengerPreArrivalControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\PortControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\PreArrivalControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\PreDepartureControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\ShipDataControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\VoyageControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SheetDisplayControls\WasteReceiptsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SplashScreenWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -930,6 +744,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="VorgaengeControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -945,6 +763,10 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Content Include="..\misc\Logo.gif">
+      <Link>Report\Logo.gif</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="..\misc\report.db">
       <Link>report.db</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -962,9 +784,6 @@
     <None Include="ENI2_3_TemporaryKey.pfx" />
     <None Include="ENI2_4_TemporaryKey.pfx" />
     <None Include="ENI2_5_TemporaryKey.pfx" />
-    <None Include="ENI2_6_TemporaryKey.pfx" />
-    <None Include="ENI2_7_TemporaryKey.pfx" />
-    <None Include="packages.config" />
     <None Include="Service References\LockingServiceReference\ENI2.LockingServiceReference.CoreLock.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
@@ -1047,15 +866,6 @@
     <Resource Include="Resources\document_plain_new.png" />
     <Resource Include="Resources\exit.png" />
     <Resource Include="Resources\document_exchange.png" />
-    <Resource Include="Resources\arrival_user.png" />
-    <Resource Include="Resources\arrival_worker.png" />
-    <Resource Include="Resources\departure_user.png" />
-    <Resource Include="Resources\departure_worker.png" />
-    <Resource Include="Resources\clock.png" />
-    <Content Include="Report\Logo.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Resource Include="Resources\pencil.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1082,6 +892,7 @@
     </Content>
     <None Include="bsmdKey.snk" />
     <None Include="ENI2.licenseheader" />
+    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1104,9 +915,9 @@
     <Resource Include="Resources\containership.ico" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -1204,17 +1015,15 @@
     <SignToolPath Condition="'$(SignToolPath)' == '' And '$(SignToolPathBase)' != ''">$(SignToolPathBase)$(Platform)\</SignToolPath>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\ENI2_7_TemporaryKey.pfx /p FgrMFUWsTVGQeb6L6i0e /fd SHA256 $(TargetPath)</PostBuildEvent>
+    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\..\misc\codesigning.pfx /p t5bj2dk9ifdIWBPhPra4U $(TargetPath)</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
-    <Error Condition="!Exists('packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
   </Target>
-  <Import Project="packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

ENI2/EditControls/ChangePasswordDialog.xaml

@@ -1,37 +0,0 @@
-<enictrl:EditWindowBase x:Class="ENI2.EditControls.ChangePasswordDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"        
-        xmlns:enictrl="clr-namespace:ENI2.Controls"
-        xmlns:p="clr-namespace:ENI2.Properties"
-        mc:Ignorable="d"
-        Title="Change password" Height="243" Width="400" Loaded="EditWindowBase_Loaded"  Background="AliceBlue">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width=".4*" />
-            <ColumnDefinition Width=".6*" />
-        </Grid.ColumnDefinitions>
-
-        <Label Grid.Row="0" Grid.Column="0" Content="Name" />
-        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOldPassword}" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textNewPassword}" />
-        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textRepeatNewPassword}" />
-        <TextBlock Grid.Row="0" Grid.Column="1" x:Name="textBlockName" VerticalAlignment="Center" FontWeight="DemiBold"/>
-        <PasswordBox Grid.Row="1" Grid.Column="1" x:Name="textBoxOldPassword" Margin="2" VerticalContentAlignment="Center" />
-        <PasswordBox Grid.Row="2" Grid.Column="1" x:Name="textBoxNew1Password" Margin="2" VerticalContentAlignment="Center" />
-        <PasswordBox Grid.Row="3" Grid.Column="1" x:Name="textBoxNew2Password" Margin="2" VerticalContentAlignment="Center" />
-        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textDefaultDisplay}" />
-        <ComboBox x:Name="comboBoxDefaultDisplay" Grid.Column="1" Grid.Row="4" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="False" />
-        <Button Grid.Row="5" Grid.Column="1" Content="Change" Name="buttonChangePassword" Margin="2" Width="80" HorizontalAlignment="Left" Click="buttonChangePassword_Click"/>
-
-    </Grid>
-</enictrl:EditWindowBase>

ENI2/EditControls/ChangePasswordDialog.xaml.cs

@@ -1,98 +0,0 @@
-// Copyright (c) 2017- schick Informatik
-// Description: Users may change their password
-//
-
-using bsmd.database;
-using ENI2.Controls;
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace ENI2.EditControls
-{
-    /// <summary>
-    /// Interaction logic for ChangePasswordDialog.xaml
-    /// </summary>
-    public partial class ChangePasswordDialog : EditWindowBase
-    {
-
-        #region Construction
-
-        public ChangePasswordDialog()
-        {
-            InitializeComponent();            
-        }
-
-        #endregion
-
-        #region Properties
-
-        public ReportingParty CurrentUser { get; set; }
-
-        #endregion
-
-        #region event handler
-
-        private void buttonChangePassword_Click(object sender, RoutedEventArgs e)
-        {
-            bool success = false;
-            string message = "";
-            if (!textBoxOldPassword.Password.IsNullOrEmpty() || !textBoxNew1Password.Password.IsNullOrEmpty() || !textBoxNew2Password.Password.IsNullOrEmpty())
-            {
-                if (!textBoxOldPassword.Password.IsNullOrEmpty())
-                {
-                    if (CurrentUser.GetHash(textBoxOldPassword.Password).Equals(CurrentUser.PasswordHash))
-                    {
-                        if (textBoxNew1Password.Password.IsNullOrEmpty() ||
-                            textBoxNew2Password.Password.IsNullOrEmpty() ||
-                            !textBoxNew1Password.Password.Equals(textBoxNew2Password.Password))
-                        {
-                            message = "New passwords are empty or do not match";
-                        }
-                        else
-                        {
-                            if (textBoxOldPassword.Password.Equals(textBoxNew1Password.Password))
-                            {
-                                message = "Old and new password are the same";
-                            }
-                            else
-                            {
-                                CurrentUser.SetPassword(textBoxNew1Password.Password);                                
-                                success = true;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        message = "Old password is not correct";
-                    }
-                }
-                else
-                {
-                    message = "Old password empty";
-                }
-                if (!success)
-                    MessageBox.Show(message, "Changing password failed", MessageBoxButton.OK, MessageBoxImage.Error);
-                else
-                    MessageBox.Show("Password successfully changed.", "Password changed", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            // user may have changed combobox default display value so we are saving anyway here
-            this.CurrentUser.ShipcallDisplayMode = (ReportingParty.ShipcallDisplayModeEnum)Enum.Parse(typeof(ReportingParty.ShipcallDisplayModeEnum), (string)this.comboBoxDefaultDisplay.SelectedValue);
-            DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(CurrentUser);
-        }
-
-        private void EditWindowBase_Loaded(object sender, RoutedEventArgs e)
-        {
-            this.textBlockName.Text = CurrentUser.Logon;
-            this.AddVisible = false;
-            this.OkVisible = false;
-            var cancelButton = (Button)Template.FindName("buttonCancel", this);
-            cancelButton.Content = "Close";
-            this.comboBoxDefaultDisplay.ItemsSource = Util.EnumHelper.GetAllValuesAndDescription(typeof(ReportingParty.ShipcallDisplayModeEnum));
-            this.comboBoxDefaultDisplay.SelectedValue = this.CurrentUser.ShipcallDisplayMode;
-        }
-
-        #endregion
-
-    }
-}

ENI2/EditControls/CompareExcelDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico">
+        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />

ENI2/EditControls/CopyDeclarationDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_cards.ico">
+        Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_cards.ico">
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -60,7 +60,7 @@
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
-        <enictrl:LocodeControl Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Width="Auto" x:Name="locodePoC" LocodeSource="OLD" />
+        <enictrl:LocodeControl Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Width="Auto" x:Name="locodePoC" />
         <DatePicker Name="datePickerETA" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199">
             <DatePicker.BlackoutDates>
                 <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>

ENI2/EditControls/CopyDeclarationDialog.xaml.cs

@@ -57,7 +57,7 @@ namespace ENI2.EditControls
             isComplete &= imo_OR_eni;
 
             string locode = this.locodePoC.LocodeValue;
-            bool validLocode = (locode?.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK") || locode.Equals("DEWHV"));
+            bool validLocode = (locode?.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK"));
 
             isComplete &= validLocode;
 

ENI2/EditControls/CoreStatusInfoDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico" >
+        Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico" >
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.3*"/>

ENI2/EditControls/EditBKRDialog.xaml

@@ -19,7 +19,7 @@
             <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
         <Label Content="{x:Static p:Resources.textBunkerType}" Grid.Row="0" Grid.Column="0" />
-        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MaxLength="25" VerticalContentAlignment="Center"/>
+        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <Label Content="{x:Static p:Resources.textBunkerQuantity}" Grid.Row="1" Grid.Column="0" />
         <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownBunkerQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" TextAlignment="Left" />
     </Grid>

ENI2/EditControls/EditCREWDialog.xaml

@@ -34,7 +34,7 @@
         <Label Name="labelNationality" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textNationality}" />
         <Label Name="labelDateOfBirth" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textDateOfBirth}" />
         <Label Name="labelIdDocType" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textIdDocType}" />
-        <Label Name="labelCountryOfBirth" Grid.Row="4" Grid.Column="1" Content="{x:Static p:Resources.textCountryOfBirth}" Grid.ColumnSpan="2" Margin="263,0,1,0" />
+        <!--<Label Name="labelCountryOfBirth" Grid.Row="4" Grid.Column="1" Content="{x:Static p:Resources.textCountryOfBirth}" Grid.ColumnSpan="2" Margin="263,0,1,0" />--> <!-- XXX : TODO -->
         <Label Name="labelIdDocNumber" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textIdDocNumber}" />
         <Label Name="labelVisaNumber" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textVisaNumber}" />
         <Label Name="labelIssuingState" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textDocumentIssuingState}" />
@@ -42,29 +42,27 @@
         <!--Label Name="labelEffects" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEffects}" /-->
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxDuty" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxLastName" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
-        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxGender" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}"/>
-        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
-        <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
-        <TextBox Grid.Row="5" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
-        <DatePicker Grid.Row="6" Grid.Column="1" Name="datePickerExpiryDate" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-            <DatePicker.BlackoutDates>
-                <CalendarDateRange Start="1/1/0001" End="12/31/1899"/>
-                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-            </DatePicker.BlackoutDates>
-        </DatePicker>
-        
         <TextBox Grid.Row="1" Grid.Column="3" Width="auto" Name="textBoxFirstName" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
+        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxGender" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}"/>
         <TextBox Grid.Row="2" Grid.Column="3" Width="auto" Name="textBoxPlaceOfBirth" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
+        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
         <DatePicker Grid.Row="3" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
             <DatePicker.BlackoutDates>
                 <CalendarDateRange Start="1/1/0001" End="12/31/1899"/>
                 <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
             </DatePicker.BlackoutDates>
         </DatePicker>
-        <ComboBox Grid.Row="4" Grid.Column="3" Width="auto" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
+        <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
+        <!-- <ComboBox Grid.Row="4" Grid.Column="3" Width="auto" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>-->
         <TextBox Grid.Row="5" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
+        <TextBox Grid.Row="5" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <ComboBox Grid.Row="6" Grid.Column="3" Width="auto" Name="comboBoxIssuingState" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
-        
+        <DatePicker Grid.Row="6" Grid.Column="1" Name="datePickerExpiryDate" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="12/31/1899"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <!--TextBox Grid.Row="7" Grid.Column="1" Width="auto" Name="textBoxEffects" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/-->
     </Grid>
 </enictrl:EditWindowBase>

ENI2/EditControls/EditCREWDialog.xaml.cs

@@ -2,7 +2,6 @@
 // Description: CREW Bearbeitungsdialog
 //
 
-using System;
 using System.Windows;
 
 using bsmd.database;
@@ -15,8 +14,7 @@ namespace ENI2.EditControls
     /// Interaction logic for EditCREWDialog.xaml
     /// </summary>
     public partial class EditCREWDialog : EditWindowBase
-    {        
+    {
-
         public EditCREWDialog()
         {
             InitializeComponent();
@@ -37,39 +35,17 @@ namespace ENI2.EditControls
             this.textBoxPlaceOfBirth.Text = this.CREW.CrewMemberPlaceOfBirth;
             this.comboBoxNationality.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxNationality.SelectedValue = this.CREW.CrewMemberNationality;
-            if (this.CREW.CrewMemberDateOfBirth > CREW.CLAMPMAXDATE)
+            this.datePickerDateOfBirth.SelectedDate = this.CREW.CrewMemberDateOfBirth;
-            {
-                this.datePickerDateOfBirth.SelectedDate = CREW.CLAMPMAXDATE;
-            }
-            else if (this.CREW.CrewMemberDateOfBirth < CREW.CLAMPMINDATE)
-            {
-                this.datePickerDateOfBirth.SelectedDate = CREW.CLAMPMINDATE;
-            }
-            else
-            {
-                this.datePickerDateOfBirth.SelectedDate = this.CREW.CrewMemberDateOfBirth;
-            }
             this.comboBoxIdDocType.ItemsSource = GlobalStructures.IDDocTypeDict;
             this.comboBoxIdDocType.SelectedValue = this.CREW.CrewMemberIdentityDocumentType?.ToString();
             this.textBoxIdDocNumber.Text = this.CREW.CrewMemberIdentityDocumentId;
             this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber;
             this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState;
-            if (this.CREW.CrewMemberIdentityDocumentExpiryDate > CREW.CLAMPMAXDATE)
+            if(this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue)
-            {
-                this.datePickerExpiryDate.SelectedDate = CREW.CLAMPMAXDATE;
-            }
-            else if(this.CREW.CrewMemberDateOfBirth < CREW.CLAMPMINDATE)
-            {
-                this.datePickerExpiryDate.SelectedDate = CREW.CLAMPMINDATE;
-            }
-            else
-            {                
                 this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
-            }
+            // this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO
-
+            // this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
-            this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
-            this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
             // this.textBoxEffects.Text = this.CREW.Effects;
             this.OKClicked += EditCREWDialog_OKClicked;
             this.AddVisible = true;
@@ -79,7 +55,6 @@ namespace ENI2.EditControls
         {
             // copy back
             this.CREW.CrewMemberDuty = this.textBoxDuty.Text.Trim();
-            if (this.CREW.CrewMemberDuty.IsNullOrEmpty()) this.CREW.CrewMemberDuty = "unknown";
             this.CREW.CrewMemberLastName = this.textBoxLastName.Text.Trim();
             this.CREW.CrewMemberFirstName = this.textBoxFirstName.Text.Trim();
             this.CREW.CrewMemberGender = (this.comboBoxGender.SelectedIndex == -1) ? null : (byte?) byte.Parse((string) this.comboBoxGender.SelectedValue);
@@ -91,7 +66,7 @@ namespace ENI2.EditControls
             this.CREW.CrewMemberVisaNumber = this.textBoxVisaNumber.Text.Trim();
             this.CREW.CrewMemberIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string) this.comboBoxIssuingState.SelectedValue;
             this.CREW.CrewMemberIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate;
-            this.CREW.CrewMemberCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
+            // this.CREW.CrewMemberCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
             // this.CREW.Effects = this.textBoxEffects.Text.Trim();
         }
 

ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml

@@ -52,7 +52,7 @@
             </DatePicker.BlackoutDates>
         </DatePicker>
         <ComboBox Name="comboBoxShipSecurityLevel" Grid.Row="5" Grid.Column="1" Margin="2" />
-        <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center" PreviewTextInput="textBoxGisisCode_PreviewTextInput" PreviewKeyDown="textBoxGisisCode_PreviewKeyDown"/>
+        <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxGisisDescription" Grid.Row="7" Grid.Column="1" Margin="2" IsEnabled="False"/>
         <enictrl:LocodeControl x:Name="locodeGISIS" Grid.Row="8" Grid.Column="1" />
         <TextBox Name="textBoxSecurityMatters" Grid.Row="9" Grid.Column="1" Margin="2" MaxLength="255" />

ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs

@@ -34,7 +34,7 @@ namespace ENI2.EditControls
             this.comboBoxShipSecurityLevel.ItemsSource = GlobalStructures.ShipSecurityLevels;
 
             if (this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.HasValue)
-                this.comboBoxShipSecurityLevel.SelectedIndex = this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.Value - 1;
+                this.comboBoxShipSecurityLevel.SelectedIndex = (this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.Value - 1);
             else
                 this.comboBoxShipSecurityLevel.SelectedIndex = -1;
 
@@ -48,33 +48,23 @@ namespace ENI2.EditControls
         public void CopyValuesToEntity()
         {
             this.LastTenPortFacilitiesCalled.PortFacilityPortLoCode = this.locodePort.LocodeValue;
-            this.LastTenPortFacilitiesCalled.PortFacilityPortName = this.textBoxPortName.Text.Trim();
+            this.LastTenPortFacilitiesCalled.PortFacilityPortName = this.textBoxPortName.Text;
-            this.LastTenPortFacilitiesCalled.PortFacilityPortCountry = this.textBoxPortCountry.Text.Trim();
+            this.LastTenPortFacilitiesCalled.PortFacilityPortCountry = this.textBoxPortCountry.Text;
             this.LastTenPortFacilitiesCalled.PortFacilityDateOfArrival = this.datePickerATA.SelectedDate;
             this.LastTenPortFacilitiesCalled.PortFacilityDateOfDeparture = this.datePickerATD.SelectedDate;
-            this.LastTenPortFacilitiesCalled.PortFacilityGISISCode = this.textBoxGisisCode.Text.Trim();
+            this.LastTenPortFacilitiesCalled.PortFacilityGISISCode = this.textBoxGisisCode.Text;
 
             if (this.comboBoxShipSecurityLevel.SelectedIndex == -1)
                 this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = null;
             else
                 this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = (byte?) (this.comboBoxShipSecurityLevel.SelectedIndex + 1);
             this.LastTenPortFacilitiesCalled.PortFacilityGISISCodeLocode = this.locodeGISIS.LocodeValue;
-            this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport = this.textBoxSecurityMatters.Text.Trim();
+            this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport = this.textBoxSecurityMatters.Text;
         }
 
         private void EditLast10PortFacilitiesDialog_OKClicked()
         {
             this.CopyValuesToEntity();
         }
-
-        private void textBoxGisisCode_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
-        {
-            e.Handled = !e.Text.IsDigitsOnly();
-        }
-
-        private void textBoxGisisCode_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-            if(e.Key == System.Windows.Input.Key.Space) e.Handled = true;
-        }
     }
 }

ENI2/EditControls/EditPasDialog.xaml

@@ -34,7 +34,7 @@
         <Label Name="labelNationality" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textNationality}" />
         <Label Name="labelDateOfBirth" Grid.Row="2" Grid.Column="2" Content="{x:Static p:Resources.textDateOfBirth}" />
         <Label Name="labelIdDocType" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textIdDocType}" />
-        <Label Name="labelCountryOfBirth" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textCountryOfBirth}" />
+        <!--<Label Name="labelCountryOfBirth" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textCountryOfBirth}" />-->
         <Label Name="labelIdDocNumber" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textIdDocNumber}" />
         <Label Name="labelVisaNumber" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textVisaNumber}" />
         <Label Name="labelPortOfEmbarkation" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textPortOfEmbarkation}" />
@@ -42,37 +42,35 @@
         <Label Name="labelTransitPassenger" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textTransitPassenger}" />
         <Label Name="labelIssuingState" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textDocumentIssuingState}" />
         <Label Name="labelExpiryDate" Grid.Row="7" Grid.Column="2" Content="{x:Static p:Resources.textDocumentExpiryDate}" />
-        <Label Name="labelEmergencyCare" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyCare}" />
+        <!--<Label Name="labelEmergencyCare" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyCare}" />
-        <Label Name="labelEmergencyContactNumber" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyContactNumber}" />
+        <Label Name="labelEmergencyContactNumber" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyContactNumber}" />-->
 
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxLastName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxGender" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
-        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-        <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-        <enictrl:LocodeControl x:Name="locodePortOfDisembarkation" Grid.Row="5" Grid.Column="1" />
-        <ComboBox Grid.Row="6" Grid.Column="1" Name="comboBoxIssuingState" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-        <TextBox Grid.Row="7" Grid.Column="1" Width="auto" Name="textBoxEmergencyCare" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-        <TextBox Grid.Row="8" Grid.Column="1" Width="auto" Name="textBoxEmergencyContactNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-
         <TextBox Grid.Row="0" Grid.Column="3" Width="auto" Name="textBoxFirstName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
+        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxGender" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
         <TextBox Grid.Row="1" Grid.Column="3" Width="auto" Name="textBoxPlaceOfBirth" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
+        <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <DatePicker Grid.Row="2" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
             <DatePicker.BlackoutDates>
                 <CalendarDateRange Start="1/1/0001" End="12/31/1899"/>
                 <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
             </DatePicker.BlackoutDates>
         </DatePicker>
-        <ComboBox Grid.Row="3" Grid.Column="3" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+        <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
+        <!--<ComboBox Grid.Row="3" Grid.Column="3" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />-->
         <TextBox Grid.Row="4" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
+        <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <enictrl:LocodeControl x:Name="locodePortOfEmbarkation" Grid.Row="5" Grid.Column="3" />
+        <enictrl:LocodeControl x:Name="locodePortOfDisembarkation" Grid.Row="5" Grid.Column="1" />
         <CheckBox Name="checkBoxTransitPassenger" Grid.Row="6" Grid.Column="3" VerticalAlignment="Center" Margin="2"/>
+        <ComboBox Grid.Row="6" Grid.Column="1" Name="comboBoxIssuingState" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <DatePicker Grid.Row="7" Grid.Column="3" Name="datePickerExpiryDate" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
             <DatePicker.BlackoutDates>
                 <CalendarDateRange Start="1/1/0001" End="12/31/1899"/>
                 <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
             </DatePicker.BlackoutDates>
         </DatePicker>
-        
+        <!--<TextBox Grid.Row="7" Grid.Column="1" Width="auto" Name="textBoxEmergencyCare" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
+        <TextBox Grid.Row="8" Grid.Column="1" Width="auto" Name="textBoxEmergencyContactNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />-->
     </Grid>
 </enictrl:EditWindowBase>

ENI2/EditControls/EditPasDialog.xaml.cs

@@ -2,7 +2,6 @@
 // Description: PAS Bearbeitungsdialog
 //
 
-using System;
 using System.Windows;
 
 using bsmd.database;
@@ -15,8 +14,7 @@ namespace ENI2.EditControls
     /// Interaction logic for EditPasDialog.xaml
     /// </summary>
     public partial class EditPASDialog : EditWindowBase
-    {        
+    {
-
         public EditPASDialog()
         {
             InitializeComponent();
@@ -36,18 +34,7 @@ namespace ENI2.EditControls
             this.textBoxPlaceOfBirth.Text = this.PAS.PassengerPlaceOfBirth;
             this.comboBoxNationality.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxNationality.SelectedValue = this.PAS.PassengerNationality;
-            if (this.PAS.PassengerDateOfBirth > CREW.CLAMPMAXDATE)
+            this.datePickerDateOfBirth.SelectedDate = this.PAS.PassengerDateOfBirth;
-            {
-                this.datePickerDateOfBirth.SelectedDate = CREW.CLAMPMAXDATE;
-            }
-            else if (this.PAS.PassengerDateOfBirth < CREW.CLAMPMINDATE)
-            {
-                this.datePickerDateOfBirth.SelectedDate = CREW.CLAMPMINDATE;
-            }
-            else
-            {
-                this.datePickerDateOfBirth.SelectedDate = this.PAS.PassengerDateOfBirth;
-            }
             this.comboBoxIdDocType.ItemsSource = GlobalStructures.IDDocTypeDict;
             this.comboBoxIdDocType.SelectedValue = this.PAS.PassengerIdentityDocumentType?.ToString();
             this.textBoxIdDocNumber.Text = this.PAS.PassengerIdentityDocumentId;
@@ -57,24 +44,13 @@ namespace ENI2.EditControls
             this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit;
             this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState;
-
+            if(this.PAS.PassengerIdentityDocumentExpiryDate.HasValue)
-            if (this.PAS.PassengerIdentityDocumentExpiryDate > CREW.CLAMPMAXDATE)
-            {
-                this.datePickerExpiryDate.SelectedDate = CREW.CLAMPMAXDATE;
-            }
-            else if (this.PAS.PassengerIdentityDocumentExpiryDate < CREW.CLAMPMINDATE)
-            {
-                this.datePickerExpiryDate.SelectedDate = CREW.CLAMPMINDATE;
-            }
-            else
-            {
                 this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
-            }
+            // XXX : TODO
-            
+            //this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
-            this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
+            //this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
-            this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
+            //this.textBoxEmergencyCare.Text = this.PAS.EmergencyCare;
-            this.textBoxEmergencyCare.Text = this.PAS.EmergencyCare;
+            //this.textBoxEmergencyContactNumber.Text = this.PAS.EmergencyContactNumber;
-            this.textBoxEmergencyContactNumber.Text = this.PAS.EmergencyContactNumber;
 
             this.OKClicked += EditPasDialog_OKClicked;
             this.AddVisible = true;
@@ -97,10 +73,10 @@ namespace ENI2.EditControls
             this.PAS.PassengerInTransit = this.checkBoxTransitPassenger.IsChecked;
             this.PAS.PassengerIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string)this.comboBoxIssuingState.SelectedValue;
             this.PAS.PassengerIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate;
-            
+            // XXX : TODO
-            this.PAS.PassengerCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
+            // this.PAS.PassengerCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
-            this.PAS.EmergencyCare = this.textBoxEmergencyCare.Text.Trim();
+            //this.PAS.EmergencyCare = this.textBoxEmergencyCare.Text.Trim();
-            this.PAS.EmergencyContactNumber = this.textBoxEmergencyContactNumber.Text.Trim();
+            //this.PAS.EmergencyContactNumber = this.textBoxEmergencyContactNumber.Text.Trim();
         }
 
         private void EditPasDialog_OKClicked()

ENI2/EditControls/EditReportingPartyDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textReportingParty}" Height="378" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
+        Title="{x:Static p:Resources.textReportingParty}" Height="350" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -21,7 +21,6 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="2*" />
@@ -47,10 +46,9 @@
         <Label Name="labelUserEMail" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" HorizontalContentAlignment="Right" />
         <Label Name="labelAdmin" Grid.Row="7" Grid.Column="2" Content="{x:Static p:Resources.textAdministrator}" HorizontalContentAlignment="Right" />
         <Label Name="labelArchived" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textArchived}" HorizontalContentAlignment="Right" />
+        <Label Name="labelCreated" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textCreated}" HorizontalContentAlignment="Right" />
+        <Label Name="labelChanged" Grid.Row="9" Grid.Column="2" Content="{x:Static p:Resources.textChanged}" HorizontalContentAlignment="Right" />
         <Label Name="labelEditor" Grid.Row="8" Grid.Column="2" Content="{x:Static p:Resources.textEditor}" HorizontalContentAlignment="Right" />
-        
-        <Label Name="labelCreated" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textCreated}" HorizontalContentAlignment="Right" />
-        <Label Name="labelChanged" Grid.Row="10" Grid.Column="2" Content="{x:Static p:Resources.textChanged}" HorizontalContentAlignment="Right" />
 
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="0" Grid.Column="3" Width="auto" Name="textBoxEMail" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
@@ -69,8 +67,9 @@
         <CheckBox Grid.Row="7" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxAdministrator" Margin="2" />
         <CheckBox Grid.Row="8" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxEditor" Margin="2" />
         <CheckBox Grid.Row="8" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxArchived" Margin="2" />
-        <Label Grid.Row="10" Grid.Column="1" Name="dateTimePickerCreated" FontStyle="Italic" />
+
-        <Label Grid.Row="10" Grid.Column="3" Name="dateTimePickerChanged" FontStyle="Italic" />
+        <Label Grid.Row="9" Grid.Column="1" Name="dateTimePickerCreated" FontStyle="Italic" />
+        <Label Grid.Row="9" Grid.Column="3" Name="dateTimePickerChanged" FontStyle="Italic" />
 
     </Grid>
 </enictrl:EditWindowBase>

ENI2/EditControls/EditReportingPartyDialog.xaml.cs

@@ -2,7 +2,6 @@
 // Description: Reporting party Bearbeitungsdialog
 //
 
-using System;
 using System.Windows;
 
 using bsmd.database;
@@ -25,7 +24,6 @@ namespace ENI2.EditControls
 
         private void EditReportingPartyDialog_Loaded(object sender, RoutedEventArgs e)
         {
-            
             this.textBoxCity.Text = this.ReportingParty.City;
             this.textBoxCountry.Text = this.ReportingParty.Country;
             this.textBoxEMail.Text = this.ReportingParty.EMail;
@@ -42,7 +40,6 @@ namespace ENI2.EditControls
             this.checkBoxAdministrator.IsChecked = this.ReportingParty.IsAdmin;
             this.checkBoxArchived.IsChecked = this.ReportingParty.IsArchived;
             this.checkBoxEditor.IsChecked = this.ReportingParty.IsEditor;
-            
 
             this.dateTimePickerChanged.Content = this.ReportingParty.Changed.HasValue ? this.ReportingParty.Changed.ToString() : "";
             this.dateTimePickerCreated.Content = this.ReportingParty.Created.HasValue ? this.ReportingParty.Created.ToString() : "";
@@ -64,7 +61,7 @@ namespace ENI2.EditControls
             this.ReportingParty.PostalCode = this.textBoxPostalCode.Text.Trim();
             this.ReportingParty.StreetAndNumber = this.textBoxStreetNumber.Text.Trim();
             this.ReportingParty.UserEMail = this.textBoxUserEMail.Text.Trim();
-            this.ReportingParty.Logon = this.textBoxUserLogon.Text.Trim();            
+            this.ReportingParty.Logon = this.textBoxUserLogon.Text.Trim();
 
             if(!this.passwordBoxPassword.Password.IsNullOrEmpty())
             {

ENI2/EditControls/EditRulesDialog.xaml

@@ -9,7 +9,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/mail_forward.png"> 
+        Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/mail_forward.png"> 
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32" />

ENI2/EditControls/EditSERVDialog.xaml.cs

@@ -1,5 +1,5 @@
 // Copyright (c) 2017 schick Informatik
-// Description: Edit SERV and SERV_template entities
+// Description:
 //
 
 using System.Windows;
@@ -14,78 +14,36 @@ namespace ENI2.EditControls
     /// </summary>
     public partial class EditSERVDialog : EditWindowBase
     {
-
-        #region Construction
-
         public EditSERVDialog()
         {
             InitializeComponent();
             Loaded += EditSERVDialog_Loaded;
         }
 
-        #endregion
-
-        #region Properties
-
-        public SERV SERV { get; set; }
-
-        public SERV_Template SERV_Template { get; set; }
-
-        #endregion
-
-        #region event handler
-
         private void EditSERVDialog_Loaded(object sender, RoutedEventArgs e)
         {
             this.OKClicked += EditSERVDialog_OKClicked;
 
             // copy into fields
-            if (this.SERV != null)
+            this.textBoxServiceName.Text = this.SERV.ServiceName;
-            {
+            this.textBoxServiceBeneficiary.Text = this.SERV.ServiceBeneficiary;
-                this.textBoxServiceName.Text = this.SERV.ServiceName;
+            this.textBoxServiceInvoiceRecipient.Text = this.SERV.ServiceInvoiceRecipient;
-                this.textBoxServiceBeneficiary.Text = this.SERV.ServiceBeneficiary;
+            this.AddVisible = true;
-                this.textBoxServiceInvoiceRecipient.Text = this.SERV.ServiceInvoiceRecipient;
-                this.AddVisible = true;
-            }
-
-            if (this.SERV_Template != null)
-            {
-                this.textBoxServiceName.Text = this.SERV_Template.ServiceName;
-                this.textBoxServiceBeneficiary.Text = this.SERV_Template.ServiceBeneficiary;
-                this.textBoxServiceInvoiceRecipient.Text = this.SERV_Template.ServiceInvoiceRecipient;
-            }
         }
-        private void EditSERVDialog_OKClicked()
-        {
-            this.CopyValuesToEntity();
-        }
-
-        #endregion
-
-        #region public methods
 
         public void CopyValuesToEntity()
         {
-
+            // copy back
-            if (this.SERV != null)
+            this.SERV.ServiceName = this.textBoxServiceName.Text.Trim();
-            {
+            this.SERV.ServiceBeneficiary = this.textBoxServiceBeneficiary.Text.Trim();
-                // copy back
+            this.SERV.ServiceInvoiceRecipient = this.textBoxServiceInvoiceRecipient.Text.Trim();
-                this.SERV.ServiceName = this.textBoxServiceName.Text.Trim();
-                this.SERV.ServiceBeneficiary = this.textBoxServiceBeneficiary.Text.Trim();
-                this.SERV.ServiceInvoiceRecipient = this.textBoxServiceInvoiceRecipient.Text.Trim();
-            }
-
-            if (this.SERV_Template != null)
-            {
-                // copy back
-                this.SERV_Template.ServiceName = this.textBoxServiceName.Text.Trim();
-                this.SERV_Template.ServiceBeneficiary = this.textBoxServiceBeneficiary.Text.Trim();
-                this.SERV_Template.ServiceInvoiceRecipient = this.textBoxServiceInvoiceRecipient.Text.Trim();
-            }
-
         }
 
-        #endregion
+        private void EditSERVDialog_OKClicked()
-        
+        {
+            this.CopyValuesToEntity();   
+        }
+
+        public SERV SERV { get; set; }
     }
 }

ENI2/EditControls/EditWasteDialog.xaml

@@ -38,11 +38,11 @@
         <Label Name="labelWasteCodeText" Grid.Row="0" Grid.Column="2" />
         <TextBox Name="textBoxDescription" Grid.Row="1" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" Width="auto" MaxLength="99" TextWrapping="Wrap" />
 
-        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountDisposed" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="9999.999" />
+        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountDisposed" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
-        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownMaxCapacity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="9999.999"/>
+        <xctk:DoubleUpDown Grid.Row="3" Grid.Column="1" Name="doubleUpDownMaxCapacity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
-        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="9999.999"/>
+        <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Row="5" Grid.Column="1" x:Name="locodePortOfDeliveryRemainingWaste" LocodeSource="SSN" />
-        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="9999.999"/>
+        <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
 
         <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "2" Grid.Column="2" />
         <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "3" Grid.Column="2" />

ENI2/EditControls/EditWasteReceiptDialog.xaml

@@ -14,7 +14,6 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
             <RowDefinition Height="56" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
@@ -31,48 +30,16 @@
         <Label Name="labelIdentificationNumber" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textIdentificationNumber}" />
         <Label Name="labelPortReceptionFacilityName" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textPortReceptionFacilityName}" />
         <Label Name="labelPortReceptionFacilityProviderName" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPortReceptionFacilityProviderName}" />
-        <Label Name="labelTemplate" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textAgentTemplate}" />
+        <Label Name="labelTreatmentFacilityProvider" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textTreatmentFacilityProviderDisplay}" />
-        <Label Name="labelTreatmentFacilityProvider" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTreatmentFacilityProviderDisplay}" />
+        <Label Name="labelWasteDeliveryDateFrom" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteDeliveryDateFrom}" />
-        <Label Name="labelWasteDeliveryDateFrom" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWasteDeliveryDateFrom}" />
+        <Label Name="labelWasteDeliveryDateTo" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWasteDeliveryDateTo}" />
-        <Label Name="labelWasteDeliveryDateTo" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textWasteDeliveryDateTo}" />
 
         <TextBox Name="textIdentificationNumber" Grid.Row="0" Grid.Column="1" Width="auto" MaxLength="20" TextWrapping="Wrap" Margin="2" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxPortReceptionFacilityName" Grid.Row="1" Grid.Column="1" Width="auto" MaxLength="70" TextWrapping="Wrap"  Margin="2" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxPortReceptionFacilityProviderName" Grid.Row="2" Grid.Column="1" Width="auto" MaxLength="70" TextWrapping="Wrap"  Margin="2" VerticalContentAlignment="Center"/>
-        <Grid Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="1" Name="gridTemplateControls" Visibility="Visible">
+        <TextBox Name="textBoxTreatmentFacilityProvider" Grid.Row="3" Grid.Column="1" Height="56" VerticalContentAlignment="Top"  Margin="2"/>
-            <Grid.ColumnDefinitions>
+        <xctk:DateTimePicker Grid.Row="4" Grid.Column="1" Name="dateTimePickerWasteDeliveryDateFrom" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-                <ColumnDefinition Width=".5*"/>
+        <xctk:DateTimePicker Grid.Row="5" Grid.Column="1" Name="dateTimePickerWasteDeliveryDateTo" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-                <ColumnDefinition Width=".5*"/>
-                <!-- Name -->
-                <ColumnDefinition Width="26"/>
-                <!-- Save button -->
-                <ColumnDefinition Width="26"/>
-                <!-- Delete button -->
-                <ColumnDefinition Width="52"/>
-                <!-- Undo button -->
-            </Grid.ColumnDefinitions>
-            <ComboBox Grid.Column="0" Name="comboBox_WSDPTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="Remark" SelectionChanged="comboBox_WSDPTemplate_SelectionChanged" />
-            <TextBox Grid.Column="1" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
-            <Button Name="buttonSaveTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonSaveTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
-                <StackPanel Orientation="Horizontal">
-                    <Image Source="../Resources/floppy_disk_blue.png" Margin="0,0,0,0" Height="20" Width="20" />
-                </StackPanel>
-            </Button>
-            <Button Name="buttonDeleteTemplate" Grid.Column="3" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
-                <StackPanel Orientation="Horizontal">
-                    <Image Source="../Resources/delete.png" Margin="0,0,0,0" Height="20" Width="20" />
-                </StackPanel>
-            </Button>
-            <Button Name="buttonUndoTemplate" Grid.Column="4" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
-                <StackPanel Orientation="Horizontal">
-                    <Image Source="../Resources/undo.png" Margin="0,0,0,0" Height="20" Width="20" />
-                </StackPanel>
-            </Button>
-        </Grid>
-
-        <TextBox Name="textBoxTreatmentFacilityProvider" Grid.Row="4" Grid.Column="1" Height="56" VerticalContentAlignment="Top"  Margin="2"/>
-        <xctk:DateTimePicker Grid.Row="5" Grid.Column="1" Name="dateTimePickerWasteDeliveryDateFrom" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
-        <xctk:DateTimePicker Grid.Row="6" Grid.Column="1" Name="dateTimePickerWasteDeliveryDateTo" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
 
         <!--Button x:Name="buttonAddEntries" Grid.Column="1" Grid.Row="7" Margin="2" Click="buttonAddEntries_Click" Width="170" Content="Add waste received entries" HorizontalAlignment="Left"/-->
 

ENI2/EditControls/EditWasteReceiptDialog.xaml.cs

@@ -3,8 +3,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Windows;
 
 using bsmd.database;
@@ -17,13 +15,6 @@ namespace ENI2.EditControls
     /// </summary>
     public partial class EditWasteReceiptDialog : EditWindowBase
     {
-
-        // TODO: "unstatic" the templates and take care they are synchronized between controls
-
-        private List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;
-        private WasteDisposalServiceProvider_Template _currentTemplate;
-        private string _undoTemplate;
-
         public EditWasteReceiptDialog()
         {
             InitializeComponent();
@@ -33,7 +24,7 @@ namespace ENI2.EditControls
 
         public WAS_RCPT WAS_RCPT { get; set; }
 
-        private async void EditWasteReceiptDialog_Loaded(object sender, RoutedEventArgs e)
+        private void EditWasteReceiptDialog_Loaded(object sender, RoutedEventArgs e)
         {
             this.textIdentificationNumber.Text = this.WAS_RCPT.IdentificationNumber;
             this.textBoxPortReceptionFacilityName.Text = this.WAS_RCPT.PortReceptionFacilityName;
@@ -44,12 +35,6 @@ namespace ENI2.EditControls
 
             OKClicked += EditWasteReceiptDialog_OKClicked;
             this.AddVisible = true;
-            
-            _wsdpTemplates = await DBManagerAsync.GetWasteDisposalServiceProviderTemplatesAsync();
-            _wsdpTemplates.Sort();
-            Trace.WriteLine($"{_wsdpTemplates.Count} WSDP templates loaded");
-            
-            this.comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
         }
         public void CopyValuesToEntity()
         {
@@ -67,87 +52,10 @@ namespace ENI2.EditControls
             this.CopyValuesToEntity();
         }
 
-        private void comboBox_WSDPTemplate_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        
-        {
+        // private void buttonAddEntries_Click(object sender, RoutedEventArgs e)
-            Trace.WriteLine("WSDP combo selection changed");
+        // {
-            if (this.comboBox_WSDPTemplate.SelectedItem is WasteDisposalServiceProvider_Template wdsp_t)
+        //    this.WAS_RCPT.AddMissingWasteReceived();
-            {
+        // }
-                this.textBoxTemplateTitle.Text = wdsp_t.Remark;
-                this.buttonDeleteTemplate.IsEnabled = true;
-                this._currentTemplate = wdsp_t;
-                this._undoTemplate = this.textBoxPortReceptionFacilityProviderName.Text.Trim();
-                this.buttonUndoTemplate.IsEnabled = this._undoTemplate.Length > 0;
-                this.textBoxPortReceptionFacilityProviderName.Text = wdsp_t.WasteDisposalServiceProviderName;
-            }
-        }
-
-        private async void buttonSaveTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            string currentWSDPProviderName = this.textBoxPortReceptionFacilityProviderName.Text.Trim();
-            string currentRemark = this.textBoxTemplateTitle.Text.Trim();
-
-            if ((currentWSDPProviderName.Length == 0) || (currentRemark.Length == 0)) return;
-
-            WasteDisposalServiceProvider_Template existingTemplate = null;
-            foreach (WasteDisposalServiceProvider_Template wdsp_template in _wsdpTemplates)
-            {
-                // bei gefundenem Match wird ggf. der Remark überschrieben
-                if (wdsp_template.Remark.Equals(currentRemark))
-                {
-                    existingTemplate = wdsp_template;
-                    break;
-                }
-            }
-
-            if (existingTemplate != null)
-            {
-                if (MessageBox.Show("A template with this name already exists, overwrite?", "Confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
-                    return;
-
-                existingTemplate.WasteDisposalServiceProviderName = currentWSDPProviderName;
-                await DBManagerAsync.SaveAsync(existingTemplate);
-                return;
-            }
-
-            WasteDisposalServiceProvider_Template newTemplate = new WasteDisposalServiceProvider_Template();
-            newTemplate.WasteDisposalServiceProviderName = currentWSDPProviderName;
-            newTemplate.Remark = currentRemark;
-            await DBManagerAsync.SaveAsync(newTemplate);
-
-            comboBox_WSDPTemplate.ItemsSource = null;
-            _wsdpTemplates.Add(newTemplate);
-            _wsdpTemplates.Sort();
-            comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
-            MessageBox.Show("Template saved", "OK", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-
-        private void buttonDeleteTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            if (_currentTemplate != null)
-            {
-                if (MessageBox.Show("Delete this template?", "Confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
-                {
-                    this.comboBox_WSDPTemplate.SelectedItem = null;
-                    this.comboBox_WSDPTemplate.ItemsSource = null;
-                    DBManager.Instance.Delete(_currentTemplate);
-                    _wsdpTemplates.Remove(_currentTemplate);
-                    this.textBoxTemplateTitle.Text = null;
-                    this.buttonDeleteTemplate.IsEnabled = false;
-                    this.comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
-                }
-            }
-        }
-
-        private void buttonUndoTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            if (this._undoTemplate != null)
-            {
-                this.textBoxPortReceptionFacilityProviderName.Text = this._undoTemplate;
-                this.buttonUndoTemplate.IsEnabled = false;
-                this._undoTemplate = null;
-                this.comboBox_WSDPTemplate.SelectedItem = null;
-            }
-        }
-
     }
 }

ENI2/EditControls/EditWasteReceivedDialog.xaml

@@ -26,7 +26,7 @@
 
         <ComboBox Name="comboBoxWasteCode" Grid.Row="0" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" />
         <TextBox Name="textBoxDescription" Grid.Row="1" Margin="2" Grid.Column="1" Width="auto" MaxLength="99" TextWrapping="Wrap" />
-        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountReceived" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left" Maximum="9999.999"/>
+        <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Name="doubleUpDownAmountReceived" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
 
     </Grid>
 </enictrl:EditWindowBase>

ENI2/EditControls/ErrorListDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_red.ico" Topmost="False">
+        Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_red.ico" Topmost="False">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />

ENI2/EditControls/MessageHistoryDialog.xaml

@@ -7,7 +7,7 @@
         xmlns:enictrl="clr-namespace:ENI2.Controls"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2Test;component/Resources/clock_history.ico">
+        Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2;component/Resources/clock_history.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />

ENI2/EditControls/NewDGItemDialog.xaml

@@ -9,7 +9,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
         Title="{x:Static p:Resources.textNewDGItem}" Height="350" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" 
-                        Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
+                        Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />

ENI2/EditControls/NewDGItemDialog.xaml.cs

@@ -18,7 +18,7 @@ namespace ENI2.EditControls
     public partial class NewDGItemDialog : EditWindowBase
     {
         private List<HAZPosTemplate> _data = null;
-        private static readonly object filterLock = new object();
+        private static object filterLock = new object();
 
         public NewDGItemDialog()
         {

ENI2/EditControls/NewWithIdDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_add.ico">
+        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_card_add.ico">
     
         <Grid Margin="4">
         <Grid.RowDefinitions>

ENI2/EditControls/SelectCrewMemberDialog.xaml

@@ -1,32 +0,0 @@
-<enictrl:EditWindowBase x:Class="ENI2.EditControls.SelectCrewMemberDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:enictrl="clr-namespace:ENI2.Controls"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ENI2.EditControls"
-        xmlns:p="clr-namespace:ENI2.Properties"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textSelectCrewMember}" Height="160" Width="400" Background="AliceBlue">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width=".5*" />
-            <ColumnDefinition Width=".5*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="28"/>
-            <RowDefinition Height="28"/>
-            <RowDefinition Height="28"/>
-            <RowDefinition Height="28"/>
-        </Grid.RowDefinitions>
-
-        <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" />
-        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textCrewFunctionOnBoard}" />
-
-        <TextBlock Text="{Binding CrewMemberLastName}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" />
-        <TextBlock Text="{Binding CrewMemberFirstName}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" />
-        <TextBlock Text="{Binding CrewMemberDuty}" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" />
-
-    </Grid>
-</enictrl:EditWindowBase>

ENI2/EditControls/SelectCrewMemberDialog.xaml.cs

@@ -1,41 +0,0 @@
-// Copyright (c) 2017- schick Informatik
-// Description:
-//
-
-using bsmd.database;
-using ENI2.Controls;
-using System.Windows;
-
-namespace ENI2.EditControls
-{
-    /// <summary>
-    /// Interaction logic for SelectCrewMemberDialog.xaml
-    /// </summary>
-    public partial class SelectCrewMemberDialog : EditWindowBase
-    {
-        public SelectCrewMemberDialog()
-        {
-            InitializeComponent();
-            Loaded += SelectCrewMemberDialog_Loaded;
-        }
-
-        #region Properties
-
-        public CREW CREW { get; set; }
-
-        #endregion
-
-        #region event handler
-
-        private void SelectCrewMemberDialog_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (CREW != null)
-            {
-                this.DataContext = CREW;
-            }
-        }
-
-        #endregion
-
-    }
-}

ENI2/EditControls/SelectImportClassesDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textSelectImportClasses}" Height="660" Width="250" Background="AliceBlue">
+        Title="{x:Static p:Resources.textSelectImportClasses}" Height="600" Width="250" Background="AliceBlue">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="1*" />

ENI2/EditControls/SelectImportClassesDialog.xaml.cs

@@ -1,13 +1,14 @@
 // Copyright (c) 2017-today schick Informatik
-// Description: Select classes for import via Excel or for sending them once completed
+// Description: Select classes for import
 // Returns: Array of selected classes as property
 
-using bsmd.database;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows;
 
+using bsmd.database;
+
 namespace ENI2.EditControls
 {
     /// <summary>
@@ -16,8 +17,7 @@ namespace ENI2.EditControls
     public partial class SelectImportClassesDialog : ENI2.Controls.EditWindowBase
     {
         private readonly List<SelectClass> _selectClasses = new List<SelectClass>();
-        private readonly List<Message.NotificationClass> _selectedClasses = new List<Message.NotificationClass>();
+        private readonly List<bsmd.database.Message.NotificationClass> _selectedClasses = new List<Message.NotificationClass>();
-        private readonly List<Message.NotificationClass> _preselectedClasses = new List<Message.NotificationClass>();
 
         public SelectImportClassesDialog()
         {
@@ -25,61 +25,35 @@ namespace ENI2.EditControls
             this.Loaded += SelectImportClassesDialog_Loaded;
         }
 
-        /// <summary>
-        /// List of all message classes that are available for selection
-        /// </summary>
         public List<Message.NotificationClass> SelectedClasses
         {
             get { return _selectedClasses; }
         }
 
-        /// <summary>
-        /// Classes that should be checked already when the dialog is opened (relevant for send mode)
-        /// </summary>
-        public List<Message.NotificationClass > PreselectedClasses
-        {
-            get { return _preselectedClasses; }
-        }
-
         /// <summary>
         /// These messages are needed to derive message classes from, already sorted in the right manner
         /// </summary>
         public List<Message> Messages { get; set; }
 
-        /// <summary>
-        /// Flag to reduce selection amount in case of transit
-        /// </summary>
         public bool IsTransit { get; set; }
 
-        /// <summary>
-        /// Flag if dialog is used in import mode (default true). Set false for send all mode.
-        /// </summary>
-        public bool IsImportMode { get; set; } = true;
-
         private void SelectImportClassesDialog_Loaded(object sender, RoutedEventArgs e)
         {
-
+            
-
+            foreach(Message aMessage in this.Messages)
-            foreach (Message aMessage in this.Messages)
             {
-                // these are of no interest
                 if ((aMessage.MessageNotificationClass == Message.NotificationClass.VISIT) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.STO))
-                    continue;
-
-                // these are neither imported nor sent by the Send all function
-
-                if ((aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.ATD))
-                    continue;
-
-
-                // filter out messages not relevant for transit
-                if (IsTransit && (
                     (aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.ATD) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) ||
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.STO) ||
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) || // XXX : TODO remove
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.PASD)
+                    ) continue;
+
+                if (IsTransit &&
+                    ((aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) ||
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.BPOL) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.HAZD) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.INFO) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.LADG) ||
@@ -90,16 +64,15 @@ namespace ENI2.EditControls
                     (aMessage.MessageNotificationClass == Message.NotificationClass.TOWD) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.WAS) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.WAS_RCPT)
-                    )) continue;                
+                    )) continue;
 
                 SelectClass sc = new SelectClass();
-                sc.Name = Enum.GetName(typeof(Message.NotificationClass), aMessage.MessageNotificationClass);
+                sc.Name = Enum.GetName(typeof(bsmd.database.Message.NotificationClass), aMessage.MessageNotificationClass);
                 sc.Class = aMessage.MessageNotificationClass;
-                sc.IsSelected = this._preselectedClasses.Contains(sc.Class);
+                sc.IsSelected = false;
                 _selectClasses.Add(sc);
             }
 
-
             this.checkListBoxClasses.ItemsSource = _selectClasses;
             this.OKClicked += SelectImportClassesDialog_OKClicked;
         }
@@ -126,7 +99,7 @@ namespace ENI2.EditControls
                     OnPropertyChanged("IsSelected");
                 }
             }
-
+            
             public event PropertyChangedEventHandler PropertyChanged;
             protected void OnPropertyChanged(string propertyName)
             {

ENI2/EditControls/SelectPortAreaDialog.xaml

@@ -1,53 +0,0 @@
-<enictrl:EditWindowBase x:Class="ENI2.EditControls.SelectPortAreaDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        xmlns:enictrl="clr-namespace:ENI2.Controls"
-        xmlns:local="clr-namespace:ENI2.EditControls"
-        xmlns:p="clr-namespace:ENI2.Properties"
-        mc:Ignorable="d"
-        Title="Search port area" Height="400" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="28" />
-            <RowDefinition Height="84" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            <RowDefinition Height="90" />
-            <RowDefinition Height="28" />
-            
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80" />
-            <ColumnDefinition Width="2*" />
-        </Grid.ColumnDefinitions>
-        <Label Grid.Row="1" Content="Select" />
-        <Label Grid.Row="0" x:Name="labelLocode" Content="ZZUKN" />
-        <ListBox Name="listBoxAreas" Grid.Column="1" Grid.Row="1" Margin="2" SelectionChanged="comboBoxType_SelectionChanged" />
-        <xctk:WatermarkTextBox Margin="2" Watermark="{x:Static p:Resources.textSearch}" Name="textBoxSearchDescription" Grid.Row="0" Grid.Column="1" TextChanged="textBoxSearchDescription_TextChanged" />
-        <Label Grid.Row="2" Content="Agency" />
-        <Label Grid.Row="3" Content="Ships" />
-        <Label Grid.Row="4" Content="Berth" />
-        <Label Grid.Row="5" Content="PortArea" />
-        <Label Grid.Row="6" Content="Remark" />
-        <Border BorderThickness="1" Grid.Column="1" Grid.Row="2" Grid.RowSpan="1" BorderBrush="Black" Margin="2">
-            <TextBlock Name="textBlockAgency" Margin="2,1,2,3" Background="LightGray" TextWrapping="Wrap"/>
-        </Border>
-        <Border BorderThickness="1" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1" BorderBrush="Black" Margin="2">
-            <TextBlock Name="textBlockShips" Margin="2,1,2,3" Background="LightGray" TextWrapping="Wrap"/>
-        </Border>
-        <Border BorderThickness="1" Grid.Column="1" Grid.Row="4" Grid.RowSpan="1" BorderBrush="Black" Margin="2">
-            <TextBlock Name="textBlockBerth" Margin="2,1,2,3" Background="LightGray" TextWrapping="Wrap"/>
-        </Border>
-        <Border BorderThickness="1" Grid.Column="1" Grid.Row="5" Grid.RowSpan="1" BorderBrush="Black" Margin="2">
-            <TextBlock Name="textBlockPortArea" Margin="2,1,2,3" Background="LightGray" TextWrapping="Wrap"/>
-        </Border>
-        <Border BorderThickness="1" Grid.Column="1" Grid.Row="6" Grid.RowSpan="1" BorderBrush="Black" Margin="2">
-            <TextBlock Name="textBlockRemarks" Margin="2,1,2,3" Background="LightGray" TextWrapping="Wrap"/>
-        </Border>
-    </Grid>
-</enictrl:EditWindowBase>

ENI2/EditControls/SelectPortAreaDialog.xaml.cs

@@ -1,86 +0,0 @@
-// Copyright (c) 2023- schick Informatik
-// Description: Helper search window to 
-//
-
-using bsmd.database;
-using ENI2.Controls;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-
-namespace ENI2.EditControls
-{
-    /// <summary>
-    /// Interaction logic for SelectPortAreaDialog.xaml
-    /// </summary>
-    public partial class SelectPortAreaDialog : EditWindowBase
-    {
-
-        #region Fields
-
-        private readonly string _poc = null;
-        private List<PortAreaInfo> _portAreas;
-        private static readonly object filterLock = new object();
-
-        #endregion
-
-        #region Construction
-
-        public SelectPortAreaDialog(string poc)
-        {
-            InitializeComponent();
-            _poc = poc;
-        }
-
-        #endregion
-
-        #region Properties
-
-        public string SelectedArea { get; private set; }
-
-        #endregion
-
-        #region event handler
-
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            if(LocalizedLookup.getPortAreaInfos().ContainsKey(this._poc))
-                _portAreas = LocalizedLookup.getPortAreaInfos()[this._poc];
-            this.labelLocode.Content = this._poc;
-        }
-
-        private void comboBoxType_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (this.listBoxAreas.SelectedItem is PortAreaInfo pai)
-            {
-                this.textBlockAgency.Text = pai.Agency;
-                this.textBlockBerth.Text = pai.Berth;
-                this.textBlockPortArea.Text = pai.PortArea;
-                this.textBlockShips.Text = pai.Ships;
-                this.textBlockRemarks.Text = pai.Remark;
-                this.SelectedArea = pai.PortAreaCode;
-            }
-        }
-
-        private void textBoxSearchDescription_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
-        {
-            string searchText = this.textBoxSearchDescription.Text.Trim();
-            if (_portAreas == null) return;
-            lock (filterLock)
-            {
-                IEnumerable<PortAreaInfo> filtered = _portAreas;
-                if (searchText.Length > 0)
-                {
-                    filtered = _portAreas.Where(elem => (elem.Remark != null && elem.Remark.ToUpperInvariant().Contains(searchText.ToUpperInvariant())) ||
-                                (elem.Agency != null && elem.Agency.ToUpperInvariant().Contains(searchText.ToUpperInvariant())) ||
-                                (elem.Berth != null && elem.Berth.ToUpperInvariant().Contains(searchText.ToUpperInvariant())) ||
-                                (elem.PortArea != null && elem.PortArea.ToUpperInvariant().Contains(searchText.ToUpperInvariant())));
-                }
-                this.listBoxAreas.ItemsSource = filtered;
-            }
-        }
-
-        #endregion
-
-    }
-}

ENI2/EditControls/ViolationListDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Topmost="False">
+        Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Topmost="False">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />

ENI2/EditControls/VisitIdDialog.xaml

@@ -8,7 +8,7 @@
         xmlns:p="clr-namespace:ENI2.Properties"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_new.ico">
+        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_card_new.ico">
     <Grid Margin="4">
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -52,7 +52,7 @@
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
-        <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" LocodeSource="OLD" />
+        <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" />
         <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
             <DatePicker.BlackoutDates>
                 <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>

ENI2/EditControls/VisitIdDialog.xaml.cs

@@ -133,7 +133,7 @@ namespace ENI2.EditControls
             isComplete &= imo_OR_eni;
 
             string locode = this.locodePoC.LocodeValue;
-            bool validLocode = (locode != null) && (locode.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK") || locode.Equals("DEWHV"));
+            bool validLocode = (locode != null) && (locode.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK"));
 
             isComplete &= validLocode;
 

ENI2/Excel/DakosyUtil.cs

@@ -4,7 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
+
 using bsmd.database;
 
 namespace ENI2.Excel
@@ -74,7 +74,7 @@ namespace ENI2.Excel
                     { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
                     { if (ScanBPOL(message, reader)) ExcelReader.SaveMessage(message); }
-                    if ((message.MessageNotificationClass == Message.NotificationClass.CREWA) && notificationClasses.Contains(Message.NotificationClass.CREWA))
+                    if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW))
                     { if (ScanCREW(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
                     { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
@@ -83,7 +83,7 @@ namespace ENI2.Excel
                     if ((message.MessageNotificationClass == Message.NotificationClass.HAZD) && notificationClasses.Contains(Message.NotificationClass.HAZD))
                     { if (ScanHAZD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.INFO) && notificationClasses.Contains(Message.NotificationClass.INFO))
-                    { if (ScanINFO(message, messageCore, reader)) ExcelReader.SaveMessage(message); continue; }
+                    { if (ScanINFO(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.LADG) && notificationClasses.Contains(Message.NotificationClass.LADG))
                     { if (ScanLADG(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.MDH) && notificationClasses.Contains(Message.NotificationClass.MDH))
@@ -92,8 +92,8 @@ namespace ENI2.Excel
                     { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
                     { if (ScanNOA_NOD(message, reader)) ExcelReader.SaveMessage(message); continue; }
-                    if ((message.MessageNotificationClass == Message.NotificationClass.PASA) && notificationClasses.Contains(Message.NotificationClass.PASA))
+                    if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS))
-                    { if (ScanPASA(message, reader)) ExcelReader.SaveMessage(message); continue; }
+                    { if (ScanPAS(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
                     { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.POBA) && notificationClasses.Contains(Message.NotificationClass.POBA))
@@ -726,61 +726,48 @@ namespace ENI2.Excel
                     pas = new PASD();
                     pas.Identifier = (i + 1).ToString();
                     pas.MessageHeader = pasdMessage;
-                    pas.IsDeparture = true;
                     pasdMessage.Elements.Add(pas);
                 }
 
-                // these two are not working, since the lookup field is a combobox where reading text always yields empty string
+                pas.NotificationSchengen = reader.ReadCellAsBool("passenger departure", "C10");
-                // if there is time we should do the solution suggested in this question
+                pas.NotificationPAX = reader.ReadCellAsBool("passenger departure", "C11");
-                // https://stackoverflow.com/questions/46752911/how-to-read-comboboxes-value-from-excel-using-c-sharp
-
-                pas.NotificationSchengen = true;
-                pas.NotificationPAX = reader.ReadCellAsBool("passenger departure", "C11") ?? false;
 
                 pas.PassengerLastName = lastName;
                 pas.PassengerFirstName = reader.ReadCellAsText("passenger departure", string.Format("C{0}", i + 16));
                 pas.PassengerPlaceOfBirth = reader.ReadCellAsText("passenger departure", string.Format("D{0}", i + 16));
-                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger departure", string.Format("E{0}", i + 16)), out bool canceled, false);
+                pas.PassengerCountryOfBirth = reader.ReadCellAsText("passenger departure", string.Format("E{0}", i + 16));
-                if (canceled) return false;
                 pas.PassengerDateOfBirth = reader.ReadCellAsDateTime("passenger departure", string.Format("F{0}", i + 16));
                 pas.PassengerGender = ParseGender(reader.ReadCellAsText("passenger departure", string.Format("G{0}", i + 16)));
-                pas.PassengerNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger departure", string.Format("H{0}", i + 16)), out canceled);
+                pas.PassengerNationality = reader.ReadCellAsText("passenger departure", string.Format("H{0}", i + 16));
-                if (canceled) return false;
+                pas.PassengerIdentityDocumentIssuingState = reader.ReadCellAsText("passenger departure", string.Format("O{0}", i + 16));
-                pas.PassengerIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger departure", string.Format("O{0}", i + 16)), out canceled);
-                if (canceled) return false;
                 pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("passenger departure", string.Format("P{0}", i + 16));
 
-                
+                if (pas.NotificationPAX ?? false)
-                pas.EmergencyCare = reader.ReadCellAsText("passenger departure", string.Format("Q{0}", i + 16));
+                {
-                pas.EmergencyContactNumber = reader.ReadCellAsText("passenger departure", string.Format("R{0}", i + 16));
+                    pas.EmergencyCare = reader.ReadCellAsText("passenger departure", string.Format("Q{0}", i + 16));
-                
+                    pas.EmergencyContactNumber = reader.ReadCellAsText("passenger departure", string.Format("R{0}", i + 16));
-                pas.PassengerIdentityDocumentType = ParseDocumentType(reader.ReadCellAsText("passenger departure", string.Format("I{0}", i + 16)));
+                }
-                pas.PassengerIdentityDocumentId = reader.ReadCellAsText("passenger departure", string.Format("J{0}", i + 16));
-                pas.PassengerVisaNumber = reader.ReadCellAsText("passenger departure", string.Format("K{0}", i + 16));
-                pas.PassengerPortOfEmbarkation = reader.ReadCellAsText("passenger departure", string.Format("L{0}", i + 16));
-                pas.PassengerPortOfDisembarkation = reader.ReadCellAsText("passenger departure", string.Format("M{0}", i + 16));
-                pas.PassengerInTransit = reader.ReadCellAsBool("passenger departure", string.Format("N{0}", i + 16));                
 
-                // if (pas.HasSchengenDetails) pas.NotificationSchengen = true;
+                if (pas.NotificationSchengen ?? false)
-                // if (pas.HasPAXDetails) pas.NotificationPAX = true;
+                {
+                    pas.PassengerIdentityDocumentType = ParseDocumentType(reader.ReadCellAsText("passenger departure", string.Format("I{0}", i + 16)));
+                    pas.PassengerIdentityDocumentId = reader.ReadCellAsText("passenger departure", string.Format("J{0}", i + 16));
+                    pas.PassengerVisaNumber = reader.ReadCellAsText("passenger departure", string.Format("K{0}", i + 16));
+                    pas.PassengerPortOfEmbarkation = reader.ReadCellAsText("passenger departure", string.Format("L{0}", i + 16));
+                    pas.PassengerPortOfDisembarkation = reader.ReadCellAsText("passenger departure", string.Format("M{0}", i + 16));
+                    pas.PassengerInTransit = reader.ReadCellAsBool("passenger departure", string.Format("N{0}", i + 16));
+                }
 
                 result = true;
             }
-
-            bool mustPAX = pasdMessage.Elements.Count >= 12;
-            if (mustPAX)
-            {
-                foreach (PASD pasd in pasdMessage.Elements.Cast<PASD>())
-                    pasd.NotificationPAX = mustPAX;
-            }
             return result;
         }
 
         #endregion
 
-        #region PASA
+        #region PAS
 
-        private static bool ScanPASA(Message pasMessage, ExcelReader reader)
+        private static bool ScanPAS(Message pasMessage, ExcelReader reader)
         {
             bool result = false;
             for (int i = 0; i < 1000; i++)
@@ -796,46 +783,37 @@ namespace ENI2.Excel
                     pasMessage.Elements.Add(pas);
                 }
 
-                pas.NotificationSchengen = true;
+                pas.NotificationSchengen = reader.ReadCellAsBool("passenger arrival", "C10");
-                pas.NotificationPAX = reader.ReadCellAsBool("passenger arrival", "C11") ?? false;
+                pas.NotificationPAX = reader.ReadCellAsBool("passenger arrival", "C11");
 
                 pas.PassengerLastName = lastName;
                 pas.PassengerFirstName = reader.ReadCellAsText("passenger arrival", string.Format("C{0}", i + 16));
                 pas.PassengerPlaceOfBirth = reader.ReadCellAsText("passenger arrival", string.Format("D{0}", i + 16));
-                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("E{0}", i + 16)), out bool canceled, false);
+                pas.PassengerCountryOfBirth = reader.ReadCellAsText("passenger arrival", string.Format("E{0}", i + 16));
-                if (canceled) return false;
                 pas.PassengerDateOfBirth = reader.ReadCellAsDateTime("passenger arrival", string.Format("F{0}", i + 16));
                 pas.PassengerGender = ParseGender(reader.ReadCellAsText("passenger arrival", string.Format("G{0}", i + 16)));
-                pas.PassengerNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("H{0}", i + 16)), out canceled);
+                pas.PassengerNationality = reader.ReadCellAsText("passenger arrival", string.Format("H{0}", i + 16));
-                if(canceled) return false;
+                pas.PassengerIdentityDocumentIssuingState = reader.ReadCellAsText("passenger arrival", string.Format("O{0}", i + 16));
-                pas.PassengerIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("O{0}", i + 16)), out canceled);
-                if (canceled) return false;
                 pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("passenger arrival", string.Format("P{0}", i + 16));
-                
-                pas.EmergencyCare = reader.ReadCellAsText("passenger arrival", string.Format("Q{0}", i + 16));
-                pas.EmergencyContactNumber = reader.ReadCellAsText("passenger arrival", string.Format("R{0}", i + 16));
-                
-                pas.PassengerIdentityDocumentType = ParseDocumentType(reader.ReadCellAsText("passenger arrival", string.Format("I{0}", i + 16)));
-                pas.PassengerIdentityDocumentId = reader.ReadCellAsText("passenger arrival", string.Format("J{0}", i + 16));
-                pas.PassengerVisaNumber = reader.ReadCellAsText("passenger arrival", string.Format("K{0}", i + 16));
-                pas.PassengerPortOfEmbarkation = reader.ReadCellAsText("passenger arrival", string.Format("L{0}", i + 16));
-                pas.PassengerPortOfDisembarkation = reader.ReadCellAsText("passenger arrival", string.Format("M{0}", i + 16));
-                pas.PassengerInTransit = reader.ReadCellAsBool("passenger arrival", string.Format("N{0}", i + 16));
-                
 
-                // if (pas.HasSchengenDetails) pas.NotificationSchengen = true;
+                //if(pas.NotificationPAX ?? false)
-                // if (pas.HasPAXDetails) pas.NotificationPAX = true;
+                //{
+                    pas.EmergencyCare = reader.ReadCellAsText("passenger arrival", string.Format("Q{0}", i + 16));
+                    pas.EmergencyContactNumber = reader.ReadCellAsText("passenger arrival", string.Format("R{0}", i + 16));
+                //}
+
+                //if(pas.NotificationSchengen ?? false)
+                //{
+                    pas.PassengerIdentityDocumentType = ParseDocumentType(reader.ReadCellAsText("passenger arrival", string.Format("I{0}", i + 16)));
+                    pas.PassengerIdentityDocumentId = reader.ReadCellAsText("passenger arrival", string.Format("J{0}", i + 16));
+                    pas.PassengerVisaNumber = reader.ReadCellAsText("passenger arrival", string.Format("K{0}", i + 16));
+                    pas.PassengerPortOfEmbarkation = reader.ReadCellAsText("passenger arrival", string.Format("L{0}", i + 16));
+                    pas.PassengerPortOfDisembarkation = reader.ReadCellAsText("passenger arrival", string.Format("M{0}", i + 16));
+                    pas.PassengerInTransit = reader.ReadCellAsBool("passenger arrival", string.Format("N{0}", i + 16));
+                //}
 
                 result = true;
             }
-
-            bool mustPAX = pasMessage.Elements.Count >= 12;
-            if (mustPAX)
-            {
-                foreach (PAS pasa in pasMessage.Elements.Cast<PAS>())
-                    pasa.NotificationPAX = mustPAX;
-            }
-
             return result;
         }
 
@@ -1117,7 +1095,7 @@ namespace ENI2.Excel
 
         #region INFO
 
-        private static bool ScanINFO(Message infoMessage, MessageCore core, ExcelReader reader)
+        private static bool ScanINFO(Message infoMessage, ExcelReader reader)
         {
             if (infoMessage.Elements.Count == 0)
             {
@@ -1142,26 +1120,7 @@ namespace ENI2.Excel
             if (!portArea.IsNullOrEmpty() && DBManager.Instance.GetPortAreaDict().ContainsKey(portArea))
                 info.PortArea = portArea;
             else
-                info.PortArea = "";
+                info.PortArea = "";            
-
-            // März 2024: Spezialfall für Abrechnungsabteilung Bremenports: Feld wird markiert (falls genügend Platz)
-            // falls das Schiff nach DEBRE oder DEBHV geht:
-
-            if (core.PoC.Equals("DEBRE") || core.PoC.Equals("DEBRV"))
-            {
-                if (info.SpecialRequirementsOfShipAtBerth == null)
-                {
-                    info.SpecialRequirementsOfShipAtBerth = "NSW by BSMD";
-                }
-                else if (info.SpecialRequirementsOfShipAtBerth.Length <= 241) // we have enough space
-                {
-                    if (info.SpecialRequirementsOfShipAtBerth.Length > 0) // if there is text already add a separator
-                    {
-                        info.SpecialRequirementsOfShipAtBerth += " | ";
-                    }
-                    info.SpecialRequirementsOfShipAtBerth += "NSW by BSMD";
-                }
-            }
 
             return true;
         }
@@ -1197,34 +1156,32 @@ namespace ENI2.Excel
                     crew = new CREWD();
                     crew.Identifier = (i + 1).ToString();
                     crew.MessageHeader = crewMessage;
-                    crew.IsDeparture = true;
                     crewMessage.Elements.Add(crew);
                 }
 
-                crew.NotificationSchengen = true;
+                crew.NotificationSchengen = reader.ReadCellAsBool("crew departure", "C10");
                 crew.NotificationPAX = reader.ReadCellAsBool("crew departure", "C11");
 
                 crew.CrewMemberLastName = lastName;
                 crew.CrewMemberFirstName = reader.ReadCellAsText("crew departure", string.Format("C{0}", i + 15));
                 crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText("crew departure", string.Format("D{0}", i + 15));
-                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("E{0}", i + 15)), out bool canceled, false);
+                crew.CrewMemberCountryOfBirth = reader.ReadCellAsText("crew departure", string.Format("E{0}", i + 15));
-                if (canceled) return false;
                 crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew departure", string.Format("F{0}", i + 15));
                 string gender = reader.ReadCellAsText("crew departure", string.Format("G{0}", i + 15));
                 crew.CrewMemberGender = ParseGender(gender);
-                crew.CrewMemberNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("H{0}", i + 15)), out canceled);
+                crew.CrewMemberNationality = reader.ReadCellAsText("crew departure", string.Format("H{0}", i + 15));
-                if (canceled) return false;
+
-                
+                if (crew.NotificationSchengen ?? false)
-                string idDocType = reader.ReadCellAsText("crew departure", string.Format("I{0}", i + 15));
+                {
-                crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType);
+                    string idDocType = reader.ReadCellAsText("crew departure", string.Format("I{0}", i + 15));
-                crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew departure", string.Format("J{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType);
-                crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew departure", string.Format("K{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew departure", string.Format("J{0}", i + 15));
-                crew.CrewMemberIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("M{0}", i + 15)), out canceled);
+                    crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew departure", string.Format("K{0}", i + 15));
-                if (canceled) return false;
+                    crew.CrewMemberIdentityDocumentIssuingState = reader.ReadCellAsText("crew departure", string.Format("M{0}", i + 15));
-                crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew departure", string.Format("N{0}", i + 15));                
+                    crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew departure", string.Format("N{0}", i + 15));
+                }
 
                 crew.CrewMemberDuty = reader.ReadCellAsText("crew departure", string.Format("L{0}", i + 15));
-                if (crew.CrewMemberDuty.IsNullOrEmpty()) crew.CrewMemberDuty = "unknown";
 
                 result = true;
             }
@@ -1233,7 +1190,7 @@ namespace ENI2.Excel
 
         #endregion
 
-        #region CREWA
+        #region CREW
 
         private static bool ScanCREW(Message crewMessage, ExcelReader reader)
         {
@@ -1251,30 +1208,29 @@ namespace ENI2.Excel
                     crewMessage.Elements.Add(crew);
                 }
 
-                crew.NotificationSchengen = true;
+                crew.NotificationSchengen = reader.ReadCellAsBool("crew arrival", "C10");
-                crew.NotificationPAX = reader.ReadCellAsBool("crew arrival", "C11") ?? false;
+                crew.NotificationPAX = reader.ReadCellAsBool("crew arrival", "C11");
 
                 crew.CrewMemberLastName = lastName;
                 crew.CrewMemberFirstName = reader.ReadCellAsText("crew arrival", string.Format("C{0}", i + 15));
                 crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText("crew arrival", string.Format("D{0}", i + 15));
-                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("E{0}", i + 15)), out bool canceled, false);
+                crew.CrewMemberCountryOfBirth = reader.ReadCellAsText("crew arrival", string.Format("E{0}", i + 15));
-                if (canceled) return false;
                 crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew arrival", string.Format("F{0}", i + 15));
                 string gender = reader.ReadCellAsText("crew arrival", string.Format("G{0}", i + 15));
                 crew.CrewMemberGender = ParseGender(gender);
-                crew.CrewMemberNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("H{0}", i + 15)), out canceled);
+                crew.CrewMemberNationality = reader.ReadCellAsText("crew arrival", string.Format("H{0}", i + 15));
-                if (canceled) return false;
 
-                string idDocType = reader.ReadCellAsText("crew arrival", string.Format("I{0}", i + 15));
+                //if(crew.NotificationSchengen ?? false)
-                crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType);
+                //{
-                crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew arrival", string.Format("J{0}", i + 15));
+                    string idDocType = reader.ReadCellAsText("crew arrival", string.Format("I{0}", i + 15));
-                crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew arrival", string.Format("K{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType);
-                crew.CrewMemberIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("M{0}", i + 15)), out canceled);
+                    crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew arrival", string.Format("J{0}", i + 15));
-                if (canceled) return false;
+                    crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew arrival", string.Format("K{0}", i + 15));
-                crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew arrival", string.Format("N{0}", i + 15));                
+                    crew.CrewMemberIdentityDocumentIssuingState = reader.ReadCellAsText("crew arrival", string.Format("M{0}", i + 15));
+                    crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew arrival", string.Format("N{0}", i + 15));
+                //}
 
                 crew.CrewMemberDuty = reader.ReadCellAsText("crew arrival", string.Format("L{0}", i + 15));
-                if (crew.CrewMemberDuty.IsNullOrEmpty()) crew.CrewMemberDuty = "unknown";
 
                 result = true;
             }

ENI2/Excel/ExcelBase.cs

@@ -7,7 +7,6 @@ using Microsoft.Office.Interop.Excel;
 using System.Runtime.InteropServices;
 using log4net;
 using System.Globalization;
-using System.Text.RegularExpressions;
 
 namespace ENI2.Excel
 {
@@ -106,20 +105,6 @@ namespace ENI2.Excel
             }
         }
 
-        private static double? ParseAnyDouble(string val)
-        {
-            double? result = null;
-            if (double.TryParse(val, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
-                           CultureInfo.InvariantCulture, out double tmpDouble))
-                result = tmpDouble;
-            if (result == null)
-            {
-                if (double.TryParse(val, out tmpDouble)) // current language style (==GER, mit , statt .)
-                    result = tmpDouble;
-            }
-            return result;
-        }
-
         internal double? ReadNumber(string lookup)
         {
             double? result = null;
@@ -129,17 +114,15 @@ namespace ENI2.Excel
                 {
                     var val = _nameDict[lookup].RefersToRange.Value;
                     if (val is double) result = val;
-                    if ((val is string) && (val.Length > 0))
+                    if (val is string)
                     {
-                        result = ParseAnyDouble(val);
+                        if (double.TryParse(val, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
-
+                            CultureInfo.InvariantCulture, out double tmpDouble))
-                        if(result == null)
+                            result = tmpDouble;
-                        {                            
+                        if (result == null)
-                            Match m = Regex.Match(val, "([0-9\\.\\,]+)([a-zA-Z]*)");
+                        {
-                            if (m.Success)
+                            if (double.TryParse(val, out tmpDouble)) // current language style (==GER, mit , statt .)
-                            {
+                                result = tmpDouble;
-                                result = ParseAnyDouble(m.Groups[1].Value);
-                            }                            
                         }
                     }
 

ENI2/Excel/ExcelReader.cs

@@ -49,14 +49,9 @@ namespace ENI2.Excel
         {
             message.CreatedBy = "EXCEL";
             if (message.MessageNotificationClass == Message.NotificationClass.STO)
-            {
                 message.InternalStatus = Message.BSMDStatus.PREPARE;
-            }
             else
-            {
                 message.InternalStatus = Message.BSMDStatus.EXCEL;
-                message.ChangedBy = ReportingParty.CurrentReportingParty?.Logon;
-            }
             message.UnsentMessageWarningShown = false;
             DBManager.Instance.Save(message);
             message.SaveElements();
@@ -128,7 +123,7 @@ namespace ENI2.Excel
                 if (portName.IsNullOrEmpty())
                 {
                     _log.WarnFormat("unknown Locode {0}", val);
-                    val = null;
+                    val = "";
                 }
             }
             return val;
@@ -283,7 +278,7 @@ namespace ENI2.Excel
                 }
             }
             return val;
-        }        
+        }
 
         internal byte? ReadHullConfiguration(string lookup)
         {
@@ -636,20 +631,14 @@ namespace ENI2.Excel
             }
         }
 
-        internal string ReadCellAsText(string sheetName, string range, int? maxLength = null)
+        internal string ReadCellAsText(string sheetName, string range)
         {
             try
             {
                 Worksheet workSheet = (Worksheet)_workBook.Worksheets[sheetName];
                 string result = workSheet.Range[range].Text.ToString();
                 if (!result.IsNullOrEmpty())
-                {
                     result = result.Trim().Clean();
-                    if(maxLength.HasValue && result.Length > maxLength.Value)
-                    {
-                        result = result.Substring(0, maxLength.Value);
-                    }
-                }
                 return result;
             }
             catch (Exception e)

ENI2/Excel/ExcelWriter.cs

@@ -76,12 +76,12 @@ namespace ENI2.Excel
                                 this.WriteItineraries(bpol);
                             }
                             break;
-                        case Message.NotificationClass.CREWA:
+                        case Message.NotificationClass.CREW:
                             this.WriteCREW(message, true, isRefSheet);
                             break;
-                        case Message.NotificationClass.CREWD:
+                        //case Message.NotificationClass.CREWD: // XXX-TODO
-                            this.WriteCREW(message, false, isRefSheet);
+                        //    this.WriteCREW(message, false, isRefSheet);
-                            break;
+                        //    break;
                         case Message.NotificationClass.HAZA:
                             this.WriteHAZ(message, true);
                         break;
@@ -111,12 +111,12 @@ namespace ENI2.Excel
                         case Message.NotificationClass.NOA_NOD:
                             if (message.Elements[0] is NOA_NOD noa_nod) this.WriteNOA_NOD(noa_nod, core.IsTransit, isRefSheet);
                             break;
-                        case Message.NotificationClass.PASA:
+                        case Message.NotificationClass.PAS:
                             this.WritePAS(message, true, isRefSheet);
                             break;
-                        case Message.NotificationClass.PASD:
+                        //case Message.NotificationClass.PASD: // XXX - TODO
-                            this.WritePAS(message, false, isRefSheet);
+                        //    this.WritePAS(message, false, isRefSheet);
-                            break;
+                        //    break;
                         case Message.NotificationClass.POBA:
                             if (message.Elements[0] is POBA poba) this.WriteMessage(poba);
                             break;
@@ -378,12 +378,14 @@ namespace ENI2.Excel
 
         private void WriteCREW(Message crewMessage, bool isArrival, bool isRefSheet)
         {
-            
+
+            /* XXX - TODO
             if (crewMessage.Elements.Count > 0)
             {
                 WriteBoolean(string.Format("CREW{0}.NotificationSchengen", isArrival ? "" : "D"), ((CREW)crewMessage.Elements[0]).NotificationSchengen);
                 WriteBoolean(string.Format("CREW{0}.NotificationPAX", isArrival ? "" : "D"), ((CREW)crewMessage.Elements[0]).NotificationPAX);
-            }            
+            }
+            */
 
             for(int i = 0; i<Math.Min(crewMessage.NumberOfExcelRows, crewMessage.Elements.Count); i++)
             {
@@ -793,12 +795,13 @@ namespace ENI2.Excel
 
         private void WritePAS(Message pasMessage, bool isArrival, bool isRefSheet)
         {
-            
+            /* XXX - TODO
             if(pasMessage.Elements.Count > 0)
             {
                 WriteBoolean(string.Format("PAS{0}.NotificationSchengen", isArrival ? "" : "D"), ((PAS)pasMessage.Elements[0]).NotificationSchengen);
                 WriteBoolean(string.Format("PAS{0}.NotificationPAX", isArrival ? "" : "D"), ((PAS)pasMessage.Elements[0]).NotificationPAX);
-            }            
+            }
+            */
 
             for(int i = 0; i < Math.Min(pasMessage.NumberOfExcelRows, pasMessage.Elements.Count); i++)
             {

ENI2/LocalizedLookup.cs

@@ -16,7 +16,6 @@ namespace ENI2
         private static readonly SQLiteConnection _con;
         private const string _locode_DB_NAME = "db.sqlite";
         private static Dictionary<string, string> _nationalities = null;
-        private static Dictionary<string, List<PortAreaInfo>> _portAreaInfos = null;
 
         static LocalizedLookup()
         {
@@ -189,8 +188,6 @@ namespace ENI2
             return result;
         }
 
-
-
         public static Dictionary<string, string> getCargoCodesNST()
         {
             Dictionary<string, string> result = new Dictionary<string, string>();
@@ -291,59 +288,5 @@ namespace ENI2
             reader.Close();
             return result;
         }
-
-        public static List<string> getMVSHLocodes()
-        {
-            List<string> result = new List<string>();
-
-            string query = string.Format("SELECT  locode from MVSH_ports");
-            SQLiteCommand cmd = new SQLiteCommand(query, _con);
-            IDataReader reader = cmd.ExecuteReader();
-            while (reader.Read())
-            {
-                if (reader.IsDBNull(0)) continue;
-                result.Add(reader.GetString(0));
-            }
-            reader.Close();
-            return result;
-        }
-
-        public static Dictionary<string, List<PortAreaInfo>> getPortAreaInfos()
-        {
-            int cnt = 0;
-            if (_portAreaInfos == null)
-            {
-                _portAreaInfos = new Dictionary<string, List<PortAreaInfo>>();
-                string query = @"SELECT Locode, Agentur, Schiffe, Liegeplatz, Hafengebiet, `Hafengebiet-Code`, Bemerkungen from INFO_PortArea_Helper";
-                SQLiteCommand cmd = new SQLiteCommand(query, _con);
-                IDataReader reader = cmd.ExecuteReader();                
-                while(reader.Read())
-                {
-                    PortAreaInfo pai = new PortAreaInfo();
-                    if (reader.IsDBNull(0)) continue;
-                    pai.Locode = reader.GetString(0);
-                    if (!reader.IsDBNull(1))
-                        pai.Agency = reader.GetString(1);
-                    if (!reader.IsDBNull(2))
-                        pai.Ships = reader.GetString(2);
-                    if (!reader.IsDBNull(3))
-                        pai.Berth = reader.GetString(3);
-                    if (!reader.IsDBNull(4))
-                        pai.PortArea = reader.GetString(4);
-                    if (!reader.IsDBNull(5))
-                        pai.PortAreaCode = reader.GetString(5);
-                    if (!reader.IsDBNull(6))
-                        pai.Remark = reader.GetString(6);
-                    if (!_portAreaInfos.ContainsKey(pai.Locode))
-                    {
-                        _portAreaInfos[pai.Locode] = new List<PortAreaInfo>();
-                    }
-                    _portAreaInfos[pai.Locode].Add(pai);
-                    cnt++;
-                }
-            }
-            return _portAreaInfos;
-        }
-
     }
 }

ENI2/MainWindow.xaml

@@ -10,9 +10,7 @@
         xmlns:util="clr-namespace:ENI2.Util"
         xmlns:local="clr-namespace:ENI2"        
         mc:Ignorable="d"
-        Title="ENI 2 Testversion" 
+        Title="ENI 2" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
-        Height="{util:SettingBinding Height}" Width="{util:SettingBinding Width}" 
-        Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
         SourceInitialized="Window_SourceInitialized">
 
     <Window.CommandBindings>
@@ -95,14 +93,8 @@
                 <MenuItem x:Name="menuItemUserAdministration" Header="{x:Static p:Resources.textUserAdministration}" Click="radioButton_Click" Visibility="Hidden"/>
                 <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" />
                 <MenuItem x:Name="labelStatusId" />
                 <MenuItem Header="Help" HorizontalAlignment="Right">
-                    <MenuItem Header="Change Password" Click="buttonChangePassword_Click">
-                        <MenuItem.Icon>
-                            <Image Source="Resources/lock.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
                     <MenuItem Header="About" Click="buttonAbout_Click">
                         <MenuItem.Icon>
                             <Image Source="Resources/about.png" />

ENI2/MainWindow.xaml.cs

@@ -39,7 +39,6 @@ namespace ENI2
         private ServerStatusControl statusControl;
         private readonly SucheControl sucheControl;
         private CompareExcelDialog compareExcelDialog;
-        private EasyPeasyControl easyPeasyControl;
         
         private bool dbConnected;
         private readonly ScaleTransform _transform = new ScaleTransform(1.0, 1.0);
@@ -80,7 +79,7 @@ namespace ENI2
 
         #region Search related event handler
 
-        private void AnmeldungenControl_MessageCoreSelected(MessageCore aMessageCore, ReportingParty.ShipcallDisplayModeEnum displayMode = ReportingParty.ShipcallDisplayModeEnum.CLASSIC)
+        private void AnmeldungenControl_MessageCoreSelected(MessageCore aMessageCore)
         {
             if(aMessageCore != null)
             {
@@ -121,7 +120,7 @@ namespace ENI2
                         iDidLockIt);
                     searchResultItem.IsCancelled = aMessageCore.Cancelled ?? false;
 
-                    DetailRootControl drc = new DetailRootControl(aMessageCore, displayMode);                    
+                    DetailRootControl drc = new DetailRootControl(aMessageCore);
                     drc.LockedByOtherUser = !iDidLockIt;
 
                     if (!(aMessageCore.Cancelled ?? false))
@@ -136,7 +135,7 @@ namespace ENI2
                     this._dbWatchDog.Register(aMessageCore);
 
                     drc.HighlightReset += Drc_HighlightReset;
-                    drc.OpenNewCoreRequested += (core) => this.AnmeldungenControl_MessageCoreSelected(core, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
+                    drc.OpenNewCoreRequested += (core) => this.AnmeldungenControl_MessageCoreSelected(core);
                     drc.ReloadCoreRequested += Drc_ReloadCoreRequested;
 
                 }
@@ -219,26 +218,15 @@ namespace ENI2
                 // Dez.22: Special case for BRE/BRV: Warning if some messages are not "confirmed"
                 if(drc.Core.PoC.Equals("DEBRE")||drc.Core.PoC.Equals("DEBRV"))
                 {
-                    if(drc.HasCriticalInfoMissing(out string missingClass, drc.Core.PoC))
+                    if(drc.HasCriticalInfoMissing(out string missingClass))
                     {
-                        // _log.WarnFormat("set close warning because at least {0} is missing from BRE/BRV/HAM arrival", missingClass);
+                        _log.WarnFormat("set close warning because at least {0} is missing from BRE/BRV arrival", missingClass);
                         if (MessageBox.Show(string.Format(Properties.Resources.textSpecialCaseBREBRV, missingClass), Properties.Resources.textConfirmation, MessageBoxButton.YesNo,
                         MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
                             e.Cancel = true;
                     }
                 }
 
-                // Jul.24: Special case HAM extended (from above)
-                if (drc.Core.PoC.Equals("DEHAM"))
-                {
-                    if (drc.HasCriticalInfoMissing(out string missingClass, drc.Core.PoC))
-                    {                        
-                        if (MessageBox.Show(string.Format(Properties.Resources.textSpecialCaseDEHAM, missingClass), Properties.Resources.textConfirmation, MessageBoxButton.YesNo,
-                        MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
-                            e.Cancel = true;
-                    }
-                }
-
                 if (!e.Cancel)
                 {
                     if (lockedCores.ContainsKey(tabItem))
@@ -325,14 +313,6 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(this.vmControl);
             }
-            else if(sender == this.menuItemEasyPeasy)
-            {
-                if(this.easyPeasyControl == null)
-                {
-                    this.easyPeasyControl = new EasyPeasyControl();
-                }
-                this.rootContainer.Children.Add(this.easyPeasyControl);                
-            }
         }
 
         private void buttonCompareSheets_Click(object sender, RoutedEventArgs ev)
@@ -348,13 +328,7 @@ namespace ENI2
             {
                 compareExcelDialog.BringUp();
             }
-        }
 
-        private void buttonChangePassword_Click(object sender, RoutedEventArgs e)
-        {
-            ChangePasswordDialog cpd = new ChangePasswordDialog();
-            cpd.CurrentUser = this.userEntity;
-            cpd.ShowDialog();
         }
 
         #endregion
@@ -386,8 +360,6 @@ namespace ENI2
             Properties.Settings.Default.MainWindowPlacement = this.GetPlacement();
             Properties.Settings.Default.Save();
             Microsoft.Win32.SystemEvents.SessionEnded -= SystemEvents_SessionEnded;
-            if (easyPeasyControl != null)
-                easyPeasyControl.SaveState();
         }
 
         private void Window_SourceInitialized(object sender, EventArgs e)
@@ -483,7 +455,7 @@ namespace ENI2
                         if (((ShowIdDialog)sid).OpenCore)
                         {
                             Dispatcher.BeginInvoke((Action)(() => {
-                                this.AnmeldungenControl_MessageCoreSelected(closedDialog.Core, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode); // in einem neuen Reiter öffnen                                                   
+                                this.AnmeldungenControl_MessageCoreSelected(closedDialog.Core); // in einem neuen Reiter öffnen                                                   
                             }));
                         }
 
@@ -551,7 +523,7 @@ namespace ENI2
 
                         // Meldeklassen für neuen Anlauf erzeugen:
                         bsmd.database.Util.CreateMessagesForCore(newCore, null, userEntity);
-                        this.AnmeldungenControl_MessageCoreSelected(newCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode); // in einem neuen Reiter öffnen
+                        this.AnmeldungenControl_MessageCoreSelected(newCore); // in einem neuen Reiter öffnen
 
                         // watchdog registrieren, damit die "grüne" Markierung erscheint, sobald die Anmeldung durch den Excel-Prozess gelaufen ist.
                         this._dbWatchDog.Register(newCore);
@@ -623,7 +595,7 @@ namespace ENI2
                             showIdDialog.Closed += (sid, showIdArgs) =>
                             {
                                 if (((ShowIdDialog)sid).OpenCore)
-                                    this.AnmeldungenControl_MessageCoreSelected(changedCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
+                                    this.AnmeldungenControl_MessageCoreSelected(changedCore);
                             };
                             showIdDialog.Show();
                             showIdDialog.Activate();
@@ -701,13 +673,11 @@ namespace ENI2
                     ReportingParty.CurrentReportingParty = this.userEntity;
                     this.menuItemMaersk.Visibility = Visibility.Visible;
                     this.menuItemValueMappings.Visibility = Visibility.Visible;
-                    this.menuItemEasyPeasy.Visibility = Visibility.Visible;
                     if (this.userEntity.IsAdmin)
                     {
-                        this.menuItemUserAdministration.Visibility = Visibility.Visible;
+                        this.menuItemUserAdministration.Visibility = Visibility.Visible;                        
                         this.sucheControl.AdminMode = true;
-                    }
+                    }                    
-                    this.menuItemValueMappings.Visibility = this.userEntity.IsEditor ? Visibility.Visible : Visibility.Hidden;
                     break;
                 case ReportingParty.LogonResult.FAILED:
                     this.labelLoginResult.Content = Properties.Resources.textWrongPassword;
@@ -764,7 +734,6 @@ namespace ENI2
         }
 
         #endregion
-
+       
-        
     }
 }

ENI2/Properties/Resources.resx

@@ -586,18 +586,6 @@
   <data name="user_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user_edit4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="user_edit3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="user_edit2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="user_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="textSave" xml:space="preserve">
     <value>Save</value>
   </data>
@@ -1184,7 +1172,7 @@
     <value>Category</value>
   </data>
   <data name="textColumsOfIBC" xml:space="preserve">
-    <value>Columns "o" of IBC Code (value 15.19)</value>
+    <value>Columns "o" of OBC Code (value 15.19)</value>
   </data>
   <data name="textContainerNo" xml:space="preserve">
     <value>Container No.</value>
@@ -1618,9 +1606,6 @@
   <data name="textCopyClip" xml:space="preserve">
     <value>Copy Id to clipboard</value>
   </data>
-  <data name="textCopyShipnameClip" xml:space="preserve">
-    <value>Copy ship name to clipboard</value>
-  </data>
   <data name="textUpdateStatus" xml:space="preserve">
     <value>Server status update</value>
   </data>
@@ -1757,7 +1742,7 @@
     <value>Select all</value>
   </data>
   <data name="textSelectImportClasses" xml:space="preserve">
-    <value>Select message classes</value>
+    <value>Select classes to import</value>
   </data>
   <data name="textSelectNone" xml:space="preserve">
     <value>Select none</value>
@@ -1874,7 +1859,7 @@
     <value>Search NST2007 list</value>
   </data>
   <data name="textSpecialCaseBREBRV" xml:space="preserve">
-    <value>At least one of NOA_NOD, AGNT, INFO, SEC, TIEFA, SERV hasn't been sent for DEBRE/DEBRV/DEHAM: ({0}) Close anyway?</value>
+    <value>At least one of NOA_NOD, AGNT, INFO, SEC, TIEFA hasn't been sent for DEBRE/DEBRV: ({0}) Close anyway?</value>
   </data>
   <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1897,375 +1882,4 @@
   <data name="textExcelValueMappings" xml:space="preserve">
     <value>Excel import value mappings</value>
   </data>
-  <data name="textCopyFromWAS" xml:space="preserve">
-    <value>Copy from WAS</value>
-  </data>
-  <data name="textCopyToWASConfirmation" xml:space="preserve">
-    <value>Do you want to copy / overwrite disposal amounts using values from WAS?</value>
-  </data>
-  <data name="textCopyToCREWA" xml:space="preserve">
-    <value>Copy to CREWA</value>
-  </data>
-  <data name="textCopyToCREWD" xml:space="preserve">
-    <value>Copy to CREWD</value>
-  </data>
-  <data name="textCopyToPASA" xml:space="preserve">
-    <value>Copy to PASA</value>
-  </data>
-  <data name="textCopyToPASD" xml:space="preserve">
-    <value>Copy to PASD</value>
-  </data>
-  <data name="textSpecialCaseDEHAM" xml:space="preserve">
-    <value>{0} has not been sent for DEHAM. Close anyway?</value>
-  </data>
-  <data name="textDeleteAllEntries" xml:space="preserve">
-    <value>Delete all entries</value>
-  </data>
-  <data name="textConfimDeleteAllEntries" xml:space="preserve">
-    <value>This will delete all entries. Are you sure?</value>
-  </data>
-  <data name="textVoyage" xml:space="preserve">
-    <value>1. Voyage</value>
-  </data>
-  <data name="text11PreviousPort" xml:space="preserve">
-    <value>1.1 Previous port</value>
-  </data>
-  <data name="text12IncomingVoyage" xml:space="preserve">
-    <value>1.2 Incoming voyage</value>
-  </data>
-  <data name="text13RelevantPortcall" xml:space="preserve">
-    <value>1.3 Relevant Portcall (port of call) / Kiel-Canal-Transit</value>
-  </data>
-  <data name="text14OutgoingVoyage" xml:space="preserve">
-    <value>1.4 Outgoing voyage</value>
-  </data>
-  <data name="text15NextPort" xml:space="preserve">
-    <value>1.5 Next port</value>
-  </data>
-  <data name="text16Voyage" xml:space="preserve">
-    <value>1.5 Voyage</value>
-  </data>
-  <data name="text17Last10PortFacilitiesCalled" xml:space="preserve">
-    <value>1.7 Last 10 port facilities called</value>
-  </data>
-  <data name="text18ShipToShip" xml:space="preserve">
-    <value>1.8 Ship to ship activities during last 10 port facilities called</value>
-  </data>
-  <data name="text19PortsCalled30days" xml:space="preserve">
-    <value>1.9 Ports called during the last 30 days</value>
-  </data>
-  <data name="text110MaritimeHealthData" xml:space="preserve">
-    <value>1.10 Maritime health data</value>
-  </data>
-  <data name="text111PortOfItinerary" xml:space="preserve">
-    <value>1.11 Port of itinerary</value>
-  </data>
-  <data name="textDefaultDisplay" xml:space="preserve">
-    <value>Default display</value>
-  </data>
-  <data name="textOpenClassic" xml:space="preserve">
-    <value>Open in classic display mode</value>
-  </data>
-  <data name="textOpenFormsheet" xml:space="preserve">
-    <value>Open in form sheet display mode</value>
-  </data>
-  <data name="text1Voyage" xml:space="preserve">
-    <value>1. Voyage</value>
-  </data>
-  <data name="text2PortCall" xml:space="preserve">
-    <value>2. Port call</value>
-  </data>
-  <data name="text21ReferenceNumbers" xml:space="preserve">
-    <value>2.1 Reference numbers</value>
-  </data>
-  <data name="text22PortOperations" xml:space="preserve">
-    <value>2.2 Port operations</value>
-  </data>
-  <data name="text23Agency" xml:space="preserve">
-    <value>2.3 Agency</value>
-  </data>
-  <data name="text24Invoice" xml:space="preserve">
-    <value>2.4 Invoice (concerning mooring fees, disposal costs etc.)</value>
-  </data>
-  <data name="text25CargeOnBoard" xml:space="preserve">
-    <value>2.5 Cargo on board related to incoming journey</value>
-  </data>
-  <data name="text26CargoPort" xml:space="preserve">
-    <value>2.6 Cargo handled in port of call (cargo to discharge / load / transiting)</value>
-  </data>
-  <data name="text27Waste" xml:space="preserve">
-    <value>2.7 Waste (MARPOL) data</value>
-  </data>
-  <data name="text28Store" xml:space="preserve">
-    <value>2.8 Store information</value>
-  </data>
-  <data name="text29CrewEffects" xml:space="preserve">
-    <value>2.9 IMO crew effects declaration (IMO FAL form 4)</value>
-  </data>
-  <data name="textStore" xml:space="preserve">
-    <value>Store</value>
-  </data>
-  <data name="textQuantityUnit" xml:space="preserve">
-    <value>Quantity unit</value>
-  </data>
-  <data name="textLocationOnBoard" xml:space="preserve">
-    <value>Location on board</value>
-  </data>
-  <data name="textOfficialUse" xml:space="preserve">
-    <value>Official use</value>
-  </data>
-  <data name="text3PreArrival" xml:space="preserve">
-    <value>3. Pre-arrival</value>
-  </data>
-  <data name="text31General" xml:space="preserve">
-    <value>3.1 General</value>
-  </data>
-  <data name="text32PersonsOnBoard" xml:space="preserve">
-    <value>3.2 Persons on board on arrival</value>
-  </data>
-  <data name="text33BunkerOnArrival" xml:space="preserve">
-    <value>3.3 Bunker on arrival</value>
-  </data>
-  <data name="text34DangerousCargo" xml:space="preserve">
-    <value>3.4 Dangerous cargo on board on arrival</value>
-  </data>
-  <data name="text36TowOnArrival" xml:space="preserve">
-    <value>3.5 Tow (barge, pontoon, etc.) on arrival</value>
-  </data>
-  <data name="textAreMatterToReport" xml:space="preserve">
-    <value>Are any security-related matters to report?</value>
-  </data>
-  <data name="textMatterToReport" xml:space="preserve">
-    <value>if yes, description of matters to report</value>
-  </data>
-  <data name="text4PreDeparture" xml:space="preserve">
-    <value>4. Pre-departure</value>
-  </data>
-  <data name="text42PersonsOnBoard" xml:space="preserve">
-    <value>4.2 Persons on board on departure</value>
-  </data>
-  <data name="text43BunkerOnDeparture" xml:space="preserve">
-    <value>4.3 Bunker on departure</value>
-  </data>
-  <data name="text44DangerousCargo" xml:space="preserve">
-    <value>4.4 Dangerous cargo on board on departure</value>
-  </data>
-  <data name="text45TowOnDeparture" xml:space="preserve">
-    <value>4.5 Tow (barge, pontoon etc.) on departure</value>
-  </data>
-  <data name="text41General" xml:space="preserve">
-    <value>4.1 General</value>
-  </data>
-  <data name="text5ShipData" xml:space="preserve">
-    <value>5. Ship data</value>
-  </data>
-  <data name="text51General" xml:space="preserve">
-    <value>5.1 General</value>
-  </data>
-  <data name="text52SSCEC" xml:space="preserve">
-    <value>5.2 SSCEC</value>
-  </data>
-  <data name="text53ISPS" xml:space="preserve">
-    <value>5.3 ISPS</value>
-  </data>
-  <data name="text54TankerDetails" xml:space="preserve">
-    <value>5.4 Tanker details</value>
-  </data>
-  <data name="textNetTonnage" xml:space="preserve">
-    <value>Net tonnage</value>
-  </data>
-  <data name="textRegistryDate" xml:space="preserve">
-    <value>Registry date</value>
-  </data>
-  <data name="textCertificateOfRegistryNumber" xml:space="preserve">
-    <value>Certificate of registry number</value>
-  </data>
-  <data name="textIsDueToInspection" xml:space="preserve">
-    <value>Is due to inspection?</value>
-  </data>
-  <data name="textPossibleAnchorage" xml:space="preserve">
-    <value>Possible anchorage?</value>
-  </data>
-  <data name="textShipEmail" xml:space="preserve">
-    <value>Ship e-mail</value>
-  </data>
-  <data name="text6CrewDataOnArrival" xml:space="preserve">
-    <value>6. Crew data on arrival</value>
-  </data>
-  <data name="text7CrewDeparture" xml:space="preserve">
-    <value>7. Crew data on departure</value>
-  </data>
-  <data name="text8PassengerArrival" xml:space="preserve">
-    <value>8. Passenger data on arrival</value>
-  </data>
-  <data name="text9PassengerDeparture" xml:space="preserve">
-    <value>9. Passenger data on departure</value>
-  </data>
-  <data name="text10DangerousCargoArrival" xml:space="preserve">
-    <value>10. Dangerous cargo data on arrival</value>
-  </data>
-  <data name="text11DangerousCargoDeparture" xml:space="preserve">
-    <value>11. Dangerous cargo data on departure</value>
-  </data>
-  <data name="text12ATAATD" xml:space="preserve">
-    <value>12. Actual time of arrival / departure</value>
-  </data>
-  <data name="text13WasteReceipts" xml:space="preserve">
-    <value>13. Waste receipts</value>
-  </data>
-  <data name="textDGContactFamilyName" xml:space="preserve">
-    <value>DG manifest contact - family name</value>
-  </data>
-  <data name="textDGContactPhone" xml:space="preserve">
-    <value>DG manifest contact - phone</value>
-  </data>
-  <data name="text102IBCData" xml:space="preserve">
-    <value>10.2 IBC data (on arrival), if applicable</value>
-  </data>
-  <data name="text10.3IGCData" xml:space="preserve">
-    <value>10.3 IGC data (on arrival), if applicable</value>
-  </data>
-  <data name="text104IMSBCData" xml:space="preserve">
-    <value>10.4 IMSBC data (on arrival), if applicable</value>
-  </data>
-  <data name="text103IGCData" xml:space="preserve">
-    <value>10.3 IGC data (on arrival), if applicable</value>
-  </data>
-  <data name="text105MARPOLData" xml:space="preserve">
-    <value>10.5 MARPOL I data (on arrival), if applicable</value>
-  </data>
-  <data name="text106IMDGData" xml:space="preserve">
-    <value>10.6 IMDG data (on arrival), if applicable</value>
-  </data>
-  <data name="text101General" xml:space="preserve">
-    <value>10.1 General</value>
-  </data>
-  <data name="text111General" xml:space="preserve">
-    <value>11.1 General</value>
-  </data>
-  <data name="text112IBCData" xml:space="preserve">
-    <value>11.2 IBC data (on departure), if applicable</value>
-  </data>
-  <data name="text113IGCData" xml:space="preserve">
-    <value>11.3 IGC data (on departure), if applicable</value>
-  </data>
-  <data name="text114IMSBCData" xml:space="preserve">
-    <value>11.4 IMSBC data (on departure), if applicable</value>
-  </data>
-  <data name="text115MARPOLData" xml:space="preserve">
-    <value>11.5 MARPOL I data (on departure), if applicable</value>
-  </data>
-  <data name="text116IMDGData" xml:space="preserve">
-    <value>11.6 IMDG data (on departure), if applicable</value>
-  </data>
-  <data name="text121ATA" xml:space="preserve">
-    <value>12.1 Actual time of arrival</value>
-  </data>
-  <data name="text122ATD" xml:space="preserve">
-    <value>12.2 Actual time of departure</value>
-  </data>
-  <data name="text131WasteReceipt" xml:space="preserve">
-    <value>13.1 Waste receipt</value>
-  </data>
-  <data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="text102" xml:space="preserve">
-    <value>2 IBC</value>
-  </data>
-  <data name="text103" xml:space="preserve">
-    <value>3 IGC</value>
-  </data>
-  <data name="text104" xml:space="preserve">
-    <value>4 IMSBC</value>
-  </data>
-  <data name="text105" xml:space="preserve">
-    <value>5 MARPOL I</value>
-  </data>
-  <data name="text106" xml:space="preserve">
-    <value>6 IMDG</value>
-  </data>
-  <data name="textTab11" xml:space="preserve">
-    <value>1-6 Actual</value>
-  </data>
-  <data name="textTab12" xml:space="preserve">
-    <value>7-9 Tables</value>
-  </data>
-  <data name="textTab13" xml:space="preserve">
-    <value>10 MDH</value>
-  </data>
-  <data name="textTab14" xml:space="preserve">
-    <value>11 Cruise</value>
-  </data>
-  <data name="textTab21" xml:space="preserve">
-    <value>1-2 Berth</value>
-  </data>
-  <data name="textTab22" xml:space="preserve">
-    <value>3-4 Contact</value>
-  </data>
-  <data name="textTab23" xml:space="preserve">
-    <value>5-6 Cargo</value>
-  </data>
-  <data name="textTab24" xml:space="preserve">
-    <value>7 Waste</value>
-  </data>
-  <data name="textTab51" xml:space="preserve">
-    <value>1 General</value>
-  </data>
-  <data name="textTab52" xml:space="preserve">
-    <value>2-3 MDH / SEC</value>
-  </data>
-  <data name="textTab53" xml:space="preserve">
-    <value>4 Tanker</value>
-  </data>
-  <data name="textNewPassword" xml:space="preserve">
-    <value>New password</value>
-  </data>
-  <data name="textOldPassword" xml:space="preserve">
-    <value>Old password</value>
-  </data>
-  <data name="textRepeatNewPassword" xml:space="preserve">
-    <value>Repeat new password</value>
-  </data>
-  <data name="textMDHSimplification" xml:space="preserve">
-    <value>MDH simplification available</value>
-  </data>
-  <data name="textSECSimplification" xml:space="preserve">
-    <value>SEC simplification available</value>
-  </data>
-  <data name="textCopyFromCREWA" xml:space="preserve">
-    <value>Copy from CREWA</value>
-  </data>
-  <data name="textSelectCrewMember" xml:space="preserve">
-    <value>Select crew member</value>
-  </data>
-  <data name="textSERVTemplate" xml:space="preserve">
-    <value>SERV-Template</value>
-  </data>
-  <data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="textWasteDisposalServiceProvider" xml:space="preserve">
-    <value>Waste disposal service provider</value>
-  </data>
-  <data name="textSendAll" xml:space="preserve">
-    <value>Send all</value>
-  </data>
-  <data name="textENIStatus" xml:space="preserve">
-    <value>ENI-Status</value>
-  </data>
-  <data name="textNSWStatus" xml:space="preserve">
-    <value>NSW-Status</value>
-  </data>
-  <data name="textConfirmWSDPOverwrite" xml:space="preserve">
-    <value>The existing value for the waste disposal service provider will be overwritten.
-
-Current entry:  {0} 
-New entry:      {1}
-
-Proceed?</value>
-  </data>
-  <data name="textEasyPeasy" xml:space="preserve">
-    <value>Easy Peasy 🍋</value>
-  </data>
 </root>

ENI2/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace ENI2.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -82,108 +82,12 @@ namespace ENI2.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nswtest;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpass" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nsw;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;P" +
-            "wd;Persist Security Info=False;Connection Reset=false")]
+            "ersist Security Info=False;Connection Reset=false")]
         public string ConnectionString {
             get {
                 return ((string)(this["ConnectionString"]));
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("825")]
-        public string Width {
-            get {
-                return ((string)(this["Width"]));
-            }
-            set {
-                this["Width"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("450")]
-        public string Height {
-            get {
-                return ((string)(this["Height"]));
-            }
-            set {
-                this["Height"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string W1Left {
-            get {
-                return ((string)(this["W1Left"]));
-            }
-            set {
-                this["W1Left"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string W1Top {
-            get {
-                return ((string)(this["W1Top"]));
-            }
-            set {
-                this["W1Top"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string W2Left {
-            get {
-                return ((string)(this["W2Left"]));
-            }
-            set {
-                this["W2Left"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string W2Top {
-            get {
-                return ((string)(this["W2Top"]));
-            }
-            set {
-                this["W2Top"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string W3Left {
-            get {
-                return ((string)(this["W3Left"]));
-            }
-            set {
-                this["W3Left"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string W3Top {
-            get {
-                return ((string)(this["W3Top"]));
-            }
-            set {
-                this["W3Top"] = value;
-            }
-        }
     }
 }

ENI2/Properties/Settings.settings

@@ -21,31 +21,7 @@
       <Value Profile="(Default)">BSMD ReportGenerator</Value>
     </Setting>
     <Setting Name="ConnectionString" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
+      <Value Profile="(Default)">Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
-    </Setting>
-    <Setting Name="Width" Type="System.String" Scope="User">
-      <Value Profile="(Default)">825</Value>
-    </Setting>
-    <Setting Name="Height" Type="System.String" Scope="User">
-      <Value Profile="(Default)">450</Value>
-    </Setting>
-    <Setting Name="W1Left" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="W1Top" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="W2Left" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="W2Top" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="W3Left" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="W3Top" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
     </Setting>
   </Settings>
 </SettingsFile>

ENI2/Report/ReportDocument.cs

@@ -101,7 +101,7 @@ namespace ENI2.Report
             string migraTempFile = string.Format("{1}\\{0}.mdddl", filenameCore, Path.GetDirectoryName(filename));
             MigraDoc.DocumentObjectModel.IO.DdlWriter.WriteToFile(document, migraTempFile);
             
-            PdfDocumentRenderer renderer = new PdfDocumentRenderer();
+            PdfDocumentRenderer renderer = new PdfDocumentRenderer(true);
             renderer.Document = document;
             renderer.RenderDocument();
 
@@ -254,7 +254,7 @@ namespace ENI2.Report
             table.AddColumn(140);
 
             Row row = table.AddRow();
-            Image logoImage = row.Cells[0].AddImage(@"Report\Logo.png"); // kann man offenbar nur von einem Pfad laden
+            Image logoImage = row.Cells[0].AddImage(@"Report\Logo.gif"); // kann man offenbar nur von einem Pfad laden
             logoImage.Width = 80;
             row.Cells[0].MergeDown = 6;
             
@@ -373,50 +373,43 @@ namespace ENI2.Report
 
             switch (message.MessageNotificationClass)
             {
-                case Message.NotificationClass.CREWA:
+                case Message.NotificationClass.CREW:
                 case Message.NotificationClass.CREWD:
-                case Message.NotificationClass.PASA:
+                case Message.NotificationClass.PAS:
                 case Message.NotificationClass.PASD:
                 case Message.NotificationClass.TOWA:
                 case Message.NotificationClass.TOWD:
                 case Message.NotificationClass.HAZA when (message.Elements[0] is HAZ haz) && ((haz.IMDGPositions.Count > 0) || (haz.IBCPositions.Count > 0) || (haz.IGCPositions.Count > 0) || (haz.IMSBCPositions.Count > 0) || (haz.MARPOLPositions.Count > 0)):
                 case Message.NotificationClass.HAZD when (message.Elements[0] is HAZ hazd) && ((hazd.IMDGPositions.Count > 0) || (hazd.IBCPositions.Count > 0) || (hazd.IGCPositions.Count > 0) || (hazd.IMSBCPositions.Count > 0) || (hazd.MARPOLPositions.Count > 0)):
                     {
-                        // Landscape if not set
+                    // Landscape if not set
-                        if (_lastOrientation == Orientation.Portrait)
+                    if (_lastOrientation == Orientation.Portrait)
-                        {
-                            DefineContentSection(document, Orientation.Landscape, false);
-                            _lastOrientation = Orientation.Landscape;
-                        }
-                        else
-                        {
-                            document.LastSection.AddPageBreak();
-                        }
-
-                        string title = messageParagraph.Title;
-                        if (message.MessageNotificationClass == Message.NotificationClass.CREWA) title = "CREWA";
-                        if (message.MessageNotificationClass == Message.NotificationClass.CREWD) title = "CREWD";
-                        if (message.MessageNotificationClass == Message.NotificationClass.PASA) title = "PASA";
-                        if (message.MessageNotificationClass == Message.NotificationClass.PASD) title = "PASD";
-
-
-                        document.LastSection.AddParagraph(ReplaceTitle(title), "Heading2");
-                        document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Subtitle), "Heading3");
-
-                    }
-                    break;
-                default:
                     {
-                        if (_lastOrientation == Orientation.Landscape)
+                        DefineContentSection(document, Orientation.Landscape, false);
-                        {
+                        _lastOrientation = Orientation.Landscape;
-                            ReportDocument.DefineContentSection(document, Orientation.Portrait, false);
-                            _lastOrientation = Orientation.Portrait;
-                        }                        
-
-                        document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Title), "Heading2");
-                        document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Subtitle), "Heading3");
                     }
-                    break;
+                    else
+                    {
+                        document.LastSection.AddPageBreak();
+                    }
+
+                    document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Title), "Heading2");
+                    document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Subtitle), "Heading3");
+
+                }
+                break;
+                default:
+                {
+                    if (_lastOrientation == Orientation.Landscape)
+                    {
+                        ReportDocument.DefineContentSection(document, Orientation.Portrait, false);
+                        _lastOrientation = Orientation.Portrait;
+                    }
+
+                    document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Title), "Heading2");
+                    document.LastSection.AddParagraph(ReplaceTitle(messageParagraph.Subtitle), "Heading3");
+                }
+                break;
             }
 
             #endregion
@@ -425,11 +418,11 @@ namespace ENI2.Report
 
             switch(message.MessageNotificationClass)
             {
-                case Message.NotificationClass.CREWA:
+                case Message.NotificationClass.CREW:
                 case Message.NotificationClass.CREWD:
                     CreateCrewTable(document, message);
                     return;
-                case Message.NotificationClass.PASA:
+                case Message.NotificationClass.PAS:
                 case Message.NotificationClass.PASD:
                     CreatePassengerTable(document, message);
                     return;
@@ -526,27 +519,13 @@ namespace ENI2.Report
         #region CREW
         private static void CreateCrewTable(Document document, Message message)
         {
-            string textSchengen = "[ ] Schengen";            
-
-            if(message.Elements.Count > 0)
-            {
-                CREW firstCREW = message.Elements[0] as CREW;
-                if(firstCREW.NotificationSchengen ?? false)
-                {
-                    textSchengen = "[X] Schengen";
-                }
-                
-                document.LastSection.AddParagraph(firstCREW.NotificationPAX ?? false ? "[X] PAX notification" : "[ ] PAX notification");
-                
-            }            
-
             Table table = AddGrayTable(document);
-            table.Format.Font.Size = 8;
+            table.Format.Font.Size = 9;
-
-            // width: 25
 
             Column column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(0.75);
+            column.Width = Unit.FromCentimeter(1);
+            column = table.AddColumn();
+            column.Width = Unit.FromCentimeter(3);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(3);
             column = table.AddColumn();
@@ -554,28 +533,17 @@ namespace ENI2.Report
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(2.5);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
-            column = table.AddColumn();
             column.Width = Unit.FromCentimeter(1.5);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(0.75);
+            column.Width = Unit.FromCentimeter(1);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(2);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
+            column.Width = Unit.FromCentimeter(3);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(1.5);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(2);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
+            column.Width = Unit.FromCentimeter(3);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
-
-            Row firstRow = table.AddRow();
-            firstRow.Cells[7].AddParagraph(textSchengen);
-            firstRow.Cells[7].Shading.Color = Colors.LightGray;
-            firstRow.Cells[7].MergeRight = 5;
 
             Row hRow = table.AddRow();
             hRow.Cells[1].AddParagraph("Last name");
@@ -586,16 +554,13 @@ namespace ENI2.Report
             hRow.Cells[6].AddParagraph("Nat.");
             hRow.Cells[7].AddParagraph("Id doc. type");
             hRow.Cells[8].AddParagraph("Id doc. number");
-            hRow.Cells[9].AddParagraph("Iss. state");
+            hRow.Cells[9].AddParagraph("Visa number");
-            hRow.Cells[10].AddParagraph("Exp. date");
+            hRow.Cells[10].AddParagraph("Duty");
-            hRow.Cells[11].AddParagraph("Visa number");
-            hRow.Cells[12].AddParagraph("Duty");
 
             for (int i = 0; i < message.Elements.Count; i++)
             {
                 CREW crew = message.Elements[i] as CREW;
                 Row row = table.AddRow();
-                
                 row.Cells[0].AddParagraph((i + 1).ToString());
                 row.Cells[1].AddParagraph(crew.CrewMemberLastName ?? "");
                 row.Cells[2].AddParagraph(crew.CrewMemberFirstName ?? "");
@@ -604,11 +569,9 @@ namespace ENI2.Report
                 row.Cells[5].AddParagraph(crew.CrewMemberGenderDisplay);
                 row.Cells[6].AddParagraph(crew.CrewMemberNationality ?? "");
                 row.Cells[7].AddParagraph(crew.CrewMemberIdentityDocumentTypeDisplay);
-                row.Cells[8].AddParagraph(crew.CrewMemberIdentityDocumentId ?? "");                
+                row.Cells[8].AddParagraph(crew.CrewMemberIdentityDocumentId ?? "");
-                row.Cells[9].AddParagraph(crew.CrewMemberIdentityDocumentIssuingState ?? "");
+                row.Cells[9].AddParagraph(crew.CrewMemberVisaNumber ?? "");
-                row.Cells[10].AddParagraph(crew.CrewMemberIdentityDocumentExpiryDateDisplay ?? "");
+                row.Cells[10].AddParagraph(crew.CrewMemberDuty ?? "");
-                row.Cells[11].AddParagraph(crew.CrewMemberVisaNumber ?? "");
-                row.Cells[12].AddParagraph(crew.CrewMemberDuty ?? "");
             }
         }
         #endregion
@@ -616,36 +579,17 @@ namespace ENI2.Report
         #region PAS
         private static void CreatePassengerTable(Document document, Message message)
         {
-            string textSchengen = "[ ] Schengen";
-            string textPAX = "[ ] PAX";
-
-            if (message.Elements.Count > 0)
-            {
-                PAS firstPAS = message.Elements[0] as PAS;
-                if (firstPAS.NotificationSchengen ?? false)                
-                    textSchengen = "[X] Schengen";                
-                if (firstPAS.NotificationPAX ?? false)
-                    textPAX = "[X] PAX";               
-            }
-
             Table table = AddGrayTable(document);
-            table.Format.Font.Size = 7;
+            table.Format.Font.Size = 9;
-            
 
             Column column = table.AddColumn();
             column.Width = Unit.FromCentimeter(0.8);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
+            column.Width = Unit.FromCentimeter(3);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
+            column.Width = Unit.FromCentimeter(3);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
+            column.Width = Unit.FromCentimeter(3);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(2);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(1.2);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(1);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(2);
             column = table.AddColumn();
@@ -655,24 +599,15 @@ namespace ENI2.Report
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(2);
             column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(1.5);
+            column.Width = Unit.FromCentimeter(3);
+            column = table.AddColumn();
+            column.Width = Unit.FromCentimeter(1.8);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(1.5);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(1.5);
             column = table.AddColumn();
             column.Width = Unit.FromCentimeter(0.5);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(1.5);
-            column = table.AddColumn();
-            column.Width = Unit.FromCentimeter(1.5);
-
-            Row h1Row = table.AddRow();
-            h1Row.Cells[7].AddParagraph(textSchengen);
-            h1Row.Cells[7].MergeRight = 7;
-            h1Row.Cells[7].Shading.Color = Colors.LightGray;
-            h1Row.Cells[15].AddParagraph(textPAX);
-            h1Row.Cells[15].MergeRight = 1;
 
             Row hRow = table.AddRow();
             hRow.Cells[1].AddParagraph("Last name");
@@ -683,14 +618,10 @@ namespace ENI2.Report
             hRow.Cells[6].AddParagraph("Nat.");
             hRow.Cells[7].AddParagraph("Id doc. type");
             hRow.Cells[8].AddParagraph("Id doc. number");
-            hRow.Cells[9].AddParagraph("Iss. state");
+            hRow.Cells[9].AddParagraph("Visa number");
-            hRow.Cells[10].AddParagraph("Exp. date");
+            hRow.Cells[10].AddParagraph("Emb.");
-            hRow.Cells[11].AddParagraph("Visa number");
+            hRow.Cells[11].AddParagraph("Disemb.");
-            hRow.Cells[12].AddParagraph("Emb.");
+            hRow.Cells[12].AddParagraph("T");
-            hRow.Cells[13].AddParagraph("Disemb.");
-            hRow.Cells[14].AddParagraph("T");
-            hRow.Cells[15].AddParagraph("Em. care");
-            hRow.Cells[16].AddParagraph("Em. number");
 
             for (int i = 0; i < message.Elements.Count; i++)
             {
@@ -705,14 +636,10 @@ namespace ENI2.Report
                 row.Cells[6].AddParagraph(pas.PassengerNationality ?? "");
                 row.Cells[7].AddParagraph(pas.PassengerIdentityDocumentTypeDisplay);
                 row.Cells[8].AddParagraph(pas.PassengerIdentityDocumentId ?? "");
-                row.Cells[9].AddParagraph(pas.PassengerIdentityDocumentIssuingState ?? "");
+                row.Cells[9].AddParagraph(pas.PassengerVisaNumber ?? "");
-                row.Cells[10].AddParagraph(pas.PassengerIdentityDocumentExpiryDateDisplay);
+                row.Cells[10].AddParagraph(pas.PassengerPortOfEmbarkation ?? "");
-                row.Cells[11].AddParagraph(pas.PassengerVisaNumber ?? "");
+                row.Cells[11].AddParagraph(pas.PassengerPortOfDisembarkation ?? "");
-                row.Cells[12].AddParagraph(pas.PassengerPortOfEmbarkation ?? "");
+                row.Cells[12].AddParagraph(pas.PassengerInTransit ?? false ? "X" : "");
-                row.Cells[13].AddParagraph(pas.PassengerPortOfDisembarkation ?? "");
-                row.Cells[14].AddParagraph(pas.PassengerInTransit ?? false ? "X" : "");
-                row.Cells[15].AddParagraph(pas.EmergencyCare ?? "");
-                row.Cells[16].AddParagraph(pas.EmergencyContactNumber ?? "");
             }
         }
         #endregion
@@ -1250,9 +1177,8 @@ namespace ENI2.Report
 
         private static void CreateWAS_RCPTTable(Document document, Message message)
         {
-            for (int i = 0; i < message.Elements.Count; i++)
+            foreach (WAS_RCPT was_rpct in message.Elements)
             {
-                WAS_RCPT was_rpct = (WAS_RCPT)message.Elements[i];
                 document.LastSection.AddParagraph("");
 
                 Table table = AddGrayTable(document);                

ENI2/SheetDisplayControls/ATAControl.xaml

@@ -1,46 +0,0 @@
-<src:DetailBaseControl xmlns:src="clr-namespace:ENI2" 
-             x:Class="ENI2.SheetDisplayControls.ATAControl"
-             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:p="clr-namespace:ENI2.Properties"
-             xmlns:enictrl="clr-namespace:ENI2.Controls"
-             xmlns:util="clr-namespace:ENI2.Util"
-             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
-             mc:Ignorable="d" 
-             d:DesignHeight="600" d:DesignWidth="800">
-    <GroupBox Name="portCallGroupBox" Header="{x:Static p:Resources.text12ATAATD}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width=".3*" />
-                    <ColumnDefinition Width=".3*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                    <RowDefinition Height="36" />
-                    <RowDefinition Height="28" />
-                </Grid.RowDefinitions>
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text121ATA}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                <Label Content="ATA" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <xctk:DateTimePicker Grid.Column="1" Grid.Row="1" Value="{Binding ATAPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATA" Format="Custom" 
-                                     FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" 
-                                     TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp" ValueChanged="dateTimePickerATA_ValueChanged" />
-
-
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text122ATD}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2"/>
-
-                <Label Content="ATD" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                <xctk:DateTimePicker Grid.Column="1" Grid.Row="3" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" 
-                                     FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" 
-                                     TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp" ValueChanged="dateTimePickerATD_ValueChanged"/>
-
-            </Grid>
-        </ScrollViewer>
-    </GroupBox>
-</src:DetailBaseControl>