Added extra verification to catch a maybe very rare error

but only if the control has a tab control and the save button was hit. In this case a complete reload happens.

ENI2/AnmeldungenControl.xaml.cs

@@ -1,20 +1,8 @@
 // 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
 {
@@ -62,7 +50,7 @@ namespace ENI2
         {
             if((this.MessageCoreSelected != null) && (aMessageCore != null))
             {
-                this.MessageCoreSelected(aMessageCore);
+                this.MessageCoreSelected(aMessageCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
             }
         }
 

ENI2/App.config

@@ -11,7 +11,7 @@
             <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" />
     </startup>
     <applicationSettings>
@@ -81,27 +81,47 @@
     <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-8.0.0.2" newVersion="8.0.0.2" />
+        <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.1" newVersion="9.0.0.1" />
+        <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.2.0" newVersion="4.0.2.0" />
+        <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.1.0" newVersion="6.0.1.0" />
+        <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.4.0" newVersion="4.0.4.0" />
+        <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.1.0" newVersion="4.2.1.0" />
+        <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>

ENI2/ControlTemplates.xaml

@@ -56,7 +56,7 @@
         </Grid>
     </ControlTemplate>
 
-
+
 
 
     <!-- Validation Error Template for a DataGrid Row -->
@@ -80,7 +80,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-
+
 
 
     <Style TargetType="{x:Type ToolTip}" >

ENI2/Controls/ClosableTabItem.cs

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

ENI2/Controls/EasyPeasyControl.xaml

@@ -0,0 +1,113 @@
+<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

@@ -0,0 +1,506 @@
+// 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/MaerskListControl.xaml.cs

@@ -607,7 +607,7 @@ namespace ENI2.Controls
                     MaerskData md = grid.SelectedItem as MaerskData;
                     if(md.MessageCore != null) {
                         Util.UIHelper.SetBusyState();
-                        this.MessageCoreSelected?.Invoke(md.MessageCore);
+                        this.MessageCoreSelected?.Invoke(md.MessageCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
                     }
                 }
             }

ENI2/Controls/ValueMappingsControl.xaml.cs

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

ENI2/DetailBaseControl.cs

@@ -70,7 +70,7 @@ namespace ENI2
         /// <summary>
         /// Damit kann ein Listenelement eine Validierung der gesamten Anmeldung auslösen (inkl. Highlighting) (auf Knopfdruck)
         /// </summary>
-        public event Action RequestValidate;
+        public event Action<bool> RequestValidate;
 
         /// <summary>
         /// Alle Meldeklassen die auf "zu versenden" stehen werden validiert und falls die Validierung scheitert auf "SUSPEND" gestellt
@@ -160,9 +160,9 @@ namespace ENI2
             this.RequestReload?.Invoke(coreId);
         }
 
-        protected virtual void OnRequestValidate()
+        protected virtual void OnRequestValidate(bool showDialog)
         {
-            this.RequestValidate?.Invoke();
+            this.RequestValidate?.Invoke(showDialog);
         }
 
         protected virtual void OnRequestSendValidation()
@@ -192,6 +192,10 @@ namespace ENI2
             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)
@@ -345,9 +349,7 @@ 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" />
+            <ColumnDefinition Width="220" x:Name="leftColumnDefinition"/>
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         

ENI2/DetailRootControl.xaml.cs

@@ -189,6 +189,7 @@ namespace ENI2
                 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;
@@ -225,6 +226,7 @@ namespace ENI2
         public void CoreChanged(MessageCore newCore)
         {
             this.Core = newCore;
+            this.ReloadCore();
             System.Windows.Application.Current.Dispatcher.Invoke(delegate
             {
                 if(controlCache.ContainsKey(Properties.Resources.textOverview))
@@ -485,6 +487,7 @@ namespace ENI2
             {
 
                 Util.UIHelper.SetBusyState();
+                int currentMainTabIndex = -1;
 
                 if (this.detailView.Children[0] is DetailBaseControl currentControl)
                 {
@@ -499,10 +502,24 @@ namespace ENI2
                         // ggf. hat sich die Ticketnr geändert..
                         DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);
                     }
-                }
-            }
 
-            this.DetailControl_RequestReload(this.Core.Id.Value);
+                    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);
+            }
         }
 
         private void SaveMessage(Message message)
@@ -511,9 +528,14 @@ 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))
@@ -553,6 +575,7 @@ namespace ENI2
             {
 
                 Util.UIHelper.SetBusyState();
+                int currentMainTabIndex = -1;
 
                 foreach (Message message in this._messages)
                 {
@@ -563,13 +586,30 @@ 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)
@@ -624,7 +664,7 @@ namespace ENI2
 
         private void ShortCutValidate(object sender, ExecutedRoutedEventArgs e)
         {
-            this.DetailControl_RequestValidate();
+            this.DetailControl_RequestValidate(true);
         }
 
         private void DetailControl_RequestReload(Guid id)
@@ -644,12 +684,15 @@ namespace ENI2
                 this.detailView.Children.Clear();
                 this.controlCache.Clear();
 
-                // return to "new" overviewdan
+                int currentIndex = this.listBoxMessages.SelectedIndex;
+
+                // 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;
                 }
                 ));
 
@@ -734,9 +777,9 @@ namespace ENI2
             }
         }
 
-        private void DetailControl_RequestValidate()
+        private void DetailControl_RequestValidate(bool showDialog)
         {
-            this.Validate(true, out _, out _);
+            this.Validate(showDialog, out _, out _);
         }
 
         private void Validate(bool showMessages, out List<MessageViolation> vViolations, out List<MessageError> vErrors)
@@ -757,6 +800,21 @@ namespace ENI2
                 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)
@@ -1230,7 +1288,7 @@ namespace ENI2
                         this._violationListDialog.BringUp();
                     }
                     _violationListDialog.Violations = vViolations;
-                }
+                }                
 
                 if((vErrors.Count == 0) && (vViolations.Count == 0))
                 {
@@ -1242,7 +1300,7 @@ namespace ENI2
 
         private void _errorListDialog_RefreshClicked()
         {
-            DetailControl_RequestValidate();
+            DetailControl_RequestValidate(true);
         }
 
         private void _errorListDialog_ErrorSelected(DatabaseEntity obj)

ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs

@@ -244,7 +244,13 @@ namespace ENI2.DetailViewControls
             }
 
             #endregion
-        }        
+        }
+
+        public override int SelectedTabIndex
+        {
+            get { return this.mainFrame.SelectedIndex; }
+            set { this.mainFrame.SelectedIndex = value; }
+        }
 
         #region Grid copy handlers
 

ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs

@@ -197,6 +197,12 @@ 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)

ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs

@@ -40,7 +40,7 @@ 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.OnNotificationClassChanged(Message.NotificationClass.BKRD); };
+            this.dataGridBKRD.CellEditEnding += (obj, ev) => { this.SublistElementChanged(Message.NotificationClass.BKRD); };
             startupComplete = true;
         }
 

ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml.cs

@@ -130,6 +130,12 @@ 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)

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="300" d:DesignWidth="800">
+             d:DesignHeight="768" d:DesignWidth="1024">
     <xctk:BusyIndicator Name="busyIndicator">
         <xctk:BusyIndicator.ProgressBarStyle>
             <Style TargetType="ProgressBar">
@@ -26,104 +26,144 @@
             </StackPanel>
         </xctk:BusyIndicator.BusyContent>
 
-        <GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textVisitTransit}">
+        <GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textOverview}">
             <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="1*" />
-                        <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"/>
-                    <enictrl:LocodeControl Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" IsEnabled="False" />
-                    <!--Grid Grid.Column="1" Grid.Row="0" Width="Auto">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <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}" />
-                <Image Name="imagePoCState" Grid.Column="1" Source="../Resources/bullet_ball_grey.png" />
-            </-->
-                    <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="3" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
-                    <TextBox Name="textBoxDisplayId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
-                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textIMO}" Margin="0,0,10,0" />
-                    <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"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textENI}" Margin="0,0,10,0" />
-                    <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"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
-                    <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" />
-                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="3" Content="{x:Static p:Resources.textATDPortOfCall}" Margin="0,0,10,0" />
-                    <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"/>
-                    <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"/>
-                    <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"/>
-                    <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" />
-                    <Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
-                    <Button Name="buttonFormblattNeu" Grid.Column="4" Grid.Row="7" 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>
-                    <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"/>
 
-                    <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"/>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="400" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="2*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            
+                            <RowDefinition Height="4" />
+                            <RowDefinition Height="36" />
+                            
+                            <RowDefinition Height="4" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            
+                            <RowDefinition Height="4" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="28" />
+                            <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>
-                    </Button>
-                    <Button Name="buttonQueryHIS" Grid.Column="4" Grid.Row="6" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
-                    <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}">
+                        <StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="11" Visibility="Hidden" Name="stackPanelLock">
+                            <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
+                            <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
+                        </StackPanel>
+
+                        <Label Grid.Column="0" Grid.Row="13" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelHIS" VerticalContentAlignment="Center" Content="{x:Static p:Resources.textSendToHIS}" />
+                        <ComboBox Grid.Column="1" Grid.Row="13" Margin="2" Name="comboBoxInitialHis" VerticalContentAlignment="Center" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding Path=InitialHIS}" />
+
+                        <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">
-                                <Image Source="../Resources/nav_refresh_blue.png" Margin="0,0,5,0" Height="24"/>
-                                <!--TextBlock Text="{x:Static p:Resources.textRefresh}" VerticalAlignment="Center"/-->
+                                <TextBlock Text="{x:Static p:Resources.textExcelImport}"></TextBlock>
+                                <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
                             </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 IsEnabled="True" Name="buttonSendPDF" Grid.Column="1" Grid.Row="17" 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>
 
-                        <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 Name="buttonQueryHIS" Grid.Column="1" Grid.Row="18" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
+                        <Button IsEnabled="True" Name="buttonCopy" Grid.Column="1" Grid.Row="19" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
+
+                        <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>
@@ -131,14 +171,64 @@
                     </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" />
-                        <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
-                    </StackPanel>
-
+                        
+                        
+                    </Grid>
                     <!-- Data Grid -->
-                    <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">
+                    <DataGrid Grid.Row="0" Grid.ColumnSpan="1" Grid.Column="1" Margin="2" x:Name="dataGridMessages" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" CanUserAddRows="False"
+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>
@@ -162,22 +252,40 @@
                                         </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}}" />
+                                        <Image Source="{Binding ENINotificationIconString, Converter={util:NullImageConverter}}" Height="24" />
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            
-                            <DataGridTextColumn Header="{x:Static p:Resources.textNotificationClass}" Binding="{Binding MessageNotificationClassDisplay}" 
-                                            IsReadOnly="True" Width="0.075*" FontWeight="Bold">
+
+                            <DataGridTextColumn Header="{x:Static p:Resources.textNotificationClass}" Binding="{Binding MessageNotificationClassDisplay}" IsReadOnly="True" Width="0.1*" FontWeight="Bold">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -185,6 +293,75 @@
                                     </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>
@@ -222,29 +399,29 @@
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
                             <!--DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <Image x:Name="imageHasUpdate"/>
-                                    <DataTemplate.Triggers>
-                                        <DataTrigger Binding="{Binding Path=HasUpdates}" Value="True">
-                                            <Setter Property="Source" Value="/Resources/recycle.png" TargetName="imageHasUpdate"/>
-                                        </DataTrigger>
-                                    </DataTemplate.Triggers>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </-->
+          <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                  <Image x:Name="imageHasUpdate"/>
+                  <DataTemplate.Triggers>
+                      <DataTrigger Binding="{Binding Path=HasUpdates}" Value="True">
+                          <Setter Property="Source" Value="/Resources/recycle.png" TargetName="imageHasUpdate"/>
+                      </DataTrigger>
+                  </DataTemplate.Triggers>
+              </DataTemplate>
+          </DataGridTemplateColumn.CellTemplate>
+      </-->
                             <!--DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <Image x:Name="imageHasReminder"/>
-                                    <DataTemplate.Triggers>
-                                        <DataTrigger Binding="{Binding Path=HasReminder}" Value="True">
-                                            <Setter Property="Source" Value="/Resources/hand_point.png" TargetName="imageHasReminder"/>
-                                        </DataTrigger>
-                                    </DataTemplate.Triggers>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </-->
+          <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                  <Image x:Name="imageHasReminder"/>
+                  <DataTemplate.Triggers>
+                      <DataTrigger Binding="{Binding Path=HasReminder}" Value="True">
+                          <Setter Property="Source" Value="/Resources/hand_point.png" TargetName="imageHasReminder"/>
+                      </DataTrigger>
+                  </DataTemplate.Triggers>
+              </DataTemplate>
+          </DataGridTemplateColumn.CellTemplate>
+      </-->
                             <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -257,6 +434,7 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
+                            
                             <DataGridTemplateColumn Header="" Width="SizeToCells" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -269,41 +447,7 @@
                                     </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">
@@ -311,13 +455,7 @@
                                     </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

@@ -21,6 +21,8 @@ using Microsoft.Win32;
 using System.Diagnostics;
 using System.ComponentModel;
 using static bsmd.database.Message;
+using PdfSharp.Fonts;
+using System.Linq;
 
 namespace ENI2.DetailViewControls
 {
@@ -29,6 +31,9 @@ namespace ENI2.DetailViewControls
     /// </summary>
     public partial class OverViewDetailControl : DetailBaseControl
     {
+
+        #region Fields
+
         private Message _message = null;
         private Message _ataMessage;
         private Message _atdMessage;
@@ -38,12 +43,20 @@ 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
@@ -52,7 +65,7 @@ namespace ENI2.DetailViewControls
             this.textBoxDisplayId.TextChanged += CoreTextBox_TextChanged;
             this.textBoxIMO.TextChanged += CoreTextBox_TextChanged;
             this.textBoxENI.TextChanged += CoreTextBox_TextChanged;
-            this.locodePoC.PropertyChanged += CoreLocode_LocodeChanged;            
+            this.locodePoC.PropertyChanged += CoreLocode_LocodeChanged;
 
             this.RegisterDateTimePickerChange(this.dateTimePickerATA, Message.NotificationClass.ATA);
             this.RegisterDateTimePickerChange(this.dateTimePickerATD, Message.NotificationClass.ATD);
@@ -60,18 +73,6 @@ namespace ENI2.DetailViewControls
             this.RegisterDateTimePickerChange(this.dateTimePickerETD, Message.NotificationClass.NOA_NOD);
         }
 
-        private void CoreLocode_LocodeChanged(object sender, PropertyChangedEventArgs e)
-        {            
-            this.OnNotificationClassChanged(null);
-        }        
-
-        private void CoreTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            this.OnNotificationClassChanged(null);
-        }
-
-        #region Initialize
-
         public override void Initialize()
         {
             bool iAmAdmin = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsAdmin;
@@ -316,7 +317,9 @@ 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;
         }        
@@ -354,6 +357,9 @@ 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)
             //{
@@ -431,44 +437,50 @@ namespace ENI2.DetailViewControls
             MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmSend, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
-                bool somethingsNotSaved = false;
-                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
+                this.SendMessages(this.dataGridMessages.SelectedItems.Cast<Message>());
+            }
+        }
+
+        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))
                 {
-                    if (selectedMessage.IsDirty) somethingsNotSaved = true;
+                    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);
+            }
 
-                if(somethingsNotSaved)
-                {
-                    if (MessageBox.Show(Properties.Resources.textUnsavedChangesSendAnyWay, Properties.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No)
-                        return;
-                }
+            // komplette Anmeldung auf "zu versenden" stellen
+            this.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+            this.Core.DefaultReportingPartyId = App.UserId;
 
-                List<Message> watchList = new List<Message>();
-                foreach (Message selectedMessage in this.dataGridMessages.SelectedItems)
-                {
-                    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);
-                }
+            DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); // löst auch den Watchdog aus
+            this.OnRequestSendValidation();
+            this.dataGridMessages.Items.Refresh();
 
-                // 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);
@@ -488,7 +500,6 @@ namespace ENI2.DetailViewControls
                 this.mssd.Activate(); // bring to foreground
                 this.mssd.AddMessages(watchList);                
                 */
-            }
         }
 
         private void contextResetMessage(object sender, RoutedEventArgs e)
@@ -574,7 +585,13 @@ 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))
@@ -616,6 +633,16 @@ 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);
@@ -724,7 +751,7 @@ namespace ENI2.DetailViewControls
 
         private void buttonValidate_Click(object sender, RoutedEventArgs e)
         {
-            this.OnRequestValidate();
+            this.OnRequestValidate(true);
         }
 
         /// <summary>
@@ -754,7 +781,7 @@ namespace ENI2.DetailViewControls
                         this.OnRequestReload(this.Core.Id.Value);
 
                         // validate all selected import classes (Finger with "selection")
-                        this.OnRequestValidate();
+                        this.OnRequestValidate(true);
 
                     }
                     else
@@ -808,7 +835,74 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        #endregion        
-        
+        private void buttonSendAll_Click(object sender, RoutedEventArgs e)
+        {
+            SelectImportClassesDialog sicd = new SelectImportClassesDialog();
+            List<Message.NotificationClass> readyToSendMessages = new List<Message.NotificationClass>();
+
+            // 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/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 PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+        <ScrollViewer>
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="300" />
@@ -92,8 +92,9 @@
                         <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="6" Grid.Column="2" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" 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="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.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" />
@@ -104,10 +105,11 @@
                         <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="6" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, 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="1" Name="textBox_AgentPhone" MaxLength="99" Margin="2" Text="{Binding AgentPhone, 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="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="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,6 +25,7 @@ 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;
@@ -68,6 +69,9 @@ 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;
         }
@@ -95,6 +99,16 @@ 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;
@@ -123,6 +137,8 @@ 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)
@@ -240,7 +256,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        #endregion        
+        #endregion
 
         #region AGNT templates combo
 
@@ -268,7 +284,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;
                 }
@@ -337,6 +353,8 @@ 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
         }
@@ -345,6 +363,13 @@ 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;
@@ -356,7 +381,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_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            this.textBox_AgentFax.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;
@@ -367,6 +392,11 @@ 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;
@@ -380,7 +410,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;
@@ -392,6 +422,7 @@ 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

@@ -24,11 +24,11 @@
         </col:ArrayList>
     </UserControl.Resources>
     <GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+        <ScrollViewer>
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="50" />
-                    <RowDefinition Height="220" />
+                    <RowDefinition Height="194" />
                     <RowDefinition Height="200" />
                     <RowDefinition Height="200" />
                 </Grid.RowDefinitions>
@@ -36,10 +36,12 @@
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="5*" />
+                            <ColumnDefinition Width="4*" />
+                            <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">
@@ -57,35 +59,84 @@
                             <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="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="3" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" 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="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="3" 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="2,2,4,2" ItemsSource="{StaticResource arrList}" 
-                                  DisplayMemberPath="Key" SelectedValuePath="Value" SelectionChanged="comboBoxGroup_SelectionChanged" ContextMenu="{DynamicResource ClearContextMenu}" />
-                        <Button Grid.Row="1" Grid.Column="3" x:Name="buttonSearchPortArea" Margin="2" Content="Lookup port area" Click="buttonSearchPortArea_Click" />
-                        <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
+                        
+                        <Grid Grid.Row="1" Grid.Column="1">
+                            <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="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="3" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top" />
-                        <TextBox Grid.Row="5" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top"/>
+                        <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"/>
+                        <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="3" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top"/>
                     </Grid>
                 </GroupBox>
                 <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="2">
-                    <enictrl:ENIDataGrid x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                    <Grid>
+                        <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" />
@@ -94,7 +145,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" 

ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs

@@ -16,6 +16,8 @@ using ENI2.EditControls;
 using ENI2.Util;
 
 using bsmd.database;
+using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace ENI2.DetailViewControls
 {
@@ -25,11 +27,18 @@ 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,
@@ -59,7 +68,7 @@ namespace ENI2.DetailViewControls
             this.dataGridLADG.CellEditEnding += (obj, ev) => { this.OnNotificationClassChanged(Message.NotificationClass.LADG); };
         }
 
-        public override void Initialize()
+        public override async void Initialize()
         {
             base.Initialize();
 
@@ -69,6 +78,7 @@ 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
@@ -155,16 +165,22 @@ namespace ENI2.DetailViewControls
             this.dataGridLADG.DeleteRequested += DataGridLADG_DeleteRequested;
             this.dataGridLADG.CreateRequested += DataGridLADG_CreateRequested;
 
-            #endregion
+            #endregion            
 
-            #region init helper Maersk / SeaGo Field
+            #region init SERV templates
 
-            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;
-            if (this.Core.IsFlagSet(MessageCore.CoreFlags.ELBE_BULK)) this.comboBoxGroup.SelectedIndex = 5;
-            if (this.Core.IsFlagSet(MessageCore.CoreFlags.FCT_JUNGE)) this.comboBoxGroup.SelectedIndex = 6;
+            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
 
@@ -365,157 +381,100 @@ namespace ENI2.DetailViewControls
 
         #endregion        
 
-        #region Spezialbalkon für die Gruppenauswahl im Core (Maersk BHV / Seago usw.)
+        #region SERV template event handler
 
         private void comboBoxGroup_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            // 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);
-            this.Core.SetFlag(false, MessageCore.CoreFlags.ELBE_BULK);
-            this.Core.SetFlag(false, MessageCore.CoreFlags.FCT_JUNGE);
-
-            if (this.comboBoxGroup.SelectedItem == null)
-            {
-                this.comboBoxGroup.SelectedIndex = 0;
-                DBManager.Instance.Save(this.Core);
+            if(this.comboBoxGroup.SelectedItem is SERV_Template st)
+            {                
+                this.buttonDeleteTemplate.IsEnabled = true;
+                this.buttonSetTemplate.IsEnabled = true;
+                this._currentTemplate = st;
             }
-            else
+        }
+
+        private void buttonSetTemplate_Click(object sender, RoutedEventArgs e)
+        {
+            if (this.comboBoxGroup.SelectedItem is SERV_Template st)
             {
-                DictionaryEntry selectedItem = (DictionaryEntry)this.comboBoxGroup.SelectedItem;
-                if (Int32.TryParse((string)selectedItem.Value, out int selectedValue))
+                bool found = false;
+                foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
                 {
-                    if (selectedValue == (int)MessageCore.CoreFlags.MAERSK_BHV) CheckServiceEntryMaerskBHV();
-                    if (selectedValue == (int)MessageCore.CoreFlags.SEAGO_BHV) CheckServiceEntrySeaGoBHV();
-                    if (selectedValue == (int)MessageCore.CoreFlags.HOEGH) CheckServiceEntryHoegh();
-                    if (selectedValue == (int)MessageCore.CoreFlags.ELBE_BULK) CheckServiceEntryElbeBulk();
-                    if (selectedValue == (int)MessageCore.CoreFlags.FCT_JUNGE) CheckServiceEntryFctJunge();
-                    this.Core.SetFlag(true, (MessageCore.CoreFlags)selectedValue);
-                    DBManager.Instance.Save(this.Core);
+                    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 special entry ship service check
-
-        private void CheckServiceEntryMaerskBHV()
-        {
-            bool found = false;
-            foreach(SERV serv in _servMessage.Elements.Cast<SERV>())
-            {
-                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, Johanniswall 7, 20095 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 _servMessage.Elements.Cast<SERV>())
-            {
-                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, Johanniswall 7, 20095 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 CheckServiceEntryHoegh()
-        {
-            bool found = false;
-            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
-            {
-                if (serv.ServiceBeneficiary.Equals("Höegh Autoliners AS, Oslo, Norway"))
-                    found = true;
-            }
-
-            if (!found)
-            {
-                SERV newServ = new SERV();
-                newServ.ServiceBeneficiary = "Höegh Autoliners AS, Oslo, Norway";
-                newServ.ServiceInvoiceRecipient = " PWL Port Services GmbH & Co. KG";
-                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);
-            }
-        }
-
-        private void CheckServiceEntryFctJunge()
-        {
-            bool found = false;
-            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
-            {
-                if (serv.ServiceName.Equals("Fct Junge - Hamburg"))
-                    found = true;
-            }
-
-            if (!found)
-            {
-                SERV newServ = new SERV();
-                newServ.ServiceBeneficiary = "";
-                newServ.ServiceInvoiceRecipient = " Frachtcontor Junge & Co. GmbH";
-                newServ.ServiceName = "Fct Junge - Hamburg";
-                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 CheckServiceEntryElbeBulk()
-        {
-            bool found = false;
-            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
-            {
-                if (serv.ServiceName.Equals("Elbe Bulk Schiffe - Hamburg"))
-                    found = true;
-            }
-
-            if (!found)
-            {
-                SERV newServ = new SERV();
-                newServ.ServiceBeneficiary = "";
-                newServ.ServiceInvoiceRecipient = " Division Elbe Bulk, Frachtcontor Junge & Co. GmbH";
-                newServ.ServiceName = "Elbe Bulk Schiffe - Hamburg";
-                newServ.MessageHeader = this._servMessage;
-                newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
-                this._servMessage.Elements.Add(newServ);
-                this.dataGridSERV.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.SERV);
-            }
-        }
+        #region other event handler
 
         private void buttonSearchPortArea_Click(object sender, RoutedEventArgs e)
         {
@@ -536,16 +495,28 @@ namespace ENI2.DetailViewControls
             }
         }
 
+        private void buttonCopyNameFromCREWA_Click(object sender, RoutedEventArgs e)
+        {
+            CREW crewA = null;
+            if (this._crewaMessage.Elements.Count > 0)
+            {
+                crewA = this._crewaMessage.Elements[0] as CREW;
+            }
+
+            SelectCrewMemberDialog scmd = new SelectCrewMemberDialog();
+            scmd.CREW = crewA;
+            scmd.AddVisible = false;
+
+            if (scmd.ShowDialog() ?? false)
+            {
+                this.textBox_NameMaster.Text = $"{crewA.CrewMemberFirstName} {crewA.CrewMemberLastName}";
+                this.SublistElementChanged(Message.NotificationClass.NAME);
+                var binding = textBox_NameMaster.GetBindingExpression(TextBox.TextProperty);
+                binding?.UpdateSource();
+            }
+        }
+
         #endregion
 
-        private void MenuItem_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        private void contextMenuClearMaersk_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
     }
 }

ENI2/DetailViewControls/SecurityDetailControl.xaml.cs

@@ -116,6 +116,12 @@ 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)

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/WasteDetailControl.xaml

@@ -35,7 +35,6 @@
                                 <RowDefinition Height="28" />
                                 <RowDefinition Height="*" />
                                 <RowDefinition Height="28" />
-                                <RowDefinition Height="28" />
                             </Grid.RowDefinitions>
                             <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_AccurateDetailsGiven" Margin="0,0,10,0"/>
                             <!--TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_ETAToPortOfCall" Margin="0,0,10,0" TextWrapping="Wrap" FontSize="10"/-->
@@ -56,38 +55,9 @@
                             <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" />
-                            <Label Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" Content="{x:Static p:Resources.textAgentTemplate}" Margin="0,0,10,0" />
-                            <ComboBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Name="comboBox_WSDPTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="Remark" SelectionChanged="comboBox_WSDPTemplate_SelectionChanged" />
-                            <Grid Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" Name="gridTemplateControls" Visibility="Visible">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <!-- Name -->
-                                    <ColumnDefinition Width="26"/>
-                                    <!-- Save button -->
-                                    <ColumnDefinition Width="26"/>
-                                    <!-- Delete button -->
-                                    <ColumnDefinition Width="52"/>
-                                    <!-- Undo button -->
-                                </Grid.ColumnDefinitions>
-                                <TextBox Grid.Column="0" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
-                                <Button Name="buttonSaveTemplate" Grid.Column="1" 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="2" 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="3" 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>
-                            <Button Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
-                            <Button Grid.Row="7" Grid.Column="2" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
+                            
+                            <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>
                         <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1" CanUserAddRows="False">

ENI2/DetailViewControls/WasteDetailControl.xaml.cs

@@ -13,8 +13,6 @@ using ExcelDataReader;
 using System.IO;
 using System;
 using Microsoft.Win32;
-using System.Diagnostics;
-using System.Threading.Tasks;
 
 namespace ENI2.DetailViewControls
 {
@@ -24,14 +22,14 @@ namespace ENI2.DetailViewControls
     public partial class WasteDetailControl : DetailBaseControl
     {
 
+        #region Fields
+
         private Message _wasMessage;
         private WAS _was;
         private Message _wasRcptMessage;
         private WAS_RCPT _selectedWAS_RCPT;
 
-        private static List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;
-        private WasteDisposalServiceProvider_Template _currentTemplate;
-        private string _undoTemplate;        
+        #endregion
 
         public WasteDetailControl()
         {
@@ -46,7 +44,7 @@ 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); };
         }
@@ -77,7 +75,7 @@ namespace ENI2.DetailViewControls
                     WasteCapacity_MTQ = 0,
                     WasteDescription = "",
                     WasteDisposalAmount_MTQ = 0,
-                    WasteDisposalPort = "ZZUKN"                    
+                    WasteDisposalPort = "ZZUKN"
                 };
                 this._was.Waste.Add(newWaste);
             }
@@ -96,7 +94,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        public async override void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
 
@@ -123,7 +121,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!)
@@ -131,14 +129,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,19 +175,17 @@ namespace ENI2.DetailViewControls
 
             #endregion
 
-            #region init WSDP provider
-
-            await InitTemplates();
-            
-            this.comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
-
-            #endregion
+        }
 
+        public override int SelectedTabIndex
+        {
+            get { return this.mainFrame.SelectedIndex; }
+            set { this.mainFrame.SelectedIndex = value; }
         }
 
         #region Waste receipt grid event handler
 
-        private async void DataGridWasteReceipt_CreateRequested()
+        private void DataGridWasteReceipt_CreateRequested()
         {
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = new WAS_RCPT();
@@ -217,11 +213,11 @@ 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);
             }
 
-            await InitTemplates(); // templates might have changed in the dialog
+         
         }
 
         private void DataGridWasteReceipt_DeleteRequested(DatabaseEntity obj)
@@ -240,7 +236,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        private async void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
+        private void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
         {
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = obj as WAS_RCPT;
@@ -263,11 +259,11 @@ 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);
-            await InitTemplates(); // templates might have changed in the dialog
+            
         }
 
         private void DataGridWasteReceipt_AddingNewItem(object sender, AddingNewItemEventArgs e)
@@ -419,7 +415,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();
@@ -477,7 +473,7 @@ namespace ENI2.DetailViewControls
                 HighlightService.HighlightControl(this.wasGroupBox, HighlightService.HighlightStyle.VIOLATION, this._wasMessage);
         }
 
-        #endregion        
+        #endregion
 
         #region Excel file import
 
@@ -494,7 +490,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;
                 }
 
@@ -521,7 +517,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))
@@ -585,102 +581,7 @@ namespace ENI2.DetailViewControls
         }
 
 
-        #endregion      
-
-        #region Waste disposal Service Provider templates event handler
-
-        private async Task InitTemplates()
-        {            
-            _wsdpTemplates = await DBManagerAsync.GetWastDisposalServiceProviderTemplatesAsync();
-            _wsdpTemplates.Sort();
-            this.comboBox_WSDPTemplate.ItemsSource = null;
-            this.comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
-            Trace.WriteLine($"{_wsdpTemplates.Count} WSDP templates loaded");            
-        }
-
-        private void comboBox_WSDPTemplate_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            Trace.WriteLine("WSDP combo selection changed");
-            if(this.comboBox_WSDPTemplate.SelectedItem is WasteDisposalServiceProvider_Template wdsp_t)
-            {
-                this.textBoxTemplateTitle.Text = wdsp_t.Remark;
-                this.buttonDeleteTemplate.IsEnabled = true;
-                this._currentTemplate = wdsp_t;
-                this._undoTemplate = this.textBoxWasteDisposalServiceProviders.Text.Trim();
-                this.buttonUndoTemplate.IsEnabled = this._undoTemplate.Length > 0;
-                this.textBoxWasteDisposalServiceProviders.Text = wdsp_t.WasteDisposalServiceProviderName;
-            }
-        }
-
-        private async void buttonSaveTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            string currentWSDPProviderName = this.textBoxWasteDisposalServiceProviders.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.textBoxWasteDisposalServiceProviders.Text = this._undoTemplate;
-                this.buttonUndoTemplate.IsEnabled = false;
-                this._undoTemplate = null;
-                this.comboBox_WSDPTemplate.SelectedItem = null;
-            }
-        }
-
-        #endregion
+        #endregion        
 
         #region Copy WAS to WAS_RCPT handler
 
@@ -688,7 +589,7 @@ namespace ENI2.DetailViewControls
         {
             if (_selectedWAS_RCPT == null) return;
 
-            if(MessageBox.Show(Properties.Resources.textCopyToWASConfirmation, Properties.Resources.textConfirmation, 
+            if(MessageBox.Show(Properties.Resources.textCopyToWASConfirmation, Properties.Resources.textConfirmation,
                 MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
             {
                 foreach(Waste waste in _was.Waste)

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>7.2.7.1</ApplicationVersion>
+    <ApplicationRevision>7</ApplicationRevision>
+    <ApplicationVersion>7.2.12.7</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -134,67 +134,79 @@
     <CodeAnalysisRuleSet>..\code.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ExcelDataReader, Version=3.7.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDataReader.3.7.0\lib\net462\ExcelDataReader.dll</HintPath>
+    <Reference Include="ExcelDataReader, Version=3.8.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
+      <HintPath>packages\ExcelDataReader.3.8.0\lib\net462\ExcelDataReader.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <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.Extensions.DependencyInjection, Version=9.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.9.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <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.Abstractions, Version=9.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <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.Logging, Version=9.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.9.0.1\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    <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.Abstractions, Version=9.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <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.Options, Version=9.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Options.9.0.1\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    <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.Primitives, Version=9.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Primitives.9.0.1\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    <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.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\MigraDoc.DocumentObjectModel.dll</HintPath>
+    <Reference Include="MigraDoc.DocumentObjectModel, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.Rendering-gdi, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\MigraDoc.Rendering-gdi.dll</HintPath>
+    <Reference Include="MigraDoc.Rendering, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.Rendering.dll</HintPath>
     </Reference>
-    <Reference Include="MigraDoc.RtfRendering-gdi, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\MigraDoc.RtfRendering-gdi.dll</HintPath>
+    <Reference Include="MigraDoc.RtfRendering, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.RtfRendering.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp-gdi, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp-gdi.dll</HintPath>
+    <Reference Include="PdfSharp, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Charting-gdi, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.Charting-gdi.dll</HintPath>
+    <Reference Include="PdfSharp.BarCodes, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.BarCodes.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Quality-gdi, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.Quality-gdi.dll</HintPath>
+    <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.Snippets-gdi, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.Snippets-gdi.dll</HintPath>
+    <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.System, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.System.dll</HintPath>
+    <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.WPFonts, Version=6.1.1.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.WPFonts.dll</HintPath>
+    <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.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    <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" />
@@ -202,30 +214,34 @@
     <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.9.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <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.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    <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.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <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.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <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.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.ValueTuple.dll</HintPath>
+    <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" />
@@ -241,20 +257,20 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=5.0.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>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=5.0.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>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=5.0.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>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -281,6 +297,9 @@
     <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" />
@@ -311,6 +330,9 @@
     <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>
@@ -539,6 +561,7 @@
     <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" />
@@ -568,6 +591,10 @@
       <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>
@@ -796,6 +823,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>
@@ -914,10 +945,6 @@
       <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>
@@ -937,6 +964,7 @@
     <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>
@@ -1019,12 +1047,15 @@
     <Resource Include="Resources\document_plain_new.png" />
     <Resource Include="Resources\exit.png" />
     <Resource Include="Resources\document_exchange.png" />
-    <Resource Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
     <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>
@@ -1051,7 +1082,6 @@
     </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>
@@ -1182,7 +1212,9 @@
       <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\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

@@ -3,9 +3,10 @@
         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:enictrl="clr-namespace:ENI2.Controls"
+        xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="Change password" Height="215" Width="400" Loaded="EditWindowBase_Loaded"  Background="AliceBlue">
+        Title="Change password" Height="243" Width="400" Loaded="EditWindowBase_Loaded"  Background="AliceBlue">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -13,6 +14,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".4*" />
@@ -20,14 +22,16 @@
         </Grid.ColumnDefinitions>
 
         <Label Grid.Row="0" Grid.Column="0" Content="Name" />
-        <Label Grid.Row="1" Grid.Column="0" Content="Old password" />
-        <Label Grid.Row="2" Grid.Column="0" Content="New password" />
-        <Label Grid.Row="3" Grid.Column="0" Content="Repeat new password" />
+        <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" />
-        <Button Grid.Row="4" Grid.Column="1" Content="Change" Name="buttonChangePassword" Margin="2" Width="80" HorizontalAlignment="Left" Click="buttonChangePassword_Click"/>
+        <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

@@ -4,6 +4,7 @@
 
 using bsmd.database;
 using ENI2.Controls;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -36,43 +37,48 @@ namespace ENI2.EditControls
         {
             bool success = false;
             string message = "";
-            if(!textBoxOldPassword.Password.IsNullOrEmpty())
+            if (!textBoxOldPassword.Password.IsNullOrEmpty() || !textBoxNew1Password.Password.IsNullOrEmpty() || !textBoxNew2Password.Password.IsNullOrEmpty())
             {
-                if(CurrentUser.GetHash(textBoxOldPassword.Password).Equals(CurrentUser.PasswordHash))
+                if (!textBoxOldPassword.Password.IsNullOrEmpty())
                 {
-                    if(textBoxNew1Password.Password.IsNullOrEmpty() ||
-                        textBoxNew2Password.Password.IsNullOrEmpty() ||
-                        !textBoxNew1Password.Password.Equals(textBoxNew2Password.Password))
+                    if (CurrentUser.GetHash(textBoxOldPassword.Password).Equals(CurrentUser.PasswordHash))
                     {
-                        message = "New passwords are empty or do not match";
-                    }
-                    else
-                    {
-                        if (textBoxOldPassword.Password.Equals(textBoxNew1Password.Password))
+                        if (textBoxNew1Password.Password.IsNullOrEmpty() ||
+                            textBoxNew2Password.Password.IsNullOrEmpty() ||
+                            !textBoxNew1Password.Password.Equals(textBoxNew2Password.Password))
                         {
-                            message = "Old and new password are the same";
+                            message = "New passwords are empty or do not match";
                         }
                         else
                         {
-                            CurrentUser.SetPassword(textBoxNew1Password.Password);
-                            DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(CurrentUser);
-                            success = true;
+                            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 is not correct";
+                    message = "Old password empty";
                 }
-            } 
-            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);
             }
-            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)
@@ -82,6 +88,8 @@ namespace ENI2.EditControls
             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/EditReportingPartyDialog.xaml

@@ -48,7 +48,7 @@
         <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="labelEditor" Grid.Row="8" Grid.Column="2" Content="{x:Static p:Resources.textEditor}" HorizontalContentAlignment="Right" />
-        <Label Name="labelDefaultDisplay" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textDefaultDisplay}" 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" />
 
@@ -69,7 +69,6 @@
         <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" />
-        <ComboBox x:Name="comboBoxDefaultDisplay" Grid.Column="1" Grid.Row="9" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" />
         <Label Grid.Row="10" Grid.Column="1" Name="dateTimePickerCreated" FontStyle="Italic" />
         <Label Grid.Row="10" Grid.Column="3" Name="dateTimePickerChanged" FontStyle="Italic" />
 

ENI2/EditControls/EditReportingPartyDialog.xaml.cs

@@ -25,7 +25,7 @@ namespace ENI2.EditControls
 
         private void EditReportingPartyDialog_Loaded(object sender, RoutedEventArgs e)
         {
-            this.comboBoxDefaultDisplay.ItemsSource = Util.EnumHelper.GetAllValuesAndDescription(typeof(ReportingParty.ShipcallDisplayModeEnum));
+            
             this.textBoxCity.Text = this.ReportingParty.City;
             this.textBoxCountry.Text = this.ReportingParty.Country;
             this.textBoxEMail.Text = this.ReportingParty.EMail;
@@ -42,7 +42,7 @@ namespace ENI2.EditControls
             this.checkBoxAdministrator.IsChecked = this.ReportingParty.IsAdmin;
             this.checkBoxArchived.IsChecked = this.ReportingParty.IsArchived;
             this.checkBoxEditor.IsChecked = this.ReportingParty.IsEditor;
-            this.comboBoxDefaultDisplay.SelectedValue = this.ReportingParty.ShipcallDisplayMode;
+            
 
             this.dateTimePickerChanged.Content = this.ReportingParty.Changed.HasValue ? this.ReportingParty.Changed.ToString() : "";
             this.dateTimePickerCreated.Content = this.ReportingParty.Created.HasValue ? this.ReportingParty.Created.ToString() : "";
@@ -64,8 +64,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.ShipcallDisplayMode = (ReportingParty.ShipcallDisplayModeEnum) Enum.Parse(typeof(ReportingParty.ShipcallDisplayModeEnum), (string) this.comboBoxDefaultDisplay.SelectedValue);
+            this.ReportingParty.Logon = this.textBoxUserLogon.Text.Trim();            
 
             if(!this.passwordBoxPassword.Password.IsNullOrEmpty())
             {

ENI2/EditControls/EditSERVDialog.xaml.cs

@@ -1,5 +1,5 @@
 // Copyright (c) 2017 schick Informatik
-// Description:
+// Description: Edit SERV and SERV_template entities
 //
 
 using System.Windows;
@@ -14,36 +14,78 @@ 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
-            this.textBoxServiceName.Text = this.SERV.ServiceName;
-            this.textBoxServiceBeneficiary.Text = this.SERV.ServiceBeneficiary;
-            this.textBoxServiceInvoiceRecipient.Text = this.SERV.ServiceInvoiceRecipient;
-            this.AddVisible = true;
+            if (this.SERV != null)
+            {
+                this.textBoxServiceName.Text = this.SERV.ServiceName;
+                this.textBoxServiceBeneficiary.Text = this.SERV.ServiceBeneficiary;
+                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
-            this.SERV.ServiceName = this.textBoxServiceName.Text.Trim();
-            this.SERV.ServiceBeneficiary = this.textBoxServiceBeneficiary.Text.Trim();
-            this.SERV.ServiceInvoiceRecipient = this.textBoxServiceInvoiceRecipient.Text.Trim();
+
+            if (this.SERV != null)
+            {
+                // copy back
+                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();
+            }
+
         }
 
-        private void EditSERVDialog_OKClicked()
-        {
-            this.CopyValuesToEntity();   
-        }
-
-        public SERV SERV { get; set; }
+        #endregion
+        
     }
 }

ENI2/EditControls/EditWasteReceiptDialog.xaml.cs

@@ -45,7 +45,7 @@ namespace ENI2.EditControls
             OKClicked += EditWasteReceiptDialog_OKClicked;
             this.AddVisible = true;
             
-            _wsdpTemplates = await DBManagerAsync.GetWastDisposalServiceProviderTemplatesAsync();
+            _wsdpTemplates = await DBManagerAsync.GetWasteDisposalServiceProviderTemplatesAsync();
             _wsdpTemplates.Sort();
             Trace.WriteLine($"{_wsdpTemplates.Count} WSDP templates loaded");
             

ENI2/EditControls/SelectCrewMemberDialog.xaml

@@ -0,0 +1,32 @@
+<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

@@ -0,0 +1,41 @@
+// 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="600" Width="250" Background="AliceBlue">
+        Title="{x:Static p:Resources.textSelectImportClasses}" Height="660" Width="250" Background="AliceBlue">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="1*" />

ENI2/EditControls/SelectImportClassesDialog.xaml.cs

@@ -1,14 +1,13 @@
 // Copyright (c) 2017-today schick Informatik
-// Description: Select classes for import
+// Description: Select classes for import via Excel or for sending them once completed
 // 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>
@@ -17,7 +16,8 @@ namespace ENI2.EditControls
     public partial class SelectImportClassesDialog : ENI2.Controls.EditWindowBase
     {
         private readonly List<SelectClass> _selectClasses = new List<SelectClass>();
-        private readonly List<bsmd.database.Message.NotificationClass> _selectedClasses = new List<Message.NotificationClass>();
+        private readonly List<Message.NotificationClass> _selectedClasses = new List<Message.NotificationClass>();
+        private readonly List<Message.NotificationClass> _preselectedClasses = new List<Message.NotificationClass>();
 
         public SelectImportClassesDialog()
         {
@@ -25,33 +25,61 @@ 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.STO)                    
-                    ) continue;
-
-                if (IsTransit &&
-                    ((aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.BPOL) ||
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.HAZD) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.INFO) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.LADG) ||
@@ -62,15 +90,16 @@ 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(bsmd.database.Message.NotificationClass), aMessage.MessageNotificationClass);
+                sc.Name = Enum.GetName(typeof(Message.NotificationClass), aMessage.MessageNotificationClass);
                 sc.Class = aMessage.MessageNotificationClass;
-                sc.IsSelected = false;
+                sc.IsSelected = this._preselectedClasses.Contains(sc.Class);
                 _selectClasses.Add(sc);
             }
 
+
             this.checkListBoxClasses.ItemsSource = _selectClasses;
             this.OKClicked += SelectImportClassesDialog_OKClicked;
         }
@@ -97,7 +126,7 @@ namespace ENI2.EditControls
                     OnPropertyChanged("IsSelected");
                 }
             }
-            
+
             public event PropertyChangedEventHandler PropertyChanged;
             protected void OnPropertyChanged(string propertyName)
             {

ENI2/EditControls/SelectPortAreaDialog.xaml.cs

@@ -65,7 +65,7 @@ namespace ENI2.EditControls
         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;

ENI2/Excel/DakosyUtil.cs

@@ -740,7 +740,7 @@ namespace ENI2.Excel
                 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);
+                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger departure", string.Format("E{0}", i + 16)), out bool canceled, false);
                 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)));
@@ -802,7 +802,7 @@ namespace ENI2.Excel
                 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);
+                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("E{0}", i + 16)), out bool canceled, false);
                 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)));
@@ -1207,7 +1207,7 @@ namespace ENI2.Excel
                 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);
+                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("E{0}", i + 15)), out bool canceled, false);
                 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));
@@ -1257,7 +1257,7 @@ namespace ENI2.Excel
                 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);
+                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("E{0}", i + 15)), out bool canceled, false);
                 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));

ENI2/Excel/ExcelReader.cs

@@ -128,7 +128,7 @@ namespace ENI2.Excel
                 if (portName.IsNullOrEmpty())
                 {
                     _log.WarnFormat("unknown Locode {0}", val);
-                    val = "";
+                    val = null;
                 }
             }
             return val;

ENI2/Excel/ExcelUtil.cs

@@ -15,6 +15,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace ENI2.Excel
@@ -1007,15 +1008,18 @@ namespace ENI2.Excel
             STAT stat = statMessage.Elements[0] as STAT;
             ScanMessage(stat, reader);
 
-            foreach (Message preMessage in messages)
+            if (!messageCore.IsTransit) // let's not do this for transit messages
             {
-                if (preMessage.MessageNotificationClass == Message.NotificationClass.PRE72H)
+                foreach (Message preMessage in messages)
                 {
-                    if (preMessage.Elements.Count > 0)
+                    if (preMessage.MessageNotificationClass == Message.NotificationClass.PRE72H)
                     {
-                        PRE72H pre72h = preMessage.Elements[0] as PRE72H;
-                        pre72h.Tanker = stat.IsTanker;
-                        ExcelReader.SaveMessage(preMessage);
+                        if (preMessage.Elements.Count > 0)
+                        {
+                            PRE72H pre72h = preMessage.Elements[0] as PRE72H;
+                            pre72h.Tanker = stat.IsTanker;
+                            ExcelReader.SaveMessage(preMessage);
+                        }
                     }
                 }
             }
@@ -1240,6 +1244,7 @@ namespace ENI2.Excel
                     if ((reader.Mode == ExcelReader.CountryMode.DE) && waste.IsDashWasteCode)
                     {
                         waste.WasteDescription = "-";
+                        // NOP
                     }
                     else if (reader.Mode == ExcelReader.CountryMode.DK)
                     {
@@ -1279,18 +1284,19 @@ namespace ENI2.Excel
                 if (waste.WasteType == 2309) waste.WasteType = 507;
                 if (waste.WasteType == 3000) waste.WasteType = 401;
 
-                waste.WasteDisposalAmount_MTQ = reader.ReadNumberDefaultZero(wasteAmount);
-                waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity);
-                waste.WasteAmountRetained_MTQ = reader.ReadNumberDefaultZero(wasteRetained);
+                waste.WasteDisposalAmount_MTQ = reader.ReadNumber(wasteAmount);
+                if (!waste.WasteDisposalAmount_MTQ.HasValue && reader.ReadText(wasteAmount).IsNullOrEmpty()) waste.WasteDisposalAmount_MTQ = 0;
+                waste.WasteCapacity_MTQ = reader.ReadNumber(wasteCapacity);
+                if (!waste.WasteCapacity_MTQ.HasValue && reader.ReadText(wasteCapacity).IsNullOrEmpty()) waste.WasteCapacity_MTQ = 0;
+                waste.WasteAmountRetained_MTQ = reader.ReadNumber(wasteRetained);
+                if (!waste.WasteAmountRetained_MTQ.HasValue && reader.ReadText(wasteRetained).IsNullOrEmpty()) waste.WasteAmountRetained_MTQ = 0;
 
                 waste.WasteDisposalPort = reader.ReadSSNLocode(wastePort);   // aka RemainingWasteDisposalPort
 
-                if (waste.WasteDisposalPort.IsNullOrEmpty())
-                {
-                    waste.WasteDisposalPort = "ZZUKN";
-                }
+                if ((waste.WasteDisposalPort == null) && reader.ReadText(wastePort).IsNullOrEmpty()) waste.WasteDisposalPort = "ZZUKN";                
 
-                waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);
+                waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumber(amountGen);
+                if (!waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue && reader.ReadText(amountGen).IsNullOrEmpty()) waste.WasteAmountGeneratedTillNextPort_MTQ = 0;
 
                 if (!waste.WasteType.HasValue || (waste.WasteType > 999))
                 {
@@ -1298,7 +1304,8 @@ namespace ENI2.Excel
                 }
             }
 
-            was.AddMissingWaste();
+            was.AddMissingWaste(false);
+
             return true;
         }
 
@@ -1368,7 +1375,7 @@ namespace ENI2.Excel
                             wr.WasteCode.Equals("204") || wr.WasteCode.Equals("510") || wr.WasteCode.Equals("511"))
                             wr.WasteDescription = "-";
                     }
-                    wr.AmountWasteReceived_MTQ = reader.ReadNumber(wAmount) ?? (double?)0; // Default ist 0, nicht nix ;-)
+                    wr.AmountWasteReceived_MTQ = reader.ReadNumber(wAmount); //  ?? (double?)0; // Default ist 0, nicht nix ;-) // Update: wir wollen doch einen Fehler
                 }
 
                 // only add message when an identification number was given
@@ -1418,10 +1425,10 @@ namespace ENI2.Excel
                         int i = 1;
                         foreach (LastTenPortFacilitiesCalled ltpfc in sec.LastTenPortFacilitesCalled)
                         {
-                            if (!(mdh.GetSublistElementWithIdentifier((i + 1).ToString()) is PortOfCallLast30Days poc30d))
+                            if (!(mdh.GetSublistElementWithIdentifier((i).ToString()) is PortOfCallLast30Days poc30d))
                             {
                                 poc30d = new PortOfCallLast30Days();
-                                poc30d.Identifier = (i + 1).ToString();
+                                poc30d.Identifier = (i).ToString();
                                 poc30d.MDH = mdh;
                                 mdh.PortOfCallLast30Days.Add(poc30d);
                             }
@@ -1435,64 +1442,66 @@ namespace ENI2.Excel
                 }
                 else // "normal mode", aus den Zellen lesen
                 {
-                    // POC last 30 days
-                    for (int i = 0; i < mdh.NumberOfExcelRows; i++)
+
+                    string sheetTitle = "1. VOYAGE";
+                    // 4.8.25: Changed this area to work like reading from a Dakosy Sheet (by values in rows, not cell names)
+                    if (reader.HasWorksheetNamed(sheetTitle))
                     {
-                        string portName = string.Format("MDH.PortOfCallLast30DaysPort_{0}", i + 1);
-                        string portCountry = string.Format("MDH.PortOfCallLast30DaysCountry_{0}", i + 1);
-                        string locode = string.Format("MDH.PortOfCallLast30DaysLocode_{0}", i + 1);
-                        string crewJoined = string.Format("MDH.PortOfCallLast30DaysCrewMembersJoined_{0}", i + 1);
-                        string crewName = string.Format("MDH.PortOfCallLast30DaysCrewJoinedShipName_{0}", i + 1);
-                        string depDate = string.Format("MDH.PortOfCallLast30DaysDateOfDeparture_{0}", i + 1);
 
-                        if (!(mdh.GetSublistElementWithIdentifier((i + 1).ToString()) is PortOfCallLast30Days poc30d))
-                        {
-                            poc30d = new PortOfCallLast30Days();
-                            poc30d.Identifier = (i + 1).ToString();
-                            poc30d.MDH = mdh;
-                            mdh.PortOfCallLast30Days.Add(poc30d);
-                        }
+                        // POC last 30 days
+                        for (int i = 0; i < mdh.NumberOfExcelRows; i++)
+                        {                            
 
-                        string pName = reader.ReadText(portName);
-                        string pCountry = reader.ReadText(portCountry);
-
-                        poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadDate(depDate);
-                        poc30d.PortOfCallLast30DaysLocode = reader.ReadLoCode(locode);
-
-                        // Verbesserungsvorschlag Jul/21: CrewMembersJoined Häkchen abhängig von den Namen in der Spalte
-                        bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadBoolean(crewJoined);
-
-                        string crewNameString = reader.ReadText(crewName);
-                        poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty();
-
-                        // if crew members joined is set explicitly to true and the name is empty, still set the field to true
-                        if (!(poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false) && (PortOfCallLast30DaysCrewMembersJoinedFlag ?? false))
-                            poc30d.PortOfCallLast30DaysCrewMembersJoined = true;
-
-                        if (!crewNameString.IsNullOrEmpty() && (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false))
-                        {
-                            // try different separators
-                            string[] crew = crewNameString.Split(';');
-                            if (crew.Length == 1)
-                                crew = crewNameString.Split(',');
-
-                            for (int j = 0; j < crew.Length; j++)
+                            if (!(mdh.GetSublistElementWithIdentifier((i + 1).ToString()) is PortOfCallLast30Days poc30d))
                             {
-                                if (!(poc30d.GetSublistElementWithIdentifier((j + 1).ToString()) is PortOfCallLast30DaysCrewJoinedShip poc30dCrew))
-                                {
-                                    poc30dCrew = new PortOfCallLast30DaysCrewJoinedShip();
-                                    poc30dCrew.Identifier = (j + 1).ToString();
-                                    poc30dCrew.PortOfCallLast30Days = poc30d;
-                                    poc30d.CrewJoinedShip.Add(poc30dCrew);
-                                }
-
-                                poc30dCrew.PortOfCallLast30DaysCrewJoinedShipName = crew[j];
+                                poc30d = new PortOfCallLast30Days();
+                                poc30d.Identifier = (i + 1).ToString();
+                                poc30d.MDH = mdh;
+                                mdh.PortOfCallLast30Days.Add(poc30d);
                             }
-                        }
 
-                        // Leer/def. Zeilen entfernen
-                        if (!poc30d.PortOfCallLast30DaysDateOfDeparture.HasValue && (poc30d.PortOfCallLast30DaysLocode == null))
-                            mdh.PortOfCallLast30Days.Remove(poc30d);
+                            string pName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 82 + i));
+                            string pCountry = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 82 + i));
+
+                            poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 82 + i));
+                            poc30d.PortOfCallLast30DaysLocode = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", 82 + i));
+                            if (LocodeDB.PortNameFromLocode(poc30d.PortOfCallLast30DaysLocode).IsNullOrEmpty()) poc30d.PortOfCallLast30DaysLocode = "";
+
+                            // Verbesserungsvorschlag Jul/21: CrewMembersJoined Häkchen abhängig von den Namen in der Spalte
+                            bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", 82 + i));
+
+                            string crewNameString = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 82 + i));
+                            poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty() && (crewNameString.Length > 1);
+
+                            // if crew members joined is set explicitly to true and the name is empty, still set the field to true
+                            if (!(poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false) && (PortOfCallLast30DaysCrewMembersJoinedFlag ?? false))
+                                poc30d.PortOfCallLast30DaysCrewMembersJoined = true;
+
+                            if (!crewNameString.IsNullOrEmpty() && (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false))
+                            {
+                                // try different separators
+                                string[] crew = crewNameString.Split(';');
+                                if (crew.Length == 1)
+                                    crew = crewNameString.Split(',');
+
+                                for (int j = 0; j < crew.Length; j++)
+                                {
+                                    if (!(poc30d.GetSublistElementWithIdentifier((j + 1).ToString()) is PortOfCallLast30DaysCrewJoinedShip poc30dCrew))
+                                    {
+                                        poc30dCrew = new PortOfCallLast30DaysCrewJoinedShip();
+                                        poc30dCrew.Identifier = (j + 1).ToString();
+                                        poc30dCrew.PortOfCallLast30Days = poc30d;
+                                        poc30d.CrewJoinedShip.Add(poc30dCrew);
+                                    }
+
+                                    poc30dCrew.PortOfCallLast30DaysCrewJoinedShipName = crew[j];
+                                }
+                            }
+
+                            // Leer/def. Zeilen entfernen
+                            if (!poc30d.PortOfCallLast30DaysDateOfDeparture.HasValue && (poc30d.PortOfCallLast30DaysLocode.IsNullOrEmpty()))
+                                mdh.PortOfCallLast30Days.Remove(poc30d);
+                        }
                     }
                 }
 
@@ -1605,7 +1614,10 @@ namespace ENI2.Excel
             }
 
             SEC sec = secMessage.Elements[0] as SEC;
-            ScanMessage(sec, reader);
+
+            ((ISublistContainer)sec).DeleteElements();
+
+            ScanMessage(sec, reader);            
 
             reader.ReadBoolean("SEC.AreMatterToReport"); // das berücksichtigen wir derzeit nicht in der DB (implizit)
 
@@ -1655,97 +1667,84 @@ namespace ENI2.Excel
             if (!sec.KielCanalPassagePlannedIncomming.HasValue && !sec.KielCanalPassagePlannedOutgoing.HasValue)
                 sec.KielCanalPassagePlanned = false;
 
-            // Last10PortFacilitesCalled
-            for (int i = 1; i <= 10; i++)
-            {
-                string portName = string.Format("SEC.PortFacilityPortName_{0}", i);
-                string portCountry = string.Format("SEC.PortFacilityPortCountry_{0}", i);
-                string portLocode = string.Format("SEC.PortFacilityPortLoCode_{0}", i);
-                string portDateOfArrival = string.Format("SEC.PortFacilityDateOfArrival_{0}", i);
-                string portDateOfDeparture = string.Format("SEC.PortFacilityDateOfDeparture_{0}", i);
-                string portShipSecLevel = string.Format("SEC.PortFacilityShipSecurityLevel_{0}", i);
-                string portGISISCode = string.Format("SEC.PortFacilityGISISCode_{0}", i);
-                string portSecMatters = string.Format("SEC.PortFacilitySecurityMattersToReport_{0}", i);
+            
 
-                if (!(sec.GetPortFacilityWithIdentifier(i.ToString()) is LastTenPortFacilitiesCalled l10fc))
-                {
-                    l10fc = new LastTenPortFacilitiesCalled();
-                    l10fc.Identifier = i.ToString();
-                    l10fc.SEC = sec;
-                    sec.LastTenPortFacilitesCalled.Add(l10fc);
+            string sheetTitle = "1. VOYAGE";
+            // 4.8.25: Changed this area to work like reading from a Dakosy Sheet (by values in rows, not cell names)
+            if (reader.HasWorksheetNamed(sheetTitle))
+            {                
+                // Last10PortFacilitesCalled
+                for (int i = 0; i < 10; i++)
+                {                    
+
+                    if (!(sec.GetPortFacilityWithIdentifier((i + 1).ToString()) is LastTenPortFacilitiesCalled l10fc))
+                    {
+                        l10fc = new LastTenPortFacilitiesCalled();
+                        l10fc.Identifier = (i + 1).ToString();
+                        l10fc.SEC = sec;
+                        sec.LastTenPortFacilitesCalled.Add(l10fc);
+                    }
+
+                    l10fc.PortFacilityPortName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 54 + i), 99);
+                    l10fc.PortFacilityPortCountry = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 54 + i), 99);
+                    l10fc.PortFacilityPortLoCode = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", 54 + i), 5);
+                    if (LocodeDB.PortNameFromLocode(l10fc.PortFacilityPortLoCode).IsNullOrEmpty()) l10fc.PortFacilityPortLoCode = "";
+                    l10fc.PortFacilityDateOfArrival = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 54 + i));
+                    l10fc.PortFacilityDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("H{0}", 54 + i));
+
+                    string sLevel = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 54 + i));
+                    if (!sLevel.IsNullOrEmpty())
+                    {
+                        if (sLevel.Contains('1')) l10fc.PortFacilityShipSecurityLevel = 1;
+                        if (sLevel.Contains('2')) l10fc.PortFacilityShipSecurityLevel = 2;
+                        if (sLevel.Contains('3')) l10fc.PortFacilityShipSecurityLevel = 3;
+                    }
+
+                    string s = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", 54 + i));
+                    // All invalid codes become "0000", Oct/25
+                    l10fc.PortFacilityGISISCode = (s != null) && Regex.IsMatch(s.Trim(), @"^\d{4}$") ? s.Trim() : "0000";
+
+                    l10fc.PortFacilitySecurityMattersToReport = reader.ReadCellAsText(sheetTitle, string.Format("K{0}", 54 + i), 255);
+
+                    // keinen "leeren" Hafen anlegen, wenn der Eintrag leer war (trifft anscheinend bei Neubauten zu, siehe E-Mail Christin vom 20./22.6.17
+                    if (l10fc.PortFacilityPortName.IsNullOrEmpty() && l10fc.PortFacilityPortLoCode.IsNullOrEmpty() && l10fc.PortFacilityPortCountry.IsNullOrEmpty())
+                        sec.LastTenPortFacilitesCalled.Remove(l10fc);
                 }
 
-                l10fc.PortFacilityPortName = reader.ReadText(portName);
-                l10fc.PortFacilityPortCountry = reader.ReadText(portCountry);
-                l10fc.PortFacilityPortLoCode = reader.ReadLoCode(portLocode);
-                l10fc.PortFacilityDateOfArrival = reader.ReadDate(portDateOfArrival);
-                l10fc.PortFacilityDateOfDeparture = reader.ReadDate(portDateOfDeparture);
+                // Ship2ShipActivities
+                for (int i = 0; i < 10; i++)
+                {                    
 
-                string sLevel = reader.ReadText(portShipSecLevel);
-                if (!sLevel.IsNullOrEmpty())
-                {
-                    if (sLevel.Contains('1')) l10fc.PortFacilityShipSecurityLevel = 1;
-                    if (sLevel.Contains('2')) l10fc.PortFacilityShipSecurityLevel = 2;
-                    if (sLevel.Contains('3')) l10fc.PortFacilityShipSecurityLevel = 3;
+                    if (!(sec.GetShipToShipWithIdentifier((i + 1).ToString()) is ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2sActivity))
+                    {
+                        s2sActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
+                        s2sActivity.Identifier = (i + 1).ToString();
+                        s2sActivity.SEC = sec;
+                        sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2sActivity);
+                    }
+
+                    s2sActivity.ShipToShipActivityLocationName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 68 + i), 255);
+                    if (s2sActivity.ShipToShipActivityLocationName.IsNullOrEmpty())
+                    {
+                        sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Remove(s2sActivity);
+                        continue;
+                    }
+
+                    s2sActivity.ShipToShipActivityLocationLoCode = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 68 + i), 5);
+                    if (LocodeDB.PortNameFromLocode(s2sActivity.ShipToShipActivityLocationLoCode).IsNullOrEmpty()) s2sActivity.ShipToShipActivityLocationLoCode = "";
+
+                    s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = (int?) reader.ReadCellAsDecimal(sheetTitle, string.Format("F{0}", 68 + i));
+                    // keine "0" (d.h. fehlerhafte Koordinaten) ins ANSW übergeben falls im Sheet nichts ist aber der Reader das aus irgendeinem Grund liest
+                    if (s2sActivity.ShipToShipActivityLocationCoordinatesLatitude == 0)
+                        s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = null;
+                    s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = (int?)reader.ReadCellAsDecimal(sheetTitle, string.Format("G{0}", 68 + i));
+                    if (s2sActivity.ShipToShipActivityLocationCoordinatesLongitude == 0)
+                        s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = null;
+                    s2sActivity.ShipToShipActivityDateFrom = reader.ReadCellAsDateTime(sheetTitle, string.Format("H{0}", 68 + i));
+                    s2sActivity.ShipToShipActivityDateTo = reader.ReadCellAsDateTime(sheetTitle, string.Format("I{0}", 68 + i));
+                    s2sActivity.ShipToShipActivityTypeCode = (int?)reader.ReadCellAsDecimal(sheetTitle, string.Format("J{0}", 68 + i));                    
+                    s2sActivity.ShipToShipActivitySecurityMattersToReport = reader.ReadCellAsText(sheetTitle, string.Format("K{0}", 68 + i), 255);
                 }
-
-                l10fc.PortFacilityGISISCode = reader.ReadTextNoWhitespace(portGISISCode);
-
-                if (l10fc.PortFacilityGISISCode.IsNullOrEmpty() || l10fc.PortFacilityGISISCode == "0")
-                    l10fc.PortFacilityGISISCode = "0000";
-                if (l10fc.PortFacilityGISISCode?.Length < 4)
-                {
-                    while (l10fc.PortFacilityGISISCode.Length < 4) l10fc.PortFacilityGISISCode = "0" + l10fc.PortFacilityGISISCode;
-                }
-
-                l10fc.PortFacilitySecurityMattersToReport = reader.ReadText(portSecMatters);
-
-                // keinen "leeren" Hafen anlegen, wenn der Eintrag leer war (trifft anscheinend bei Neubauten zu, siehe E-Mail Christin vom 20./22.6.17
-                if (l10fc.PortFacilityPortName.IsNullOrEmpty() && l10fc.PortFacilityPortLoCode.IsNullOrEmpty() && l10fc.PortFacilityPortCountry.IsNullOrEmpty())
-                    sec.LastTenPortFacilitesCalled.Remove(l10fc);
-            }
-
-            // Ship2ShipActivities
-            for (int i = 1; i <= 10; i++)
-            {
-                string s2sName = string.Format("SEC.ShipToShipActivityLocationName_{0}", i);
-                string s2sLocode = string.Format("SEC.ShipToShipActivityLocationLoCode_{0}", i);
-                string s2sLatitude = string.Format("SEC.ShipToShipActivityLocationCoordinatesLatitude_{0}", i);
-                string s2sLongitude = string.Format("SEC.ShipToShipActivityLocationCoordinatesLongitude_{0}", i);
-                string s2sFromDate = string.Format("SEC.ShipToShipActivityDateFrom_{0}", i);
-                string s2sToDate = string.Format("SEC.ShipToShipActivityDateTo_{0}", i);
-                string s2sSec = string.Format("SEC.ShipToShipActivitySecurityMattersToReport_{0}", i);
-                string s2sActivityString = string.Format("SEC.ShipToShipActivityType_{0}", i);
-
-
-                if (!(sec.GetShipToShipWithIdentifier(i.ToString()) is ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2sActivity))
-                {
-                    s2sActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
-                    s2sActivity.Identifier = i.ToString();
-                    s2sActivity.SEC = sec;
-                    sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2sActivity);
-                }
-
-                s2sActivity.ShipToShipActivityLocationName = reader.ReadText(s2sName);
-                if (s2sActivity.ShipToShipActivityLocationName.IsNullOrEmpty())
-                {
-                    sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Remove(s2sActivity);
-                    continue;
-                }
-
-                s2sActivity.ShipToShipActivityLocationLoCode = reader.ReadLoCode(s2sLocode);
-                s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = (int?)reader.ReadNumber(s2sLatitude);
-                // keine "0" (d.h. fehlerhafte Koordinaten) ins ANSW übergeben falls im Sheet nichts ist aber der Reader das aus irgendeinem Grund liest
-                if (s2sActivity.ShipToShipActivityLocationCoordinatesLatitude == 0)
-                    s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = null;
-                s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = (int?)reader.ReadNumber(s2sLongitude);
-                if (s2sActivity.ShipToShipActivityLocationCoordinatesLongitude == 0)
-                    s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = null;
-                s2sActivity.ShipToShipActivityDateFrom = reader.ReadDate(s2sFromDate);
-                s2sActivity.ShipToShipActivityDateTo = reader.ReadDate(s2sToDate);
-                s2sActivity.ShipToShipActivityTypeCode = (int?)reader.ReadNumber(s2sActivityString);
-                reader.ReadShip2ShipActivityType(s2sActivityString); // 24.8.21 nicht Code dem Klartext zuordnen, nur das Feld kolorieren
-                s2sActivity.ShipToShipActivitySecurityMattersToReport = reader.ReadText(s2sSec);
             }
 
             return true;
@@ -2133,7 +2132,7 @@ namespace ENI2.Excel
                     crew.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18)), out canceled);
                     if (canceled) return true;
                     crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18), 100);
-                    crew.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _);                    
+                    crew.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _, false);                    
 
                     crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18));
 
@@ -2252,7 +2251,7 @@ namespace ENI2.Excel
                     crewd.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18)), out canceled);
                     if (canceled) return true;
                     crewd.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18), 100);
-                    crewd.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _);                    
+                    crewd.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _, false);                    
                     crewd.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18));
 
                     crewd.CrewMemberIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out canceled);
@@ -2374,7 +2373,7 @@ namespace ENI2.Excel
                     pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 17));
 
                     pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 17), 100);
-                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17)), out _);                    
+                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17)), out _, false);                    
 
                     if (canceled) return true;
                     DateTime? dateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("L{0}", i + 17));
@@ -2515,7 +2514,7 @@ namespace ENI2.Excel
                     pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 18));
 
                     pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 18), 100);
-                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out _);
+                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out _, false);
 
                     if (canceled) return true;
                     DateTime? dateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("L{0}", i + 18));
@@ -2848,12 +2847,12 @@ namespace ENI2.Excel
             return result;
         }
 
-        public static string ReadNationality(string nationality, out bool canceled)
+        public static string ReadNationality(string nationality, out bool canceled, bool setPlaceHolder = true)
         {
             string result = null;
             canceled = false;
             nationality = nationality.Trim();
-            if (nationality.IsNullOrEmpty())
+            if (nationality.IsNullOrEmpty() && setPlaceHolder)
             {
                 result = "XX";
             }
@@ -2871,35 +2870,38 @@ namespace ENI2.Excel
             }
             else // we cannot find whatever this is..
             {
-                FixImportDialog fid = new FixImportDialog();
-                fid.Value = nationality;
-                fid.ValueType = "Nationality";
-                fid.SelectionValues = CREW.NationalityDict;
-                if (fid.ShowDialog() ?? false)
+                if (setPlaceHolder) // only show import dialog if this is a required field..
                 {
-                    if (!fid.SelectedValue.IsNullOrEmpty())
+                    FixImportDialog fid = new FixImportDialog();
+                    fid.Value = nationality;
+                    fid.ValueType = "Nationality";
+                    fid.SelectionValues = CREW.NationalityDict;
+                    if (fid.ShowDialog() ?? false)
                     {
-                        if(!ValueMapping.InvalidKeys[ValueMapping.MappingType.COUNTRY].Contains(nationality))
+                        if (!fid.SelectedValue.IsNullOrEmpty())
                         {
-                            string selectedValue = fid.SelectedValue;
-                            Task<bool> createResult = Task.Run(async () => await ValueMapping.Create(ValueMapping.MappingType.COUNTRY, nationality, selectedValue));
-                            if(!createResult.Result)
-                                _log.WarnFormat("Error saving nationality value mapping {0} -> {1}", nationality, selectedValue);
+                            if (!ValueMapping.InvalidKeys[ValueMapping.MappingType.COUNTRY].Contains(nationality))
+                            {
+                                string selectedValue = fid.SelectedValue;
+                                Task<bool> createResult = Task.Run(async () => await ValueMapping.Create(ValueMapping.MappingType.COUNTRY, nationality, selectedValue));
+                                if (!createResult.Result)
+                                    _log.WarnFormat("Error saving nationality value mapping {0} -> {1}", nationality, selectedValue);
+                            }
+                            else
+                            {
+                                // add temporary
+                                ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.COUNTRY);
+                                vm.Key = nationality;
+                                vm.Value = fid.SelectedValue;
+                                ValueMapping.Dicts[ValueMapping.MappingType.COUNTRY].Add(nationality, vm);
+                            }
+                            result = fid.SelectedValue.Substring(0, 2); // attention manual entry
                         }
-                        else
-                        {
-                            // add temporary
-                            ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.COUNTRY);
-                            vm.Key = nationality;
-                            vm.Value = fid.SelectedValue;
-                            ValueMapping.Dicts[ValueMapping.MappingType.COUNTRY].Add(nationality, vm);
-                        }
-                        result = fid.SelectedValue.Substring(0, 2); // attention manual entry
                     }
-                }
-                else
-                {
-                    canceled = true;
+                    else
+                    {
+                        canceled = true;
+                    }
                 }
             }
 

ENI2/ILLink/ILLink.Descriptors.LibraryBuild.xml

@@ -1,8 +0,0 @@
-<linker>
-  <assembly fullname="System.Diagnostics.DiagnosticSource">
-    <type fullname="System.Diagnostics.Metrics.MetricsEventSource">
-      <!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
-      <method name="GetInstance" />
-    </type>
-  </assembly>
-</linker>

ENI2/MainWindow.xaml

@@ -95,6 +95,7 @@
                 <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">

ENI2/MainWindow.xaml.cs

@@ -39,6 +39,7 @@ 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);
@@ -135,7 +136,7 @@ namespace ENI2
                     this._dbWatchDog.Register(aMessageCore);
 
                     drc.HighlightReset += Drc_HighlightReset;
-                    drc.OpenNewCoreRequested += (core) => this.AnmeldungenControl_MessageCoreSelected(core);
+                    drc.OpenNewCoreRequested += (core) => this.AnmeldungenControl_MessageCoreSelected(core, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
                     drc.ReloadCoreRequested += Drc_ReloadCoreRequested;
 
                 }
@@ -324,6 +325,14 @@ 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)
@@ -377,6 +386,8 @@ 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)
@@ -472,7 +483,7 @@ namespace ENI2
                         if (((ShowIdDialog)sid).OpenCore)
                         {
                             Dispatcher.BeginInvoke((Action)(() => {
-                                this.AnmeldungenControl_MessageCoreSelected(closedDialog.Core); // in einem neuen Reiter öffnen                                                   
+                                this.AnmeldungenControl_MessageCoreSelected(closedDialog.Core, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode); // in einem neuen Reiter öffnen                                                   
                             }));
                         }
 
@@ -540,7 +551,7 @@ namespace ENI2
 
                         // Meldeklassen für neuen Anlauf erzeugen:
                         bsmd.database.Util.CreateMessagesForCore(newCore, null, userEntity);
-                        this.AnmeldungenControl_MessageCoreSelected(newCore); // in einem neuen Reiter öffnen
+                        this.AnmeldungenControl_MessageCoreSelected(newCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode); // 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);
@@ -612,7 +623,7 @@ namespace ENI2
                             showIdDialog.Closed += (sid, showIdArgs) =>
                             {
                                 if (((ShowIdDialog)sid).OpenCore)
-                                    this.AnmeldungenControl_MessageCoreSelected(changedCore);
+                                    this.AnmeldungenControl_MessageCoreSelected(changedCore, DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].ShipcallDisplayMode);
                             };
                             showIdDialog.Show();
                             showIdDialog.Activate();
@@ -690,6 +701,7 @@ 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;
@@ -753,5 +765,6 @@ namespace ENI2
 
         #endregion
 
+        
     }
 }

ENI2/Properties/Resources.Designer.cs

@@ -750,6 +750,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap pencil {
+            get {
+                object obj = ResourceManager.GetObject("pencil", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -2011,7 +2021,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Columns &quot;o&quot; of OBC Code (value 15.19).
+        ///   Looks up a localized string similar to Columns &quot;o&quot; of IBC Code (value 15.19).
         /// </summary>
         public static string textColumsOfIBC {
             get {
@@ -2163,6 +2173,20 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The existing value for the waste disposal service provider will be overwritten.
+        ///
+        ///Current entry:  {0} 
+        ///New entry:      {1}
+        ///
+        ///Proceed?.
+        /// </summary>
+        public static string textConfirmWSDPOverwrite {
+            get {
+                return ResourceManager.GetString("textConfirmWSDPOverwrite", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Construction characteristics.
         /// </summary>
@@ -2253,6 +2277,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copy from CREWA.
+        /// </summary>
+        public static string textCopyFromCREWA {
+            get {
+                return ResourceManager.GetString("textCopyFromCREWA", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy from last 10 port facilities called.
         /// </summary>
@@ -2838,6 +2871,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Easy Peasy 🍋.
+        /// </summary>
+        public static string textEasyPeasy {
+            get {
+                return ResourceManager.GetString("textEasyPeasy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to _Edit.
         /// </summary>
@@ -2928,6 +2970,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ENI-Status.
+        /// </summary>
+        public static string textENIStatus {
+            get {
+                return ResourceManager.GetString("textENIStatus", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to entries.
         /// </summary>
@@ -4008,6 +4059,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to MDH simplification available.
+        /// </summary>
+        public static string textMDHSimplification {
+            get {
+                return ResourceManager.GetString("textMDHSimplification", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Was a medical practitioner consulted?.
         /// </summary>
@@ -4188,6 +4248,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to New password.
+        /// </summary>
+        public static string textNewPassword {
+            get {
+                return ResourceManager.GetString("textNewPassword", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Create new id.
         /// </summary>
@@ -4287,6 +4356,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to NSW-Status.
+        /// </summary>
+        public static string textNSWStatus {
+            get {
+                return ResourceManager.GetString("textNSWStatus", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Number of deaths.
         /// </summary>
@@ -4323,6 +4401,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Old password.
+        /// </summary>
+        public static string textOldPassword {
+            get {
+                return ResourceManager.GetString("textOldPassword", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to This only works if the grid is empty!.
         /// </summary>
@@ -4989,6 +5076,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Repeat new password.
+        /// </summary>
+        public static string textRepeatNewPassword {
+            get {
+                return ResourceManager.GetString("textRepeatNewPassword", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Reporting party.
         /// </summary>
@@ -5178,6 +5274,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to SEC simplification available.
+        /// </summary>
+        public static string textSECSimplification {
+            get {
+                return ResourceManager.GetString("textSECSimplification", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Security.
         /// </summary>
@@ -5215,7 +5320,16 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select classes to import.
+        ///   Looks up a localized string similar to Select crew member.
+        /// </summary>
+        public static string textSelectCrewMember {
+            get {
+                return ResourceManager.GetString("textSelectCrewMember", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select message classes.
         /// </summary>
         public static string textSelectImportClasses {
             get {
@@ -5232,6 +5346,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Send all.
+        /// </summary>
+        public static string textSendAll {
+            get {
+                return ResourceManager.GetString("textSendAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Send date.
         /// </summary>
@@ -5313,6 +5436,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to SERV-Template.
+        /// </summary>
+        public static string textSERVTemplate {
+            get {
+                return ResourceManager.GetString("textSERVTemplate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ship-to-ship activity.
         /// </summary>
@@ -5629,7 +5761,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cruise.
+        ///   Looks up a localized string similar to 11 Cruise.
         /// </summary>
         public static string textTab14 {
             get {
@@ -6258,6 +6390,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Waste disposal service provider.
+        /// </summary>
+        public static string textWasteDisposalServiceProvider {
+            get {
+                return ResourceManager.GetString("textWasteDisposalServiceProvider", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Waste disposal service providers.
         /// </summary>

ENI2/Properties/Resources.resx

@@ -1184,7 +1184,7 @@
     <value>Category</value>
   </data>
   <data name="textColumsOfIBC" xml:space="preserve">
-    <value>Columns "o" of OBC Code (value 15.19)</value>
+    <value>Columns "o" of IBC Code (value 15.19)</value>
   </data>
   <data name="textContainerNo" xml:space="preserve">
     <value>Container No.</value>
@@ -1757,7 +1757,7 @@
     <value>Select all</value>
   </data>
   <data name="textSelectImportClasses" xml:space="preserve">
-    <value>Select classes to import</value>
+    <value>Select message classes</value>
   </data>
   <data name="textSelectNone" xml:space="preserve">
     <value>Select none</value>
@@ -2195,7 +2195,7 @@
     <value>10 MDH</value>
   </data>
   <data name="textTab14" xml:space="preserve">
-    <value>Cruise</value>
+    <value>11 Cruise</value>
   </data>
   <data name="textTab21" xml:space="preserve">
     <value>1-2 Berth</value>
@@ -2218,4 +2218,54 @@
   <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/Report/ReportDocument.cs

@@ -254,7 +254,7 @@ namespace ENI2.Report
             table.AddColumn(140);
 
             Row row = table.AddRow();
-            Image logoImage = row.Cells[0].AddImage(@"Report\Logo.gif"); // kann man offenbar nur von einem Pfad laden
+            Image logoImage = row.Cells[0].AddImage(@"Report\Logo.png"); // kann man offenbar nur von einem Pfad laden
             logoImage.Width = 80;
             row.Cells[0].MergeDown = 6;
             

ENI2/SheetDisplayControls/ATAControl.xaml

@@ -16,7 +16,8 @@
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width=".65*" />
+                    <ColumnDefinition Width=".3*" />
+                    <ColumnDefinition Width=".3*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36" />

ENI2/SheetDisplayControls/CrewDepartureControl.xaml.cs

@@ -74,6 +74,8 @@ namespace ENI2.SheetDisplayControls
                 this.checkBoxCrewNotificationPAXDeparture.IsChecked = ((CREWD)this._crewdMessage.Elements[0]).NotificationPAX;
             }
 
+            this.textBlockNumCrewEntriesDeparture.DataContext = this._crewdMessage;
+
             // extra menu copy to CREWA
             {
                 this.dataGridCrewListDeparture.ContextMenu.Items.Add(new Separator());

ENI2/SheetDisplayControls/CrewPreArrivalControl.xaml

@@ -16,7 +16,8 @@
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="220"/>
-                    <ColumnDefinition Width=".65*" />
+                    <ColumnDefinition Width=".3*" />
+                    <ColumnDefinition Width=".3*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="28" />
@@ -29,6 +30,7 @@
 
                 <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" />
+                <Button Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textCopyFromCREWA}" Margin="2" Width="120" HorizontalAlignment="Left" x:Name="buttonCopyFromCrewA" Click="buttonCopyFromCrewA_Click" />
                 <Label Name="labelCrewNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
                 <CheckBox Name="checkBoxCrewNotificationSchengen" Grid.Row="1" Grid.Column="1" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationSchengen_Click"/>
                 <Label Name="labelCrewNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" Grid.Row="2" Grid.Column="0"  HorizontalAlignment="Right" />
@@ -40,7 +42,7 @@
                     <Label Name="labelCrewEntryCount" Content="{x:Static p:Resources.textEntries}" />
                     <Button Name="buttonDeleteAllCrewA" Margin="2" Content="{x:Static p:Resources.textDeleteAllEntries}" Background="Transparent" Click="buttonDeleteAllCrewA_Click"/>
                 </StackPanel>
-                <enictrl:ENIDataGrid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridCrewList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                <enictrl:ENIDataGrid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3" x:Name="dataGridCrewList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                          AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />

ENI2/SheetDisplayControls/CrewPreArrivalControl.xaml.cs

@@ -55,6 +55,7 @@ namespace ENI2.SheetDisplayControls
             }
 
             this.textBox_NameMaster.DataContext = _name;
+            this.textBlockNumCrewEntries.DataContext = _crewaMessage;
 
             #region init CREWA
 
@@ -232,6 +233,28 @@ namespace ENI2.SheetDisplayControls
             }
         }
 
+        private void buttonCopyFromCrewA_Click(object sender, RoutedEventArgs e)
+        {
+            CREW crewA = null;
+            if (this._crewaMessage.Elements.Count > 0)
+            {
+                crewA = this._crewaMessage.Elements[0] as CREW;
+            }
+
+            SelectCrewMemberDialog scmd = new SelectCrewMemberDialog();
+            scmd.CREW = crewA;
+            scmd.AddVisible = false;
+
+            if (scmd.ShowDialog() ?? false)
+            {
+                this.textBox_NameMaster.Text = $"{crewA.CrewMemberFirstName} {crewA.CrewMemberLastName}";
+                this.SublistElementChanged(Message.NotificationClass.NAME);
+                var binding = textBox_NameMaster.GetBindingExpression(TextBox.TextProperty);
+                binding?.UpdateSource();
+            }
+        }
+        
+
         #endregion
 
         #region crew grid arrival
@@ -377,8 +400,10 @@ namespace ENI2.SheetDisplayControls
             }
         }
 
+
+
+
         #endregion
-
-
+        
     }
 }

ENI2/SheetDisplayControls/DangerousCargoControl.xaml

@@ -15,45 +15,38 @@
         <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width=".35*"/>
-                    <ColumnDefinition Width=".65*" />
+                    <ColumnDefinition Width="290"/>
+                    <ColumnDefinition Width=".3*" />
+                    <ColumnDefinition Width=".3*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36" />
-                    <RowDefinition Height="56" />
+                    <RowDefinition Height="28" />
+                    <RowDefinition Height="28" />
+                    <RowDefinition Height="28" />
+                    <RowDefinition Height="28" />
+                    <RowDefinition Height="28" />
                     <RowDefinition Height="28" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
 
                 <TextBlock x:Name="textBlock101" FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text101General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width=".15*" />
-                        <ColumnDefinition Width="20" />
-                        <ColumnDefinition Width=".25*" />
-                        <ColumnDefinition Width=".2*" />
-                        <ColumnDefinition Width=".2*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="28" />
-                    </Grid.RowDefinitions>
-                    <Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textDGContactFamilyName}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textDGContactPhone}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="4" Grid.Row="0" HorizontalContentAlignment="Center" Margin="0,0,10,0"/>
 
-                    <CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                    <TextBox Grid.Row="0" Grid.Column="3" Name="textBoxDGManifestContactFamilyName" MaxLength="99" Margin="2" Text="{Binding DPGContactFamilyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
-                    <TextBox Grid.Row="1" Grid.Column="3" Name="textBoxDGManifestContactPhone" MaxLength="99" Margin="2" Text="{Binding DPGContactPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
-                    <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                    <ComboBox x:Name="comboBoxVesselClass" Grid.Row="1" Grid.Column="4" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
-                </Grid>
-                
-                <TextBlock Name="textBlockMessageClass" FontWeight="DemiBold" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                <Button Content="{x:Static p:Resources.textNewDGItem}" Name="buttonNewItem" Margin="2" Click="buttonNewItem_Click" Grid.Row="2" Grid.Column="1" Background="Transparent" />
-                <TabControl Grid.Row="3" Grid.ColumnSpan="2">
+                <Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                <Label Content="{x:Static p:Resources.textDGContactFamilyName}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                <Label Content="{x:Static p:Resources.textDGContactPhone}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                <Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                <Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+
+                <CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="2"/>
+                <TextBox Grid.Row="2" Grid.Column="1" Name="textBoxDGManifestContactFamilyName" MaxLength="99" Margin="2" Text="{Binding DPGContactFamilyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
+                <TextBox Grid.Row="3" Grid.Column="1" Name="textBoxDGManifestContactPhone" MaxLength="99" Margin="2" Text="{Binding DPGContactPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
+                <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="2"/>
+                <ComboBox x:Name="comboBoxVesselClass" Grid.Row="5" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
+
+                <TextBlock Name="textBlockMessageClass" FontWeight="DemiBold" Grid.Row="6" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0" />
+                <Button Content="{x:Static p:Resources.textNewDGItem}" Name="buttonNewItem" Margin="2" Click="buttonNewItem_Click" Grid.Row="6" Grid.Column="1" Background="Transparent" />
+                <TabControl Grid.Row="7" Grid.ColumnSpan="3">
                     <TabItem Header="{x:Static p:Resources.text102}" x:Name="tabIBCItems">
                         <Grid>
                             <Grid.RowDefinitions>

ENI2/SheetDisplayControls/PassengerDepartureControl.xaml.cs

@@ -75,6 +75,8 @@ namespace ENI2.SheetDisplayControls
                 this.checkBoxPasNotificationPAXDeparture.IsChecked = ((PASD)this._pasdMessage.Elements[0]).NotificationPAX;
             }
 
+            this.textBlockNumPasEntriesDeparture.DataContext = this._pasdMessage;
+
             // extra menu copy to PASA
             {
                 this.dataGridPassengerListDeparture.ContextMenu.Items.Add(new Separator());

ENI2/SheetDisplayControls/PassengerPreArrivalControl.xaml.cs

@@ -58,7 +58,9 @@ namespace ENI2.SheetDisplayControls
             {
                 this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PASA);
                 this.Messages.Add(this._pasMessage);
-            }            
+            }
+
+            this.textBlockNumPasEntries.DataContext = this._pasMessage;
 
             this.dataGridPassengerList.Initialize();
             this.dataGridPassengerList.ItemsSource = this._pasMessage.Elements;

ENI2/SheetDisplayControls/PortControl.xaml

@@ -1,23 +1,36 @@
-<src:DetailBaseControl xmlns:src="clr-namespace:ENI2" 
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
              x:Class="ENI2.SheetDisplayControls.PortControl"
              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: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:col="clr-namespace:System.Collections;assembly=mscorlib"
              xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="1050" d:DesignWidth="800">
+    <UserControl.Resources>
+        <col:ArrayList x:Key="arrList">
+            <col:DictionaryEntry Key="None" Value="0" />
+            <col:DictionaryEntry Key="Maersk BHV" Value="1" />
+            <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="portCallGroupBox" Header="{x:Static p:Resources.text2PortCall}">
-        <TabControl>
+        <TabControl x:Name="mainTabControl">
             <TabItem Header="{x:Static p:Resources.textTab21}">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="220"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width=".3*" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
@@ -37,11 +50,12 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textVisitTransitId}" Margin="0,0,10,0" />
                     <TextBox Name="textBoxDisplayId" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="1" IsReadOnly="True" Margin="2" VerticalContentAlignment="Center" />
                     <Label HorizontalAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
-                    <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
+                    <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="1" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
 
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text22PortOperations}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
-                    <GroupBox Grid.Row="4" Grid.ColumnSpan="2" Name="groupBoxCallPurpose" Header="{x:Static p:Resources.textCallPurposes}" >
-                        <enictrl:ENIDataGrid x:Name="dataGridCallPurposes" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+
+                    <GroupBox Grid.Row="4" Grid.ColumnSpan="3" Name="groupBoxCallPurpose" Header="{x:Static p:Resources.textCallPurposes}" >
+                        <enictrl:ENIDataGrid x:Name="dataGridCallPurposes" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
      SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -74,12 +88,14 @@
             <TabItem Header="{x:Static p:Resources.textTab22}">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="120"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width="190"/>
+                        <ColumnDefinition Width=".3*" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="1" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
@@ -93,10 +109,11 @@
                         <RowDefinition Height="28" />
 
                         <RowDefinition Height="36" />
+                        <RowDefinition Height="28" />
                         <RowDefinition Height="140" />
 
                     </Grid.RowDefinitions>
-                    
+
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text23Agency}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textAgentTemplate}" Name="labelAgentTemplate" Margin="0,0,10,0"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textCompanyName}" Name="label_AgentCompanyName" Margin="0,0,10,0"/>
@@ -109,20 +126,18 @@
                     <Label HorizontalContentAlignment="Right" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_AgentEMail" Margin="0,0,10,0" />
                     <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_AgentLastName" Margin="0,0,10,0"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_AgentFirstName" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProvider}" Name="label_WasteDisposalServiceProvider" Margin="0,0,10,0"/>
 
                     <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBox_AgentTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="AgentTitle" SelectionChanged="comboBox_AgentTemplate_SelectionChanged" />
                     <Grid Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="26" />
                         </Grid.ColumnDefinitions>
-                        <Button Name="buttonSetTemplate" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" 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>
+                        
                     </Grid>
-                    <Grid Grid.Row="2" Grid.Column="1" Name="gridTemplateControls" Visibility="Visible">
+                    <Grid Grid.Row="1" Grid.Column="2" Name="gridTemplateControls" Visibility="Visible">
                         <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="26" />
                             <ColumnDefinition Width="*"/>
                             <!-- Name -->
                             <ColumnDefinition Width="26"/>
@@ -132,18 +147,23 @@
                             <ColumnDefinition Width="52"/>
                             <!-- Undo button -->
                         </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
-                        <Button Name="buttonSaveTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
+                        <Button Name="buttonSetTemplate" Grid.Column="0" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" 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>
+                        <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="2" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
+                        <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="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
+                        <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>
@@ -153,17 +173,52 @@
                     <TextBox Grid.Row="3" Grid.Column="1" Name="textBox_AgentCompanyName" MaxLength="99" Margin="2" Text="{Binding AgentCompanyName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     <TextBox Grid.Row="4" Grid.Column="1" Name="textBox_AgentStreetAndNumber" MaxLength="99" Margin="2" Text="{Binding AgentStreetAndNumber, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     <TextBox Grid.Row="5" Grid.Column="1" Name="textBox_AgentPostalCode" MaxLength="99" Margin="2" Text="{Binding AgentPostalCode, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                    <TextBox Grid.Row="6" Grid.Column="3" Name="textBox_AgentCity" MaxLength="99" Margin="2" Text="{Binding AgentCity, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="6" Grid.Column="1" Name="textBox_AgentCity" MaxLength="99" Margin="2" Text="{Binding AgentCity, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     <TextBox Grid.Row="7" Grid.Column="1" Name="textBox_AgentCountry" MaxLength="99" Margin="2" Text="{Binding AgentCountry, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center" />
                     <TextBox Grid.Row="8" Grid.Column="1" Name="textBox_AgentPhone" MaxLength="99" Margin="2" Text="{Binding AgentPhone, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                    <TextBox Grid.Row="9" Grid.Column="3" Name="textBox_AgentFax" MaxLength="99" Margin="2" Text="{Binding AgentFax, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="9" Grid.Column="1" Name="textBox_AgentFax" MaxLength="99" Margin="2" Text="{Binding AgentFax, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     <TextBox Grid.Row="10" Grid.Column="1" Name="textBox_AgentEMail" MaxLength="99" Margin="2" Text="{Binding AgentEMail, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     <TextBox Grid.Row="11" Grid.Column="1" Name="textBox_AgentLastName" MaxLength="99" Margin="2" Text="{Binding AgentLastName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                    <TextBox Grid.Row="12" Grid.Column="3" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="12" Grid.Column="1" Name="textBox_AgentFirstName" MaxLength="99" Margin="2" Text="{Binding AgentFirstName, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                    <TextBox Grid.Row="13" Grid.Column="1" Name="textBox_WasteDisposalServiceProvider" MaxLength="99" Margin="2" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
 
-                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text24Invoice}" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="2"/>
-                    <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="14" Grid.Column="0" Grid.ColumnSpan="2">
-                        <enictrl:ENIDataGrid x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text24Invoice}" Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="3"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textSERVTemplate}" Name="label_MaerskSeaGo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="15" Grid.Column="1" x:Name="comboBoxGroup" DisplayMemberPath="ServiceName" Margin="2" SelectionChanged="comboBoxGroup_SelectionChanged" ContextMenu="{DynamicResource ClearContextMenu}" />
+                    <Grid Grid.Row="15" Grid.Column="2">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Button Name="buttonSetSERVTemplate" Margin="2"  Click="buttonSetSERVTemplate_Click" BorderThickness="0" Background="Transparent" Grid.Column="0"
+                                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="buttonEditSERVTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonEditSERVTemplate_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="buttonNewSERVTemplate" Grid.Column="3" Grid.Row="0" Margin="2"  Click="buttonNewSERVTemplate_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="buttonDeleteSERVTemplate" Grid.Column="4" Grid.Row="0" Margin="2"  Click="buttonDeleteSERVTemplate_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>
+                    <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="3">
+                        <enictrl:ENIDataGrid x:Name="dataGridSERV" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
              AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -179,7 +234,8 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="220"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width=".3*" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
@@ -188,26 +244,29 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
 
                         <RowDefinition Height="36" />
                         <RowDefinition Height="180" />
 
                     </Grid.RowDefinitions>
-                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text25CargeOnBoard}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text25CargeOnBoard}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textGeneralCargoDescription}" Name="label_GeneralCargoDescription" Margin="0,0,10,0"/>
-                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="1" Grid.Column="1" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
+                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="1" Grid.Column="1" IsEditable="False" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                    <CheckBox Grid.Row="2" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
-                    <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="4"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center" MaxLength="99" />
-                    <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
+                    <CheckBox Grid.Row="2" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2,2,2,2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textTanker}" VerticalContentAlignment="Center" Margin="0,0,10,0" />
+                    <CheckBox Grid.Row="3" Grid.Column="1" Name="checkBoxTanker" VerticalContentAlignment="Center" IsChecked="{Binding Tanker, Mode=TwoWay}" Margin="2,2,2,2" />
+                    <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="5"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center" MaxLength="99" />
+                    <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
 
-                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text26CargoPort}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
-                    <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2">
-                        <enictrl:ENIDataGrid x:Name="dataGridLADG" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text26CargoPort}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3"/>
+                    <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="3">
+                        <enictrl:ENIDataGrid x:Name="dataGridLADG" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
              AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -248,15 +307,18 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="320"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width=".3*" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                         <RowDefinition Height="56" />
-                        <RowDefinition Height="56" />
-                        <RowDefinition Height="280" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="530" />
                         <RowDefinition Height="28" />
 
                         <RowDefinition Height="36" />
@@ -266,19 +328,23 @@
                         <RowDefinition Height="140" />
                     </Grid.RowDefinitions>
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text27Waste}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
-                    <enictrl:LocodeControl Grid.Row="1" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
-                    <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/1800" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textValidExemption}" Name="label_ValidExemption" Margin="0,0,10,0"/>
+                    <CheckBox Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption, Mode=TwoWay}" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_AccurateDetailsGiven" Margin="0,0,10,0"/>
+                    <CheckBox Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness, Mode=TwoWay}" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+                    <DatePicker Grid.Row="4" 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"/>
                             <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
                         </DatePicker.BlackoutDates>
                     </DatePicker>
-                    <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="1" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" Margin="2" />
-                    <Label Grid.Row="4" Grid.Column="0" HorizontalContentAlignment="Right" Content="{x:Static p:Resources.textAgentTemplate}" Margin="0,0,10,0" />
-                    <Grid Grid.Row="4" Grid.Column="1">
+                    <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="1" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText, Converter={util:TrimStringConverter}}" Margin="2" />
+                    <!-- Label Grid.Row="6" Grid.Column="0" HorizontalContentAlignment="Right" Content="{x:Static p:Resources.textAgentTemplate}" Margin="0,0,10,0" / -->
+                    <Grid Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" x:Name="gridWasteControls">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width=".25*" />
                             <ColumnDefinition Width=".25*" />
@@ -286,43 +352,17 @@
                             <ColumnDefinition Width=".25*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="28" />
+                            <!-- RowDefinition Height="28" / -->
                             <RowDefinition Height="28" />
                         </Grid.RowDefinitions>
 
                         <ComboBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Name="comboBox_WSDPTemplate" Margin="2" SelectedValuePath="Id" DisplayMemberPath="Remark" SelectionChanged="comboBox_WSDPTemplate_SelectionChanged" />
-                        <Grid Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Name="gridWasteTemplateControls" Visibility="Visible">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <!-- Name -->
-                                <ColumnDefinition Width="26"/>
-                                <!-- Save button -->
-                                <ColumnDefinition Width="26"/>
-                                <!-- Delete button -->
-                                <ColumnDefinition Width="52"/>
-                                <!-- Undo button -->
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" Margin="2" Name="textBoxWasteTemplateTitle" VerticalContentAlignment="Center"/>
-                            <Button Name="buttonSaveWasteTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveWasteTemplate_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="buttonDeleteWasteTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonDeleteWasteTemplate_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="buttonUndoWasteTemplate" Grid.Column="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoWasteTemplate_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>
+                        
+                        
                         <Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
                         <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
                     </Grid>
-                    <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="5" Grid.ColumnSpan="2" CanUserAddRows="False">
+                    <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="7" Grid.ColumnSpan="3" CanUserAddRows="False">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
@@ -389,8 +429,8 @@
                             </DataGridTemplateColumn>
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textNextWasteDisposalPort}" Name="label_NextWasteDisposalPort" Margin="0,0,10,0"/>
-                    <enictrl:LocodeControl Grid.Row="6" Grid.Column="1" x:Name="locodeCtrlNextWastePort" LocodeValue="{Binding NextWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textNextWasteDisposalPort}" Name="label_NextWasteDisposalPort" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl Grid.Row="8" Grid.Column="1" x:Name="locodeCtrlNextWastePort" LocodeValue="{Binding NextWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
                     <!--
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text28Store}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2"/>
                     <GroupBox Name="storeGroupBox" Header="{x:Static p:Resources.textStore}" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2">

ENI2/SheetDisplayControls/PortControl.xaml.cs

@@ -33,7 +33,6 @@ namespace ENI2.SheetDisplayControls
         private SEC _sec;
         private WAS _was;
         private Message _stoMessage;
-        private Message _crewMessage;
 
         private Dictionary<string, string> portAreas = null;
 
@@ -41,7 +40,10 @@ namespace ENI2.SheetDisplayControls
         private AGNT_Template _currentTemplate;
         private AGNT_Template _undoTemplate;
 
-        private static List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;        
+        private static List<SERV_Template> _servTemplates = null;
+        private SERV_Template _currentSERVTemplate;
+
+        private static List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;
         private WasteDisposalServiceProvider_Template _currentWSDPTemplate;
         private string _undoWSDPTemplate;
 
@@ -79,17 +81,17 @@ namespace ENI2.SheetDisplayControls
         {
             base.Initialize();
             foreach (Message aMessage in this.Messages)
-            {             
+            {
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.LADG) { this._ladgMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.SERV) { this._servMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.NOA_NOD) { this._noa_nod = aMessage.Elements[0] as NOA_NOD; this.ControlMessages.Add(aMessage); }
-                if (aMessage.MessageNotificationClass == Message.NotificationClass.SEC) { this._sec = aMessage.Elements[0] as SEC; this.ControlMessages.Add(aMessage); }                
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.SEC) { this._sec = aMessage.Elements[0] as SEC; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.INFO) { this._info = aMessage.Elements[0] as INFO; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.PRE72H) { this._pre72H = aMessage.Elements[0] as PRE72H; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.AGNT) { this._agnt = aMessage.Elements[0] as AGNT; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.WAS) { this._was = aMessage.Elements[0] as WAS; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.STO) { this._stoMessage = aMessage; this.ControlMessages.Add(aMessage); }
-                if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWA) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
+                // if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWA) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
             }
 
             // 2.1
@@ -103,9 +105,10 @@ namespace ENI2.SheetDisplayControls
             this.dataGridCallPurposes.AddingNewItem += DataGridCallPurposes_AddingNewItem;
             this.dataGridCallPurposes.CreateRequested += DataGridCallPurposes_CreateRequested;
             this.dataGridCallPurposes.DeleteRequested += DataGridCallPurposes_DeleteRequested;
-            
+
             portAreas = LocalizedLookup.getPortAreasForLocode(this.Core.PoC);
             this.comboBoxPortArea.ItemsSource = portAreas;
+            this.comboBoxPortArea.DataContext = this._info;
             this.textRequestedPostionInPortOfCall.DataContext = this._info;
             this.textSpecialRequirements.DataContext = this._info;
             this.textConstructionCharacteristics.DataContext = this._info;
@@ -123,6 +126,7 @@ namespace ENI2.SheetDisplayControls
             this.textBox_AgentPhone.DataContext = this._agnt;
             this.textBox_AgentPostalCode.DataContext = this._agnt;
             this.textBox_AgentStreetAndNumber.DataContext = this._agnt;
+            this.textBox_WasteDisposalServiceProvider.DataContext = this._was;
             if (_agntTemplates == null)
             {
                 _agntTemplates = await DBManagerAsync.GetAGNTTemplatesAsync(); // inital full load
@@ -132,6 +136,18 @@ namespace ENI2.SheetDisplayControls
             this.comboBox_AgentTemplate.ItemsSource = _agntTemplates;
 
             // 2.4
+
+            #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;
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.ELBE_BULK)) this.comboBoxGroup.SelectedIndex = 5;
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.FCT_JUNGE)) this.comboBoxGroup.SelectedIndex = 6;
+
+            #endregion
+
             this.dataGridSERV.Initialize();
             this.dataGridSERV.ItemsSource = this._servMessage.Elements;
             this.dataGridSERV.AddingNewItem += DataGridSERV_AddingNewItem;
@@ -147,6 +163,7 @@ namespace ENI2.SheetDisplayControls
             this.comboBoxConditionCargoBallastTanks.DataContext = this._pre72H;
             this.textBoxNatureOfCargo.DataContext = this._pre72H;
             this.doubleUpDownVolumeOfCargo.DataContext = this._pre72H;
+            this.checkBoxTanker.DataContext = this._pre72H;
 
             // 2.6
             this.dataGridLADG.Initialize();
@@ -157,6 +174,10 @@ namespace ENI2.SheetDisplayControls
             this.dataGridLADG.CreateRequested += DataGridLADG_CreateRequested;
 
             // 2.7
+            this.checkBoxValidExemption.Checked += CheckBoxValidExemption_Checked;
+            this.checkBoxValidExemption.Unchecked += CheckBoxValidExemption_Checked;
+            this.checkBoxAccurateCorrectDetails.DataContext = _was;
+            this.checkBoxValidExemption.DataContext = _was;
             this.dataGridWaste.Initialize();
             this.dataGridWaste.ItemsSource = _was.Waste;
             this.dataGridWaste.AddingNewItem += DataGridWaste_AddingNewItem;
@@ -183,6 +204,29 @@ namespace ENI2.SheetDisplayControls
             // this.dataGridEffects.Initialize();
             // this.dataGridEffects.ItemsSource = _crewMessage.Elements;
 
+            #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.buttonDeleteSERVTemplate.Visibility = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor ? Visibility.Visible : Visibility.Hidden;
+            this.buttonEditSERVTemplate.Visibility = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor ? Visibility.Visible : Visibility.Hidden;
+            this.buttonNewSERVTemplate.Visibility = DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsEditor ? Visibility.Visible : Visibility.Hidden;
+
+            #endregion
+
+        }
+
+        public override int SelectedTabIndex
+        {
+            get { return this.mainTabControl.SelectedIndex; }
+            set {  this.mainTabControl.SelectedIndex = value; }
         }
 
         public override void SetEnabled(bool enabled)
@@ -220,6 +264,7 @@ namespace ENI2.SheetDisplayControls
             this.RegisterTextboxChange(this.textBox_AgentPostalCode, Message.NotificationClass.AGNT);
             this.RegisterTextboxChange(this.textBox_AgentStreetAndNumber, Message.NotificationClass.AGNT);
             this.RegisterTextboxChange(this.textBox_AgentCountry, Message.NotificationClass.AGNT);
+            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;
@@ -239,10 +284,20 @@ namespace ENI2.SheetDisplayControls
             this.RegisterLocodeChange(this.locodeCtrlNextWastePort, Message.NotificationClass.WAS);
             this.RegisterTextboxChange(this.textBoxWasteDisposalServiceProviders, Message.NotificationClass.WAS);
             this.RegisterDatePickerChange(this.datePickerDateLastDisposal, Message.NotificationClass.WAS);
-            
 
         }
 
+        private void CheckBoxValidExemption_Checked(object sender, RoutedEventArgs e)
+        {
+            bool on = !(this.checkBoxValidExemption.IsChecked ?? false);
+            this.checkBoxAccurateCorrectDetails.IsEnabled = on;
+            this.locodeCtrlLastWastePort.IsEnabled = on;
+            this.datePickerDateLastDisposal.IsEnabled = on;
+            this.textBoxWasteDisposalServiceProviders.IsEnabled = on;
+            this.gridWasteControls.IsEnabled = on;
+            this.dataGridWaste.IsEnabled = on;
+        }
+
         private void buttonSearchPortArea_Click(object sender, RoutedEventArgs e)
         {
             if (portAreas != null)
@@ -283,6 +338,14 @@ namespace ENI2.SheetDisplayControls
         {
             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;
@@ -294,7 +357,7 @@ namespace ENI2.SheetDisplayControls
             this.textBox_AgentEMail.Text = this._currentTemplate.AgentEMail;
             this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFax.Text = this._currentTemplate.AgentFax;
-            this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            this.textBox_AgentFax.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;
@@ -305,6 +368,11 @@ namespace ENI2.SheetDisplayControls
             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;
@@ -392,6 +460,8 @@ namespace ENI2.SheetDisplayControls
             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
         }
@@ -413,6 +483,7 @@ namespace ENI2.SheetDisplayControls
             at.AgentPhone = this.textBox_AgentPhone.Text;
             at.AgentPostalCode = this.textBox_AgentPostalCode.Text;
             at.AgentStreetAndNumber = textBox_AgentStreetAndNumber.Text;
+            at.WasteDisposalServiceProviderName = textBox_WasteDisposalServiceProvider.Text;
 
             return at;
         }
@@ -545,11 +616,130 @@ namespace ENI2.SheetDisplayControls
 
         #endregion
 
+        #region special entry ship service check
+
+        private void CheckServiceEntryMaerskBHV()
+        {
+            bool found = false;
+            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
+            {
+                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, Johanniswall 7, 20095 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 _servMessage.Elements.Cast<SERV>())
+            {
+                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, Johanniswall 7, 20095 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 CheckServiceEntryHoegh()
+        {
+            bool found = false;
+            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
+            {
+                if (serv.ServiceBeneficiary.Equals("Höegh Autoliners AS, Oslo, Norway"))
+                    found = true;
+            }
+
+            if (!found)
+            {
+                SERV newServ = new SERV();
+                newServ.ServiceBeneficiary = "Höegh Autoliners AS, Oslo, Norway";
+                newServ.ServiceInvoiceRecipient = " PWL Port Services GmbH & Co. KG";
+                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);
+            }
+        }
+
+        private void CheckServiceEntryFctJunge()
+        {
+            bool found = false;
+            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
+            {
+                if (serv.ServiceName.Equals("Fct Junge - Hamburg"))
+                    found = true;
+            }
+
+            if (!found)
+            {
+                SERV newServ = new SERV();
+                newServ.ServiceBeneficiary = "";
+                newServ.ServiceInvoiceRecipient = " Frachtcontor Junge & Co. GmbH";
+                newServ.ServiceName = "Fct Junge - Hamburg";
+                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 CheckServiceEntryElbeBulk()
+        {
+            bool found = false;
+            foreach (SERV serv in _servMessage.Elements.Cast<SERV>())
+            {
+                if (serv.ServiceName.Equals("Elbe Bulk Schiffe - Hamburg"))
+                    found = true;
+            }
+
+            if (!found)
+            {
+                SERV newServ = new SERV();
+                newServ.ServiceBeneficiary = "";
+                newServ.ServiceInvoiceRecipient = " Division Elbe Bulk, Frachtcontor Junge & Co. GmbH";
+                newServ.ServiceName = "Elbe Bulk Schiffe - Hamburg";
+                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
+
         #region Templates
 
         private async Task InitTemplates()
         {
-            _wsdpTemplates = await DBManagerAsync.GetWastDisposalServiceProviderTemplatesAsync();
+            _wsdpTemplates = await DBManagerAsync.GetWasteDisposalServiceProviderTemplatesAsync();
             _wsdpTemplates.Sort();
             this.comboBox_WSDPTemplate.ItemsSource = null;
             this.comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
@@ -962,7 +1152,100 @@ namespace ENI2.SheetDisplayControls
             this.DataGridWaste_CreateRequested();
         }
 
-        #endregion        
+        #endregion
+
+        #region SERV template button event handler
+
+        private void comboBoxGroup_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (this.comboBoxGroup.SelectedItem is SERV_Template st)
+            {
+                this.buttonDeleteSERVTemplate.IsEnabled = true;
+                this.buttonSetSERVTemplate.IsEnabled = true;
+                this._currentSERVTemplate = st;
+            }
+        }
+
+        private void buttonSetSERVTemplate_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 buttonEditSERVTemplate_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 buttonNewSERVTemplate_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 buttonDeleteSERVTemplate_Click(object sender, RoutedEventArgs e)
+        {
+            if (_currentSERVTemplate != 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(_currentSERVTemplate);
+                    this.buttonDeleteSERVTemplate.IsEnabled = false;
+                    this.comboBoxGroup.ItemsSource = _servTemplates;
+                    this.buttonSetSERVTemplate.IsEnabled = false;
+                }
+            }
+        }
+
+        #endregion
 
     }
 }

ENI2/SheetDisplayControls/PreArrivalControl.xaml

@@ -15,8 +15,9 @@
         <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="220"/>
-                    <ColumnDefinition Width=".65*" />
+                    <ColumnDefinition Width="240"/>
+                    <ColumnDefinition Width=".3*" />
+                    <ColumnDefinition Width=".3*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36" />
@@ -43,19 +44,19 @@
 
                 </Grid.RowDefinitions>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text31General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text31General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
                 <Label Grid.Row="1" Content="{x:Static p:Resources.textDraughtOnArrivalLabel}" Grid.Column="0"  HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" Value="{Binding DraughtUponArrival_DMT, Mode=TwoWay}" TextAlignment="Left"/>
                 <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textCurrentShipSecLevel}" Name="label_CurrentShipSecLevel" Margin="0,0,10,0"/>
                 <ComboBox Name="comboBoxCurrentShipSecurityLevel" Grid.Row="2" Grid.Column="1" SelectedValue="{Binding CurrentShipSecurityLevel}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textAnchored}" Name="label_IsAnchored" Margin="0,0,10,0" />
-                <CheckBox Grid.Column="1" Grid.Row="3" IsThreeState="True" VerticalContentAlignment="Center" Name="checkBox_IsAnchored" IsChecked="{Binding IsAnchored}"/>
+                <CheckBox Grid.Column="1" Grid.Row="3" IsThreeState="False" VerticalContentAlignment="Center" Name="checkBox_IsAnchored" IsChecked="{Binding IsAnchored}"/>
                 <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textAreMatterToReport}" Name="label_AreMatterToReport" Margin="0,0,10,0"/>
-                <CheckBox Grid.Column="1" Grid.Row="4" IsThreeState="True" VerticalContentAlignment="Center" Name="checkBox_AreMatterToReport" IsChecked="{Binding IsAnchored}"/>
+                <CheckBox Grid.Column="1" Grid.Row="4" IsThreeState="False" VerticalContentAlignment="Center" Name="checkBox_AreMatterToReport" IsChecked="{Binding AreMatterToReport}"/>
                 <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textMatterToReport}" Name="label_MatterToReport" Margin="0,0,10,0"/>
-                <TextBox Name="textBoxMatterToReport" Grid.Row="5" Grid.Column="1" MaxLength="1024" Text="{Binding MatterToReport, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
+                <TextBox Name="textBoxMatterToReport" Grid.Row="5" Grid.Column="1" MaxLength="1024" Text="{Binding MatterToReport, Converter={util:TrimStringConverter}}" IsEnabled="{Binding ElementName=checkBox_AreMatterToReport, Path=IsChecked}" Margin="2" VerticalContentAlignment="Center"/>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text32PersonsOnBoard}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text32PersonsOnBoard}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3"/>
                 <Label Content="{x:Static p:Resources.textPersonsOnBoard}" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <xctk:IntegerUpDown Value="{Binding TotalPersonsOnBoardUponArrival, Mode=TwoWay}" Grid.Row="7" Grid.Column="1" Name="integerUpDownPersonsOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                 <Label Content="{x:Static p:Resources.textCrewMemberOnBoard}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
@@ -65,8 +66,8 @@
                 <Label Content="{x:Static p:Resources.textStowawaysOnBoard}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <xctk:IntegerUpDown Value="{Binding TotalStowawaysOnBoardUponArrival, Mode=TwoWay}" Grid.Row="10" Grid.Column="1" Name="integerUpDownStowawaysOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text33BunkerOnArrival}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridBKRA" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="12" Grid.ColumnSpan="2"
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text33BunkerOnArrival}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="3"/>
+                <enictrl:ENIDataGrid x:Name="dataGridBKRA" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="12" Grid.ColumnSpan="3"
                                  AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -91,12 +92,12 @@
                     </DataGrid.Columns>
                 </enictrl:ENIDataGrid>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text34DangerousCargo}" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="2"/>
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text34DangerousCargo}" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="3"/>
                 <Label Content="{x:Static p:Resources.textDangerousGoodsOnBoard}" Grid.Column="0" Grid.Row="14" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival, Converter={util:InverseBooleanConverter}}" Grid.Row="14" Grid.Column="1" VerticalAlignment="Center"/>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text36TowOnArrival}" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridTowageOnArrival" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text36TowOnArrival}" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="3"/>
+                <enictrl:ENIDataGrid Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="3" x:Name="dataGridTowageOnArrival" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
                         <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding TowageOnArrivalName}" IsReadOnly="True" Width="Auto" />

ENI2/SheetDisplayControls/PreDepartureControl.xaml

@@ -16,7 +16,8 @@
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="220"/>
-                    <ColumnDefinition Width=".65*" />
+                    <ColumnDefinition Width=".3*" />
+                    <ColumnDefinition Width=".3*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36" />
@@ -43,11 +44,11 @@
 
                 </Grid.RowDefinitions>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text41General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text41General}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
                 <Label Grid.Row="1" Content="{x:Static p:Resources.textDraughtOnDepartureLabel}" Grid.Column="0"  HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" Value="{Binding DraughtUponDeparture_DMT, Mode=TwoWay}" TextAlignment="Left"/>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text42PersonsOnBoard}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text42PersonsOnBoard}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3"/>
                 <Label Content="{x:Static p:Resources.textPersonsOnBoard}" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <xctk:IntegerUpDown Value="{Binding TotalPersonsOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="7" Grid.Column="1" Name="integerUpDownPersonsOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
                 <Label Content="{x:Static p:Resources.textCrewMemberOnBoard}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
@@ -57,8 +58,8 @@
                 <Label Content="{x:Static p:Resources.textStowawaysOnBoard}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <xctk:IntegerUpDown Value="{Binding TotalStowawaysOnBoardUponDeparture, Mode=TwoWay}" Grid.Row="10" Grid.Column="1" Name="integerUpDownStowawaysOnBoard" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text43BunkerOnDeparture}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid x:Name="dataGridBKRD" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="12" Grid.ColumnSpan="2"
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text43BunkerOnDeparture}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="3"/>
+                <enictrl:ENIDataGrid x:Name="dataGridBKRD" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="12" Grid.ColumnSpan="3"
                                  AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -83,30 +84,30 @@
                     </DataGrid.Columns>
                 </enictrl:ENIDataGrid>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text44DangerousCargo}" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="2"/>
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text44DangerousCargo}" Grid.Column="0" Grid.Row="13" Grid.ColumnSpan="3"/>
                 <Label Content="{x:Static p:Resources.textDangerousGoodsOnBoard}" Grid.Column="0" Grid.Row="14" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                 <CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival, Converter={util:InverseBooleanConverter}}" Grid.Row="14" Grid.Column="1" VerticalAlignment="Center"/>
 
-                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text45TowOnDeparture}" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="2"/>
-                <enictrl:ENIDataGrid Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridTowageOnDeparture" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
+                <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text45TowOnDeparture}" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="3"/>
+                <enictrl:ENIDataGrid Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="3" x:Name="dataGridTowageOnDeparture" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding TowageOnArrivalName}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPurposeOfCall}" Binding="{Binding TowageOnArrivalPurposeOfCall}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlag}" Binding="{Binding TowageOnArrivalFlag}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textDraughtInDecimetre}" Binding="{Binding TowageOnArrivalDraught_DMT, StringFormat={}{0:N1}}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textGrossTonnage}" Binding="{Binding TowageOnArrivalGrossTonnage}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textLengthOverAll}" Binding="{Binding TowageOnArrivalLengthOverall_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textBeamOverAll}" Binding="{Binding TowageOnArrivalBeam_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding TowageOnArrivalRemarks}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCompanyName}" Binding="{Binding TowageOnArrivalOperatorCompanyName}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStreetNumber}" Binding="{Binding TowageOnArrivalOperatorStreetNameAndNumber}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPostalCode}" Binding="{Binding TowageOnArrivalOperatorPostalCode}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCity}" Binding="{Binding TowageOnArrivalOperatorCity}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCountry}" Binding="{Binding TowageOnArrivalOperatorCountry}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textEMail}" Binding="{Binding TowageOnArrivalOperatorEmail}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPhone}" Binding="{Binding TowageOnArrivalOperatorPhone}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFax}" Binding="{Binding TowageOnArrivalOperatorFax}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding TowageOnDepartureName}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textPurposeOfCall}" Binding="{Binding TowageOnDeparturePurposeOfCall}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textFlag}" Binding="{Binding TowageOnDepartureFlag}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textDraughtInDecimetre}" Binding="{Binding TowageOnDepartureDraught_DMT, StringFormat={}{0:N1}}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textGrossTonnage}" Binding="{Binding TowageOnDepartureGrossTonnage}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textLengthOverAll}" Binding="{Binding TowageOnDepartureLengthOverall_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textBeamOverAll}" Binding="{Binding TowageOnDepartureBeam_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding TowageOnDepartureRemarks}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textCompanyName}" Binding="{Binding TowageOnDepartureOperatorCompanyName}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textStreetNumber}" Binding="{Binding TowageOnDepartureOperatorStreetNameAndNumber}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textPostalCode}" Binding="{Binding TowageOnDepartureOperatorPostalCode}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textCity}" Binding="{Binding TowageOnDepartureOperatorCity}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textCountry}" Binding="{Binding TowageOnDepartureOperatorCountry}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textEMail}" Binding="{Binding TowageOnDepartureOperatorEmail}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textPhone}" Binding="{Binding TowageOnDepartureOperatorPhone}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textFax}" Binding="{Binding TowageOnDepartureOperatorFax}" IsReadOnly="True" Width="Auto" />
                     </DataGrid.Columns>
                 </enictrl:ENIDataGrid>
 

ENI2/SheetDisplayControls/PreDepartureControl.xaml.cs

@@ -69,7 +69,7 @@ namespace ENI2.SheetDisplayControls
 
             // 4.3
             this.dataGridBKRD.Initialize();
-            this.dataGridBKRD.ItemsSource = this._brkaMessage.Elements;
+            this.dataGridBKRD.ItemsSource = this._brkdMessage.Elements;
             this.dataGridBKRD.AddingNewItem += DataGridBKRD_AddingNewItem;
             this.dataGridBKRD.EditRequested += DataGridBKRD_EditRequested;
             this.dataGridBKRD.DeleteRequested += DataGridBKRD_DeleteRequested;

ENI2/SheetDisplayControls/ShipDataControl.xaml

@@ -12,13 +12,14 @@
              mc:Ignorable="d" 
              d:DesignHeight="1050" d:DesignWidth="800">
     <GroupBox Name="shipDataGroupBox" Header="{x:Static p:Resources.text3PreArrival}">
-        <TabControl>
+        <TabControl x:Name="mainTabControl">
             <TabItem Header="{x:Static p:Resources.textTab51}">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="200"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width=".3*" />
                         <ColumnDefinition Width="25" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
@@ -113,8 +114,9 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="290"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width=".3*" />
                         <ColumnDefinition Width="25" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
@@ -122,6 +124,8 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
 
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
@@ -137,70 +141,86 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
                     
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text52SSCEC}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryControlExemption}" Name="label_SanitaryControlExemption" Margin="0,0,10,0"/>
-                    <CheckBox Name="checkBoxSanitaryControlExemption" IsChecked="{Binding ValidSanitaryControlExemptionOrCertificateOnBoard}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPlaceOfIssue}" Name="label_PlaceOfIssue" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxPlaceOfIssue" Grid.Row="2" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue, Converter={util:TrimStringConverter}}" Margin="2" />
-                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0"  Content="{x:Static p:Resources.textDateOfIssue}" Name="label_DateOfIssue" Margin="0,0,10,0"/>
-                    <DatePicker Name="datePickerDateOfIssue" Grid.Row="3" Grid.Column="1" SelectedDate="{Binding DateOfIssue, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                        <DatePicker.BlackoutDates>
-                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                        </DatePicker.BlackoutDates>
-                    </DatePicker>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textReinspectionSanitaryControl}" Name="label_ReinspectionSanitaryControl" Margin="0,0,10,0"/>
-                    <CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"/>
 
-                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text53ISPS}" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2"/>
-                    <Label HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textChiefSecurityOfficer}" Name="label_ChiefSecurityOfficer" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_LastName" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxCSOLastName" Grid.Row="7" Grid.Column="1" MaxLength="100" Text="{Binding CSOLastName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_FirstName" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxCSOFirstName" Grid.Row="8" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_Phone" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxCSOPhoneName" Grid.Row="9" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_EMail" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxCSOEMailName" Grid.Row="10" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_Fax" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxCSOFaxName" Grid.Row="11" Grid.Column="1" MaxLength="100" Text="{Binding CSOFax, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textValidISSCOnBoard}" Name="label_ValidISSCOnBoard" Margin="0,0,10,0"/>
-                    <CheckBox Name="checkBoxValidISSCOnBoard" IsChecked="{Binding ValidISSCOnBoard}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textReasonForInvalidISSC}" Name="label_ReasonForInvalidISSC" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="13" Grid.Column="1" MaxLength="255" Text="{Binding ReasonsForNoValidISSC, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0" Content="{x:Static p:Resources.textISSCType}" Name="label_ISSCType" Margin="0,0,10,0"/>
-                    <ComboBox Name="comboBoxISSCType" Grid.Row="14" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textISSCExpirationDate}" Name="label_ISSCExpirationDate" Margin="0,0,10,0"/>
-                    <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textMDHSimplification}" Name="label_MDHSimplificationAvailable" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkSimplification" IsChecked="{Binding MDHSimplification}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Checked="checkSimplification_Checked" Unchecked="checkSimplification_Checked"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPortOfHealth}" Name="label_PortOfHealth" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl x:Name="locodePortWhereHealthDeclarationWasGiven" Grid.Row="2" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteMDHNotified, Mode=TwoWay}" IsEnabled="{Binding ElementName=checkSimplification, Path=IsChecked}" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryControlExemption}" Name="label_SanitaryControlExemption" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxSanitaryControlExemption" IsChecked="{Binding ValidSanitaryControlExemptionOrCertificateOnBoard}" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" 
+                              IsEnabled="{Binding ElementName=checkSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}" Checked="checkSimplification_Checked" Unchecked="checkSimplification_Checked"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textPlaceOfIssue}" Name="label_PlaceOfIssue" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxPlaceOfIssue" Grid.Row="4" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue, Converter={util:TrimStringConverter}}" Margin="2" />
+                    <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0"  Content="{x:Static p:Resources.textDateOfIssue}" Name="label_DateOfIssue" Margin="0,0,10,0"/>
+                    <DatePicker Name="datePickerDateOfIssue" Grid.Row="5" Grid.Column="1" SelectedDate="{Binding DateOfIssue, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate" >
                         <DatePicker.BlackoutDates>
                             <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
                             <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
                         </DatePicker.BlackoutDates>
                     </DatePicker>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerType}" Name="label_ISSCIssuerType" Margin="0,0,10,0"/>
-                    <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="16" Grid.Column="1" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="17" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerName}" Name="label_ISSCIssuerName" Margin="0,0,10,0"/>
-                    <TextBox Name="textBoxISSCIssuerName" Grid.Row="17" Grid.Column="1" MaxLength="100" Text="{Binding ISSCIssuerName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textApprovedSecPlan}" Name="label_ApprovedSecPlan" Margin="0,0,10,0"/>
-                    <CheckBox Name="checkBoxApprovedSecurityPlanOnBoard" IsChecked="{Binding ApprovedSecurityPlanOnBoard}" Grid.Row="18" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textReinspectionSanitaryControl}" Name="label_ReinspectionSanitaryControl" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding ElementName=checkSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text53ISPS}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textSECSimplification}" Name="label_SimplificationAvailable" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxSECSimplification" IsChecked="{Binding SECSimplification}" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textPortWhereSimplWasGiven}" Name="label_PortWhereSimplWasGiven" Margin="0,0,10,0"/>
+                    <enictrl:LocodeControl x:Name="locodePortOfCallWhereCompleteSECNotified" Grid.Row="9" Grid.Column="1" LocodeValue="{Binding PortOfCallWhereCompleteSECNotified, Mode=TwoWay}" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked}"/>
+                    <Label HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom" Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textChiefSecurityOfficer}" Name="label_ChiefSecurityOfficer" Margin="0,0,10,0"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="11" Grid.Column="0" Content="{x:Static p:Resources.textLastName}" Name="label_LastName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOLastName" Grid.Row="11" Grid.Column="1" MaxLength="100" Text="{Binding CSOLastName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textFirstName}" Name="label_FirstName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOFirstName" Grid.Row="12" Grid.Column="1" MaxLength="100" Text="{Binding CSOFirstName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" Name="label_Phone" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOPhoneName" Grid.Row="13" Grid.Column="1" MaxLength="100" Text="{Binding CSOPhone, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0" Content="{x:Static p:Resources.textEMail}" Name="label_EMail" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOEMailName" Grid.Row="14" Grid.Column="1" MaxLength="100" Text="{Binding CSOEMail, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textFax}" Name="label_Fax" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxCSOFaxName" Grid.Row="15" Grid.Column="1" MaxLength="100" Text="{Binding CSOFax, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textValidISSCOnBoard}" Name="label_ValidISSCOnBoard" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxValidISSCOnBoard" IsChecked="{Binding ValidISSCOnBoard}" Grid.Row="16" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="17" Grid.Column="0" Content="{x:Static p:Resources.textReasonForInvalidISSC}" Name="label_ReasonForInvalidISSC" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="17" Grid.Column="1" MaxLength="255" Text="{Binding ReasonsForNoValidISSC, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textISSCType}" Name="label_ISSCType" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxISSCType" Grid.Row="18" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="19" Grid.Column="0" Content="{x:Static p:Resources.textISSCExpirationDate}" Name="label_ISSCExpirationDate" Margin="0,0,10,0"/>
+                    <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="19" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="20" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerType}" Name="label_ISSCIssuerType" Margin="0,0,10,0"/>
+                    <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="20" Grid.Column="1" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="21" Grid.Column="0" Content="{x:Static p:Resources.textISSCIssuerName}" Name="label_ISSCIssuerName" Margin="0,0,10,0"/>
+                    <TextBox Name="textBoxISSCIssuerName" Grid.Row="21" Grid.Column="1" MaxLength="100" Text="{Binding ISSCIssuerName, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="22" Grid.Column="0" Content="{x:Static p:Resources.textApprovedSecPlan}" Name="label_ApprovedSecPlan" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxApprovedSecurityPlanOnBoard" IsChecked="{Binding ApprovedSecurityPlanOnBoard}" Grid.Row="22" Grid.Column="1" VerticalAlignment="Center" IsEnabled="{Binding ElementName=checkBoxSECSimplification, Path=IsChecked, Converter={util:InverseBooleanConverter}}"/>
                 </Grid>
             </TabItem>
             <TabItem Header="{x:Static p:Resources.textTab53}">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="200"/>
-                        <ColumnDefinition Width=".65*" />
+                        <ColumnDefinition Width=".3*" />
                         <ColumnDefinition Width="25" />
+                        <ColumnDefinition Width=".3*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                     </Grid.RowDefinitions>
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text54TankerDetails}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
-                    <Label Content="{x:Static p:Resources.textTankerHullConfig}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxTankerHullConfig" Margin="2" SelectedIndex="{Binding TankerHullConfiguration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <Label Content="{x:Static p:Resources.textTanker}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxTanker" IsChecked="{Binding Tanker}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                    <Label Content="{x:Static p:Resources.textTankerHullConfig}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxTankerHullConfig" Margin="2" SelectedIndex="{Binding TankerHullConfiguration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
                 </Grid>
             </TabItem>
         </TabControl>

ENI2/SheetDisplayControls/ShipDataControl.xaml.cs

@@ -85,12 +85,16 @@ namespace ENI2.SheetDisplayControls
             this.shipEMailLabel.DataContext = this.Core;
 
             // 5.2
+            this.checkSimplification.DataContext = _mdh;
+            this.locodePortWhereHealthDeclarationWasGiven.DataContext = _mdh;
             this.checkBoxSanitaryControlExemption.DataContext = _mdh;
             this.textBoxPlaceOfIssue.DataContext = _mdh;
             this.datePickerDateOfIssue.DataContext = _mdh;
             this.checkBoxReinspectionSanitary.DataContext = _mdh;
 
             // 5.3
+            this.checkBoxSECSimplification.DataContext = _sec;
+            this.locodePortOfCallWhereCompleteSECNotified.DataContext = _sec;
             this.textBoxCSOLastName.DataContext = _sec;
             this.textBoxCSOFirstName.DataContext = _sec;
             this.textBoxCSOPhoneName.DataContext = _sec;
@@ -107,6 +111,7 @@ namespace ENI2.SheetDisplayControls
             this.checkBoxApprovedSecurityPlanOnBoard.DataContext = _sec;
 
             // 5.4
+            this.checkBoxTanker.DataContext = _pre72H;
             this.comboBoxTankerHullConfig.ItemsSource = hullConfiguration;
             this.comboBoxTankerHullConfig.DataContext = _pre72H;
 
@@ -118,6 +123,12 @@ namespace ENI2.SheetDisplayControls
             this.shipDataGroupBox.IsEnabled = enabled;
         }
 
+        public override int SelectedTabIndex
+        {
+            get { return this.mainTabControl.SelectedIndex; }
+            set { this.mainTabControl.SelectedIndex = value; }
+        }
+
         #endregion
 
         #region event handler
@@ -171,6 +182,12 @@ namespace ENI2.SheetDisplayControls
             // 5.4
             this.RegisterComboboxIndexChange(this.comboBoxTankerHullConfig, Message.NotificationClass.PRE72H);
 
+        }        
+
+        private void checkSimplification_Checked(object sender, RoutedEventArgs e)
+        {
+            this.textBoxPlaceOfIssue.IsEnabled = !(this.checkSimplification.IsChecked ?? false) && (checkBoxSanitaryControlExemption.IsChecked ?? false);
+            this.datePickerDateOfIssue.IsEnabled = !(this.checkSimplification.IsChecked ?? false) && (checkBoxSanitaryControlExemption.IsChecked ?? false);
         }
 
         #endregion

ENI2/SheetDisplayControls/VoyageControl.xaml

@@ -13,13 +13,14 @@
              d:DesignHeight="1150" d:DesignWidth="800">
 
     <GroupBox Name="voyageGroupBox" Header="{x:Static p:Resources.textVoyage}">
-        <TabControl>
+        <TabControl x:Name="mainTabControl">
             <TabItem Header="{x:Static p:Resources.textTab11}">
                 <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="280"/>
-                            <ColumnDefinition Width=".65*" />
+                            <ColumnDefinition Width=".3*" />
+                            <ColumnDefinition Width=".3*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="36" />
@@ -51,19 +52,19 @@
                             <RowDefinition Height="28" />
                         </Grid.RowDefinitions>
 
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text11PreviousPort}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text11PreviousPort}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLastPort}" Name="label_LastPort" Margin="0,0,10,0"/>
                         <enictrl:LocodeControl Grid.Column="1" Grid.Row="1" Width="Auto" x:Name="locodeControl_LastPort" LocodeValue="{Binding LastPort, Mode=TwoWay}" LocodeSource="SSN" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDLastPort}" Name="label_ETDFromLastport"  Margin="0,0,10,0"/>
                         <xctk:DateTimePicker Grid.Column="1" Grid.Row="2" Value="{Binding ETDFromLastPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETDFromLastPort" 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"/>
 
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text12IncomingVoyage}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text12IncomingVoyage}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textKielPassagePlanned}" Name="label_KielPassagePlanned" Margin="0,0,10,0"/>
                         <CheckBox Name="checkBoxKielCanalPassagePlanned" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Checked="checkBoxKielCanalPassagePlanned_Checked" Unchecked="checkBoxKielCanalPassagePlanned_Checked"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textIncomingETANOK}" Name="label_IncomingETANOK" Margin="0,0,10,0"/>
                         <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedIncomming" Grid.Row="5" Grid.Column="1" Value="{Binding KielCanalPassagePlannedIncomming, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" AllowTextInput="True" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
 
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text13RelevantPortcall}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text13RelevantPortcall}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" Margin="0,0,10,0"/>
                         <enictrl:LocodeControl Grid.Column="1" Grid.Row="7" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" IsEnabled="False" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textETAPortOfCall}" Margin="0,0,10,0" />
@@ -73,19 +74,19 @@
                         <Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                         <xctk:DoubleUpDown Grid.Row="10" Grid.Column="1" Name="doubleUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" FormatString="N2" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
 
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text14OutgoingVoyage}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text14OutgoingVoyage}" Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="3"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="12" Grid.Column="0" Content="{x:Static p:Resources.textKielPassagePlanned}" Name="label_KielPassagePlanned_Outgoing" Margin="0,0,10,0"/>
                         <CheckBox Name="checkBoxKielCanalPassagePlannedOutgoing" IsChecked="{Binding KielCanalPassagePlanned}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center" Checked="checkBoxKielCanalPassagePlanned_Checked" Unchecked="checkBoxKielCanalPassagePlanned_Checked"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textOutgoingETANOK}" Name="label_OutgoingETANOK" Margin="0,0,10,0"/>
                         <xctk:DateTimePicker Name="dateTimePickerKielCanalPassagePlannedOutgoing" Grid.Row="13" Grid.Column="1" Value="{Binding KielCanalPassagePlannedOutgoing, Converter={util:UtcToLocalDateTimeConverter}}" Margin="2" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" AllowTextInput="True" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
 
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text15NextPort}" Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text15NextPort}" Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="3"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="15" Grid.Column="0" Content="{x:Static p:Resources.textNextPort}" Name="label_NextPort" Margin="0,0,10,0"/>
                         <enictrl:LocodeControl Grid.Column="1" Grid.Row="15" Width="Auto" x:Name="locodeControl_NextPort" LocodeValue="{Binding NextPort, Mode=TwoWay}" LocodeSource="SSN" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="16" Grid.Column="0" Content="{x:Static p:Resources.textETANextPort}" Name="label_ETAToNextPort" Margin="0,0,10,0" />
                         <xctk:DateTimePicker Grid.Column="1" Grid.Row="16" Value="{Binding ETAToNextPort, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePicker_ETAToNextPort" 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"/>
 
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text16Voyage}" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text16Voyage}" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="3"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="18" Grid.Column="0" Content="{x:Static p:Resources.textShippingArea}" Name="label_INFOShippingArea" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <ComboBox Grid.Row="18" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="19" Grid.Column="0" Content="{x:Static p:Resources.textTransportMode}" Margin="0,0,10,0" />
@@ -106,15 +107,15 @@
                         <Grid.RowDefinitions>
                             <RowDefinition Height="36" />
                             <RowDefinition Height="28" />
-                            <RowDefinition Height="300" />
+                            <RowDefinition Height="260" />
 
                             <RowDefinition Height="36" />
                             <RowDefinition Height="28" />
-                            <RowDefinition Height="120" />
+                            <RowDefinition Height="260" />
 
                             <RowDefinition Height="36" />
                             <RowDefinition Height="28" />
-                            <RowDefinition Height="300" />
+                            <RowDefinition Height="340" />
                         </Grid.RowDefinitions>
 
                         <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text17Last10PortFacilitiesCalled}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
@@ -219,8 +220,9 @@
                 <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="280"/>
-                            <ColumnDefinition Width=".65*" />
+                            <ColumnDefinition Width="290"/>
+                            <ColumnDefinition Width=".3*" />
+                            <ColumnDefinition Width=".3*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="36" />
@@ -242,10 +244,10 @@
 
                             <RowDefinition Height="120" />
                         </Grid.RowDefinitions>
-                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text110MaritimeHealthData}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
+                        <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text110MaritimeHealthData}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
 
                         <TextBlock Grid.Row="1" Grid.RowSpan="2" Text="{x:Static p:Resources.textPersonDiedOnBoard}" Name="textBlock_PersonsDiedOnBoard" Margin="0,0,10,0" TextWrapping="Wrap" VerticalAlignment="Top"/>
-                        <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                        <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0"  Content="{x:Static p:Resources.textNumberOfDeaths}" Name="label_NumberOfDeaths" Margin="0,0,10,0"/>
                         <xctk:IntegerUpDown Name="integerUpDownNumberOfDeaths" Grid.Row="2" Grid.Column="1" Value="{Binding NonAccidentalDeathsDuringVoyageCount}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
                         <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.textDiseaseInfectiousNature}" Name="textBlock_diseaseInfectious"  TextWrapping="Wrap"  Margin="0,0,10,0"/>
@@ -262,7 +264,7 @@
                         <CheckBox Name="checkBoxAwareOfConditions" IsChecked="{Binding AwareOfFurtherInfections}" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0"  Content="{x:Static p:Resources.textAnySanitaryMeasures}" Name="labelSanitaryMeasuresApplied" Margin="0,0,10,0"/>
                         <CheckBox Name="checkBoxSanitaryMeasuresApplied" IsChecked="{Binding SanitaryMeasuresApplied}" Grid.Row="9" Grid.Column="1" VerticalAlignment="Center" />
-                        <enictrl:ENIDataGrid Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridSanitaryMeasures" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                        <enictrl:ENIDataGrid Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="3" x:Name="dataGridSanitaryMeasures" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -279,7 +281,7 @@
                         <CheckBox Name="checkBoxSickAnimalsOrPets" IsChecked="{Binding SickAnimalOrPetOnBoard}" Grid.Row="13" Grid.Column="1" VerticalAlignment="Center"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="14" Grid.Column="0"  Content="{x:Static p:Resources.textShipVisitedInfectedArea}" Name="labelHasShipVisited" Margin="0,0,10,0" />
                         <CheckBox Name="checkBoxHasShipVisited" IsChecked="{Binding InfectedAreaVisited}" Grid.Row="14" Grid.Column="1" VerticalAlignment="Center" />
-                        <enictrl:ENIDataGrid Grid.Row="15" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridInfectedAreas" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                        <enictrl:ENIDataGrid Grid.Row="15" Grid.Column="0" Grid.ColumnSpan="3" x:Name="dataGridInfectedAreas" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@@ -301,13 +303,17 @@
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
                         <RowDefinition Height="300" />
                     </Grid.RowDefinitions>
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text111PortOfItinerary}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"  />
                     <Label Content="{x:Static p:Resources.textCruiseShip}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
                     <CheckBox Name="checkBoxCruiseShip" IsChecked="{Binding CruiseShip}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
-                    <Button Name="buttonImportPortOfItineraryFromSEC" Grid.Column="0" Grid.Row="2" Margin="2" HorizontalAlignment="Left" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportPortOfItineraryFromSEC_Click" Background="Transparent" />
-                    <enictrl:ENIDataGrid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfItinerary" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                    <Label Content="{x:Static p:Resources.textStowaways}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <CheckBox Name="checkBoxStowaways" IsChecked="{Binding StowawaysOnBoard}" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"/>
+
+                    <Button Name="buttonImportPortOfItineraryFromSEC" Grid.Column="0" Grid.Row="3" Margin="2" HorizontalAlignment="Left" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportPortOfItineraryFromSEC_Click" Background="Transparent" />
+                    <enictrl:ENIDataGrid Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfItinerary" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
         AutoGenerateColumns="False" Margin="0,5,0,0">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />

ENI2/SheetDisplayControls/VoyageControl.xaml.cs

@@ -100,6 +100,7 @@ namespace ENI2.SheetDisplayControls
             // 1.7
             this.dataGridLast10PortFacilities.Initialize();
             this.dataGridLast10PortFacilities.ItemsSource = _sec.LastTenPortFacilitesCalled;
+            this.textBlockNumL10PEntries.DataContext = _sec;
 
             this.dataGridLast10PortFacilities.AddingNewItem += DataGridLast10PortFacilities_AddingNewItem;
             this.dataGridLast10PortFacilities.EditRequested += DataGridLast10PortFacilities_EditRequested;
@@ -107,6 +108,7 @@ namespace ENI2.SheetDisplayControls
             this.dataGridLast10PortFacilities.CreateRequested += DataGridLast10PortFacilities_CreateRequested;
 
             // 1.8
+            this.textBlockNumS2SEntries.DataContext = _sec;
             this.dataGridShip2ShipActivities.Initialize();
             foreach (ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s in _sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
             {
@@ -120,6 +122,7 @@ namespace ENI2.SheetDisplayControls
             this.dataGridShip2ShipActivities.CreateRequested += DataGridShip2ShipActivities_CreateRequested;
 
             // 1.9
+            this.textBlockNumPoCEntries.DataContext = _mdh;
             this.dataGridPortOfCallLast30Days.Initialize();
             this.dataGridPortOfCallLast30Days.ItemsSource = _mdh.PortOfCallLast30Days;
             this.dataGridPortOfCallLast30Days.AddingNewItem += DataGridPortOfCallLast30Days_AddingNewItem;
@@ -177,7 +180,18 @@ namespace ENI2.SheetDisplayControls
             this.dataGridInfectedAreas.DeleteRequested += DataGridInfectedAreas_DeleteRequested;
             this.dataGridInfectedAreas.CreateRequested += DataGridInfectedAreas_CreateRequested;
 
-        }
+            this.checkBoxStowaways.DataContext = _bpol;
+            this.checkBoxCruiseShip.DataContext = _bpol;
+            this.checkBoxCruiseShip.Checked += CheckBoxCruiseShip_Checked;
+            this.checkBoxCruiseShip.Unchecked += CheckBoxCruiseShip_Checked;
+            this.CheckBoxCruiseShip_Checked(null, null);
+            this.dataGridPortOfItinerary.Initialize();
+            this.dataGridPortOfItinerary.ItemsSource = _bpol.PortOfItineraries;
+            this.dataGridPortOfItinerary.AddingNewItem += DataGridPortOfItinerary_AddingNewItem;
+            this.dataGridPortOfItinerary.EditRequested += DataGridPortOfItinerary_EditRequested;
+            this.dataGridPortOfItinerary.DeleteRequested += DataGridPortOfItinerary_DeleteRequested;
+            this.dataGridPortOfItinerary.CreateRequested += DataGridPortOfItinerary_CreateRequested;
+        }        
 
         public override void SetEnabled(bool enabled)
         {
@@ -185,6 +199,12 @@ namespace ENI2.SheetDisplayControls
             this.voyageGroupBox.IsEnabled = enabled;
         }
 
+        public override int SelectedTabIndex
+        {
+            get { return this.mainTabControl.SelectedIndex; }
+            set { this.mainTabControl.SelectedIndex = value; }
+        }
+
         #endregion
 
         #region event handler
@@ -232,19 +252,15 @@ namespace ENI2.SheetDisplayControls
             this.RegisterIntegerUpDownChange(this.integerUpDownNumberOfIllPersons, Message.NotificationClass.MDH);            
             this.RegisterTextboxChange(this.textBoxStowawaysJoiningLocation, Message.NotificationClass.MDH);
 
-            // 1.11
-            this.checkBoxCruiseShip.DataContext = _bpol;
-            this.dataGridPortOfItinerary.Initialize();
-            this.dataGridPortOfItinerary.ItemsSource = _bpol.PortOfItineraries;
-            this.dataGridPortOfItinerary.AddingNewItem += DataGridPortOfItinerary_AddingNewItem;
-            this.dataGridPortOfItinerary.EditRequested += DataGridPortOfItinerary_EditRequested;
-            this.dataGridPortOfItinerary.DeleteRequested += DataGridPortOfItinerary_DeleteRequested;
-            this.dataGridPortOfItinerary.CreateRequested += DataGridPortOfItinerary_CreateRequested;
+            // 1.11                        
+
+            this.RegisterCheckboxChange(this.checkBoxStowaways, Message.NotificationClass.BPOL);
+            this.RegisterCheckboxChange(this.checkBoxCruiseShip, Message.NotificationClass.BPOL);
 
         }        
 
         private void checkBoxKielCanalPassagePlanned_Checked(object sender, RoutedEventArgs e)
-        {
+        {            
             this.dateTimePickerKielCanalPassagePlannedIncomming.IsEnabled = this.checkBoxKielCanalPassagePlanned.IsChecked ?? false;
             this.dateTimePickerKielCanalPassagePlannedOutgoing.IsEnabled = this.checkBoxKielCanalPassagePlanned.IsChecked ?? false;
         }
@@ -277,6 +293,12 @@ namespace ENI2.SheetDisplayControls
             this.dataGridSanitaryMeasures.IsReadOnly = !(this.checkBoxSanitaryMeasuresApplied.IsChecked ?? false);
         }
 
+        private void CheckBoxCruiseShip_Checked(object sender, RoutedEventArgs e)
+        {
+            this.buttonImportPortOfItineraryFromSEC.IsEnabled = this.checkBoxCruiseShip.IsChecked ?? false;
+            this.dataGridPortOfItinerary.IsEnabled = this.checkBoxCruiseShip.IsChecked ?? false;
+        }
+
         private void buttonImportExcelLast10PortFacilities_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog ofd = new OpenFileDialog
@@ -1025,6 +1047,6 @@ namespace ENI2.SheetDisplayControls
         }
 
         #endregion
-                
+        
     }
 }

ENI2/SheetDisplayControls/WasteReceiptsControl.xaml

@@ -10,7 +10,7 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
              mc:Ignorable="d" 
-             d:DesignHeight="600" d:DesignWidth="800">
+             d:DesignHeight="1200" d:DesignWidth="800">
     <GroupBox Name="wasteReceiptsGroupBox" Header="{x:Static p:Resources.text13WasteReceipts}">
         <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
@@ -20,16 +20,16 @@
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36" />
-                    <RowDefinition Height="640" />
+                    <RowDefinition Height="1080" />
                 </Grid.RowDefinitions>
 
                 <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text131WasteReceipt}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"/>
                 <GroupBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Name="was_rcptGroupBox" Header="{x:Static p:Resources.textWasteReceipt}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="120" />
+                            <RowDefinition Height="240" />
                             <RowDefinition Height="28" />
-                            <RowDefinition Height="330*" />
+                            <RowDefinition Height=".9*" />
                         </Grid.RowDefinitions>
                         <enictrl:ENIDataGrid x:Name="dataGridWasteReceipt" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" SelectionMode="Single"
                                  AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="0" SelectionChanged="dataGridWasteReceipt_SelectionChanged">
@@ -71,6 +71,11 @@
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn-->
                                 <DataGridTextColumn Header="{x:Static p:Resources.textAmountWasteReceived_MTQ}" IsReadOnly="False" Width="0.15*">
+                                    <DataGridTextColumn.ElementStyle>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="HorizontalAlignment" Value="Center" />
+                                        </Style>
+                                    </DataGridTextColumn.ElementStyle>
                                     <DataGridTextColumn.Binding>
                                         <Binding Path="AmountWasteReceived_MTQ" Mode="TwoWay" StringFormat="N3" >
                                             <Binding.ValidationRules>

ENI2/SucheControl.xaml.cs

@@ -102,7 +102,8 @@ namespace ENI2
         private void ContextMenu_ContextMenuOpening(object sender, ContextMenuEventArgs e)
         {
             MessageCore selectedCore = this.dataGrid.SelectedItem as MessageCore;
-            cancelItem.Visibility = (this.AdminMode && (selectedCore.Cancelled ?? false)) ? Visibility.Visible : Visibility.Collapsed;
+            if(selectedCore != null)
+                cancelItem.Visibility = (this.AdminMode && (selectedCore.Cancelled ?? false)) ? Visibility.Visible : Visibility.Collapsed;
         }
 
         private void CancelItem_Click(object sender, RoutedEventArgs e)

ENI2/Themes/Generic.xaml

@@ -66,7 +66,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type enictrl:ClosableTabItem}">
+    <Style TargetType="{x:Type enictrl:ClosableTabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type enictrl:ClosableTabItem}">

ENI2/Util/EasyPeasyState.cs

@@ -0,0 +1,63 @@
+// Copyright (c) 2017- schick Informatik
+// Description: Helper class for customs data serialization
+//
+
+using bsmd.database.EasyPeasy;
+using System;
+using System.IO;
+using System.Xml.Serialization;
+
+namespace ENI2.Util
+{
+    public static class EasyPeasyState
+    {
+        private static readonly string Root = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "EasyPeasy");
+        private static readonly string StatePath = Path.Combine(Root, "state.xml");
+
+        public static ProofRequest LoadOrCreate()
+        {
+            try
+            {
+                if (File.Exists(StatePath))
+                {
+                    using (var fs = File.OpenRead(StatePath))
+                    {
+                        var ser = new XmlSerializer(typeof(ProofRequest));
+                        return (ProofRequest)ser.Deserialize(fs);
+                    }
+                }
+            }
+            catch { /* swallow & create new */ }
+
+            return CreateDefault();
+        }
+
+        public static void Save(ProofRequest data)
+        {
+            Directory.CreateDirectory(Root);
+            using (var fs = File.Create(StatePath))
+            {
+                var ser = new XmlSerializer(typeof(ProofRequest));
+                ser.Serialize(fs, data);
+            }
+        }
+
+        public static ProofRequest CreateDefault()
+        {
+            return new ProofRequest
+            {
+                ProofInformationT2LT2LF = new ProofInformationT2LT2LF
+                {
+                    RequestedValidityOfTheProof = new RequestedValidityOfTheProof(),
+                    GoodsShipmentForT2LT2LF = new GoodsShipmentForT2LT2LF
+                    {
+                        LocationOfGoods = new LocationOfGoods(),
+                        TransportDocuments = new TransportDocuments()
+                    }
+                }
+            };
+        }
+    }
+}

ENI2/Util/InverseBooleanConverter.cs

@@ -28,23 +28,32 @@ namespace ENI2.Util
         public object Convert(object value, Type targetType, object parameter,
             System.Globalization.CultureInfo culture)
         {
-            if (targetType != typeof(bool?))
-                throw new InvalidOperationException("The target must be a boolean");
+            
+            if (targetType == typeof(bool?))
+            {
+                if (!((bool?)value).HasValue) return null;
+                return !(bool?)value;
+            }
 
-            if (!((bool?)value).HasValue) return null;
+            if (targetType == typeof(bool))
+                return !(bool) value;
 
-            return !(bool?)value;
+            throw new InvalidOperationException("The target must be a boolean");            
         }
 
         public object ConvertBack(object value, Type targetType, object parameter,
             System.Globalization.CultureInfo culture)
         {
-            if (targetType != typeof(bool?))
-                throw new InvalidOperationException("The target must be a boolean");
+            if (targetType == typeof(bool?))
+            {
+                if (!((bool?)value).HasValue) return null;
+                return !(bool?)value;
+            }
 
-            if (!((bool?)value).HasValue) return null;
+            if(targetType == typeof(bool))
+                return !(bool)value;
 
-            return !(bool?)value;
+            throw new InvalidOperationException("The target must be a boolean");            
         }
 
         #endregion

ENI2/packages.config

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-Sample license text.
--->
 <packages>
-  <package id="ExcelDataReader" version="3.7.0" targetFramework="net48" />
-  <package id="Extended.Wpf.Toolkit" version="4.6.1" targetFramework="net48" />
-  <package id="log4net" version="3.0.3" targetFramework="net48" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="9.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging" version="9.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Options" version="9.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Primitives" version="9.0.1" targetFramework="net48" />
+  <package id="ExcelDataReader" version="3.8.0" targetFramework="net48" />
+  <package id="Extended.Wpf.Toolkit" version="5.0.0" targetFramework="net48" />
+  <package id="log4net" version="3.2.0" targetFramework="net48" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Bcl.Cryptography" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="9.0.9" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="9.0.9" targetFramework="net48" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net48" />
-  <package id="PDFsharp-MigraDoc-GDI" version="6.1.1" targetFramework="net48" />
+  <package id="PDFsharp" version="6.2.2" targetFramework="net48" />
+  <package id="PDFsharp-MigraDoc" version="6.2.2" targetFramework="net48" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net48" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
   <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.1" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.0" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net48" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.9" targetFramework="net48" />
+  <package id="System.Formats.Asn1" version="9.0.9" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Pkcs" version="9.0.9" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
 </packages>

SQL/SERV_template.sql

@@ -0,0 +1,25 @@
+PRINT N'Creating [dbo].[SERV_template]...';
+
+GO
+CREATE TABLE [dbo].[SERV_template] (
+    [Id]                    UNIQUEIDENTIFIER NOT NULL,
+    [ServiceName]           NVARCHAR (100)    NULL,
+	[ServiceBeneficiary]	NVARCHAR (256)	  NULL,
+    [ServiceInvoiceRecipient] NVARCHAR (256)	  NULL,
+    [Created]               DATETIME         NULL DEFAULT CURRENT_TIMESTAMP,
+    [Changed]               DATETIME         NULL,
+    PRIMARY KEY CLUSTERED ([Id] ASC)
+);
+
+GO
+
+CREATE TRIGGER SERV_template_Trigger_Change_Log
+ON
+	dbo.SERV_template
+	FOR UPDATE
+	AS
+		SET NOCOUNT ON
+		IF NOT UPDATE([Changed])
+		UPDATE SERV_template SET [Changed] = GETDATE() WHERE Id IN (SELECT Id FROM [inserted])
+
+GO

SendNSWMessageService/NSWSendService.cs

@@ -23,9 +23,7 @@ namespace SendNSWMessageService
             Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
             InitializeComponent();
 
-            System.Net.ServicePointManager.ServerCertificateValidationCallback += (object _, System.Security.Cryptography.X509Certificates.X509Certificate ____,
-                            System.Security.Cryptography.X509Certificates.X509Chain __,
-                            System.Net.Security.SslPolicyErrors ___) =>
+            System.Net.ServicePointManager.ServerCertificateValidationCallback += (_, ____, __, ___) =>
             {
                 return true; // **** Immer OK weil wir nur mit einem dedizierten Endpoint reden..
             };

SendNSWMessageService/SendNSWMessageService.csproj

@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

SendNSWMessageService/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.3" targetFramework="net48" />
+  <package id="log4net" version="3.2.0" targetFramework="net48" />
 </packages>

bsmd.LockingService/bsmd.LockingService.csproj

@@ -46,8 +46,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />

bsmd.LockingService/bsmd.LockingService.csproj.user

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-    <Use64BitIISExpress />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>

bsmd.LockingService/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.3" targetFramework="net48" />
+  <package id="log4net" version="3.2.0" targetFramework="net48" />
 </packages>

bsmd.Tool/App.config

@@ -1,36 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net"/>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="bsmd.Tool.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="bsmd.Tool.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
   <log4net>
     <root>
-      <level value="DEBUG"/>
-      <appender-ref ref="LogFileAppender"/>
+      <level value="DEBUG" />
+      <appender-ref ref="LogFileAppender" />
     </root>
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="log.bsmd.Tool.txt"/>
-      <param name="AppendToFile" value="true"/>
-      <rollingStyle value="Size"/>
-      <maxSizeRollBackups value="10"/>
-      <maximumFileSize value="10MB"/>
-      <staticLogFileName value="true"/>
+      <param name="File" value="log.bsmd.Tool.txt" />
+      <param name="AppendToFile" value="true" />
+      <rollingStyle value="Size" />
+      <maxSizeRollBackups value="10" />
+      <maximumFileSize value="10MB" />
+      <staticLogFileName value="true" />
       <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline"/>
+        <param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline" />
       </layout>
     </appender>
   </log4net>
   <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
-    <userSettings>
-        <bsmd.Tool.Properties.Settings>
-            <setting name="ConnectionString" serializeAs="String">
-                <value>replace me!</value>
-            </setting>
-        </bsmd.Tool.Properties.Settings>
-    </userSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <applicationSettings>
+    <bsmd.Tool.Properties.Settings>
+      <setting name="ConnectionString" serializeAs="String">
+        <value>replace me!</value>
+      </setting>
+      <setting name="EcholotOutputFolder" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="EcholotMaxThreads" serializeAs="String">
+        <value>4</value>
+      </setting>
+      <setting name="HISNORD_Folder" serializeAs="String">
+        <value>C:\temp\hisnord</value>
+      </setting>
+      <setting name="DBH_Folder" serializeAs="String">
+        <value>C:\temp\dbh</value>
+      </setting>
+    </bsmd.Tool.Properties.Settings>
+  </applicationSettings>
 </configuration>

bsmd.Tool/Echolot.cs

@@ -0,0 +1,224 @@
+// Copyright (c) 2020- schick Informatik
+// Description: The purpose of this tool is to evaluate files sent both through HIS-Nord and dbh
+// to evaluate how many classes were sent at what time and by whom to the purpose of improved employee
+// time planning 
+
+
+using ClosedXML.Excel;
+using log4net;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace bsmd.Tool
+{
+    internal static class Echolot
+    {
+
+        private static readonly ILog _log = LogManager.GetLogger(typeof(Echolot));
+
+        static readonly HashSet<string> ValidGroupingKeys = new HashSet<string>
+        {
+            "VISIT",
+            "TRANSIT",
+            "NOA_NOD",
+            "NOANOD",
+            "ATA",
+            "ATD",
+            "SEC",
+            "POBA",
+            "POBD",
+            "NAME",
+            "TIEFA",
+            "TIEFD",
+            "BKRA",
+            "BKRD",
+            "STAT",
+            "LADG",
+            "INFO",
+            "SERV",
+            "PRE72H",
+            "MDH",
+            "WAS",
+            "CREWA",
+            "PASA",
+            "BPOL",
+            "TOWA",
+            "TOWD",
+            "HAZA",
+            "HAZD",
+            "AGNT",
+            "STO",
+            "CREWD",
+            "PASD",
+            "WAS_RCPT"
+        };
+
+        static readonly HashSet<string> IgnoreGroupingKeys = new HashSet<string>
+        {
+            "VISIT",
+            "TRANSIT",
+            "ATA",
+            "ATD"
+        };
+
+        internal static void Evaluate(string outputFolder, int maxThreads)
+        {
+            DateTime executionTime = DateTime.Now;
+
+            #region first scan: dbh files
+
+            string inputFolder = Properties.Settings.Default.DBH_Folder;
+            var files = Directory.GetFiles(inputFolder, "*.xml");
+            var results = new ConcurrentBag<ResultRow>();
+
+            Parallel.ForEach(files, new ParallelOptions { MaxDegreeOfParallelism = maxThreads }, file =>
+            {
+                try
+                {
+                    var doc = XDocument.Load(file);
+
+                    // Look for a valid grouping key at the root level
+                    var groupingElem = doc.Root.Elements()
+                        .FirstOrDefault(x => ValidGroupingKeys.Contains(x.Name.LocalName) && !IgnoreGroupingKeys.Contains(x.Name.LocalName));
+
+                    if (groupingElem == null)
+                    {
+                        _log.InfoFormat("skipping {0}", file);
+                        return; // Skip file
+                    }
+                        
+                    var lastName = doc.Descendants("RPLastName").FirstOrDefault()?.Value?.Trim();
+                    var firstName = doc.Descendants("RPFirstName").FirstOrDefault()?.Value?.Trim();
+                    var timestampStr = doc.Descendants("Timestamp").FirstOrDefault()?.Value?.Trim();                                        
+
+                    DateTime timestamp = DateTime.Parse(timestampStr);
+
+                    results.Add(new ResultRow
+                    {
+                        FirstName = firstName,
+                        LastName = lastName,
+                        Timestamp = timestamp,
+                        WeekStart = GetWeekStart(timestamp, executionTime.DayOfWeek),
+                        Provider = "DBH"
+                    });
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex.ToString());
+                }
+            });
+
+            #endregion
+
+            #region second scan: his-nord files
+
+            var inputFolder2 = Properties.Settings.Default.HISNORD_Folder;
+            var files2 = Directory.GetFiles(inputFolder2, "*.xml");            
+
+            Parallel.ForEach(files2, new ParallelOptions { MaxDegreeOfParallelism = maxThreads }, file =>
+            {
+                try
+                {
+                    var doc = XDocument.Load(file);
+
+                    var match = Regex.Match(file, @"-([A-Z0-9_]+)\.xml$", RegexOptions.None);
+
+                    string key = "";
+                    if (match.Success)
+                    {
+                        key = match.Groups[1].Value;                        
+                    }
+                    
+                    if((key.Length == 0) || IgnoreGroupingKeys.Contains(key))
+                    {
+                        _log.InfoFormat("skipping {0}", file);
+                        return; // Skip file
+                    }                    
+
+                    var username = doc.Descendants("firstname").FirstOrDefault()?.Value?.Trim();
+                    if(username == null)
+                    {
+                        _log.WarnFormat("Username not found in file {0}", file);
+                        return;
+                    }
+                    var splitname = username.Split(' ');
+                    var lastName = splitname[1].Trim();
+                    var firstName = splitname[0].Trim();
+
+                    DateTime timestamp = File.GetCreationTime(file);
+
+                    results.Add(new ResultRow
+                    {
+                        FirstName = firstName,
+                        LastName = lastName,
+                        Timestamp = timestamp,
+                        WeekStart = GetWeekStart(timestamp, executionTime.DayOfWeek),
+                        Provider = "HIS-NORD"
+                    });
+                }
+                catch (Exception ex)
+                {
+                    _log.Error(ex.ToString());
+                }
+            });
+
+
+            #endregion
+
+            var grouped = results
+                .GroupBy(r => r.WeekStart)
+                .OrderBy(g => g.Key);
+            
+
+            // Write Excel
+            string excelFile = Path.Combine(outputFolder, $"echolot_{executionTime:yyyyMMdd_HHmmss}.xlsx");
+            using (var workbook = new XLWorkbook())
+            {
+                foreach (var weekGroup in grouped)
+                {
+                    var ws = workbook.Worksheets.Add(weekGroup.Key.ToString("yyyy-MM-dd"));
+                    ws.Cell(1, 1).Value = "Firstname";
+                    ws.Cell(1, 2).Value = "Lastname";
+                    ws.Cell(1, 3).Value = "Count";
+                    int row = 2;
+
+                    var orderedGroups = weekGroup
+                        .GroupBy(x => new { x.FirstName, x.LastName })
+                        .OrderByDescending(g => g.Count()); // Use OrderBy for ascending
+
+
+                    foreach (var nameGroup in orderedGroups)
+                    {
+                        ws.Cell(row, 1).Value = nameGroup.Key.FirstName;
+                        ws.Cell(row, 2).Value = nameGroup.Key.LastName;
+                        ws.Cell(row, 3).Value = nameGroup.Count();
+                        row++;
+                    }
+                }
+                workbook.SaveAs(excelFile);
+            }
+        }
+
+        static DateTime GetWeekStart(DateTime date, DayOfWeek weekStart)
+        {
+            int diff = (7 + (date.DayOfWeek - weekStart)) % 7;
+            return date.Date.AddDays(-1 * diff);
+        }
+
+        class ResultRow
+        {
+            public string FirstName { get; set; }
+            public string LastName { get; set; }
+            public DateTime Timestamp { get; set; }
+            public DateTime WeekStart { get; set; }
+            public string Provider {  get; set; }
+        }
+
+    }
+}

bsmd.Tool/Options.cs

@@ -25,6 +25,18 @@ namespace bsmd.Tool
         [Option("locodes", HelpText = "use this flag if you want to import locodes")]
         public bool ImportLocodes { get; set; }
 
+        [Option("echolot", HelpText = "use this flag to run the echolot output file evaluation")]
+        public bool Echolot { get; set; }
+
+        [Option('i', "input_folder", HelpText = "Input folder")]
+        public string InputFolder { get; set; }
+
+        [Option('o', "output_folder", HelpText = "Output folder")]
+        public string OutputFolder { get; set; }
+
+        [Option("max_threads", HelpText = "Maximum amount of parallelism for folder parsing")]
+        public int? MaxThreads { get; set; }
+
         [Option('s', "staledays", Default = 30, HelpText ="Delete files older than X days")]
         public int StaleDays { get; set; }
 

bsmd.Tool/Program.cs

@@ -1,4 +1,5 @@
-using CommandLine;
+using bsmd.database;
+using CommandLine;
 using log4net;
 using System;
 
@@ -40,15 +41,24 @@ namespace bsmd.Tool
                             LocodeSQliteImport.Import(o.LocodeDB, o.LocodeCSV);
                         }
                     }
+                    if(o.Echolot)
+                    {                        
+                        string outputFolder = Properties.Settings.Default.EcholotOutputFolder;
+                        if (!o.OutputFolder.IsNullOrEmpty())
+                            outputFolder = o.OutputFolder;
+                        int maxThreads = 2;
+                        if (o.MaxThreads.HasValue) maxThreads = o.MaxThreads.Value;
+                        Echolot.Evaluate(outputFolder, maxThreads);
+                    }
       
                 });
             }
             catch (Exception ex)
             {
                 log.Fatal(ex.ToString());
+                Console.WriteLine(ex.Message);
                 result = 1;
-            }
-            Console.Read();
+            }            
             return result;
         }
     }

bsmd.Tool/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace bsmd.Tool.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -23,15 +23,48 @@ namespace bsmd.Tool.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("replace me!")]
         public string ConnectionString {
             get {
                 return ((string)(this["ConnectionString"]));
             }
-            set {
-                this["ConnectionString"] = value;
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string EcholotOutputFolder {
+            get {
+                return ((string)(this["EcholotOutputFolder"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("4")]
+        public int EcholotMaxThreads {
+            get {
+                return ((int)(this["EcholotMaxThreads"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\temp\\hisnord")]
+        public string HISNORD_Folder {
+            get {
+                return ((string)(this["HISNORD_Folder"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\temp\\dbh")]
+        public string DBH_Folder {
+            get {
+                return ((string)(this["DBH_Folder"]));
             }
         }
     }

bsmd.Tool/Properties/Settings.settings

@@ -2,8 +2,20 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="bsmd.Tool.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="ConnectionString" Type="System.String" Scope="User">
+    <Setting Name="ConnectionString" Type="System.String" Scope="Application">
       <Value Profile="(Default)">replace me!</Value>
     </Setting>
+    <Setting Name="EcholotOutputFolder" Type="System.String" Scope="Application">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="EcholotMaxThreads" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">4</Value>
+    </Setting>
+    <Setting Name="HISNORD_Folder" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">C:\temp\hisnord</Value>
+    </Setting>
+    <Setting Name="DBH_Folder" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">C:\temp\dbh</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

bsmd.Tool/bsmd.Tool.csproj

@@ -44,25 +44,62 @@
     <Reference Include="bsmd.database">
       <HintPath>..\bsmd.database\bin\Debug\bsmd.database.dll</HintPath>
     </Reference>
+    <Reference Include="ClosedXML, Version=0.105.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClosedXML.0.105.0\lib\netstandard2.0\ClosedXML.dll</HintPath>
+    </Reference>
+    <Reference Include="ClosedXML.Parser, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d5f7376574c51ec, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClosedXML.Parser.2.0.0\lib\netstandard2.0\ClosedXML.Parser.dll</HintPath>
+    </Reference>
     <Reference Include="CommandLine, Version=2.9.1.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.1.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.1.1\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.1.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.1.1\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=3.1.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.1.0\lib\net462\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+    </Reference>
+    <Reference Include="RBush, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c77e27b81f4d0187, processorArchitecture=MSIL">
+      <HintPath>..\packages\RBush.Signed.4.0.0\lib\net47\RBush.dll</HintPath>
+    </Reference>
+    <Reference Include="SixLabors.Fonts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
+      <HintPath>..\packages\SixLabors.Fonts.1.0.0\lib\netstandard2.0\SixLabors.Fonts.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <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.117.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\bsmd.database\Properties\AssemblyProductInfo.cs">
@@ -76,6 +113,7 @@
     </Compile>
     <Compile Include="CheckRules.cs" />
     <Compile Include="CleanupFiles.cs" />
+    <Compile Include="Echolot.cs" />
     <Compile Include="LocodeSQliteImport.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
@@ -89,6 +127,7 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="..\bsmdKey.snk" />
+    <None Include="bsmd.Tool.licenseheader" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -96,12 +135,12 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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')" />
+  <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')" />
   <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.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\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'))" />
   </Target>
   <!-- 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.

bsmd.Tool/bsmd.Tool.csproj.user

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>--locodes --csv="C:\svn_lager\bsmd\nsw\Archiv\2022-2.UNLOCODE.all.csv" --db "C:\git_lager\git_bsmd\misc\db.sqlite"</StartArguments>
+    <StartArguments>--echolot --output_folder="C:\temp"</StartArguments>
   </PropertyGroup>
 </Project>

bsmd.Tool/bsmd.Tool.licenseheader

@@ -0,0 +1,14 @@
+extensions: designer.cs generated.cs
+extensions: .cs .cpp .h
+// Copyright (c) 2020- schick Informatik
+// Description:
+//
+
+extensions: .aspx .ascx
+<%-- 
+Copyright (c) 2020- schick Informatik
+--%>
+extensions:  .xml .config .xsd
+<!--
+Copyright (c) 2020- schick Informatik
+-->

bsmd.Tool/packages.config

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="ClosedXML" version="0.105.0" targetFramework="net48" />
+  <package id="ClosedXML.Parser" version="2.0.0" targetFramework="net48" />
   <package id="CommandLineParser" version="2.9.1" targetFramework="net48" />
-  <package id="log4net" version="2.0.15" targetFramework="net48" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.117.0" targetFramework="net48" />
-  <package id="System.Data.SQLite.Core" version="1.0.117.0" targetFramework="net48" />
+  <package id="DocumentFormat.OpenXml" version="3.1.1" targetFramework="net48" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.1.1" targetFramework="net48" />
+  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
+  <package id="log4net" version="3.1.0" targetFramework="net48" />
+  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net48" />
+  <package id="RBush.Signed" version="4.0.0" targetFramework="net48" />
+  <package id="SixLabors.Fonts" version="1.0.0" targetFramework="net48" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net48" />
 </packages>

bsmd.dakosy/bsmd.dakosy.csproj

@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -52,8 +52,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WinSCPnet, Version=1.15.0.15073, Culture=neutral, PublicKeyToken=2271ec4a3c56d0bf, processorArchitecture=MSIL">
-      <HintPath>..\packages\WinSCP.6.3.6\lib\net40\WinSCPnet.dll</HintPath>
+    <Reference Include="WinSCPnet, Version=1.16.0.16364, Culture=neutral, PublicKeyToken=2271ec4a3c56d0bf, processorArchitecture=MSIL">
+      <HintPath>..\packages\WinSCP.6.5.3\lib\net40\WinSCPnet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -93,12 +93,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\WinSCP.6.3.6\build\WinSCP.targets" Condition="Exists('..\packages\WinSCP.6.3.6\build\WinSCP.targets')" />
+  <Import Project="..\packages\WinSCP.6.5.3\build\WinSCP.targets" Condition="Exists('..\packages\WinSCP.6.5.3\build\WinSCP.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\WinSCP.6.3.6\build\WinSCP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinSCP.6.3.6\build\WinSCP.targets'))" />
+    <Error Condition="!Exists('..\packages\WinSCP.6.5.3\build\WinSCP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinSCP.6.5.3\build\WinSCP.targets'))" />
   </Target>
   <!-- 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.

bsmd.dakosy/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.3" targetFramework="net48" />
-  <package id="WinSCP" version="6.3.6" targetFramework="net48" />
+  <package id="log4net" version="3.2.0" targetFramework="net48" />
+  <package id="WinSCP" version="6.5.3" targetFramework="net48" />
 </packages>

bsmd.database/AGNT_Template.cs

@@ -5,8 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
-using System.Runtime.Serialization;
-
 
 namespace bsmd.database
 {
@@ -56,6 +54,9 @@ namespace bsmd.database
         [MaxLength(99)]
         public string AgentEMail { get; set; }
 
+        [MaxLength(99)]
+        public string WasteDisposalServiceProviderName { get; set; }
+
         #endregion
 
         #region DatabaseEntity implementation
@@ -86,6 +87,8 @@ namespace bsmd.database
             else scmd.Parameters.AddWithValue("@P10", DBNull.Value);
             if (this.AgentEMail != null) scmd.Parameters.AddWithValue("@P11", this.AgentEMail);
             else scmd.Parameters.AddWithValue("@P11", DBNull.Value);
+            if (this.WasteDisposalServiceProviderName != null) scmd.Parameters.AddWithValue("@P12", this.WasteDisposalServiceProviderName);
+            else scmd.Parameters.AddWithValue("@P12", DBNull.Value);
 
             if (this.IsNew)
             {
@@ -93,13 +96,13 @@ namespace bsmd.database
                 scmd.Parameters.AddWithValue("@ID", this.Id);
                 cmd.CommandText = string.Format("INSERT INTO {0} (Id, Title, AgentCompanyName, AgentStreetAndNumber, " +
                     "AgentPostalCode, AgentCity, AgentCountry, AgentLastName, AgentFirstName, AgentPhone, AgentFax, " +
-                    "AgentEMail) VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11)", this.Tablename);
+                    "AgentEMail, WasteDisposalServiceProviderName) VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12)", this.Tablename);
             }
             else
             {
                 cmd.CommandText = string.Format("UPDATE {0} SET Title = @P1, AgentCompanyName = @P2, AgentStreetAndNumber = @P3, AgentPostalCode = @P4, AgentCity = @P5, " +
                     "AgentCountry = @P6, AgentLastName = @P7, AgentFirstName = @P8, AgentPhone = @P9, AgentFax = @P10, " +
-                    "AgentEMail = @P11 WHERE Id = @ID", this.Tablename);
+                    "AgentEMail = @P11, WasteDisposalServiceProviderName = @P12 WHERE Id = @ID", this.Tablename);
                 scmd.Parameters.AddWithValue("@ID", this.Id);
             }
         }
@@ -107,7 +110,7 @@ namespace bsmd.database
         public override void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
         {
             string query = string.Format("SELECT Id, Title, AgentCompanyName, AgentStreetAndNumber, AgentPostalCode, AgentCity, AgentCountry, " +
-                "AgentLastName, AgentFirstName, AgentPhone, AgentFax, AgentEMail FROM {0} ", this.Tablename);
+                "AgentLastName, AgentFirstName, AgentPhone, AgentFax, AgentEMail, WasteDisposalServiceProviderName FROM {0} ", this.Tablename);
 
             switch (filter)
             {                
@@ -138,6 +141,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(9)) agnt_t.AgentPhone = reader.GetString(9);
                 if (!reader.IsDBNull(10)) agnt_t.AgentFax = reader.GetString(10);
                 if (!reader.IsDBNull(11)) agnt_t.AgentEMail = reader.GetString(11);
+                if (!reader.IsDBNull(12)) agnt_t.WasteDisposalServiceProviderName = reader.GetString(12);
 
                 result.Add(agnt_t);
             }
@@ -172,6 +176,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(9)) agnt_t.AgentPhone = reader.GetString(9);
                 if (!reader.IsDBNull(10)) agnt_t.AgentFax = reader.GetString(10);
                 if (!reader.IsDBNull(11)) agnt_t.AgentEMail = reader.GetString(11);
+                if (!reader.IsDBNull(12)) agnt_t.WasteDisposalServiceProviderName = reader.GetString(12);
             }
             return agnt_t;
         }

bsmd.database/CREW.cs

@@ -43,12 +43,11 @@ namespace bsmd.database
         public string CrewMemberFirstName { get; set; }
 
         [ShowReport]
-        [ReportDisplayName("Place of birth")]        
+        [ReportDisplayName("Place of birth")]
         [MaxLength(100)]
         [ENI2Validation]
         public string CrewMemberPlaceOfBirth { get; set; }
-
-        [Validation(ValidationCode.FLAG_CODE)]
+        
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberCountryOfBirth { get; set; }
@@ -82,7 +81,7 @@ namespace bsmd.database
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberNationality { get; set; }
-        
+
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
         public byte? CrewMemberIdentityDocumentType { get; set; }
@@ -121,7 +120,7 @@ namespace bsmd.database
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberIdentityDocumentIssuingState { get; set; }
-        
+
         [Validation(ValidationCode.PAST_DATE)]
         [ENI2Validation]
         public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }
@@ -138,8 +137,8 @@ namespace bsmd.database
             }
         }
 
-        [ENI2Validation]
-        [MaxLength(256)]
+        //[ENI2Validation]
+        //[MaxLength(256)]
         public string Effects { get; set; }
 
         [ENI2Validation]
@@ -324,12 +323,12 @@ namespace bsmd.database
             }
 
             if (this.CrewMemberDateOfBirth.HasValue && (this.CrewMemberDateOfBirth.Value > DateTime.Today))
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Date of birth is in the future", null, this.Title, this.Identifier, this.IsDeparture ? "CREWD" : "CREWA"));            
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Date of birth is in the future", null, this.Title, this.Identifier, this.IsDeparture ? "CREWD" : "CREWA"));
 
             if (this.CrewMemberDateOfBirth.HasValue && (this.CrewMemberDateOfBirth.Value <= CLAMPMINDATE))
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check date of birth", null, this.Title, this.Identifier, this.IsDeparture ? "CREWD" : "CREWA"));
 
-            // NSW 7.2 rules            
+            // NSW 7.2 rules
 
             if((this.NotificationSchengen ?? false) && (!this.HasSchengenDetails))
             {
@@ -382,14 +381,14 @@ namespace bsmd.database
                 row[5] = crew.CrewMemberGender ?? (object)DBNull.Value;
                 if (crew.CrewMemberNationality?.Length == 2)
                     row[6] = crew.CrewMemberNationality;
-                else 
+                else
                     row[6] = DBNull.Value;
                 row[7] = crew.CrewMemberIdentityDocumentType ?? (object)DBNull.Value;
                 row[8] = crew.CrewMemberIdentityDocumentId ?? (object)DBNull.Value;
                 row[9] = crew.CrewMemberVisaNumber ?? (object)DBNull.Value;
                 row[10] = crew.CrewMemberDuty ?? (object)DBNull.Value;
                 row[11] = crew.Identifier ?? (object)DBNull.Value;
-                row[12] = crew.IsDeparture;                
+                row[12] = crew.IsDeparture;
                 if (crew.CrewMemberIdentityDocumentIssuingState?.Length == 2)
                     row[13] = crew.CrewMemberIdentityDocumentIssuingState;
                 else
@@ -448,7 +447,7 @@ namespace bsmd.database
             this.CrewMemberIdentityDocumentType = crew.CrewMemberIdentityDocumentType;
             this.CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId;
             this.CrewMemberVisaNumber = crew.CrewMemberVisaNumber;
-            this.CrewMemberDuty = crew.CrewMemberDuty;            
+            this.CrewMemberDuty = crew.CrewMemberDuty;
             this.CrewMemberIdentityDocumentIssuingState = crew.CrewMemberIdentityDocumentIssuingState;
             this.CrewMemberIdentityDocumentExpiryDate = crew.CrewMemberIdentityDocumentExpiryDate;
             this.Effects = crew.Effects;
@@ -462,7 +461,7 @@ namespace bsmd.database
 
         public static CREW CreateCommon(List<CREW> crewList)
         {
-            CREW crew = new CREW(); // template entity            
+            CREW crew = new CREW(); // template entity
 
             if(crewList.IsNullOrEmpty())
                 return crew;

bsmd.database/DBManagerAsync.cs

@@ -112,7 +112,17 @@ namespace bsmd.database
             return (await at.LoadListAsync(reader)).ConvertAll(x => (AGNT_Template)x);            
         }
 
-        public static async Task<List<WasteDisposalServiceProvider_Template>> GetWastDisposalServiceProviderTemplatesAsync()
+        public static async Task<List<SERV_Template>> GetSERVTemplatesAsync()
+        {
+            SqlCommand cmd = new SqlCommand();
+            SERV_Template st = new SERV_Template();
+            st.PrepareLoadCommand(cmd, Message.LoadFilter.ALL);
+            SqlDataReader reader = await PerformCommandAsync(cmd);
+            return (await st.LoadListAsync(reader)).ConvertAll(x => (SERV_Template)x);
+        }
+
+
+        public static async Task<List<WasteDisposalServiceProvider_Template>> GetWasteDisposalServiceProviderTemplatesAsync()
         {
             SqlCommand cmd = new SqlCommand();
             WasteDisposalServiceProvider_Template wdsp_t = new WasteDisposalServiceProvider_Template();

bsmd.database/EasyPeasy.cs

@@ -0,0 +1,92 @@
+// Copyright (c) 2024-present schick Informatik
+// Description: Collection of classes for the customs XML upload app
+
+using System;
+using System.Collections.ObjectModel;
+using System.Xml.Serialization;
+
+namespace bsmd.database.EasyPeasy
+{
+    // Root: <proofRequest>
+    [XmlRoot("proofRequest")]
+    public class ProofRequest
+    {
+        public string DelegateIdentificationType { get; set; }
+        public string TraderIdentificationType { get; set; }
+        public string LRN { get; set; }
+        public string TraderIdentificationNumber { get; set; }
+        public string Country { get; set; }
+
+        public ProofInformationT2LT2LF ProofInformationT2LT2LF { get; set; }
+
+        public string DelegateIdentificationNumber { get; set; }
+    }
+
+    public class ProofInformationT2LT2LF
+    {
+        public string CompetentCustomsOffice { get; set; }
+        public string DeclarationType { get; set; }
+        public DateTime DeclarationDate { get; set; }
+        public decimal TotalGrossMassKg { get; set; }
+        public RequestedValidityOfTheProof RequestedValidityOfTheProof { get; set; }
+        public GoodsShipmentForT2LT2LF GoodsShipmentForT2LT2LF { get; set; }
+        public string RequestType { get; set; }
+    }
+
+    public class RequestedValidityOfTheProof
+    {
+        public int NumberOfDays { get; set; }
+    }
+
+    public class GoodsShipmentForT2LT2LF
+    {
+        public bool ContainerIndication { get; set; }
+        public LocationOfGoods LocationOfGoods { get; set; }
+
+        [XmlElement("GoodsItemsForT2LT2LF")]
+        public ObservableCollection<GoodsItemForT2LT2LF> GoodsItemsForT2LT2LF { get; set; } = new ObservableCollection<GoodsItemForT2LT2LF>();
+
+        public TransportDocuments TransportDocuments { get; set; }
+    }
+
+    public class LocationOfGoods
+    {
+        public string TypeOfLocation { get; set; }
+        public string QualifierOfIdentification { get; set; }
+        public string UNLocode { get; set; }
+    }
+
+    public class GoodsItemForT2LT2LF
+    {
+        public Commodity Commodity { get; set; } = new Commodity();
+        public int GoodsItemNumber { get; set; }
+        public string DescriptionOfGoods { get; set; }
+        public GoodsMeasure GoodsMeasure { get; set; } = new GoodsMeasure();
+        public Packaging Packaging { get; set; } = new Packaging();
+    }
+
+    public class Commodity
+    {
+        public string HarmonizedSystemSubHeadingCode { get; set; }
+    }
+
+    public class GoodsMeasure
+    {
+        public decimal GrossMass { get; set; }
+        public decimal NetMass { get; set; }
+    }
+
+    public class Packaging
+    {
+        public string ShippingMarks { get; set; }
+        public int NumberOfPackages { get; set; }
+        public string TypeOfPackages { get; set; }
+    }
+
+    public class TransportDocuments
+    {
+        public string Type { get; set; }
+        public string ReferenceNumber { get; set; }
+    }
+
+}

bsmd.database/HAZ.cs

@@ -25,14 +25,14 @@ namespace bsmd.database
         { }
 
         #region Properties
-        
+
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
-        public bool? NoDPGOnBoardOnArrival { get; set; }
+        public bool? NoDPGOnBoardOnArrival { get; set; } = true;
 
         [ShowReport]
         [ENI2Validation]
-        public bool? DPGManifestOnBoardOnArrival { get; set; }
+        public bool? DPGManifestOnBoardOnArrival { get; set; } = false;
 
         [ShowReport]
         [ENI2Validation]
@@ -40,7 +40,7 @@ namespace bsmd.database
 
         [ShowReport]
         [ENI2Validation]
-        public bool? MOUBaltic { get; set; }
+        public bool? MOUBaltic { get; set; } = false;
         
         [ENI2Validation]
         public bool? DPGClassificationIMDG { get; set; }

bsmd.database/HAZPosTemplate.cs

@@ -35,7 +35,7 @@ namespace bsmd.database
 
         public byte? Flashpoint { get; set; }
 
-        public bool? SpecRef15_19 { get; set; }
+        public bool? SpecRef15_19 { get; set; } = false;
 
         public bool? MHB { get; set; }
 
@@ -68,7 +68,10 @@ namespace bsmd.database
 
             while(reader.Read())
             {
-                if (reader.IsDBNull(4)) continue; // this row has no type -> ignore
+                string type = "";
+                if (!reader.IsDBNull(4))
+                    type = reader.GetString(4);
+
                 HAZPosTemplate hpt = new HAZPosTemplate();
                 hpt.Description = reader.GetString(0);
                 if (!reader.IsDBNull(1))
@@ -81,8 +84,7 @@ namespace bsmd.database
                     if (specRefString.Equals("JA", StringComparison.OrdinalIgnoreCase) || specRefString.Equals("Yes", StringComparison.OrdinalIgnoreCase)) hpt.SpecRef15_19 = true;
                     if (specRefString.Equals("NEIN", StringComparison.OrdinalIgnoreCase) || specRefString.Equals("No", StringComparison.OrdinalIgnoreCase)) hpt.SpecRef15_19 = false;
                 }
-
-                string type = reader.GetString(4);
+                
                 switch(type)
                 {
                     case "IBC": hpt.TemplateType = SublistType.IBC; break;
@@ -90,7 +92,7 @@ namespace bsmd.database
                     case "IMSBC": hpt.TemplateType = SublistType.IMSBC ; break;
                     case "MARPOL": hpt.TemplateType = SublistType.MARPOL; break;
                     default:
-                        continue; // ignore this thing
+                        break;
                 }
 
                 if(!reader.IsDBNull(5))

bsmd.database/IBCPosition.cs

@@ -155,7 +155,7 @@ namespace bsmd.database
 
         [ShowReport]
         [ENI2Validation]
-        public bool? SpecRef15_19 { get; set; }
+        public bool? SpecRef15_19 { get; set; } = false;
 
         [ShowReport]
         [MaxLength(255)]
@@ -266,6 +266,10 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
+
+            if(this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
             if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value == 2) &&
             this.Flashpoint_CEL.IsNullOrEmpty())
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.V804, "Flashpoint_CEL", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));

bsmd.database/IGCPosition.cs

@@ -201,6 +201,9 @@ namespace bsmd.database
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
 
+            if(this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
             if (!this.UNNumber.IsNullOrEmpty() && !unNumberRegex.IsMatch(this.UNNumber))
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "UNNumber", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
 

bsmd.database/IMDGPosition.cs

@@ -114,7 +114,7 @@ namespace bsmd.database
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
-        public bool? MarinePollutant { get; set; }
+        public bool? MarinePollutant { get; set; } = false;
 
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
@@ -130,12 +130,12 @@ namespace bsmd.database
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
-        public bool? LimitedQuantities { get; set; }
+        public bool? LimitedQuantities { get; set; } = false;
 
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
-        public bool? ExceptedQuantities { get; set; }
+        public bool? ExceptedQuantities { get; set; } = false;
 
         [ShowReport]
         [ENI2Validation]
@@ -154,7 +154,7 @@ namespace bsmd.database
 
         [ShowReport]
         [ENI2Validation]
-        public bool? GeneralCargoIBC { get; set; }
+        public bool? GeneralCargoIBC { get; set; } = false;
 
         [ShowReport]
         [MaxLength(24)]
@@ -499,7 +499,7 @@ namespace bsmd.database
             if((this.NetQuantity_KGM >= 1000000000) ||
                 (this.GrossQuantity_KGM >= 1000000000) ||
                 (this.Volume_MTQ >= 1000000000))
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.V809, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
 
 
             foreach (SubsidiaryRisks sr in this.SubsidiaryRiskList)

bsmd.database/IMSBCPosition.cs

@@ -58,7 +58,7 @@ namespace bsmd.database
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
-        public bool? MHB { get; set; }
+        public bool? MHB { get; set; } = false;
 
         [ShowReport]
         [MaxLength(4)]
@@ -235,7 +235,10 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
-            if(!MHB ?? false)
+            if(this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
+            if (!MHB ?? false)
             {
                 if(this.UNNumber.IsNullOrEmpty())
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V803, "UNNumber", this.UNNumber, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));