Version bump

ENI2/App.config

@@ -85,7 +85,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -121,7 +121,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.9" newVersion="9.0.0.9" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.7" newVersion="9.0.0.7" />
       </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/EasyPeasyControl.xaml

@@ -5,7 +5,7 @@
              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">
+             d:DesignHeight="650" d:DesignWidth="800" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded">
 
 
     <DockPanel>
@@ -21,63 +21,62 @@
         <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"/>
+                <UniformGrid Columns="4" Rows="3" Margin="0,0,0,12">
+                    <TextBlock Text="DelegateIdentificationType" />
+                    <TextBox Text="{Binding DelegateIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                    <TextBlock Text="TraderIdentificationType" />
+                    <TextBox Text="{Binding TraderIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
 
-                    <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="LRN" />
+                    <TextBox Text="{Binding LRN, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                    <TextBlock Text="TraderIdentificationNumber" />
+                    <TextBox Text="{Binding TraderIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
 
-                    <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"/>
+                    <TextBlock Text="Country" />
+                    <TextBox Text="{Binding Country, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                    <TextBlock Text="DelegateIdentificationNumber" />
+                    <TextBox Text="{Binding DelegateIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
                 </UniformGrid>
 
                 <!-- ProofInformation -->
-                <GroupBox Header="Kennung des Antrags auf Nachweis TZ2L(F)">
+                <GroupBox Header="ProofInformationT2LT2LF">
                     <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"/>
+                        <UniformGrid Columns="4" Rows="4" Margin="0,0,0,12">
+                            <TextBlock Text="CompetentCustomsOffice"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.CompetentCustomsOffice, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                            <TextBlock Text="DeclarationType"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
 
-                            <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 Text="DeclarationDate (yyyy-MM-ddTHH:mm:ss)"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationDate, StringFormat={}{0:yyyy-MM-ddTHH:mm:ss}, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                            <TextBlock Text="TotalGrossMassKg"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.TotalGrossMassKg, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
 
-                            <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"/>
+                            <TextBlock Text="RequestedValidityOfTheProof.NumberOfDays"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                            <TextBlock Text="RequestType"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
                         </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"/>
+                        <GroupBox Header="LocationOfGoods">
+                            <UniformGrid Columns="6" Margin="8">
+                                <TextBlock Text="TypeOfLocation"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.TypeOfLocation}" Margin="2" />
+                                <TextBlock Text="QualifierOfIdentification"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.QualifierOfIdentification}" Margin="2" />
+                                <TextBlock Text="UNLocode"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.UNLocode}" Margin="2" />
                             </UniformGrid>
                         </GroupBox>
 
-                        <CheckBox Content="In Containern beförderte Waren" Margin="8"
+                        <CheckBox Content="ContainerIndication"
                                   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"/>
+                        <TextBlock Text="GoodsItemsForT2LT2LF (Paste tab/CSV with columns: HS, Item#, Description, Gross, Net, Pkgs, Type, Marks)" Margin="0,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">
+                                  AutoGenerateColumns="False" CanUserAddRows="True"
+                                  PreviewKeyDown="DataGrid_PreviewKeyDown" >
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="HS Code" Binding="{Binding Commodity.HarmonizedSystemSubHeadingCode}"/>
                                 <DataGridTextColumn Header="Item #" Binding="{Binding GoodsItemNumber}"/>
@@ -90,12 +89,12 @@
                             </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" />
+                        <GroupBox Header="TransportDocuments" Margin="0,12,0,0">
+                            <UniformGrid Columns="4" Margin="8">
+                                <TextBlock Text="Type"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.Type}" Margin="2" />
+                                <TextBlock Text="ReferenceNumber"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.ReferenceNumber}" Margin="2" />
                             </UniformGrid>
                         </GroupBox>
                     </StackPanel>

ENI2/Controls/EasyPeasyControl.xaml.cs

@@ -4,20 +4,23 @@
 
 using bsmd.database.EasyPeasy;
 using ENI2.Util;
+using Microsoft.Office.Interop.Excel;
 using Microsoft.Win32;
 using System;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Globalization;
+using System.Collections.Generic;
 using System.IO;
 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 System.Xml;
 using System.Xml.Serialization;
 
@@ -31,94 +34,28 @@ namespace ENI2.Controls
 
         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()
+        private void DataGrid_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            try
+            if (e.Key == Key.V && (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
             {
-                EasyPeasyState.Save(_vm);
+                if (Clipboard.ContainsText())
+                {
+                    var text = Clipboard.GetText();
+                    PasteGoodsItems(text);
+                    e.Handled = true;
+                }
             }
-            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._vm = EasyPeasyState.CreateDefault();
             this.DataContext = this._vm;
-            SetupAutoCalculation();
         }
 
         private void buttonExport_Click(object sender, RoutedEventArgs e)
@@ -161,38 +98,6 @@ namespace ENI2.Controls
             }
         }
 
-        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();
@@ -204,16 +109,11 @@ namespace ENI2.Controls
                     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);
@@ -221,112 +121,6 @@ namespace ENI2.Controls
             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;
@@ -350,7 +144,7 @@ namespace ENI2.Controls
                 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();                
+                if (cells.Length > 7) item.Packaging.ShippingMarks = cells[7].Trim();
 
                 _vm.ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF.Add(item);
             }
@@ -379,127 +173,23 @@ namespace ENI2.Controls
             return res.ToArray();
         }
 
-        private bool TryPaste_EspHsPkgsGross(string text)
+        private void buttonImport_Click(object sender, RoutedEventArgs e)
         {
-            if (_vm?.ProofInformationT2LT2LF?.GoodsShipmentForT2LT2LF == null) return false;
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.Filter = "XML file|*.xml";
+            ofd.RestoreDirectory = true;
+            ofd.Multiselect = 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)
+            if (ofd.ShowDialog() == true)
             {
-                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)
+                using (var fs = File.OpenRead(ofd.FileName))
                 {
-                    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);
+                    var ser = new XmlSerializer(typeof(ProofRequest));
+                    _vm = (ProofRequest)ser.Deserialize(fs);
+                    this.DataContext = _vm;
                 }
-                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/DetailRootControl.xaml.cs

@@ -226,7 +226,6 @@ 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))
@@ -528,14 +527,9 @@ namespace ENI2
             {
                 if ((message.Status == Message.MessageStatus.ACCEPTED) &&
                     ((message.InternalStatus == Message.BSMDStatus.CONFIRMED) || (message.InternalStatus == Message.BSMDStatus.VIOLATION)))
-                {
                     message.InternalStatus = Message.BSMDStatus.UPDATED;
-                    message.Status = null; // reset send status
-                }
                 else
-                {
                     message.InternalStatus = Message.BSMDStatus.SAVED;
-                }
 
                 string userName = "?";
                 if(App.UserId.HasValue && DBManager.Instance.GetReportingPartyDict().ContainsKey(App.UserId.Value))
@@ -805,15 +799,9 @@ namespace ENI2
                 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;
-                }
+                    aMessage.ViolationCount = null;                    
 
                 string messageGroup = this.MessageGroupForMessage(aMessage);
 

ENI2/DetailViewControls/OverViewDetailControl.xaml

@@ -252,24 +252,6 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                         </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>
@@ -285,7 +267,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
 
-                            <DataGridTextColumn Header="{x:Static p:Resources.textNotificationClass}" Binding="{Binding MessageNotificationClassDisplay}" IsReadOnly="True" Width="0.1*" FontWeight="Bold">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textNotificationClass}" Binding="{Binding MessageNotificationClassDisplay}" IsReadOnly="True" Width="0.075*" FontWeight="Bold">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -318,7 +300,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
 
-                            <DataGridTextColumn Header="{x:Static p:Resources.textErrors}" IsReadOnly="True" Width="0.06*" Binding="{Binding ErrorCount}">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textErrors}" IsReadOnly="True" Width="0.1*" Binding="{Binding ErrorCount}">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -328,7 +310,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
 
-                            <DataGridTextColumn Header="{x:Static p:Resources.textViolations}" IsReadOnly="True" Width="0.06*" Binding="{Binding ViolationCount}">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textViolations}" IsReadOnly="True" Width="0.1*" Binding="{Binding ViolationCount}">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -338,7 +320,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
 
-                            <DataGridTextColumn Header="HIS" Binding="{Binding HISOverviewDisplay}" IsReadOnly="True" Width="0.06*">
+                            <DataGridTextColumn Header="HIS" Binding="{Binding HISOverviewDisplay}" IsReadOnly="True" Width="0.1*">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>

ENI2/DetailViewControls/OverViewDetailControl.xaml.cs

@@ -357,9 +357,6 @@ namespace ENI2.DetailViewControls
 
             this.buttonExcelImport.IsEnabled = !this.Core.DisplayId.IsNullOrEmpty();
 
-            this.dataGridMessages.ItemsSource = null;
-            this.dataGridMessages.ItemsSource = this.Messages;
-
             //MessageBox.Show(string.Format("Visit/Transit ID updated: {0}", this.Core.DisplayId));
             //ShowIdDialog sid = new ShowIdDialog(this.Core)
             //{
@@ -839,43 +836,25 @@ namespace ENI2.DetailViewControls
         {
             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)
+            {                
+                // Evaluate a number of criteria for messages that should not be preselected for sending
+                if (((message.ViolationCount ?? 0) > 0) || ((message.ErrorCount ?? 0) > 0)) continue; // these need more work
+                if (Message.IsListClass(message.MessageNotificationClass) && (message.Elements.Count == 0)) continue; // avoid suspend on empty list classes                
+                if ((message.MessageNotificationClass == Message.NotificationClass.HAZA) && !XtraSendLogic.ShouldSendMessage(message)) continue;
+                if ((message.MessageNotificationClass == Message.NotificationClass.HAZD) && !XtraSendLogic.ShouldSendMessage(message)) continue;
+                if (message.MessageNotificationClass == Message.NotificationClass.BPOL)
                 {
-                    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.Count > 0)
+                    {
+                        if (message.Elements[0] is BPOL bpol)
                         {
-                            if (message.Elements[0] is BPOL bpol)
-                            {
-                                if (bpol.PortOfItineraries.Count == 0) addToSend = false;
-                            }                            
+                            if (bpol.PortOfItineraries.Count == 0) continue;
                         }
-                        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);
+                readyToSendMessages.Add(message.MessageNotificationClass);
             }
 
             sicd.Messages = this.Messages;

ENI2/DetailViewControls/PortCallDetailControl.xaml.cs

@@ -69,9 +69,6 @@ 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;
         }
@@ -256,7 +253,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        #endregion
+        #endregion        
 
         #region AGNT templates combo
 
@@ -284,7 +281,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;
                 }
@@ -355,6 +352,7 @@ namespace ENI2.DetailViewControls
             this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_WasteDisposalServiceProvider.Text = this._undoTemplate.WasteDisposalServiceProviderName;
             this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            this.SublistElementChanged(Message.NotificationClass.WAS);
 
             this.buttonUndoTemplate.IsEnabled = false; // can't undo after undo
         }
@@ -381,7 +379,7 @@ namespace ENI2.DetailViewControls
             this.textBox_AgentEMail.Text = this._currentTemplate.AgentEMail;
             this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFax.Text = this._currentTemplate.AgentFax;
-            this.textBox_AgentFax.GetBindingExpression (TextBox.TextProperty).UpdateSource();
+            this.textBox_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;
@@ -392,11 +390,9 @@ 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.textBox_WasteDisposalServiceProvider.Text = this._currentTemplate.WasteDisposalServiceProviderName;
+            this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            this.SublistElementChanged(Message.NotificationClass.WAS);
 
             this.buttonUndoTemplate.IsEnabled = true;
             this.buttonSetTemplate.IsEnabled = false;
@@ -410,7 +406,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;
@@ -428,6 +424,6 @@ namespace ENI2.DetailViewControls
         }
 
         #endregion
-
+        
     }
 }

ENI2/DetailViewControls/PortNotificationDetailControl.xaml

@@ -24,7 +24,7 @@
         </col:ArrayList>
     </UserControl.Resources>
     <GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="50" />

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.cs

@@ -94,7 +94,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        public override void Initialize()
+        public async override void Initialize()
         {
             base.Initialize();
 
@@ -185,7 +185,7 @@ namespace ENI2.DetailViewControls
 
         #region Waste receipt grid event handler
 
-        private void DataGridWasteReceipt_CreateRequested()
+        private async void DataGridWasteReceipt_CreateRequested()
         {
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = new WAS_RCPT();
@@ -236,7 +236,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        private void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
+        private async void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
         {
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = obj as WAS_RCPT;

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>7</ApplicationRevision>
-    <ApplicationVersion>7.2.12.7</ApplicationVersion>
+    <ApplicationRevision>8</ApplicationRevision>
+    <ApplicationVersion>7.2.12.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -134,75 +134,75 @@
     <CodeAnalysisRuleSet>..\code.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <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 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>
-    <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 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.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 Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.Cryptography.9.0.9\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.Cryptography.9.0.7\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.9.0.9\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.DependencyInjection.9.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.9\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.9.0.9\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.9.0.7\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.9.0.9\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=9.0.0.9, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Options.9.0.9\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Options.9.0.7\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 Include="Microsoft.Extensions.Primitives, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Primitives.9.0.7\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="MigraDoc.DocumentObjectModel, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc.6.2.2\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll</HintPath>
+    <Reference Include="MigraDoc.DocumentObjectModel, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.0\lib\netstandard2.0\MigraDoc.DocumentObjectModel.dll</HintPath>
     </Reference>
-    <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 Include="MigraDoc.Rendering, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.0\lib\netstandard2.0\MigraDoc.Rendering.dll</HintPath>
     </Reference>
-    <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 Include="MigraDoc.RtfRendering, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp-MigraDoc.6.2.0\lib\netstandard2.0\MigraDoc.RtfRendering.dll</HintPath>
     </Reference>
-    <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 Include="PdfSharp, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\lib\netstandard2.0\PdfSharp.dll</HintPath>
     </Reference>
-    <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 Include="PdfSharp.BarCodes, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\lib\netstandard2.0\PdfSharp.BarCodes.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Charting, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Charting.dll</HintPath>
+    <Reference Include="PdfSharp.Charting, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\lib\netstandard2.0\PdfSharp.Charting.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Cryptography, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Cryptography.dll</HintPath>
+    <Reference Include="PdfSharp.Cryptography, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\lib\netstandard2.0\PdfSharp.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Quality, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Quality.dll</HintPath>
+    <Reference Include="PdfSharp.Quality, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\lib\netstandard2.0\PdfSharp.Quality.dll</HintPath>
     </Reference>
-    <Reference Include="PdfSharp.Shared, Version=6.2.2.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp.6.2.2\lib\netstandard2.0\PdfSharp.Shared.dll</HintPath>
+    <Reference Include="PdfSharp.Shared, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\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 Include="PdfSharp.Snippets, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\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 Include="PdfSharp.System, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\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 Include="PdfSharp.WPFonts, Version=6.2.0.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>packages\PDFsharp.6.2.0\lib\netstandard2.0\PdfSharp.WPFonts.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -214,12 +214,12 @@
     <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=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 Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Diagnostics.DiagnosticSource.9.0.7\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 Include="System.Formats.Asn1, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Formats.Asn1.9.0.7\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -234,8 +234,8 @@
     </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 Include="System.Security.Cryptography.Pkcs, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Security.Cryptography.Pkcs.9.0.7\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
@@ -257,20 +257,20 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=5.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.5.0.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25104.5739\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

ENI2/Excel/ExcelUtil.cs

@@ -15,7 +15,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace ENI2.Excel
@@ -1008,18 +1007,15 @@ namespace ENI2.Excel
             STAT stat = statMessage.Elements[0] as STAT;
             ScanMessage(stat, reader);
 
-            if (!messageCore.IsTransit) // let's not do this for transit messages
+            foreach (Message preMessage in messages)
             {
-                foreach (Message preMessage in messages)
+                if (preMessage.MessageNotificationClass == Message.NotificationClass.PRE72H)
                 {
-                    if (preMessage.MessageNotificationClass == Message.NotificationClass.PRE72H)
+                    if (preMessage.Elements.Count > 0)
                     {
-                        if (preMessage.Elements.Count > 0)
-                        {
-                            PRE72H pre72h = preMessage.Elements[0] as PRE72H;
-                            pre72h.Tanker = stat.IsTanker;
-                            ExcelReader.SaveMessage(preMessage);
-                        }
+                        PRE72H pre72h = preMessage.Elements[0] as PRE72H;
+                        pre72h.Tanker = stat.IsTanker;
+                        ExcelReader.SaveMessage(preMessage);
                     }
                 }
             }
@@ -1243,7 +1239,7 @@ namespace ENI2.Excel
                 {
                     if ((reader.Mode == ExcelReader.CountryMode.DE) && waste.IsDashWasteCode)
                     {
-                        waste.WasteDescription = "-";
+                        // waste.WasteDescription = "-";
                         // NOP
                     }
                     else if (reader.Mode == ExcelReader.CountryMode.DK)
@@ -1471,7 +1467,7 @@ namespace ENI2.Excel
                             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);
+                            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))
@@ -1692,7 +1688,7 @@ namespace ENI2.Excel
                     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));
+                    string sLevel = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 54 + i), 1);
                     if (!sLevel.IsNullOrEmpty())
                     {
                         if (sLevel.Contains('1')) l10fc.PortFacilityShipSecurityLevel = 1;
@@ -1700,9 +1696,14 @@ namespace ENI2.Excel
                         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.PortFacilityGISISCode = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", 54 + i), 4);
+
+                    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.ReadCellAsText(sheetTitle, string.Format("K{0}", 54 + i), 255);
 

ENI2/MainWindow.xaml.cs

@@ -386,8 +386,6 @@ namespace ENI2
             Properties.Settings.Default.MainWindowPlacement = this.GetPlacement();
             Properties.Settings.Default.Save();
             Microsoft.Win32.SystemEvents.SessionEnded -= SystemEvents_SessionEnded;
-            if (easyPeasyControl != null)
-                easyPeasyControl.SaveState();
         }
 
         private void Window_SourceInitialized(object sender, EventArgs e)

ENI2/SheetDisplayControls/PortControl.xaml.cs

@@ -7,6 +7,7 @@ using ENI2.EditControls;
 using ExcelDataReader;
 using Microsoft.Win32;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -33,6 +34,7 @@ namespace ENI2.SheetDisplayControls
         private SEC _sec;
         private WAS _was;
         private Message _stoMessage;
+        // private Message _crewMessage;
 
         private Dictionary<string, string> portAreas = null;
 
@@ -43,7 +45,7 @@ namespace ENI2.SheetDisplayControls
         private static List<SERV_Template> _servTemplates = null;
         private SERV_Template _currentSERVTemplate;
 
-        private static List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;
+        private static List<WasteDisposalServiceProvider_Template> _wsdpTemplates = null;        
         private WasteDisposalServiceProvider_Template _currentWSDPTemplate;
         private string _undoWSDPTemplate;
 
@@ -81,11 +83,11 @@ 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); }
@@ -105,7 +107,7 @@ 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;
@@ -264,7 +266,6 @@ 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;
@@ -284,7 +285,7 @@ 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)
@@ -368,11 +369,9 @@ 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.textBox_WasteDisposalServiceProvider.Text = this._currentTemplate.WasteDisposalServiceProviderName;
+            this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            this.SublistElementChanged(Message.NotificationClass.WAS);
 
             this.buttonUndoTemplate.IsEnabled = true;
             this.buttonSetTemplate.IsEnabled = false;
@@ -462,6 +461,7 @@ namespace ENI2.SheetDisplayControls
             this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_WasteDisposalServiceProvider.Text = this._undoTemplate.WasteDisposalServiceProviderName;
             this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            this.SublistElementChanged(Message.NotificationClass.WAS);
 
             this.buttonUndoTemplate.IsEnabled = false; // can't undo after undo
         }
@@ -612,7 +612,7 @@ namespace ENI2.SheetDisplayControls
                 stream.Close();
 
             }
-        }
+        }        
 
         #endregion
 
@@ -731,7 +731,7 @@ namespace ENI2.SheetDisplayControls
                 this.dataGridSERV.Items.Refresh();
                 this.SublistElementChanged(Message.NotificationClass.SERV);
             }
-        }
+        }        
 
         #endregion
 

ENI2/SucheControl.xaml.cs

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

ENI2/packages.config

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <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="ExcelDataReader" version="3.7.0" targetFramework="net48" />
+  <package id="Extended.Wpf.Toolkit" version="4.7.25104.5739" targetFramework="net48" />
+  <package id="log4net" version="3.1.0" targetFramework="net48" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Bcl.Cryptography" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="9.0.7" targetFramework="net48" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net48" />
-  <package id="PDFsharp" version="6.2.2" targetFramework="net48" />
-  <package id="PDFsharp-MigraDoc" version="6.2.2" targetFramework="net48" />
+  <package id="PDFsharp" version="6.2.0" targetFramework="net48" />
+  <package id="PDFsharp-MigraDoc" version="6.2.0" targetFramework="net48" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
   <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.9" targetFramework="net48" />
-  <package id="System.Formats.Asn1" version="9.0.9" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.7" targetFramework="net48" />
+  <package id="System.Formats.Asn1" version="9.0.7" 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.Security.Cryptography.Pkcs" version="9.0.7" 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>

SendNSWMessageService/NSWSendService.cs

@@ -23,7 +23,9 @@ namespace SendNSWMessageService
             Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
             InitializeComponent();
 
-            System.Net.ServicePointManager.ServerCertificateValidationCallback += (_, ____, __, ___) =>
+            System.Net.ServicePointManager.ServerCertificateValidationCallback += (object _, System.Security.Cryptography.X509Certificates.X509Certificate ____,
+                            System.Security.Cryptography.X509Certificates.X509Chain __,
+                            System.Net.Security.SslPolicyErrors ___) =>
             {
                 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.2.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.2.0\lib\net462\log4net.dll</HintPath>
+    <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>
     <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.2.0" targetFramework="net48" />
+  <package id="log4net" version="3.0.3" targetFramework="net48" />
 </packages>

bsmd.LockingService/bsmd.LockingService.csproj

@@ -46,8 +46,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <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 Include="log4net, Version=3.1.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.3.1.0\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />

bsmd.LockingService/bsmd.LockingService.csproj.user

@@ -0,0 +1,38 @@
+<?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.2.0" targetFramework="net48" />
+  <package id="log4net" version="3.1.0" targetFramework="net48" />
 </packages>

bsmd.dakosy/bsmd.dakosy.csproj

@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <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 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>
     <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.16.0.16364, Culture=neutral, PublicKeyToken=2271ec4a3c56d0bf, processorArchitecture=MSIL">
-      <HintPath>..\packages\WinSCP.6.5.3\lib\net40\WinSCPnet.dll</HintPath>
+    <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>
   </ItemGroup>
   <ItemGroup>
@@ -93,12 +93,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\WinSCP.6.5.3\build\WinSCP.targets" Condition="Exists('..\packages\WinSCP.6.5.3\build\WinSCP.targets')" />
+  <Import Project="..\packages\WinSCP.6.3.6\build\WinSCP.targets" Condition="Exists('..\packages\WinSCP.6.3.6\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.5.3\build\WinSCP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinSCP.6.5.3\build\WinSCP.targets'))" />
+    <Error Condition="!Exists('..\packages\WinSCP.6.3.6\build\WinSCP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinSCP.6.3.6\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.2.0" targetFramework="net48" />
-  <package id="WinSCP" version="6.5.3" targetFramework="net48" />
+  <package id="log4net" version="3.0.3" targetFramework="net48" />
+  <package id="WinSCP" version="6.3.6" targetFramework="net48" />
 </packages>

bsmd.database/EasyPeasy.cs

@@ -2,7 +2,7 @@
 // Description: Collection of classes for the customs XML upload app
 
 using System;
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
 using System.Xml.Serialization;
 
 namespace bsmd.database.EasyPeasy
@@ -44,7 +44,7 @@ namespace bsmd.database.EasyPeasy
         public LocationOfGoods LocationOfGoods { get; set; }
 
         [XmlElement("GoodsItemsForT2LT2LF")]
-        public ObservableCollection<GoodsItemForT2LT2LF> GoodsItemsForT2LT2LF { get; set; } = new ObservableCollection<GoodsItemForT2LT2LF>();
+        public List<GoodsItemForT2LT2LF> GoodsItemsForT2LT2LF { get; set; } = new List<GoodsItemForT2LT2LF>();
 
         public TransportDocuments TransportDocuments { get; set; }
     }
@@ -88,5 +88,4 @@ namespace bsmd.database.EasyPeasy
         public string Type { get; set; }
         public string ReferenceNumber { get; set; }
     }
-
 }

bsmd.database/HAZPosTemplate.cs

@@ -68,10 +68,7 @@ namespace bsmd.database
 
             while(reader.Read())
             {
-                string type = "";
-                if (!reader.IsDBNull(4))
-                    type = reader.GetString(4);
-
+                if (reader.IsDBNull(4)) continue; // this row has no type -> ignore
                 HAZPosTemplate hpt = new HAZPosTemplate();
                 hpt.Description = reader.GetString(0);
                 if (!reader.IsDBNull(1))
@@ -84,7 +81,8 @@ 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;
@@ -92,7 +90,7 @@ namespace bsmd.database
                     case "IMSBC": hpt.TemplateType = SublistType.IMSBC ; break;
                     case "MARPOL": hpt.TemplateType = SublistType.MARPOL; break;
                     default:
-                        break;
+                        continue; // ignore this thing
                 }
 
                 if(!reader.IsDBNull(5))

bsmd.database/INFO.cs

@@ -216,8 +216,9 @@ namespace bsmd.database
                         errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "PortArea", this.PortArea, "INFO", "", this.Tablename));
             }
             else
-            {                
-                errors.Add(RuleEngine.CreateError(ValidationCode.PORTAREA, "PortArea", this.PortArea ?? "", "INFO", "", this.Tablename));
+            {
+                if(this.MessageCore.PoC != "DEHAM")
+                    errors.Add(RuleEngine.CreateError(ValidationCode.PORTAREA, "PortArea", this.PortArea ?? "", "INFO", "", this.Tablename));
             }
 
             if(DeplacementSummerDraught_TNE.HasValue)

bsmd.database/MaerskData.cs

@@ -6,6 +6,9 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace bsmd.database
 {

bsmd.database/Message.cs

@@ -431,12 +431,6 @@ namespace bsmd.database
         /// </summary>
         public int? ViolationCount { get; set; }
 
-        /// <summary>
-        /// Number of violations during last validation that have the "identifier" set and are thus detected violations
-        /// from underlying list elements
-        /// </summary>
-        public int? PositionViolationCount { get; set; }
-
         /// <summary>
         /// Number of errors during last validation
         /// </summary>

bsmd.database/MessageTelemetry.cs

@@ -34,64 +34,37 @@ namespace bsmd.database
 
         public static void Enqueue(Message.NSWProvider provider, Message message)
         {
-            // Validate inputs
-            if (message == null)
-            {
-                _log.ErrorFormat("Enqueue called with null message for provider {0}", provider);
-                return;
-            }
-
-            if (!message.Id.HasValue)
-            {
-                _log.ErrorFormat("Enqueue called with message that has no Id assigned for provider {0}", provider);
-                return;
-            }
-
             if (!_telemetry.ContainsKey(provider))
                 _telemetry.Add(provider, new Dictionary<Guid, MessageTelemetry>());
 
-            Guid messageId = message.Id.Value;
-
-            if (_telemetry[provider].ContainsKey(messageId))
+            if (_telemetry[provider].ContainsKey(message.Id.Value))
             {
-                _telemetry[provider][messageId].NumTries++;
+                _telemetry[provider][message.Id.Value].NumTries++;
             }
             else
             {
                 MessageTelemetry mt = new MessageTelemetry();
                 mt.SendDate = DateTime.Now;
                 mt.NumTries = 1;
-                _telemetry[provider][messageId] = mt;
+                _telemetry[provider][message.Id.Value]  = mt;
             }
         }
 
         public static void Dequeue(Message.NSWProvider provider, Message message)
         {
-            if (message == null)
-            {
-                _log.ErrorFormat("Dequeue called with null message for provider {0}", provider);
-                return;
-            }
-
-            if (!message.Id.HasValue)
-            {
-                _log.ErrorFormat("Dequeue called with message that has no Id assigned for provider {0}", provider);
-                return;
-            }
-
             if (_telemetry.ContainsKey(provider))
             {
-                Guid messageId = message.Id.Value;
-                if (_telemetry[provider].ContainsKey(messageId))
+                if (_telemetry[provider].ContainsKey(message.Id.Value))
                 {
-                    MessageTelemetry mt = _telemetry[provider][messageId];
-                    _log.InfoFormat("[{0,10}][{1,8}][{2:00000}][{3:00}] ", provider, message.MessageNotificationClassDisplay, (DateTime.Now - mt.SendDate).TotalSeconds, mt.NumTries);
-                    _telemetry[provider].Remove(messageId);
+                    MessageTelemetry mt = _telemetry[provider][message.Id.Value];
+                    _log.InfoFormat("[{0,10}][{1,8}][{2:00000}][{3:00}] ",provider, message.MessageNotificationClassDisplay, (DateTime.Now - mt.SendDate).TotalSeconds, mt.NumTries);
+                    _telemetry[provider].Remove(message.Id.Value);
                 }
                 else
                 {
+                    // this can happen if the service gets re-started and not all sent messages have yet been received
                     _log.WarnFormat("trying to deque a message from telemetry that we don't know about. Provider: {0} MessageId: {1}",
-                        provider.ToString(), messageId);
+                        provider.ToString(), message.Id.Value);
                 }
             }
         }

bsmd.database/WAS_RCPT.cs

@@ -146,13 +146,6 @@ namespace bsmd.database
                     };
                     this.WasteReceived.Add(foundWasteReceived);
                 }
-                else
-                {
-                    if (!foundWasteReceived.AmountWasteReceived_MTQ.HasValue)
-                    {
-                        foundWasteReceived.AmountWasteReceived_MTQ = 0;
-                    }
-                }
 
                 if (foundWasteReceived.WasteDescription.IsNullOrEmpty())
                 {

bsmd.database/WasteDisposalServiceProvider_Template.cs

@@ -98,7 +98,7 @@ namespace bsmd.database
         public int CompareTo(object obj)
         {
             if (obj is WasteDisposalServiceProvider_Template template)
-                return this.Remark?.CompareTo(template.Remark ?? "") ?? 0;
+                this.Remark?.CompareTo(template.Remark ?? "");
             return 0;
         }
 

bsmd.database/bsmd.database.csproj

@@ -89,11 +89,11 @@
     <UseWinFormsOutOfProcDesigner>False</UseWinFormsOutOfProcDesigner>
   </PropertyGroup>
   <ItemGroup>
-    <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 Include="log4net, Version=3.1.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.3.1.0\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\ENI2\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

bsmd.database/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.2.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
+  <package id="log4net" version="3.1.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
 </packages>

bsmd.dbh/bsmd.dbh.csproj

@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <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 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>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

bsmd.dbh/packages.config

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

bsmd.hisnord/Request.cs

@@ -85,18 +85,6 @@ namespace bsmd.hisnord
             bool? retval;
             try
             {
-                if (core == null)
-                {
-                    _log.ErrorFormat("CreateSendFile called with null core");
-                    return false;
-                }
-
-                if (!core.Id.HasValue)
-                {
-                    _log.ErrorFormat("CreateSendFile called with core that has no Id assigned");
-                    return false;
-                }
-
                 nsw _nsw = new nsw();
                 _nsw.conveyance = new conveyance();
 
@@ -133,9 +121,8 @@ namespace bsmd.hisnord
                 _nsw.conveyance.owner_sender.contact.phone = rp.Phone;
                 _nsw.conveyance.owner_sender.contact.fax = rp.Fax;
 
-                Guid coreId = core.Id.Value;
-                _nsw.document_reference = coreId.ToString();
-                _nsw.conveyance.code = coreId.ToString();
+                _nsw.document_reference = core.Id.Value.ToString();
+                _nsw.conveyance.code = core.Id.ToString();
 
                 if (!core.VisitId.IsNullOrEmpty())
                 {

bsmd.hisnord/bsmd.hisnord.csproj

@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <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 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>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

bsmd.hisnord/packages.config

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

bsmd.status/bsmd.status.csproj

@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <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 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>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

bsmd.status/packages.config

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

misc/GEFAHRGUTLISTE.csv

@@ -7,7 +7,6 @@ Acrylonitrile (ACN)  ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
 Alcoholic beverages, n.o.s. (Wine);;;;; ;IBC;;;;;;;;x (Z);2;;;;
 Alkanes (C6-C9);S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
 n-Alkanens (C10+)      ;;;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-Alumina (( = Aluminiumoxid) => ist nicht anzumelden als DG));;;;;;;;;;;;;;;;;;;
 Alkylate;;;<60°C;2; ;MARPOL;;;;;;;;;;x;;6;
 Alumina hydrate / Aluminiumhydroxid;;;;;;IMSBC;x;y;;A/B;;;;;;;;;
 alpha-Methylstyrene        ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
@@ -76,7 +75,7 @@ Dolomitic quicklime;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
 Eisen II Sulphat;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Eisensilikat granulat / Iron Silicate Granules;;;;;;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Energy Rich Fuel / Neste Renewable Diesel / NExBTL / HVO / Hydrotreated Vegetable Oils;;;>60°C;1;;;;;;;;;;;;;;;siehe Bemerkung NExBTL - Renewable Diesel
-Ethyl acetate       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Ethyl acetate       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
 Ethanol / Ethyl alcohol / Grain alcohol / Drinking alcohol;;;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
 Ethylene glycol / (Mono-)Ethylenglycol / MEG / Glycol;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
 Ethyl tert-butyl ether / ETBE  ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
@@ -92,7 +91,7 @@ Ferrochrom;;;;;;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Ferrosilicochrom 40 / Ferrosilicon;;;;; ;IMSBC;x;;;B;1;1408;4.3;;;;;;
 FERROUS METAL / BORINGS / SHAVINGS / TURNINGS / CUTTINGS;;;;; ;IMSBC;x;;;B;1;2793;4.2;;;;;;
 FERTILIZER POTASH  (PINK GRANULATED MURIATE OF POTASH);;;;;;IMSBC;x;;;;;;;;;;;;
-Fish Meal - self-heating ;;;;; ;IMSBC;x;n;;B;1; ; ;;;;;;Dieses Gefahrgut wird OHNE MHB und OHNE IMO/UN Nummer abgesendet. Wenn Ladehafen Bremen dann Gruppe C und nicht anzumelden. (Stand 29.10.2025)
+Fish Meal treated with Antioxidant;;;;; ;IMSBC;x;;;B;1;2216;9;;;;;;wenn Ladehafen Bremen dann Gruppe C und nicht anzumelden
 Fishoil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
 Fish Silage Protein Concentrate (containing 4% or less formic acid);P;0;NF;0;Nein;IBC;;;;;;;;x (Y) ;;;;;
 Fish protein concentrate (containing 4% or less formic acid);P;0;NF;0;Nein;IBC;;;;;;;;x (Z);2;;;;
@@ -111,7 +110,6 @@ Ground Colemanite;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
 Gypsum / Gips;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 HCGO / Heavy Cycle Gas Oil;;;;; ;MARPOL;;;;;;;;;;x;;;
 HFO  ;;;;;;MARPOL;;;;;;;;;;x;;;
-Hot roiled coils (HRC);;;;;;;;;;;;;;;;;;;Keine Anmeldung
 Holzstämme / Wooden Poles;;;;; ;IMSBC;x;y;;B;1;;;;;;;;Nur wenn unter Deck, nur wenn in Loser Schüttung!
 Hydrochloric Acid;S/P;2;NF;0;Nein;IBC;;;;;;;;x (Z);2;;;NF;
 Hydrocarbon Wax / PROWAX 312;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (X);0;;;;
@@ -297,4 +295,5 @@ Wooden poles / Holzstämme;;;;; ;IMSBC;x;y;;B;1;;;;;;;;NUR UNTER DECK (in Luken)
 Xylenes / Ortho-Xylene / Para Xylene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1; ;;;
 Zellulose / Cellulose / Wood pulp;;;;; ;;;;;;;;;;;;;;"Keine Anmeldung,
 Nur falls Bulk-Ladung"
-Zinc Concentrates / MRM BULK CONCENTRATES /  Mineral Concentrates / METAL SULPHIDE CONCENTRATES;;;;; ;IMSBC;x;;;A;0;;;;;;;;Dieses Gefahrgut wird OHNE MHB und OHNE IMO/UN Nummer abgesendet. Eine gelbe Violation-Meldung aus dem NSW ist zu ignorieren
+Zinc Concentrates / MRM BULK CONCENTRATES /  Mineral Concentrates;;;;; ;IMSBC;x;;;A;0;3077;9;;;;;;"Nachfragen ob als Mineral Concentrates (3077/9) oder METAL SULPHIDE CONCENTRATES (MHB) (""Shippers declaration for solid bulk cargos"" anfordern oder auch  ""Cargo information for solid bulk cargos"""
+Zinc Concentrates / MRM BULK CONCENTRATES /  METAL SULPHIDE CONCENTRATES;;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;"Nachfragen ob als Mineral Concentrates (3077/9) oder METAL SULPHIDE CONCENTRATES (MHB) (""Shippers declaration for solid bulk cargos"" anfordern oder auch  ""Cargo information for solid bulk cargos"""