From a58ecb68d1a03a87cb8aca4592e5bddaac8d2a56 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 26 Jan 2023 07:49:19 +0100
Subject: [PATCH 01/34] version bump

---
 ENI2/ENI2.csproj                                | 4 ++--
 bsmd.database/Properties/AssemblyProductInfo.cs | 2 +-
 bsmd.database/Properties/AssemblyProjectInfo.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 3492ba13..6b5c5246 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>7.8.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 564ff8ca..2dc6a129 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.8.0")]
+[assembly: AssemblyInformationalVersion("7.9.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 046c0723..3d2ff33a 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.8.0.*")]
+[assembly: AssemblyVersion("7.9.0.*")]
 

From 114b9db663ccbaea18b6e508bf93ec35e6a76f22 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 26 Jan 2023 07:49:19 +0100
Subject: [PATCH 02/34] version bump

---
 ENI2/ENI2.csproj                                | 2 +-
 bsmd.database/Properties/AssemblyProductInfo.cs | 2 +-
 bsmd.database/Properties/AssemblyProjectInfo.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 732b0f1b..6b5c5246 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -37,7 +37,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>7.8.1.%2a</ApplicationVersion>
+    <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 229436f1..2dc6a129 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.8.1")]
+[assembly: AssemblyInformationalVersion("7.9.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index eaba9da0..3d2ff33a 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.8.1.*")]
+[assembly: AssemblyVersion("7.9.0.*")]
 

From b94835ee4bddf1be7084724b8d0a439e039c971d Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 3 Feb 2023 14:13:15 +0100
Subject: [PATCH 03/34] =?UTF-8?q?POListControl=20umbenannt,=20neue=20?=
 =?UTF-8?q?=C3=9Cbersicht=20mit=20Tabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...istControl.xaml => MaerskListControl.xaml} | 112 ++--
 ...trol.xaml.cs => MaerskListControl.xaml.cs} | 556 +++++++++---------
 ENI2/Controls/MaerskOverviewControl.xaml      |  12 +
 ENI2/Controls/MaerskOverviewControl.xaml.cs   |  28 +
 ENI2/ENI2.csproj                              |  13 +-
 ENI2/MainWindow.xaml.cs                       |   8 +-
 6 files changed, 388 insertions(+), 341 deletions(-)
 rename ENI2/Controls/{POListControl.xaml => MaerskListControl.xaml} (97%)
 rename ENI2/Controls/{POListControl.xaml.cs => MaerskListControl.xaml.cs} (96%)
 create mode 100644 ENI2/Controls/MaerskOverviewControl.xaml
 create mode 100644 ENI2/Controls/MaerskOverviewControl.xaml.cs

diff --git a/ENI2/Controls/POListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
similarity index 97%
rename from ENI2/Controls/POListControl.xaml
rename to ENI2/Controls/MaerskListControl.xaml
index cafbeb49..e00d047a 100644
--- a/ENI2/Controls/POListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -1,56 +1,56 @@
-<UserControl x:Class="ENI2.Controls.POListControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:util="clr-namespace:ENI2.Util"
-             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-             xmlns:col="clr-namespace:System.Collections;assembly=mscorlib"
-             xmlns:p="clr-namespace:ENI2.Properties"
-             xmlns:local="clr-namespace:ENI2.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-        <col:ArrayList x:Key="arrList">
-            <col:DictionaryEntry Key="None" Value="0" />
-            <col:DictionaryEntry Key="Maersk BRV/WHV" Value="1" />
-            <col:DictionaryEntry Key="SeaGo BHV" Value="2" />
-            <col:DictionaryEntry Key="SeaGo WHV" Value="4" />
-        </col:ArrayList>
-    </UserControl.Resources>
-    <GroupBox Name="groupBoxRP" Header="{x:Static p:Resources.textPOLists}">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="28" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal">
-                <Label Content="Calendar week" />
-                <xctk:DoubleUpDown x:Name="doubleUpDownCalendarWeek" VerticalContentAlignment="Center" VerticalAlignment="Center"
-                                   HorizontalAlignment="Stretch" Margin="2" Value="01" ValueChanged="doubleUpDownCalendarWeek_ValueChanged"/>
-                <Label Content="Type" />
-                <ComboBox x:Name="comboBoxFilterType" Margin="2" SelectionChanged="comboBoxFilterType_SelectionChanged" Width="100" />
-                
-                <Button x:Name="buttonExcelExport" Margin="2" Click="buttonExcelExport_Click" Content="Export Excel" Width="100" />
-                <Button x:Name="buttonSaveChanges" Margin="2" Click="buttonSaveChanges_Click" Content="Save changes" Width="100" IsEnabled="False" />
-            </StackPanel>
-            <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                                             SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="IMO/ENI" Binding="{Binding IMOENIDisplay}" IsReadOnly="True" />
-                    <DataGridTextColumn x:Name="gridColumnPONumber" Header="PO number" Binding="{Binding PONumber, Mode=TwoWay}" IsReadOnly="False" />
-                    <DataGridComboBoxColumn x:Name="gridColumnGroup" Header="Group" IsReadOnly="False" SelectedValueBinding="{Binding Flags, Mode=TwoWay}"
-                                            ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value">
-                    </DataGridComboBoxColumn>
-                    <DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETA" Binding="{Binding ETA_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETD" Binding="{Binding ETD_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\},  Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
-                    <DataGridTextColumn x:Name="gridColumnATA" Header="ATA" Binding="{Binding POATA, StringFormat=\{0:dd.MM.yyyy\}, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="False" />
-                    <DataGridTextColumn Header="ATD" Binding="{Binding ATD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Hafen" Binding="{Binding PortnameDisplay}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
-                </DataGrid.Columns>
-            </local:ENIDataGrid>
-        </Grid>
-    </GroupBox>
-</UserControl>
+<UserControl x:Class="ENI2.Controls.MaerskListControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:util="clr-namespace:ENI2.Util"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:col="clr-namespace:System.Collections;assembly=mscorlib"
+             xmlns:p="clr-namespace:ENI2.Properties"
+             xmlns:local="clr-namespace:ENI2.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <col:ArrayList x:Key="arrList">
+            <col:DictionaryEntry Key="None" Value="0" />
+            <col:DictionaryEntry Key="Maersk BRV/WHV" Value="1" />
+            <col:DictionaryEntry Key="SeaGo BHV" Value="2" />
+            <col:DictionaryEntry Key="SeaGo WHV" Value="4" />
+        </col:ArrayList>
+    </UserControl.Resources>
+    <GroupBox Name="groupBoxRP" Header="{x:Static p:Resources.textPOLists}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="28" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <StackPanel Orientation="Horizontal">
+                <Label Content="Calendar week" />
+                <xctk:DoubleUpDown x:Name="doubleUpDownCalendarWeek" VerticalContentAlignment="Center" VerticalAlignment="Center"
+                                   HorizontalAlignment="Stretch" Margin="2" Value="01" ValueChanged="doubleUpDownCalendarWeek_ValueChanged"/>
+                <Label Content="Type" />
+                <ComboBox x:Name="comboBoxFilterType" Margin="2" SelectionChanged="comboBoxFilterType_SelectionChanged" Width="100" />
+                
+                <Button x:Name="buttonExcelExport" Margin="2" Click="buttonExcelExport_Click" Content="Export Excel" Width="100" />
+                <Button x:Name="buttonSaveChanges" Margin="2" Click="buttonSaveChanges_Click" Content="Save changes" Width="100" IsEnabled="False" />
+            </StackPanel>
+            <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                                             SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="IMO/ENI" Binding="{Binding IMOENIDisplay}" IsReadOnly="True" />
+                    <DataGridTextColumn x:Name="gridColumnPONumber" Header="PO number" Binding="{Binding PONumber, Mode=TwoWay}" IsReadOnly="False" />
+                    <DataGridComboBoxColumn x:Name="gridColumnGroup" Header="Group" IsReadOnly="False" SelectedValueBinding="{Binding Flags, Mode=TwoWay}"
+                                            ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value">
+                    </DataGridComboBoxColumn>
+                    <DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETA" Binding="{Binding ETA_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETD" Binding="{Binding ETD_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\},  Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
+                    <DataGridTextColumn x:Name="gridColumnATA" Header="ATA" Binding="{Binding POATA, StringFormat=\{0:dd.MM.yyyy\}, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="False" />
+                    <DataGridTextColumn Header="ATD" Binding="{Binding ATD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Hafen" Binding="{Binding PortnameDisplay}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
+                </DataGrid.Columns>
+            </local:ENIDataGrid>
+        </Grid>
+    </GroupBox>
+</UserControl>
diff --git a/ENI2/Controls/POListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
similarity index 96%
rename from ENI2/Controls/POListControl.xaml.cs
rename to ENI2/Controls/MaerskListControl.xaml.cs
index 0985b92f..0ec89672 100644
--- a/ENI2/Controls/POListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -1,278 +1,278 @@
-// Copyright (c) 2017 schick Informatik
-// Description: PO Nummer Übersicht. Ergänzung Nummern. Excel Export
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using Microsoft.Win32;
-
-using Microsoft.Office.Interop.Excel;
-using System.Runtime.InteropServices;
-
-using bsmd.database;
-
-namespace ENI2.Controls
-{
-    /// <summary>
-    /// Interaction logic for POListControl.xaml
-    /// </summary>
-    public partial class POListControl : UserControl
-    {
-
-        #region Fields
-
-        private readonly string[] _comboBoxEntries = 
-        {
-            "All",
-            "Maersk BRV/WHV",
-            "SeaGo BHV",
-            "SeaGo WHV"
-        };
-
-        private List<MessageCore> searchResult = new List<MessageCore>();
-        private readonly List<MessageCore> filteredResult = new List<MessageCore>();
-
-        #endregion
-
-        #region Construction
-
-        public POListControl()
-        {
-            InitializeComponent();
-            Loaded += POList_Loaded;
-        }
-
-        #endregion
-
-        #region control event handler
-
-        private void POList_Loaded(object sender, RoutedEventArgs e)
-        {
-            this.comboBoxFilterType.ItemsSource = this._comboBoxEntries;
-            this.doubleUpDownCalendarWeek.Value = bsmd.database.Util.GetIso8601WeekOfYear(DateTime.Now);
-            this.dataGridPOCores.ItemsSource = this.filteredResult;
-        }
-
-        private void buttonExcelExport_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.filteredResult.Count == 0) return;
-
-            OpenFileDialog ofd = new OpenFileDialog
-            {
-                Filter = "Excel Files|*.xls;*.xlsx"
-            };
-            if (ofd.ShowDialog() ?? false)
-            {                
-                try
-                {
-                    Microsoft.Office.Interop.Excel.Application excelApp = new Microsoft.Office.Interop.Excel.Application();
-                    excelApp.DisplayAlerts = false;
-                    Workbook workBook = excelApp.Workbooks.Open(ofd.FileName);
-                    Worksheet workSheet = workBook.Worksheets[1];
-
-                    int rowIndex = 3;
-                    foreach(MessageCore core in this.filteredResult)
-                    {
-                        workSheet.Cells[rowIndex, 7].Value = core.Shipname;
-                        workSheet.Cells[rowIndex, 10].Value = core.PoC.Substring(2);
-                        if(core.POATA.HasValue)
-                            workSheet.Cells[rowIndex, 11].Value = core.POATA.Value.ToShortDateString();
-                        workSheet.Cells[rowIndex, 13].Value = core.PONumber;
-                        rowIndex++;
-                    }
-
-                    workBook.Save();
-                    workBook.Close();
-                    Marshal.ReleaseComObject(workBook);
-                    excelApp.Quit();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-        }
-
-        private void buttonSaveChanges_Click(object sender, RoutedEventArgs e)
-        {
-            foreach(MessageCore messageCore in this.filteredResult)
-            {
-                if (messageCore.IsDirty)
-                {
-                    DBManager.Instance.Save(messageCore);
-                    messageCore.IsDirty = false;
-                    // load ATA for this Core
-                    /* DAS ATA WIRD JETZT NICHT MEHR IN DIE MELDEKLASSE GESPEICHERT
-                    Message ataMessage = DBManager.Instance.GetMessage(messageCore, Message.NotificationClass.ATA);
-                    if(ataMessage?.Elements.Count == 1)
-                    {
-                        if(messageCore.ATA != ((ATA)ataMessage.Elements[0]).ATAPortOfCall)
-                        {
-                            ((ATA)ataMessage.Elements[0]).ATAPortOfCall = messageCore.ATA;
-                            DBManager.Instance.Save(ataMessage.Elements[0]);
-                        }
-                    }
-                    */
-                }
-            }
-            this.buttonSaveChanges.IsEnabled = false;
-        }
-
-        private void doubleUpDownCalendarWeek_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            if (!this.IsLoaded) return;
-            this.comboBoxFilterType.SelectedIndex = -1;
-            this.PerformSearch();
-        }
-
-        private void comboBoxFilterType_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            this.dataGridPOCores.ItemsSource = null;
-            if (this.comboBoxFilterType.SelectedIndex == -1) return;
-
-            this.filteredResult.Clear();
-            foreach (MessageCore core in this.searchResult)
-            {
-                switch (this.comboBoxFilterType.SelectedIndex)
-                {
-                    case 0: this.filteredResult.Add(core); break;
-                    case 1: if (core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.filteredResult.Add(core); break;
-                    case 2: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.filteredResult.Add(core); break;
-                    case 3: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.filteredResult.Add(core); break;
-                    case 4: if (core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.filteredResult.Add(core); break;
-                }
-            }
-            this.dataGridPOCores.ItemsSource = this.filteredResult;            
-        }
-
-        private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
-        {
-            if (e.EditAction == DataGridEditAction.Commit)
-            {
-                if (e.Column == gridColumnPONumber)
-                {
-                    // validate for "true" number
-                    var el = e.EditingElement as System.Windows.Controls.TextBox;
-                    if (!el.Text.IsDigitsOnly())
-                    {
-                        el.Text = string.Empty;
-                        e.Cancel = true;
-                    }
-                    else
-                    {
-                        buttonSaveChanges.IsEnabled = true;
-                        MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
-                        editedCore.IsDirty = true;
-                    }
-                }
-                if(e.Column == gridColumnGroup)
-                {
-                    var el = e.EditingElement as ComboBox;
-                    DictionaryEntry selectedItem = (DictionaryEntry) el.SelectedItem;
-                    MessageCore.CoreFlags coreFlag = (MessageCore.CoreFlags) Enum.Parse(typeof(MessageCore.CoreFlags), selectedItem.Value.ToString());
-                    MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
-                    // clear all first
-                    editedCore.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
-                    editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
-                    editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
-                    editedCore.SetFlag(false, MessageCore.CoreFlags.HOEGH);
-                    if (coreFlag != MessageCore.CoreFlags.NONE)
-                    {
-                        editedCore.SetFlag(true, coreFlag);
-                    }
-                    buttonSaveChanges.IsEnabled = true;
-                    editedCore.IsDirty = true;
-                }
-                if(e.Column == gridColumnATA)
-                {
-                    var el = e.EditingElement as System.Windows.Controls.TextBox;
-                    if(DateTime.TryParse(el.Text, out DateTime localATA))
-                    {
-                        MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
-                        editedCore.ATA = DateTime.SpecifyKind(localATA, DateTimeKind.Local).ToUniversalTime();
-                        buttonSaveChanges.IsEnabled = true;
-                        editedCore.IsDirty = true;
-                    } 
-                    else
-                    {
-                        el.Text = string.Empty;
-                        e.Cancel = true;
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region private methods
-
-        private void PerformSearch()
-        {
-            this.dataGridPOCores.ItemsSource = null;
-            this.filteredResult.Clear();
-
-            if (!this.doubleUpDownCalendarWeek.Value.HasValue) return;
-
-            Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
-
-            DateTime start = bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
-            DateTime end = start.Add(new TimeSpan(6, 23, 59, 59));
-            
-            // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
-            uint from = start.Subtract(new TimeSpan(10, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
-            uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();           
-            filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
-
-            Util.UIHelper.SetBusyState();
-
-            // suche auslösen
-            this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
-            // alle anderen Häfen weg
-            this.searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")));
-
-            // rückwärts iterieren um nach ETA und ATA zu filtern
-            if (this.searchResult.Count > 0)
-            {
-                for (int i = this.searchResult.Count - 1; i >= 0; i--)
-                {
-                    MessageCore messageCore = this.searchResult[i];
-                    if (messageCore.ATA.HasValue)
-                    {
-                        if ((messageCore.ATA.Value < start) || (messageCore.ATA.Value > end))
-                        {
-                            this.searchResult.RemoveAt(i);
-                        } 
-                        else
-                        {
-                            if(!messageCore.POATA.HasValue)
-                            {
-                                messageCore.POATA = messageCore.ATA;
-                                messageCore.IsDirty = true;
-                                this.buttonSaveChanges.IsEnabled = true;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if ((messageCore.ETA.Value < start) || (messageCore.ETA.Value > end)) this.searchResult.RemoveAt(i);
-                    }
-                }
-            }
-
-            searchResult.Sort((x, y) => DateTime.Compare(x.ATA ?? DateTime.MaxValue, y.ATA ?? DateTime.MaxValue));
-            
-            this.dataGridPOCores.SelectedItem = null;
-            this.filteredResult.AddRange(searchResult);
-            this.dataGridPOCores.ItemsSource = this.filteredResult;
-        }
-
-
-        #endregion
-        
-    }
-}
+// Copyright (c) 2017 schick Informatik
+// Description: PO Nummer Übersicht. Ergänzung Nummern. Excel Export
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Win32;
+
+using Microsoft.Office.Interop.Excel;
+using System.Runtime.InteropServices;
+
+using bsmd.database;
+
+namespace ENI2.Controls
+{
+    /// <summary>
+    /// Interaction logic for MaerskListControl.xaml
+    /// </summary>
+    public partial class MaerskListControl : UserControl
+    {
+
+        #region Fields
+
+        private readonly string[] _comboBoxEntries = 
+        {
+            "All",
+            "Maersk BRV/WHV",
+            "SeaGo BHV",
+            "SeaGo WHV"
+        };
+
+        private List<MessageCore> searchResult = new List<MessageCore>();
+        private readonly List<MessageCore> filteredResult = new List<MessageCore>();
+
+        #endregion
+
+        #region Construction
+
+        public MaerskListControl()
+        {
+            InitializeComponent();
+            Loaded += POList_Loaded;
+        }
+
+        #endregion
+
+        #region control event handler
+
+        private void POList_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxFilterType.ItemsSource = this._comboBoxEntries;
+            this.doubleUpDownCalendarWeek.Value = bsmd.database.Util.GetIso8601WeekOfYear(DateTime.Now);
+            this.dataGridPOCores.ItemsSource = this.filteredResult;
+        }
+
+        private void buttonExcelExport_Click(object sender, RoutedEventArgs e)
+        {
+            if (this.filteredResult.Count == 0) return;
+
+            OpenFileDialog ofd = new OpenFileDialog
+            {
+                Filter = "Excel Files|*.xls;*.xlsx"
+            };
+            if (ofd.ShowDialog() ?? false)
+            {                
+                try
+                {
+                    Microsoft.Office.Interop.Excel.Application excelApp = new Microsoft.Office.Interop.Excel.Application();
+                    excelApp.DisplayAlerts = false;
+                    Workbook workBook = excelApp.Workbooks.Open(ofd.FileName);
+                    Worksheet workSheet = workBook.Worksheets[1];
+
+                    int rowIndex = 3;
+                    foreach(MessageCore core in this.filteredResult)
+                    {
+                        workSheet.Cells[rowIndex, 7].Value = core.Shipname;
+                        workSheet.Cells[rowIndex, 10].Value = core.PoC.Substring(2);
+                        if(core.POATA.HasValue)
+                            workSheet.Cells[rowIndex, 11].Value = core.POATA.Value.ToShortDateString();
+                        workSheet.Cells[rowIndex, 13].Value = core.PONumber;
+                        rowIndex++;
+                    }
+
+                    workBook.Save();
+                    workBook.Close();
+                    Marshal.ReleaseComObject(workBook);
+                    excelApp.Quit();
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return;
+                }
+            }
+        }
+
+        private void buttonSaveChanges_Click(object sender, RoutedEventArgs e)
+        {
+            foreach(MessageCore messageCore in this.filteredResult)
+            {
+                if (messageCore.IsDirty)
+                {
+                    DBManager.Instance.Save(messageCore);
+                    messageCore.IsDirty = false;
+                    // load ATA for this Core
+                    /* DAS ATA WIRD JETZT NICHT MEHR IN DIE MELDEKLASSE GESPEICHERT
+                    Message ataMessage = DBManager.Instance.GetMessage(messageCore, Message.NotificationClass.ATA);
+                    if(ataMessage?.Elements.Count == 1)
+                    {
+                        if(messageCore.ATA != ((ATA)ataMessage.Elements[0]).ATAPortOfCall)
+                        {
+                            ((ATA)ataMessage.Elements[0]).ATAPortOfCall = messageCore.ATA;
+                            DBManager.Instance.Save(ataMessage.Elements[0]);
+                        }
+                    }
+                    */
+                }
+            }
+            this.buttonSaveChanges.IsEnabled = false;
+        }
+
+        private void doubleUpDownCalendarWeek_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            if (!this.IsLoaded) return;
+            this.comboBoxFilterType.SelectedIndex = -1;
+            this.PerformSearch();
+        }
+
+        private void comboBoxFilterType_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            this.dataGridPOCores.ItemsSource = null;
+            if (this.comboBoxFilterType.SelectedIndex == -1) return;
+
+            this.filteredResult.Clear();
+            foreach (MessageCore core in this.searchResult)
+            {
+                switch (this.comboBoxFilterType.SelectedIndex)
+                {
+                    case 0: this.filteredResult.Add(core); break;
+                    case 1: if (core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.filteredResult.Add(core); break;
+                    case 2: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.filteredResult.Add(core); break;
+                    case 3: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.filteredResult.Add(core); break;
+                    case 4: if (core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.filteredResult.Add(core); break;
+                }
+            }
+            this.dataGridPOCores.ItemsSource = this.filteredResult;            
+        }
+
+        private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
+        {
+            if (e.EditAction == DataGridEditAction.Commit)
+            {
+                if (e.Column == gridColumnPONumber)
+                {
+                    // validate for "true" number
+                    var el = e.EditingElement as System.Windows.Controls.TextBox;
+                    if (!el.Text.IsDigitsOnly())
+                    {
+                        el.Text = string.Empty;
+                        e.Cancel = true;
+                    }
+                    else
+                    {
+                        buttonSaveChanges.IsEnabled = true;
+                        MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
+                        editedCore.IsDirty = true;
+                    }
+                }
+                if(e.Column == gridColumnGroup)
+                {
+                    var el = e.EditingElement as ComboBox;
+                    DictionaryEntry selectedItem = (DictionaryEntry) el.SelectedItem;
+                    MessageCore.CoreFlags coreFlag = (MessageCore.CoreFlags) Enum.Parse(typeof(MessageCore.CoreFlags), selectedItem.Value.ToString());
+                    MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
+                    // clear all first
+                    editedCore.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
+                    editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
+                    editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
+                    editedCore.SetFlag(false, MessageCore.CoreFlags.HOEGH);
+                    if (coreFlag != MessageCore.CoreFlags.NONE)
+                    {
+                        editedCore.SetFlag(true, coreFlag);
+                    }
+                    buttonSaveChanges.IsEnabled = true;
+                    editedCore.IsDirty = true;
+                }
+                if(e.Column == gridColumnATA)
+                {
+                    var el = e.EditingElement as System.Windows.Controls.TextBox;
+                    if(DateTime.TryParse(el.Text, out DateTime localATA))
+                    {
+                        MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
+                        editedCore.ATA = DateTime.SpecifyKind(localATA, DateTimeKind.Local).ToUniversalTime();
+                        buttonSaveChanges.IsEnabled = true;
+                        editedCore.IsDirty = true;
+                    } 
+                    else
+                    {
+                        el.Text = string.Empty;
+                        e.Cancel = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region private methods
+
+        private void PerformSearch()
+        {
+            this.dataGridPOCores.ItemsSource = null;
+            this.filteredResult.Clear();
+
+            if (!this.doubleUpDownCalendarWeek.Value.HasValue) return;
+
+            Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
+
+            DateTime start = bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
+            DateTime end = start.Add(new TimeSpan(6, 23, 59, 59));
+            
+            // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
+            uint from = start.Subtract(new TimeSpan(10, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
+            uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();           
+            filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
+
+            Util.UIHelper.SetBusyState();
+
+            // suche auslösen
+            this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
+            // alle anderen Häfen weg
+            this.searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")));
+
+            // rückwärts iterieren um nach ETA und ATA zu filtern
+            if (this.searchResult.Count > 0)
+            {
+                for (int i = this.searchResult.Count - 1; i >= 0; i--)
+                {
+                    MessageCore messageCore = this.searchResult[i];
+                    if (messageCore.ATA.HasValue)
+                    {
+                        if ((messageCore.ATA.Value < start) || (messageCore.ATA.Value > end))
+                        {
+                            this.searchResult.RemoveAt(i);
+                        } 
+                        else
+                        {
+                            if(!messageCore.POATA.HasValue)
+                            {
+                                messageCore.POATA = messageCore.ATA;
+                                messageCore.IsDirty = true;
+                                this.buttonSaveChanges.IsEnabled = true;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if ((messageCore.ETA.Value < start) || (messageCore.ETA.Value > end)) this.searchResult.RemoveAt(i);
+                    }
+                }
+            }
+
+            searchResult.Sort((x, y) => DateTime.Compare(x.ATA ?? DateTime.MaxValue, y.ATA ?? DateTime.MaxValue));
+            
+            this.dataGridPOCores.SelectedItem = null;
+            this.filteredResult.AddRange(searchResult);
+            this.dataGridPOCores.ItemsSource = this.filteredResult;
+        }
+
+
+        #endregion
+        
+    }
+}
diff --git a/ENI2/Controls/MaerskOverviewControl.xaml b/ENI2/Controls/MaerskOverviewControl.xaml
new file mode 100644
index 00000000..766efbdc
--- /dev/null
+++ b/ENI2/Controls/MaerskOverviewControl.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="ENI2.Controls.MaerskOverviewControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/ENI2/Controls/MaerskOverviewControl.xaml.cs b/ENI2/Controls/MaerskOverviewControl.xaml.cs
new file mode 100644
index 00000000..79cf4f50
--- /dev/null
+++ b/ENI2/Controls/MaerskOverviewControl.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.Controls
+{
+    /// <summary>
+    /// Interaction logic for MaerskOverviewControl.xaml
+    /// </summary>
+    public partial class MaerskOverviewControl : UserControl
+    {
+        public MaerskOverviewControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 6b5c5246..724287f6 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -228,6 +228,9 @@
     <Compile Include="Controls\LocodeControl.xaml.cs">
       <DependentUpon>LocodeControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\MaerskOverviewControl.xaml.cs">
+      <DependentUpon>MaerskOverviewControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="EditControls\CompareExcelDialog.xaml.cs">
       <DependentUpon>CompareExcelDialog.xaml</DependentUpon>
     </Compile>
@@ -249,8 +252,8 @@
     <Compile Include="Excel\ExcelManager.cs" />
     <Compile Include="Excel\ExcelReader.cs" />
     <Compile Include="Excel\ExcelUtil.cs" />
-    <Compile Include="Controls\POListControl.xaml.cs">
-      <DependentUpon>POListControl.xaml</DependentUpon>
+    <Compile Include="Controls\MaerskListControl.xaml.cs">
+      <DependentUpon>MaerskListControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\ReportingPartyControl.xaml.cs">
       <DependentUpon>ReportingPartyControl.xaml</DependentUpon>
@@ -458,7 +461,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\POListControl.xaml">
+    <Page Include="Controls\MaerskOverviewControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\MaerskListControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index f54b77e9..3d81c257 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -35,7 +35,7 @@ namespace ENI2
         #region Fields
 
         private ReportingPartyControl rpControl;
-        private POListControl poControl;
+        private MaerskOverviewControl moControl;
         private ServerStatusControl statusControl;
         private readonly SucheControl sucheControl;
         private CompareExcelDialog compareExcelDialog;
@@ -281,11 +281,11 @@ namespace ENI2
             }
             else if(sender == this.buttonPOListe)
             {
-                if (this.poControl == null)
+                if (this.moControl == null)
                 {
-                    this.poControl = new POListControl();
+                    this.moControl = new MaerskOverviewControl();
                 }
-                this.rootContainer.Children.Add(poControl);
+                this.rootContainer.Children.Add(moControl);
             }
             else if(sender == this.buttonStatus)
             {

From 1d222259bbaa539be149e13121a292a3bdbd2a14 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 3 Feb 2023 14:45:51 +0100
Subject: [PATCH 04/34] UI Umbau, WIP

---
 ENI2/Controls/MaerskListControl.xaml     |   8 +-
 ENI2/Controls/MaerskListControl.xaml.cs  | 111 +----------------------
 ENI2/Controls/MaerskOverviewControl.xaml |  14 ++-
 ENI2/Properties/Resources.Designer.cs    |   2 +-
 ENI2/Properties/Resources.resx           |   2 +-
 5 files changed, 22 insertions(+), 115 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index e00d047a..dba0dac2 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -26,13 +26,9 @@
             </Grid.RowDefinitions>
             <StackPanel Orientation="Horizontal">
                 <Label Content="Calendar week" />
-                <xctk:DoubleUpDown x:Name="doubleUpDownCalendarWeek" VerticalContentAlignment="Center" VerticalAlignment="Center"
-                                   HorizontalAlignment="Stretch" Margin="2" Value="01" ValueChanged="doubleUpDownCalendarWeek_ValueChanged"/>
                 <Label Content="Type" />
-                <ComboBox x:Name="comboBoxFilterType" Margin="2" SelectionChanged="comboBoxFilterType_SelectionChanged" Width="100" />
-                
-                <Button x:Name="buttonExcelExport" Margin="2" Click="buttonExcelExport_Click" Content="Export Excel" Width="100" />
-                <Button x:Name="buttonSaveChanges" Margin="2" Click="buttonSaveChanges_Click" Content="Save changes" Width="100" IsEnabled="False" />
+                <Button x:Name="buttonExcelExport" Margin="2" Content="Export Excel" Width="100" />
+                <Button x:Name="buttonSaveChanges" Margin="2" Content="Save changes" Width="100" IsEnabled="False" />
             </StackPanel>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 0ec89672..008e6d02 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -23,15 +23,7 @@ namespace ENI2.Controls
     public partial class MaerskListControl : UserControl
     {
 
-        #region Fields
-
-        private readonly string[] _comboBoxEntries = 
-        {
-            "All",
-            "Maersk BRV/WHV",
-            "SeaGo BHV",
-            "SeaGo WHV"
-        };
+        #region Fields        
 
         private List<MessageCore> searchResult = new List<MessageCore>();
         private readonly List<MessageCore> filteredResult = new List<MessageCore>();
@@ -52,103 +44,12 @@ namespace ENI2.Controls
 
         private void POList_Loaded(object sender, RoutedEventArgs e)
         {
-            this.comboBoxFilterType.ItemsSource = this._comboBoxEntries;
-            this.doubleUpDownCalendarWeek.Value = bsmd.database.Util.GetIso8601WeekOfYear(DateTime.Now);
-            this.dataGridPOCores.ItemsSource = this.filteredResult;
+            
         }
 
-        private void buttonExcelExport_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.filteredResult.Count == 0) return;
+        
 
-            OpenFileDialog ofd = new OpenFileDialog
-            {
-                Filter = "Excel Files|*.xls;*.xlsx"
-            };
-            if (ofd.ShowDialog() ?? false)
-            {                
-                try
-                {
-                    Microsoft.Office.Interop.Excel.Application excelApp = new Microsoft.Office.Interop.Excel.Application();
-                    excelApp.DisplayAlerts = false;
-                    Workbook workBook = excelApp.Workbooks.Open(ofd.FileName);
-                    Worksheet workSheet = workBook.Worksheets[1];
-
-                    int rowIndex = 3;
-                    foreach(MessageCore core in this.filteredResult)
-                    {
-                        workSheet.Cells[rowIndex, 7].Value = core.Shipname;
-                        workSheet.Cells[rowIndex, 10].Value = core.PoC.Substring(2);
-                        if(core.POATA.HasValue)
-                            workSheet.Cells[rowIndex, 11].Value = core.POATA.Value.ToShortDateString();
-                        workSheet.Cells[rowIndex, 13].Value = core.PONumber;
-                        rowIndex++;
-                    }
-
-                    workBook.Save();
-                    workBook.Close();
-                    Marshal.ReleaseComObject(workBook);
-                    excelApp.Quit();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-        }
-
-        private void buttonSaveChanges_Click(object sender, RoutedEventArgs e)
-        {
-            foreach(MessageCore messageCore in this.filteredResult)
-            {
-                if (messageCore.IsDirty)
-                {
-                    DBManager.Instance.Save(messageCore);
-                    messageCore.IsDirty = false;
-                    // load ATA for this Core
-                    /* DAS ATA WIRD JETZT NICHT MEHR IN DIE MELDEKLASSE GESPEICHERT
-                    Message ataMessage = DBManager.Instance.GetMessage(messageCore, Message.NotificationClass.ATA);
-                    if(ataMessage?.Elements.Count == 1)
-                    {
-                        if(messageCore.ATA != ((ATA)ataMessage.Elements[0]).ATAPortOfCall)
-                        {
-                            ((ATA)ataMessage.Elements[0]).ATAPortOfCall = messageCore.ATA;
-                            DBManager.Instance.Save(ataMessage.Elements[0]);
-                        }
-                    }
-                    */
-                }
-            }
-            this.buttonSaveChanges.IsEnabled = false;
-        }
-
-        private void doubleUpDownCalendarWeek_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            if (!this.IsLoaded) return;
-            this.comboBoxFilterType.SelectedIndex = -1;
-            this.PerformSearch();
-        }
-
-        private void comboBoxFilterType_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            this.dataGridPOCores.ItemsSource = null;
-            if (this.comboBoxFilterType.SelectedIndex == -1) return;
-
-            this.filteredResult.Clear();
-            foreach (MessageCore core in this.searchResult)
-            {
-                switch (this.comboBoxFilterType.SelectedIndex)
-                {
-                    case 0: this.filteredResult.Add(core); break;
-                    case 1: if (core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.filteredResult.Add(core); break;
-                    case 2: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.filteredResult.Add(core); break;
-                    case 3: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.filteredResult.Add(core); break;
-                    case 4: if (core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.filteredResult.Add(core); break;
-                }
-            }
-            this.dataGridPOCores.ItemsSource = this.filteredResult;            
-        }
+        
 
         private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
@@ -216,11 +117,9 @@ namespace ENI2.Controls
             this.dataGridPOCores.ItemsSource = null;
             this.filteredResult.Clear();
 
-            if (!this.doubleUpDownCalendarWeek.Value.HasValue) return;
-
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
-            DateTime start = bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
+            DateTime start = DateTime.Now; // bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
             DateTime end = start.Add(new TimeSpan(6, 23, 59, 59));
             
             // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
diff --git a/ENI2/Controls/MaerskOverviewControl.xaml b/ENI2/Controls/MaerskOverviewControl.xaml
index 766efbdc..f6d27262 100644
--- a/ENI2/Controls/MaerskOverviewControl.xaml
+++ b/ENI2/Controls/MaerskOverviewControl.xaml
@@ -7,6 +7,18 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-            
+        <Grid.RowDefinitions>
+            <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Label Grid.Row="0" Content="Maersk lists" />
+        <TabControl x:Name="tabControlMaersk" Grid.Row="1">
+            <TabItem Name="tabItemBRV" Header="DEBRV">
+                <local:MaerskListControl x:Name="brvListControl" />
+            </TabItem>
+            <TabItem Name="tabItemWVN" Header="DEWVN">
+                <local:MaerskListControl x:Name="wvnListControl" />
+            </TabItem>
+        </TabControl>
     </Grid>
 </UserControl>
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 8687c93c..347184fb 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -3733,7 +3733,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to PO numbers.
+        ///   Looks up a localized string similar to Maersk.
         /// </summary>
         public static string textPOLists {
             get {
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index eae8c582..522722e4 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1709,7 +1709,7 @@
     <value>IMO hazard class (Group)</value>
   </data>
   <data name="textPOLists" xml:space="preserve">
-    <value>PO numbers</value>
+    <value>Maersk</value>
   </data>
   <data name="textMaerskSeago" xml:space="preserve">
     <value>Maersk / SeaGo</value>

From f470fba78fd81b1c2e03ba163cb69be55fc2cc99 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 3 Feb 2023 18:34:59 +0100
Subject: [PATCH 05/34] wip

---
 ENI2/Controls/MaerskListControl.xaml    |  4 ++--
 ENI2/Controls/MaerskListControl.xaml.cs | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index dba0dac2..b2bde931 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -27,8 +27,8 @@
             <StackPanel Orientation="Horizontal">
                 <Label Content="Calendar week" />
                 <Label Content="Type" />
-                <Button x:Name="buttonExcelExport" Margin="2" Content="Export Excel" Width="100" />
-                <Button x:Name="buttonSaveChanges" Margin="2" Content="Save changes" Width="100" IsEnabled="False" />
+                <Button x:Name="buttonImport" Margin="2" Content="Import" Width="70" />
+                <Button x:Name="buttonExport" Margin="2" Content="Export" Width="70" />
             </StackPanel>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 008e6d02..45062c46 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -44,13 +44,9 @@ namespace ENI2.Controls
 
         private void POList_Loaded(object sender, RoutedEventArgs e)
         {
-            
+
         }
 
-        
-
-        
-
         private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
             if (e.EditAction == DataGridEditAction.Commit)
@@ -66,7 +62,7 @@ namespace ENI2.Controls
                     }
                     else
                     {
-                        buttonSaveChanges.IsEnabled = true;
+                        // buttonSaveChanges.IsEnabled = true;
                         MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
                         editedCore.IsDirty = true;
                     }
@@ -86,7 +82,7 @@ namespace ENI2.Controls
                     {
                         editedCore.SetFlag(true, coreFlag);
                     }
-                    buttonSaveChanges.IsEnabled = true;
+                    // buttonSaveChanges.IsEnabled = true;
                     editedCore.IsDirty = true;
                 }
                 if(e.Column == gridColumnATA)
@@ -96,7 +92,7 @@ namespace ENI2.Controls
                     {
                         MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
                         editedCore.ATA = DateTime.SpecifyKind(localATA, DateTimeKind.Local).ToUniversalTime();
-                        buttonSaveChanges.IsEnabled = true;
+                        // buttonSaveChanges.IsEnabled = true;
                         editedCore.IsDirty = true;
                     } 
                     else
@@ -152,7 +148,7 @@ namespace ENI2.Controls
                             {
                                 messageCore.POATA = messageCore.ATA;
                                 messageCore.IsDirty = true;
-                                this.buttonSaveChanges.IsEnabled = true;
+                                // this.buttonSaveChanges.IsEnabled = true;
                             }
                         }
                     }
@@ -170,6 +166,14 @@ namespace ENI2.Controls
             this.dataGridPOCores.ItemsSource = this.filteredResult;
         }
 
+        private List<MessageCore> GetNextNDayCoresFromList(List<MessageCore> cores, int numDays = 3)
+        {
+            List<MessageCore> result = new List<MessageCore>();
+
+            result.AddRange(cores.FindAll(x => (x.ETADisplay.Value - DateTime.Now).TotalHours < (numDays * 24)));
+
+            return result;
+        }
 
         #endregion
         

From fc62386477a0f0e2be202f0fc3c3ea1cdc9ed00e Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 3 Feb 2023 18:36:25 +0100
Subject: [PATCH 06/34] wip

---
 ENI2/Controls/MaerskListControl.xaml.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 45062c46..ffaa94a2 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -113,6 +113,11 @@ namespace ENI2.Controls
             this.dataGridPOCores.ItemsSource = null;
             this.filteredResult.Clear();
 
+            // TODO: Da diese Suche hier so unfassbar lahmarschig ist wäre es günstig (zukünftig für das gesamte ENI),
+            // wenn die Abfrage asynchron stattfinden würde. Man muss nur irgendwie den Anwender bei Laune halten so dass
+            // er merkt, da passiert noch was. Eventuell mit einem "spinning" Icon. Aber der Rest bleibt aktiv.
+
+
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
             DateTime start = DateTime.Now; // bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
@@ -120,7 +125,7 @@ namespace ENI2.Controls
             
             // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
             uint from = start.Subtract(new TimeSpan(10, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
-            uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();           
+            uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
             filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
 
             Util.UIHelper.SetBusyState();

From 5f28c8c7ea6cac1cf824cca45c51f06783ade5f5 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 5 Feb 2023 11:14:07 +0100
Subject: [PATCH 07/34] wip

---
 ENI2/Controls/BusyControl.xaml               | 14 ++++++
 ENI2/Controls/BusyControl.xaml.cs            | 44 ++++++++++++++++
 ENI2/Controls/MaerskListControl.xaml         | 21 +++++---
 ENI2/Controls/MaerskListControl.xaml.cs      | 35 +++++++++----
 ENI2/ENI2.csproj                             |  7 +++
 ENI2/EditControls/CompareExcelDialog.xaml.cs |  2 +-
 ENI2/Util/UIHelper.cs                        | 53 ++++++++++++++++++--
 bsmd.database/DBManager.cs                   |  2 +-
 8 files changed, 154 insertions(+), 24 deletions(-)
 create mode 100644 ENI2/Controls/BusyControl.xaml
 create mode 100644 ENI2/Controls/BusyControl.xaml.cs

diff --git a/ENI2/Controls/BusyControl.xaml b/ENI2/Controls/BusyControl.xaml
new file mode 100644
index 00000000..83b0c937
--- /dev/null
+++ b/ENI2/Controls/BusyControl.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="ENI2.Controls.BusyControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:p="clr-namespace:ENI2.Properties"
+             xmlns:util="clr-namespace:ENI2.Util"
+             xmlns:local="clr-namespace:ENI2.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="28" d:DesignWidth="28">
+    <Grid>
+        <Image Source="../Resources/bullet_ball_grey.png" x:Name="imageBall" />
+    </Grid>
+</UserControl>
diff --git a/ENI2/Controls/BusyControl.xaml.cs b/ENI2/Controls/BusyControl.xaml.cs
new file mode 100644
index 00000000..e840a1fc
--- /dev/null
+++ b/ENI2/Controls/BusyControl.xaml.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 2023- schick Informatik
+// 
+// Description: Idea to have a simple control that shows if the application is busy or not using a simple icon
+// that will be set according to a state
+//
+
+using ENI2.Util;
+using System.Windows.Controls;
+
+namespace ENI2.Controls
+{
+    /// <summary>
+    /// Interaction logic for BusyControl.xaml
+    /// </summary>
+    public partial class BusyControl : UserControl
+    {
+        UIHelper.BusyStateEnum _busyState = UIHelper.BusyStateEnum.NEUTRAL;
+
+        public BusyControl()
+        {
+            InitializeComponent();
+        }
+
+        public UIHelper.BusyStateEnum BusyState
+        {
+            set
+            {
+                _busyState = value;
+                //Dispatcher.Invoke(() =>
+                //{
+                    switch (_busyState)
+                    {
+                        case UIHelper.BusyStateEnum.NEUTRAL: imageBall.Source = Properties.Resources.bullet_ball_grey.CreateBitmapSource(); break;
+                        case UIHelper.BusyStateEnum.BUSY: imageBall.Source = Properties.Resources.bullet_ball_yellow.CreateBitmapSource(); break;
+                        case UIHelper.BusyStateEnum.FAIL: imageBall.Source = Properties.Resources.bullet_ball_red.CreateBitmapSource(); break;
+                        case UIHelper.BusyStateEnum.SUCCESS: imageBall.Source = Properties.Resources.bullet_ball_green.CreateBitmapSource(); break;
+                    }
+                //});
+            }
+
+            get => _busyState;
+        }
+    }
+}
diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index b2bde931..b6ab6887 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -24,12 +24,21 @@
                 <RowDefinition Height="28" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal">
-                <Label Content="Calendar week" />
-                <Label Content="Type" />
-                <Button x:Name="buttonImport" Margin="2" Content="Import" Width="70" />
-                <Button x:Name="buttonExport" Margin="2" Content="Export" Width="70" />
-            </StackPanel>
+            <Grid Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="30" />
+                </Grid.ColumnDefinitions>
+                <Label Content="Calendar week" Grid.Column="0"/>
+                <Button x:Name="buttonLoad" Grid.Column="1" Content="Load" Margin="2" Click="buttonLoad_Click" />
+                <Button x:Name="buttonImport" Grid.Column="2" Margin="2" Content="Import" Click="buttonImport_Click" />
+                <Button x:Name="buttonExport" Grid.Column="3" Margin="2" Content="Export" Click="buttonExport_Click" />
+                <local:BusyControl x:Name="busyControl" Grid.Column="5" />
+            </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
                 <DataGrid.Columns>
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index ffaa94a2..647297c7 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -111,24 +111,17 @@ namespace ENI2.Controls
         private void PerformSearch()
         {
             this.dataGridPOCores.ItemsSource = null;
-            this.filteredResult.Clear();
-
-            // TODO: Da diese Suche hier so unfassbar lahmarschig ist wäre es günstig (zukünftig für das gesamte ENI),
-            // wenn die Abfrage asynchron stattfinden würde. Man muss nur irgendwie den Anwender bei Laune halten so dass
-            // er merkt, da passiert noch was. Eventuell mit einem "spinning" Icon. Aber der Rest bleibt aktiv.
-
+            this.filteredResult.Clear();            
 
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
             DateTime start = DateTime.Now; // bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
             DateTime end = start.Add(new TimeSpan(6, 23, 59, 59));
-            
+
             // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
             uint from = start.Subtract(new TimeSpan(10, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
             uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
-            filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
-
-            Util.UIHelper.SetBusyState();
+            filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));            
 
             // suche auslösen
             this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
@@ -181,6 +174,26 @@ namespace ENI2.Controls
         }
 
         #endregion
-        
+
+        #region button event handler
+
+        private void buttonLoad_Click(object sender, RoutedEventArgs e)
+        {
+            Util.UIHelper.SetBusyState();
+            this.PerformSearch();
+        }
+
+        private void buttonImport_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void buttonExport_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        #endregion
+
     }
 }
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 724287f6..d0bb12f2 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -218,6 +218,9 @@
     <Compile Include="..\bsmd.ExcelReadService\LocodeDB.cs">
       <Link>Locode\LocodeDB.cs</Link>
     </Compile>
+    <Compile Include="Controls\BusyControl.xaml.cs">
+      <DependentUpon>BusyControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\ClosableTabItem.cs" />
     <Compile Include="Controls\ConditionGroupControl.xaml.cs">
       <DependentUpon>ConditionGroupControl.xaml</DependentUpon>
@@ -453,6 +456,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\BusyControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\ConditionGroupControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ENI2/EditControls/CompareExcelDialog.xaml.cs b/ENI2/EditControls/CompareExcelDialog.xaml.cs
index 36429513..62bfba7a 100644
--- a/ENI2/EditControls/CompareExcelDialog.xaml.cs
+++ b/ENI2/EditControls/CompareExcelDialog.xaml.cs
@@ -31,7 +31,7 @@ namespace ENI2.EditControls
 
         #region Drag&Drop event handler
 
-        private async void imageSource_Drop(object sender, DragEventArgs e)
+        private void imageSource_Drop(object sender, DragEventArgs e)
         {
             string[] files = (string[]) e.Data.GetData(DataFormats.FileDrop);
             if (files != null)
diff --git a/ENI2/Util/UIHelper.cs b/ENI2/Util/UIHelper.cs
index 3edcad61..383881b9 100644
--- a/ENI2/Util/UIHelper.cs
+++ b/ENI2/Util/UIHelper.cs
@@ -5,10 +5,12 @@
 
 using System;
 using System.Collections.Generic;
+
 using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
 using bsmd.database;
@@ -20,6 +22,15 @@ namespace ENI2.Util
 
         private static bool isBusy;
         private static readonly Random r = new Random();
+        
+
+        public enum BusyStateEnum
+        {
+            NEUTRAL,
+            BUSY,
+            FAIL,
+            SUCCESS
+        }
 
         public static void SetBusyState()
         {
@@ -28,15 +39,16 @@ namespace ENI2.Util
 
         private static void SetBusyState(bool busy)
         {
+           
             if(busy != isBusy)
             {
                 isBusy = busy;
-                Mouse.OverrideCursor = isBusy ? Cursors.Wait : null;
+                Mouse.OverrideCursor = isBusy ? Cursors.Wait : null;               
             }
 
             if(isBusy)
             {
-                new DispatcherTimer(TimeSpan.FromSeconds(0), DispatcherPriority.ApplicationIdle, dispatcherTimer_Tick, Application.Current.Dispatcher);
+                _ = new DispatcherTimer(TimeSpan.FromSeconds(0), DispatcherPriority.ApplicationIdle, dispatcherTimer_Tick, Application.Current.Dispatcher);
             }
         }
 
@@ -44,13 +56,13 @@ namespace ENI2.Util
         {
             if (sender is DispatcherTimer timer)
             {
-                SetBusyState(false);
+                SetBusyState(false);               
                 timer.Stop();
             }
         }
 
         public static bool IsModal(this Window window)
-        { 
+        {
             return (bool)typeof(Window).GetField("_showingAsDialog", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(window);
         }
 
@@ -59,6 +71,38 @@ namespace ENI2.Util
             return Color.FromRgb((byte) r.Next(150, 255), (byte) r.Next(150, 255), (byte) r.Next(150, 255));
         }
 
+        public static BitmapSource CreateBitmapSource(this System.Drawing.Bitmap bitmap)
+        {
+            if (bitmap == null)
+                throw new ArgumentNullException("bitmap");
+
+            System.Drawing.Rectangle rect = new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height);
+
+            System.Drawing.Imaging.BitmapData bitmapData = bitmap.LockBits(rect,
+                System.Drawing.Imaging.ImageLockMode.ReadWrite,
+                System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+
+            try
+            {
+                var size = rect.Width * rect.Height * 4;
+
+                return BitmapSource.Create(
+                    bitmap.Width,
+                    bitmap.Height,
+                    bitmap.HorizontalResolution,
+                    bitmap.VerticalResolution,
+                    PixelFormats.Bgra32,
+                    null,
+                    bitmapData.Scan0,
+                    size,
+                    bitmapData.Stride);
+            }
+            finally
+            {
+                bitmap.UnlockBits(bitmapData);
+            }
+        }
+
         public static void SetMessageIcons(List<Message> messages)
         {
             foreach (Message aMessage in messages)
@@ -159,6 +203,5 @@ namespace ENI2.Util
                 }
             }
         }
-
     }
 }
diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index ed3c9426..735cf5cf 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -1537,7 +1537,7 @@ namespace bsmd.database
                     cmd.Connection = this._con;
                     // Stopwatch sw = new Stopwatch();
                     // sw.Start();
-                    reader = cmd.ExecuteReader();
+                    reader = cmd.ExecuteReader();                    
                     // sw.Stop();
                     // _log.DebugFormat("{1}ms:  {0}", cmd.CommandText, sw.ElapsedMilliseconds);
                     

From af1a071664c4666f7f2b7bd0d0f83181ec4d9e23 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 5 Feb 2023 11:27:20 +0100
Subject: [PATCH 08/34] Erster Versuch, eine ASYNC Version des DBManagers zu
 starten

---
 bsmd.database/DBManager.cs | 64 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index 735cf5cf..1deaf673 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -15,6 +15,8 @@ using System.Diagnostics;
 using Newtonsoft.Json;
 using log4net;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace bsmd.database
 {
@@ -32,6 +34,7 @@ namespace bsmd.database
         private bool _closeConnectionAfterUse = false;
         private readonly List<string> truncatedFieldCollection = new List<string>();
         private Dictionary<Type, string> messageHistoryTypeDict;
+        private SemaphoreSlim _asyncSemaphore = new SemaphoreSlim(1);
 
         #endregion
 
@@ -99,6 +102,22 @@ namespace bsmd.database
             }
         }
 
+        public async Task<bool> ConnectAsync(string dbConnectionString)
+        {
+            try
+            {
+                _con = new SqlConnection(dbConnectionString);
+                await _con.OpenAsync();
+                this.ConnectionString = dbConnectionString;
+                return true;
+            }
+            catch(Exception ex)
+            {
+                _log.ErrorFormat("DBManager cannot connect:{0}", ex.Message);
+                return false;
+            }
+        }
+
         public void Disconnect()
         {
             if (this._con?.State == ConnectionState.Open)
@@ -785,6 +804,13 @@ namespace bsmd.database
                 this.Connect(this.ConnectionString);
         }
 
+        private async Task CheckConnectionAsync()
+        {
+            if ((this._con == null) ||
+                (this._con.State == ConnectionState.Closed))
+                await this.ConnectAsync(this.ConnectionString);
+        }
+
         private void LogNonQueryResult(string query, int queryResult)
         {
             switch (queryResult)
@@ -1537,7 +1563,7 @@ namespace bsmd.database
                     cmd.Connection = this._con;
                     // Stopwatch sw = new Stopwatch();
                     // sw.Start();
-                    reader = cmd.ExecuteReader();                    
+                    reader = cmd.ExecuteReader();
                     // sw.Stop();
                     // _log.DebugFormat("{1}ms:  {0}", cmd.CommandText, sw.ElapsedMilliseconds);
                     
@@ -1660,7 +1686,41 @@ namespace bsmd.database
                     bulkCopy.WriteToServer(table);
                 }
             }
-        }        
+        }
+
+        #endregion
+
+        #region async DB access methods
+
+        internal async Task<SqlDataReader> PerformCommandAsync(SqlCommand cmd)
+        {
+            SqlDataReader reader = null;
+
+            await _asyncSemaphore.WaitAsync();
+            try
+            {
+                await this.CheckConnectionAsync();
+                cmd.Connection = this._con;
+                reader = await cmd.ExecuteReaderAsync();
+            }
+            catch (SqlException ex)
+            {
+                Trace.WriteLine("SQL Exception:" + ex.Message);
+                _log.Error("Error performing command", ex);
+                _log.DebugFormat("Query: {0}", cmd.CommandText);
+                _log.Debug("Parameters:");
+                for (int i = 0; i < cmd.Parameters.Count; i++)
+                {
+                    _log.DebugFormat("{0}:{1}", cmd.Parameters[i].ParameterName, cmd.Parameters[i].Value);
+                }
+            }
+            finally
+            {
+                _asyncSemaphore.Release();
+            }
+
+            return reader;
+        }
 
         #endregion
 

From 8862d8e83cc7f69a19dbf57fb0fb2653ba2e4c0c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 7 Feb 2023 11:00:31 +0100
Subject: [PATCH 09/34] rework main screen Part I

---
 ENI2/ENI2.csproj                      |   5 +++
 ENI2/MainWindow.xaml                  |  45 +++++++++++++++++++----
 ENI2/MainWindow.xaml.cs               |  49 ++++++++++---------------
 ENI2/Properties/Resources.Designer.cs |  50 ++++++++++++++++++++++++++
 ENI2/Properties/Resources.resx        |  15 ++++++++
 ENI2/Resources/about.png              | Bin 0 -> 1331 bytes
 ENI2/Resources/document_exchange.png  | Bin 0 -> 1427 bytes
 ENI2/Resources/document_into.png      | Bin 0 -> 1177 bytes
 ENI2/Resources/document_plain_new.png | Bin 0 -> 1161 bytes
 ENI2/Resources/exit.png               | Bin 0 -> 1320 bytes
 ENI2/SucheControl.xaml                |  33 ++++++++---------
 ENI2/SucheControl.xaml.cs             |  13 +++++++
 12 files changed, 158 insertions(+), 52 deletions(-)
 create mode 100644 ENI2/Resources/about.png
 create mode 100644 ENI2/Resources/document_exchange.png
 create mode 100644 ENI2/Resources/document_into.png
 create mode 100644 ENI2/Resources/document_plain_new.png
 create mode 100644 ENI2/Resources/exit.png

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index d0bb12f2..b5972b73 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -852,6 +852,11 @@
     <Resource Include="Resources\logo_eni.png" />
     <Resource Include="Resources\import1.png" />
     <Resource Include="Resources\import2.png" />
+    <Resource Include="Resources\about.png" />
+    <Resource Include="Resources\document_into.png" />
+    <Resource Include="Resources\document_plain_new.png" />
+    <Resource Include="Resources\exit.png" />
+    <Resource Include="Resources\document_exchange.png" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml
index 37d9d068..223488bf 100644
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@@ -59,12 +59,48 @@
             </Grid>
         </xctk:BusyIndicator.BusyContent>
         <DockPanel Name="mainPanel">
-            <Grid DockPanel.Dock="Top" Height="80" Background="#FFE8F6FF">
+            <Menu DockPanel.Dock="Top" Background="#FFE8F6FF">
+                <Menu.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <DockPanel HorizontalAlignment="Stretch"/>
+                    </ItemsPanelTemplate>
+                </Menu.ItemsPanel>
+                <MenuItem Header="_File">
+                    <MenuItem Header="_Create new Id" Click="buttonNewTransitIdClick">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/document_plain_new.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="_New with Id" Click="buttonNewWithIdClick">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/document_into.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="Compare _Excel sheets" Click="buttonCompareSheets_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/document_exchange.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <Separator />
+                    <MenuItem Header="Exit" Click="MenuItem_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/exit.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
+                <MenuItem Header="Help" HorizontalAlignment="Right">
+                    <MenuItem Header="About" Click="buttonAbout_Click">
+                        <MenuItem.Icon>
+                            <Image Source="Resources/about.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuItem>
+            </Menu>
+            <Grid DockPanel.Dock="Top" Height="28" Background="#FFE8F6FF">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Image Grid.Column="0" x:Name="logoImage" HorizontalAlignment="Left" Height="75" Width="75" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp" Margin="2"/>
                 <Grid Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>
@@ -79,14 +115,11 @@
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>
                     </Grid.RowDefinitions>
-                    <Button Grid.Column="0" x:Name="buttonNewId" Content="{x:Static p:Resources.textNewVisitTransitId}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonNewTransitIdClick" Background="Transparent" Margin="2,2,0,0" Grid.RowSpan="2"/>
-                    <Button Grid.Column="1" x:Name="buttonNewWithId" Content="{x:Static p:Resources.textNewWithId}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonNewWithIdClick" Background="Transparent" Margin="2,2,0,0" Grid.RowSpan="2"/>
+                    
                     <RadioButton Grid.Column="2" x:Name="buttonNotifications" Content="{x:Static p:Resources.textNotifications}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" IsChecked="True" Grid.RowSpan="2" />
                     <RadioButton Grid.Column="3" x:Name="buttonStatus" Content="{x:Static p:Resources.textServerStatus}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" Grid.RowSpan="2" />
                     <RadioButton Grid.Column="4" x:Name="buttonUserAdmin" Content="{x:Static p:Resources.textUserAdministration}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2"/>
                     <RadioButton Grid.Column="5" x:Name="buttonPOListe" Content="{x:Static p:Resources.textPOLists}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2" />
-                    <Button Grid.Column="6" x:Name="buttonCompareSheets" Content="{x:Static p:Resources.textCompareExcel}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="buttonCompareSheets_Click" Background="Transparent" Margin="2,2,0,0" />
-                    <Button Grid.Column="7" x:Name="buttonAbout" Content="?" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" Margin="0,2,2,0" Padding="5,0,5,0" Click="buttonAbout_Click" Grid.RowSpan="2"/>
                     <Label Grid.Column="0" Grid.Row="1" x:Name="labelStatusId" Grid.ColumnSpan="3" Margin="2,2,0,0" HorizontalAlignment="Left"/>
                 </Grid>
             </Grid>
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index 3d81c257..d2dac9d7 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -1,28 +1,27 @@
-// Copyright (c) 2017 schick Informatik
+// Copyright (c) 2017-present schick Informatik
 // Description: The main application window
 //
 
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Threading;
-using System.Timers;
+using System.Text;
+
+using log4net;
 
 using bsmd.database;
-using System.Windows.Controls;
+
 using ENI2.Controls;
 using ENI2.EditControls;
 using ENI2.Util;
-
-using log4net;
-using System.ComponentModel;
 using ENI2.Locode;
-using System.Text;
+
 
 namespace ENI2
 {
@@ -39,8 +38,7 @@ namespace ENI2
         private ServerStatusControl statusControl;
         private readonly SucheControl sucheControl;
         private CompareExcelDialog compareExcelDialog;
-
-        private bool efMode = false;
+        
         private bool dbConnected;
         private readonly ScaleTransform _transform = new ScaleTransform(1.0, 1.0);
         private readonly Dictionary<Guid, ClosableTabItem> openTabs = new Dictionary<Guid, ClosableTabItem>();
@@ -245,13 +243,7 @@ namespace ENI2
 
         #endregion
 
-        #region Window control click event handler       
-
-        private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            if(efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
-            else Process.Start("http://www.eureport.de/");            
-        }
+        #region Window control click event handler               
 
         private void buttonAbout_Click(object sender, RoutedEventArgs e)
         {
@@ -262,12 +254,12 @@ namespace ENI2
         private void radioButton_Click(object sender, RoutedEventArgs e)
         {
             this.rootContainer.Children.Clear();
-            bool newButtonsVisible = false;
+            
 
             if(sender == this.buttonNotifications)
             {
                 this.rootContainer.Children.Add(this.mainFrame);
-                newButtonsVisible = true;
+            
             }
             else if(sender == this.buttonUserAdmin)
             {
@@ -295,9 +287,6 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(this.statusControl);
             }
-
-            this.buttonNewId.Visibility = newButtonsVisible ? Visibility.Visible : Visibility.Hidden;
-            this.buttonNewWithId.Visibility = newButtonsVisible ? Visibility.Visible : Visibility.Hidden;
         }
 
         private void buttonCompareSheets_Click(object sender, RoutedEventArgs ev)
@@ -327,12 +316,7 @@ namespace ENI2
             this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString);
             labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed";
             labelVersion.Text = "V. " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
-            if (Keyboard.IsKeyDown(Key.LeftShift))
-            {
-                efMode = true; 
-                logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
-            }
+            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;            
             Microsoft.Win32.SystemEvents.SessionEnded += SystemEvents_SessionEnded;
         }
 
@@ -609,6 +593,11 @@ namespace ENI2
             }
         }
 
+        private void MenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
         #endregion
 
         #region mouse wheel / zooming events
@@ -717,6 +706,6 @@ namespace ENI2
         }
 
         #endregion
-        
+       
     }
 }
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 347184fb..a47afa95 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -70,6 +70,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap about {
+            get {
+                object obj = ResourceManager.GetObject("about", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -290,6 +300,26 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap document_exchange {
+            get {
+                object obj = ResourceManager.GetObject("document_exchange", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap document_into {
+            get {
+                object obj = ResourceManager.GetObject("document_into", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -310,6 +340,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap document_plain_new {
+            get {
+                object obj = ResourceManager.GetObject("document_plain_new", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -380,6 +420,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap exit {
+            get {
+                object obj = ResourceManager.GetObject("exit", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index 522722e4..f959d19d 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1861,4 +1861,19 @@
   <data name="textSpecialCaseBREBRV" xml:space="preserve">
     <value>At least one of NOA_NOD, AGNT, INFO, SEC, TIEFA hasn't been sent for DEBRE/DEBRV: ({0}) Close anyway?</value>
   </data>
+  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="document_exchange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document_exchange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="document_into" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document_into.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="document_plain_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document_plain_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI2/Resources/about.png b/ENI2/Resources/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2738bf4672a6ec9c30e9efd8d9b35897f2ed724
GIT binary patch
literal 1331
zcmV-31<d-1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKBJATc%|L}hv)GB7YRATc*OFf=+cHXti7F)%P-HZAS|000McNliru
z(*p((4?7XU-GKlA010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00fIk
zL_t(|+O<_{OdM4dJ~KP)EX(ff0$m=<!dlo=VoVHFDH?2)^bf%h8)NW?iDFC8rlvw{
ztg*qyq-{)VO?)L9V(|w_QLzvywoS~owNTQ=wE<cyNsHmV3&HMlc4p_{xig&ww1isq
zBqw(==kE7?_nhy}0{qWGtyLHpP)!^cs}%&fPLjlGnuao(ma=7822m9Lh{ySx0Mf7|
zQ3HjAGydAzdikCRjvP_x#zxo?3`%d?Y|_S@90nW?2Fzx?uB!T)Oajc$$6#t|0cK``
z6HaIDp^1t9FL&>5Q`RI{SWw;5)6mUvQjOQkfXTEBNc}|$As|WWq6jcLIu4VQzh7{>
zeJ|A2mCgN)AR1MRZ`^<jKA-Y{(@AUZ6h%*l0q|d$hmXD))84<f{b6{jq5vW>Y?7oW
zIpN$~7>0)Yx4hn>t@ZU)Giid65tZS27%VSWsyL3;R1sjZlFY~e$Zz--Lf02H0?#A)
zF!l9zSXk1*Qz?CAS%6?L0)BtrrRwV9Cu?e+mKj~W_;Nu3jo{2Ga1uCEpzt}+@hr4`
z9stHf!O`YQ;FHTIG=xN>0L8@|cs%8gpF0<L5r6)b)(c6JcN7(wR!^VOm8o|?oLLMU
zYpH<7S}%ldC-s`ToCZ-i3{YA57}n#>1V=jo!zh(3OQkoGAcG_7E!du8KTN{ekq|hn
z42ZG{JGYiVsVgge0t1|^@i>6nP1>5dIZZ%Oat7HzRHNTDcMx!+O%HkOFfz--@U18a
zk^(V7)!Md_z(`5Lnr=BZO@NnXNm005@;;edJ%c2k<e7?W2*niW8eGx}VL=x_(f~G|
zGcqVZ!$2gm_#62>t$SKLv$&Yj3WjncWkQAy5y)0+7J$tLl!-~tW+f3(?{WcLzC4Vb
zkh;<Yd3pICjE^tM#E!;oHIl|tQ8@oh7LD$(18{bHX2D9ju!4ZtG$)5bu@VFVKh9dM
z1s|sgwrpVof?zrn2+U|+Cap4Bl!-f<2jb9l7LVuP&`umQ`Qz~FPdu0@9h}U~<3U4M
z08X6fkX$a;EA8#O!f65$+qUJs8wv@Z3=dDJ<mQqjszkJ-HIs$>B0H3NY_Jj2<+g(r
z?IlY(0ne*owF30?oJ99UTU%RO&KS7NvhRs6;Pvz8=YQ_)y>xWbrjp#!(jq{7c>htn
z1DFc=EFfSC*9e*+A}qIuWGHk~peRS@x}WR*{_$*7vWw^AO%@AN>TqOJHk%V2V%7ko
zcxByg?;TSp*ct`bCFt({bl~ve_v-KI|G<de-mB%|aHvWY6J?^9a;8!VDj1x8qM@N>
zGt1^eB9Q=}&x+t(NVw3jZ(r;8>tU`N2M>Ps#;H@ksH3BjdhHsoUc5M=?%n&&(A@;n
z_koWNOBS-M1zV${|3&EQJ07#!xt*l+uL(LjzA(q*$wr^A96!w==<52AcQ`E1x3|A_
z{cii2e@YMx3I|F`9`v3*eG<mT27leKq41^s``^5>*8X*eY(!`0ar5kK;y@yC`#Bu!
pRas8<ppC!Vv!_kEpEmzz@h62SSE&9~bfo|Q002ovPDHLkV1kd5X3PKp

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/document_exchange.png b/ENI2/Resources/document_exchange.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b580aac5c53238ff25bcfbca601b126f79a35f
GIT binary patch
literal 1427
zcmV;E1#J3>P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru
z(+CI&5*twZCBFaw010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00iqv
zL_t(|+Pzk5Y?D<Oe!jNrz3bKu+?Y(<GFfziDKXr=Y&cMcYza{u5Md;E0}|0qCkF7(
zkPQ<wV<Aq5Iw3e0aW}HLh>0?Y*N6cog!_yRT1LCJU;AB;=X~wDbr=5Wn>=67`FeVu
z_j%vvoD}$vgJX{km5n4bJq5C=f>Q|;Re?%z(>?fiNHCNh*}v&0ZS^)3f=3Nh`V`Rz
zBYJQhZRmn<N0ztt9wie+$MMsobYrb={c9gD9$Acs@CxV7XmSzf9xK6%xP~f9JW1%-
zgD6Cs&^<LMRE0?2B_&#rmY<&}aisJ4Ee-RuMb-EXMp7vb%E+E~7xGG{XX<5LC*HyQ
z$q95^q+T4Sflb*PLWwexESR&Z#3AV9Z`N(Ce^guO!tt<QLXz1Im(7kjOS4P}qIMzz
zLxhElZw_UU6dCup%qX1YLSfbhhx_8?9wOC0_PPG$^UwpyHXA~`fYjtfoN@Kf=XVM&
zs$_7S0@~X#n{%21&tMQIdw)mZ#!c+odl+6XpRl6%;oki-TRlcw0+Os&I2p_oNj4qq
zNSjarCQ!g)d0{>Z7w6HEaY&z<jB{zn&~UZ^@B@w{Gn^(1jGO^xV*+?N41~~tI^3r2
zYQ-ixj`e`V6KKt5U+VR+Sj@0mOqvm@W>+D{l7pv;a<O^UQdrFvO@ZBHLREPQ@@LIh
z03W>g1)q#5kvxWA1S)Mb12cj_XF&6cX7u!4LLekyio=0ais>n-IP_gFoCEpFT6f(?
z_z+UOi=qNlI?xaulTpPRHbROq1+As6c(1bysR<6uuuMU1M+XX~m!qoakRAq8``VZ4
z7sL@LvZVc-d7nX|_~Lpq_Wrp?I}-|tH$t8x4^4%iVb`%Q@n+`{te(0V&&p+JJKPQ!
zO?H3C+x^T7`yP)qSu2H>b!3BvYX?wwp_)2LMYb~+E7MkvGXi^eZblz6OqnR2S_)BA
zP_cdqd_zH;zcOI|s{KR@6U-V~yk*Bh5~c%RSSH)g?jkvD(?|>1Mh=m!#NL!hPI*p~
zH{NZDyGB&n7>UXYQMtUN5?)k^pUNMi@B|gIvEqQ15p^KfL5M=jKu~$&RkU3>h>8`(
zxEgZ9Bl+=q@iIKuQHrcw+Z~O-F3Ol8xRJ(cJ;;9`6Xk8|@MEAIYYG;k|CR?HzaMT2
zJGJQ2McMdZ;BC5zd`BaU5VG&o5rQAYE_jF+x*O@(-S{;Ef&d@SgAa#L*V2vlu09Ot
z`cZv)cbpMqx`(VrE=M+IRnWjF$*7aO`tCI_(Zh1pei7R*mBSn65e|tEi3xsh81K*g
z6spgTvIiGIkknYVngS9r2N`7&GFHKp1#`H9g?U{0iINnbH>mn30aM_m5Q7qO?st{_
z{KrMG<0xy{4uj5zvyR$Xp$#Cc38M*OL2p8SP&oD1KerGN!?+y`f}P2^jdM>jBdF1A
zV*nX79#*B&5~;E4C!T<X4Hdt3Uls;~0a~g6%#H-m3%GzpGn7drYppCaQ&r12GM8v~
zMJh8)p+rxnVI09uoKmXP<!6reH#+aNX4<EjfeT#C>>?+8K>|TgV)w6>Bo}S268&WF
z=?$yX=_Vmyu^ZoF8Se9`{L{WZ{)zM{>5tTWzaw=hJcPbpF-kzd(d-pkI;Mnhkv|M<
h%;`D!ytnbc#J`^M`sN*_Sd{<(002ovPDHLkV1j7QeOLeh

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/document_into.png b/ENI2/Resources/document_into.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dce3fae52726a94b55fee860e06ee0a30a91e4b
GIT binary patch
literal 1177
zcmV;K1ZMk*P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru
z(+L9?DiK?0P>}!t010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Z$!
zL_t(|+Pzj?Xk0}U{^tJdCbk>bl!C>wp{-KXD6tJFX=@^Z`iEkn3I&6TQuU#I5&F=V
zir|wXzSx(lV11~FRG|@)AR42MG`2QLq3T1L+Wff9nsj%Q&F<a3bB|}{-n-pRHfdh;
z?w*}9voq(LbG~n87x<4KQQ3Lr$fuOpv;nU4^f$sIc!K<v2t*zm_f3K8$=T_=W9|Fm
zqk}_hMmzfc*R<BB`}+~v_v(9@m*4ti&uTG^$__~i9MU@tP3>NC7A}8ZWRpB4-cXM_
zTUr`Qg1&v}(1}OZ24Dmg6N29rrX~tKtbMK;hym}4*JJ1Y=VFfG_H`XT-hN8}15}$R
zAwpbj3Z*1nG&R=Y;Vp5rbsdON#O{9a&EsvW0(jm{|G_Vtmw_08DwO>*m&4%MVVpU6
z8h`Zk0FmhW`Fy(fh1WlPta6=IjdwGH>x+}P@6^4xeBk$G87YxH-PwZ9J<TW<B?<)x
znQRV!jwjcjKJ)WeJY_>ofL*P3m;G2|9iHsiitV3oM{oNeu1%#;;=nF5>=HELE(u8P
z8@7qZcPFs9X*2rzFE%dA;I<F!sdcev<H7L`m?wo+%^h|FS~qRO;_f1z7}$j#2AQ1B
z!Z0}?1L;<QaVuB>s=TCXM;?{|G{>4YzTNePopt6BwIVPLo0VeXuiRxklt^f)KKsj~
z7=HeeE{~_Bi@-=1*8dC{S^}_GD2dV8A*2dP*p>~;ve+Vsm=V~nh1M-iSeS9}z^VK3
z-QFSG$T}KGmH`ZGOWdxr@M>jX@@0^BvoOhG&(OP9+jIG4@U@UhEy7KgkSSy_o6h6v
zM8@aA^9eUB6I&B;E|EGjH8PMqwdgp|N0e6*Gg;*A)Wr>WITvStyMlA6B!1`^!PrDP
zsCBjO^gZP<7pRfJ*j&>6tUKe9VOWMDjF;8bTX^lMHk`XKj$czL{Mb2yD=K)Upvxcu
z59%ONjSTX~+*ls-_@?(fJ+pTwOOJ5R#~U#^JcXgu3<f$!F+S-Br+{45@d6ArrmY4C
zRVTTB@RF{Q%3#5DFfjc$e&XO)Ik*byE65L~2=;@M4;p5$<hrQ>kl{pbqtOQRbMP?^
zuE&GmGL$F$TUL+jH5{EeP=G656+}`mE-=x3?ZX(mmiB=wN}~dYnS{X+lt$u~08~Ca
z6Eh1CEI)mGcu)kSQh1(7jr*<=hU5%N(!T{(1VC6<Ue>xJ5l|@nVE#t^mO>RNQ3@8h
zr-h+;Sq(s;XL1C`kyVq*!G&KI5fCcXFP#ipJ!Ww>#>xPx)EwS<_XICm3J@G1{YQX(
r;ptyAMJ%x|0$=?Z$fR%Je|`Q1_Y-MO8IEo{00000NkvXXu0mjf=1d%6

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/document_plain_new.png b/ENI2/Resources/document_plain_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..66987e896600ead9ee04744b897f7e1e4b4b9ebd
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000hbVXQnLvm$d
zbZKvHAXI5>WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru
z(+CF_ECxK{%r^i4010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00ZGk
zL_t(|+P#)vXdG1-#ea8plg-9WvPl~MB*8YOYAMmyMr~;kt3?#l(n=5n`{G}GP(i_G
z5quKG7xQ8Zq6j`nUeZd9NDD?ES~X3il45B}Y&Geo+x^qH*<|NlzdJj#nN70M7ah2>
zbMMTYbI<wCH!S?ehYC-gd+Ug~y}gm<NRCowLGCIFb#WO97M&=@Xc-0-QOwR<{i9Hf
z9{l2?mrngF0t1l`-X1Ky@yKTA$iV0{#G-P23vB3yo?b}aRC)2(i3yH;K9XxmwmtF5
z`_F$@iy-2ID|XU5)w=c7yJjb#{&$!dh3Q{l>{rb8HcWO2w;@TXz5yJ?Tsp^8DIP0i
zGXp#NpFA;sYWUJx1dey!Mho+@$IAk)euMNyIM50Qx4?^=P^V9#CeGmec>$$0N_J$l
zp(`1uf8an<(J74_dTsE*+5~-@x_Iw}M|<`(iXAc^5a5pUVvCTuGcb7;b?!&hwG^sw
z-7|K{EwQn!ft@``b{~4C$<)^!efE{X-D?w!UySnl;k0vIyx*IInWK;rd*;NZJ8p$u
zS<75S{gp>8EqH~SOV9Je_h%UXbco60$HmrIB45aS{q)NpJ`^U1dgmCLI^4yxV&lSA
zsGIa7ApE6SvFm>L>I!Jb%Z01q@qOFb_dp+ui!KWbMY6eh&P~lEhK5JKl!w}@2{bvW
z^yNY}20sh<{(GTSY|4op=M(VRH*nv>nC>K|p%E=nbs`bs@hEYrd7`<I_8VL2-q_8^
z$+5Q87Kvh9rmx)D2fM_^!{Yz9vRaaO4*evGZpO4)WfId^V>x&BEJUsht?iJx^-g+a
z6@eO)3^i~ebx*$li>S10;#f))bc)8iF?*lFZ0^JD>Jbnnz=Vcb?xfYd>sw@x(_9*V
ztcm>tdoby3kk5<uxY)G|)6t3UyiM%6!L!Hsa204%zP2j#3I!Dc;Wcl@nqbQg+<X=m
zi{&=#N?>Bm7{~E;YpCA+GMVz!shSFWPbF^XmJQx_sA}DU8JmY-$7OIGkjWjRm7MiD
z1loTo&>gZMa5(_i;X3$aw#dq?tDp?7P1Q3i2$pTqf%n1v^=eRlqT~~psx$;iSym7#
ztZ$v&xTgS9o4~D7u%1P}EoND@hpts9wrg7Cdf=|9PIDCjWd_YkHClT09|_9Ev$BJ@
znGi!I`yt@qJqy0%D&O9kH3((80;#;ALNi@4(1ub`GUZQ&Th-ZX5Lou?yrEchs~!qK
zZEIK{<y&sQL$2%pdTUV}$Ei(_N~L+{-H+v^l>~kR*_7C3Qo7tT#&)l0@UQKkfo$d)
b|LgHLc%&PBWG1SG00000NkvXXu0mjfM9C?Q

literal 0
HcmV?d00001

diff --git a/ENI2/Resources/exit.png b/ENI2/Resources/exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e21816019c046462e87b924e7585bd565b35a2e
GIT binary patch
literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000gbVXQnLvm$d
zbZKvHAXI5>WdKBJAT}UMb!;FqFfcSAF)}(cGCDOdAS*C2Fffw?u&)3B00(qQO+^RP
z2L=iw0AUV=;s5{u32;bRa{vGf5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<VFdsH1c6CJ
zK~#9!wN+hc990zl?w!BvCYyAlX_JZxA!<QXC{$`SNcvQ)C_XfbSdrF<z7%{@q+r2^
zycMLf1{#DAP<+rzC@ZxTt4K(Sfe<iJNt>ok>?WIalb!vWnR{nEclIao!6brSxO->M
z-Z|en-}%m2;D26hrwfThVuW+v=ledVubfWM)}$0X2!imLHdD`1dWP=@(sA635OQ>I
zaPXYI6F@$1ztq=vw0UW13BHslJ0*A?r_CS)$Z3Ee(4lDt-PQ<@A(Po?DHf++CBx1D
z6cN_e()eX|4rR%}G=|<orx1;hJ(DLO0mpG*+a;7rWdiiUc_cj5+7Uof)WY-N@+c0!
z_AUgy*P6|vn9t(&?G(yomx7RpMoly~M=2|xfU;y0`mO*J=fo$N@1aqn?__fvkEko7
zkqiR^ePE1}4RBpxZZ3`G<q4H}SYQ56j*THcTLVy8sM{?j&}?o38-^J=FO@)<fan5D
z(?UfEVta}j4XY>rsq<U!BfVC7b(JCs&}5Ng31k9QSjDxD^>tunC5Lo6N6)q@Fo9NT
zw=F=66=SEL>wEakZ%^UtgO~8@{4KOJ073!K?}UL=DudC{s}%}ELV~(5$fnf+qUVj}
z#+cPgae-?@H@)4+8uUXQ53%A=7cc+NkD;fBLwblU@<W9eL7fJTlof<oAv`N9;B|n<
zVqI<LUVq2PIW{cagvJf9K*M5T76&`K;6Dqz{o`rO^M$Z#EX<%<8&-3^xm89ojHC)s
zEPHGwa|7ve3Wjb#*LB(^OwEKrYJ0M~3;9(CPki|(W?q?~JY`r&&y!))T!FGm;ZX&5
zT@Q5?DOO4%2aP(C(L_+uL-8mDB+;>vE<&z*$dxzf_9{7(VFw>L5J!K1H#$3wFzV_U
zsVQ$$ro^c4Dj|CmjzejdB;1?`i{=*uewzFp-`}~3>n~o!_4x~Myb?8^#J+tTv6zWH
zdngbJMisXPAcWYg!OcHYV&w9MkSqY>j6T64QG>m8{24YmwSdXgJ$$_P0=hqVo@4}k
z@xmMG9>&L)F*S9A<f&1k#jAb6D%~%()S&dCh?QXfO{V)3&Cbm9vN`_8Qt-{=V=VFc
zC)nFzLHbUp8jog8p#Yje?c_|^lq&sj*i|y{w(o;Hz4X<s>3d^6ms=+%CN0i1#N!P_
zrc#aKn+Obx%Bqu;Rcuvtd1~ZtH!6zETN7ve{mEp~Q4w(>E`Fbdcq_HDMo!3)2zjq4
zNu9)dU7j>$wQVyX=MPjQ7r><<qY>vF@is(*7^zMVsZvE%729ks)cZmznPC^xlv2&Q
zuG1XD{WzZeh=v)59%({`0F-i+!`i01^xu)8z32pid45*_l=jG-yNmC0u5FB6xwKj+
z<n0qD&OTM^TIJZbZDg}q8sWKxAh0e*BCVfYyLNRY%xEV7wT6d>`M|(H*rq2>CVGw?
zJ3MdOMUv^y$mMc^XisXI92y&Iy8@i?x4ye8fUWDuk@q6)?M>g&D0q-E7y+!|Wb*9Y
ef9vNzTYmvQE6TC}^o1<|0000<MNUMnLSTY|uU5bS

literal 0
HcmV?d00001

diff --git a/ENI2/SucheControl.xaml b/ENI2/SucheControl.xaml
index ce6e5028..84ae526e 100644
--- a/ENI2/SucheControl.xaml
+++ b/ENI2/SucheControl.xaml
@@ -17,7 +17,8 @@
         <Grid Grid.Row="0">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="75" />
+                <ColumnDefinition Width="75" />
                 <ColumnDefinition Width="2*" />
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="2*" />
@@ -30,19 +31,19 @@
                 <RowDefinition Height="30" />
                 <RowDefinition Height="30" />
             </Grid.RowDefinitions>
-
-            <Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="0" Content="Id" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="1" Content="IMO / ENI No." Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="0" Grid.Row="2" Content="Shipname" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="0" Content="Port of call" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="1" Content="ETA" Margin="0,0,10,0"/>
-            <Label HorizontalContentAlignment="Right" Grid.Column="2" Grid.Row="2" Content="Ticket-No." Margin="0,0,10,0"/>
-            <TextBox Grid.Column="1" Grid.Row="0" Name="textBoxId" VerticalContentAlignment="Center" Margin="2"/>
-            <TextBox Grid.Column="1" Grid.Row="1" Name="textBoxIMO" VerticalContentAlignment="Center" Margin="2" MaxLength="8"/>
-            <TextBox Grid.Column="1" Grid.Row="2" Name="textBoxName" VerticalContentAlignment="Center" Margin="2"/>
-            <TextBox Grid.Column="3" Grid.Row="0" Name="textBoxHafen" VerticalContentAlignment="Center" Margin="2"/>
+            <Image Grid.Column="0" Grid.RowSpan="3" x:Name="logoImage" HorizontalAlignment="Left" Height="75" Width="75" Source="Resources/EUREPORT.png" Stretch="Fill" MouseUp="logoImage_MouseUp" Margin="2"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="0" Content="Id" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="1" Content="IMO / ENI No." Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="1" Grid.Row="2" Content="Shipname" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="0" Content="Port of call" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="1" Content="ETA" Margin="0,0,10,0"/>
+            <Label HorizontalContentAlignment="Right" Grid.Column="3" Grid.Row="2" Content="Ticket-No." Margin="0,0,10,0"/>
+            <TextBox Grid.Column="2" Grid.Row="0" Name="textBoxId" VerticalContentAlignment="Center" Margin="2"/>
+            <TextBox Grid.Column="2" Grid.Row="1" Name="textBoxIMO" VerticalContentAlignment="Center" Margin="2" MaxLength="8"/>
+            <TextBox Grid.Column="2" Grid.Row="2" Name="textBoxName" VerticalContentAlignment="Center" Margin="2"/>
+            <TextBox Grid.Column="4" Grid.Row="0" Name="textBoxHafen" VerticalContentAlignment="Center" Margin="2"/>
             
-            <Grid Grid.Column="3" Grid.Row="1" Height="Auto" Margin="2">
+            <Grid Grid.Column="4" Grid.Row="1" Height="Auto" Margin="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="3*" />
@@ -54,9 +55,9 @@
                 <Label Grid.Column="2" Grid.Row="0" Content="To:" HorizontalAlignment="Left" />
                 <DatePicker Grid.Column="3" Grid.Row="0" Name="dateTimePickerETATo" VerticalContentAlignment="Center" SelectedDateChanged="etaValueChanged" ContextMenu="{DynamicResource ClearContextMenu}"/>
             </Grid>
-            <TextBox Grid.Column="3" Grid.Row="2" Name="textBoxTicketNr" VerticalContentAlignment="Center" Margin="2"/>
-            <Button Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="1" Content="Search" Name="buttonSuche" Click="buttonSuche_Click" Margin="2" FontSize="14"/>
-            <Grid Grid.Column="3" Grid.Row="3">
+            <TextBox Grid.Column="4" Grid.Row="2" Name="textBoxTicketNr" VerticalContentAlignment="Center" Margin="2"/>
+            <Button Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="1" Content="Search" Name="buttonSuche" Click="buttonSuche_Click" Margin="2" FontSize="14"/>
+            <Grid Grid.Column="4" Grid.Row="3">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
diff --git a/ENI2/SucheControl.xaml.cs b/ENI2/SucheControl.xaml.cs
index 5d935a60..d3df5625 100644
--- a/ENI2/SucheControl.xaml.cs
+++ b/ENI2/SucheControl.xaml.cs
@@ -13,6 +13,7 @@ using bsmd.database;
 using System.Windows.Data;
 using log4net;
 using System.Windows.Media.Imaging;
+using System.Diagnostics;
 
 namespace ENI2
 {
@@ -24,6 +25,7 @@ namespace ENI2
 
         #region Fields
 
+        private bool efMode = false;
         private List<MessageCore> anmeldungen = new List<MessageCore>();
         private readonly object searchLock = new object();
         private readonly ILog _log = LogManager.GetLogger("SucheControl");
@@ -55,6 +57,12 @@ namespace ENI2
             cancelItem.Click += CancelItem_Click;
             cancelItem.Visibility = Visibility.Collapsed;
             this.dataGrid.ContextMenu.Items.Add(cancelItem);
+
+            if (Keyboard.IsKeyDown(Key.LeftShift))
+            {
+                efMode = true;
+                logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
+            }
         }
 
         
@@ -291,5 +299,10 @@ namespace ENI2
 
         #endregion
 
+        private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
+            else Process.Start("http://www.eureport.de/");
+        }
     }
 }

From 1ab7641efe59c297d2db17ae8064f57aa4eb93a9 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 7 Feb 2023 18:01:32 +0100
Subject: [PATCH 10/34] fixed a number of small things and continued on Maersk

---
 ENI2/Controls/MaerskListControl.xaml    |  22 ++--
 ENI2/Controls/MaerskListControl.xaml.cs | 130 +++++++++++++++---------
 ENI2/EditControls/EditLADGDialog.xaml   |   2 +-
 ENI2/Excel/ExcelReader.cs               |  18 ++++
 bsmd.database/DBManager.cs              |   2 +-
 bsmd.database/Extensions.cs             |   2 +-
 bsmd.database/MDH.cs                    |   5 +
 bsmd.database/MessageCore.cs            |  20 +++-
 misc/db.sqlite                          | Bin 14135296 -> 14135296 bytes
 9 files changed, 141 insertions(+), 60 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index b6ab6887..acb952e8 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -26,18 +26,24 @@
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="40" />
+                    <ColumnDefinition Width="120" />
+                    <ColumnDefinition Width="40" />
+                    <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="30" />
                 </Grid.ColumnDefinitions>
-                <Label Content="Calendar week" Grid.Column="0"/>
-                <Button x:Name="buttonLoad" Grid.Column="1" Content="Load" Margin="2" Click="buttonLoad_Click" />
-                <Button x:Name="buttonImport" Grid.Column="2" Margin="2" Content="Import" Click="buttonImport_Click" />
-                <Button x:Name="buttonExport" Grid.Column="3" Margin="2" Content="Export" Click="buttonExport_Click" />
-                <local:BusyControl x:Name="busyControl" Grid.Column="5" />
+                <Label Content="From" Grid.Column="0" />
+                <xctk:DateTimePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" Format="ShortDate" />
+                <Label Content="To" Grid.Column="2" />
+                <xctk:DateTimePicker x:Name="dateTimePickerTo" Margin="2" Grid.Column="3" Format="ShortDate" />
+                <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
+                <Button x:Name="buttonImport" Grid.Column="6" Margin="2" Content="Import" Click="buttonImport_Click" />
+                <Button x:Name="buttonExport" Grid.Column="7" Margin="2" Content="Export" Click="buttonExport_Click" />
+                <local:BusyControl x:Name="busyControl" Grid.Column="8" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 647297c7..648cf13e 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -14,6 +14,7 @@ using Microsoft.Office.Interop.Excel;
 using System.Runtime.InteropServices;
 
 using bsmd.database;
+using ExcelDataReader;
 
 namespace ENI2.Controls
 {
@@ -36,6 +37,8 @@ namespace ENI2.Controls
         {
             InitializeComponent();
             Loaded += POList_Loaded;
+            this.dateTimePickerFrom.Value = DateTime.Today.AddDays(-14);
+            this.dateTimePickerTo.Value = DateTime.Today.AddDays(14);
         }
 
         #endregion
@@ -111,68 +114,31 @@ namespace ENI2.Controls
         private void PerformSearch()
         {
             this.dataGridPOCores.ItemsSource = null;
-            this.filteredResult.Clear();            
+            this.filteredResult.Clear();
 
-            Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
+            Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();            
 
-            DateTime start = DateTime.Now; // bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
-            DateTime end = start.Add(new TimeSpan(6, 23, 59, 59));
-
-            // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
-            uint from = start.Subtract(new TimeSpan(10, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
-            uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
-            filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));            
+            // Die Suche findet in dem eingestellten Intervall statt
+            uint from = this.dateTimePickerFrom.Value.Value.ToUniversalTime().ToUnixTimeStamp();
+            uint to = this.dateTimePickerTo.Value.Value.ToUniversalTime().ToUnixTimeStamp();
+            filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
+            // eingeschränkt auf flags
+            filterDict.Add(MessageCore.SearchFilterType.FILTER_FLAG_EQ, "0");
 
             // suche auslösen
             this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
+
             // alle anderen Häfen weg
             this.searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")));
 
-            // rückwärts iterieren um nach ETA und ATA zu filtern
-            if (this.searchResult.Count > 0)
-            {
-                for (int i = this.searchResult.Count - 1; i >= 0; i--)
-                {
-                    MessageCore messageCore = this.searchResult[i];
-                    if (messageCore.ATA.HasValue)
-                    {
-                        if ((messageCore.ATA.Value < start) || (messageCore.ATA.Value > end))
-                        {
-                            this.searchResult.RemoveAt(i);
-                        } 
-                        else
-                        {
-                            if(!messageCore.POATA.HasValue)
-                            {
-                                messageCore.POATA = messageCore.ATA;
-                                messageCore.IsDirty = true;
-                                // this.buttonSaveChanges.IsEnabled = true;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if ((messageCore.ETA.Value < start) || (messageCore.ETA.Value > end)) this.searchResult.RemoveAt(i);
-                    }
-                }
-            }
+            // sortieren nach ETA (kombiniert)
+            searchResult.Sort((x, y) => DateTime.Compare(x.ETADisplay ?? DateTime.MaxValue, y.ETADisplay ?? DateTime.MaxValue));
 
-            searchResult.Sort((x, y) => DateTime.Compare(x.ATA ?? DateTime.MaxValue, y.ATA ?? DateTime.MaxValue));
-            
             this.dataGridPOCores.SelectedItem = null;
             this.filteredResult.AddRange(searchResult);
             this.dataGridPOCores.ItemsSource = this.filteredResult;
         }
 
-        private List<MessageCore> GetNextNDayCoresFromList(List<MessageCore> cores, int numDays = 3)
-        {
-            List<MessageCore> result = new List<MessageCore>();
-
-            result.AddRange(cores.FindAll(x => (x.ETADisplay.Value - DateTime.Now).TotalHours < (numDays * 24)));
-
-            return result;
-        }
-
         #endregion
 
         #region button event handler
@@ -185,7 +151,75 @@ namespace ENI2.Controls
 
         private void buttonImport_Click(object sender, RoutedEventArgs e)
         {
+            OpenFileDialog ofd = new OpenFileDialog
+            {
+                Filter = "Excel Files|*.xls;*.xlsx"
+            };
+            if (ofd.ShowDialog() ?? false)
+            {
+                FileStream stream;
+                try
+                {
+                    stream = File.Open(ofd.FileName, FileMode.Open, FileAccess.Read);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return;
+                }
 
+                using (IExcelDataReader reader = ExcelReaderFactory.CreateReader(stream))
+                {
+                    List<MessageCore> importCores = new List<MessageCore>();
+
+                    try
+                    {
+                        do
+                        {
+                            while (reader.Read())
+                            {
+                                if (reader.FieldCount < 13)
+                                {
+                                    throw new InvalidDataException("Sheet must have 13 columns of data");
+                                }
+                                MessageCore core = new MessageCore();
+                                if (reader.IsDBNull(0) && reader.IsDBNull(1)) continue;
+                                /*
+                                if (!reader.IsDBNull(0)) crew.CrewMemberLastName = reader.GetString(0).Clean();
+
+                                if (crew.CrewMemberLastName.Equals("Family Name") || (crew.CrewMemberLastName.Trim().Length == 0)) continue;
+                                if (!reader.IsDBNull(1)) crew.CrewMemberFirstName = reader.GetString(1).Clean();
+                                if (!reader.IsDBNull(2)) crew.CrewMemberGender = GlobalStructures.ParseGender(reader.GetString(2));
+                                if (!reader.IsDBNull(3)) crew.CrewMemberDuty = reader.GetString(3).Clean();
+                                if (!reader.IsDBNull(4)) crew.CrewMemberNationality = reader.GetString(4).Substring(0, 2).ToUpper();
+                                if (!reader.IsDBNull(5)) crew.CrewMemberPlaceOfBirth = reader.GetString(5).Clean();
+                                if (!reader.IsDBNull(6)) crew.CrewMemberCountryOfBirth = reader.GetString(6).Substring(0, 2).ToUpper();
+                                if (!reader.IsDBNull(7)) crew.CrewMemberDateOfBirth = reader.GetDateTime(7);
+                                if (!reader.IsDBNull(8)) crew.CrewMemberIdentityDocumentType = GlobalStructures.ReadIdentityDocumentType(reader.GetString(8));
+                                if (!reader.IsDBNull(9)) crew.CrewMemberIdentityDocumentId = this.getValueAsString(reader, 9).Clean();
+                                if (!reader.IsDBNull(10)) crew.CrewMemberIdentityDocumentIssuingState = reader.GetString(10).Substring(0, 2).ToUpper();
+                                if (!reader.IsDBNull(11)) crew.CrewMemberIdentityDocumentExpiryDate = reader.GetDateTime(11);
+                                if (!reader.IsDBNull(12)) crew.CrewMemberVisaNumber = this.getValueAsString(reader, 12).Clean();
+                                */
+                                importCores.Add(core);
+                            }
+                        } while (reader.NextResult());
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show("Error reading Excel: " + ex.Message, Properties.Resources.textCaptionError, MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+
+                    // we only want cores for the next 3 days
+                    if (importCores.Count > 0)
+                    {
+                        
+                        
+                    }
+                }
+
+                stream.Close();
+            }
         }
 
         private void buttonExport_Click(object sender, RoutedEventArgs e)
diff --git a/ENI2/EditControls/EditLADGDialog.xaml b/ENI2/EditControls/EditLADGDialog.xaml
index 457bc9b0..ba281ebc 100644
--- a/ENI2/EditControls/EditLADGDialog.xaml
+++ b/ENI2/EditControls/EditLADGDialog.xaml
@@ -11,7 +11,7 @@ Copyright (c) 2017 schick Informatik
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textLadg}" Height="246" Width="900" WindowStyle="SingleBorderWindow" Background="AliceBlue">
+        Title="{x:Static p:Resources.textLadg}" Height="300" Width="900" WindowStyle="SingleBorderWindow" Background="AliceBlue">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index 06103366..ab6f628f 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -289,6 +289,15 @@ namespace ENI2.Excel
                 if (val.IndexOf("sbt", StringComparison.OrdinalIgnoreCase) >= 0) result = 1;
                 if (val.IndexOf("single", StringComparison.OrdinalIgnoreCase) >= 0) result = 0;
                 if (val.IndexOf("double", StringComparison.OrdinalIgnoreCase) >= 0) result = 2;
+
+                if (!result.HasValue)
+                {
+                    if (int.TryParse(val, out int parsed))
+                    {
+                        if ((parsed < 4) && (parsed > 0))
+                            result = (byte)parsed;
+                    }
+                }
             }
 
             if (!result.HasValue)
@@ -347,6 +356,15 @@ namespace ENI2.Excel
                 if (val.IndexOf("full", StringComparison.OrdinalIgnoreCase) >= 0) result = 0;
                 if (val.IndexOf("empty", StringComparison.OrdinalIgnoreCase) >= 0) result = 1;
                 if (val.IndexOf("inerted", StringComparison.OrdinalIgnoreCase) >= 0) result = 2;
+
+                if (!result.HasValue)
+                {
+                    if (int.TryParse(val, out int parsed))
+                    {
+                        if ((parsed < 4) && (parsed > 0))
+                            result = (byte)parsed;
+                    }
+                }
             }
 
             if (!result.HasValue)
diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index 1deaf673..b10acfb1 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -34,7 +34,7 @@ namespace bsmd.database
         private bool _closeConnectionAfterUse = false;
         private readonly List<string> truncatedFieldCollection = new List<string>();
         private Dictionary<Type, string> messageHistoryTypeDict;
-        private SemaphoreSlim _asyncSemaphore = new SemaphoreSlim(1);
+        private readonly SemaphoreSlim _asyncSemaphore = new SemaphoreSlim(1);
 
         #endregion
 
diff --git a/bsmd.database/Extensions.cs b/bsmd.database/Extensions.cs
index 87c4cea2..29b03dbb 100644
--- a/bsmd.database/Extensions.cs
+++ b/bsmd.database/Extensions.cs
@@ -84,7 +84,7 @@ namespace bsmd.database
             foreach (char c in str)
             {
                 if (!char.IsControl(c) || c == ' ' || c == '\t' || c == '\n')
-                    sb.Append(c);                
+                    sb.Append(c);
             }
             return sb.ToString();
         }
diff --git a/bsmd.database/MDH.cs b/bsmd.database/MDH.cs
index 86c9acbd..f8ea80cf 100644
--- a/bsmd.database/MDH.cs
+++ b/bsmd.database/MDH.cs
@@ -606,6 +606,11 @@ namespace bsmd.database
                     (this.PlaceOfIssue.IsNullOrEmpty() || !this.DateOfIssue.HasValue))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V765, "Cert. Place or Date of issue missing", null, this.Title, null, this.Tablename));
 
+                if( (!this.ValidSanitaryControlExemptionOrCertificateOnBoard.HasValue || (this.ValidSanitaryControlExemptionOrCertificateOnBoard.Value == false)) &&
+                    ((!this.PlaceOfIssue.IsNullOrEmpty()) || this.DateOfIssue.HasValue))                
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Check sanitary control exemption or certificate", null, this.Title, null, this.Tablename));
+                
+
                 if ((this.InfectedAreaVisited ?? false) && this.InfectedAreas.IsNullOrEmpty())
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V766, "Infected area date or port missing", null, this.Title, null, this.Tablename));
 
diff --git a/bsmd.database/MessageCore.cs b/bsmd.database/MessageCore.cs
index 758623e3..191ec9d0 100644
--- a/bsmd.database/MessageCore.cs
+++ b/bsmd.database/MessageCore.cs
@@ -85,7 +85,9 @@ namespace bsmd.database
             FILTER_ETA,
             FILTER_TICKETNO,
             FILTER_LATESTIDS,
-            FILTER_CREATEDBY
+            FILTER_CREATEDBY,
+            FILTER_FLAG_EQ,
+            FILTER_FLAG_NEQ
         }
 
         [Flags]
@@ -692,6 +694,22 @@ namespace bsmd.database
                                             ((SqlCommand)cmd).Parameters.AddWithValue("@DRPID", searchDict[key]);
                                             break;
                                         }
+                                    case SearchFilterType.FILTER_FLAG_EQ:
+                                        {
+                                            sb.Append(" MessageCore.Flags = @FLAG ");
+                                            int flag = 0;
+                                            int.TryParse(searchDict[key], out flag);
+                                            ((SqlCommand)cmd).Parameters.AddWithValue("@FLAG", flag);
+                                            break;
+                                        }
+                                    case SearchFilterType.FILTER_FLAG_NEQ:
+                                        {
+                                            sb.Append(" MessageCore.Flags <> @FLAG ");
+                                            int flag = 0;
+                                            int.TryParse(searchDict[key], out flag);
+                                            ((SqlCommand)cmd).Parameters.AddWithValue("@FLAG", flag);
+                                            break;
+                                        }
                                 }
                                 if (!moreThanOne) moreThanOne = true;
                             }
diff --git a/misc/db.sqlite b/misc/db.sqlite
index dc07251b30c628a20720620942a025824431be7b..372a0ba024f4ae72dceb29b82ea7d289ad448582 100644
GIT binary patch
delta 763
zcmXBQ)lwB;07YSs7}$Z>-I&;&*kE@r6+5syKwWlscXwkPySw$y@j1Nmcic1I?E97e
z`&W+iU`we;bZhCPNHhb9NLGoFY?57aNKT2BT#{SzNM6Y&`K5pqltNNi;-rYgOHnB%
z#ifLllu}Y!%1Bu$C*`GrRFq0mS*l1?sV3DWL25`%sU@|gj?|SzsVDWNfi#px(pZ{E
zQ)wp6rG>PVR?=G9NLy(q?IlS%NJr@;ou!L(m2Q$ODbihfNKfe{y`_)zm44D+2FO4e
zB!gv$43%LrTt>)934KP%Xc;4^GFHaPc$pv*Ws*#mDKb^2Nt#TT88TC5$!wV;b7h{)
zmj$v=7Rh2+B1>hNq)Ub@mld*7lvT1?*2r2}C+lT{Y?Mv1S+>Yl*(Td%hwPMHvRn4Z
zUfC!6<$xTNLvmP-$Wb{a$K`~alv8qA&d6CgC+FpYT$D?4S+2-cxhB`;hTN1}k}0?4
zj@*@dH;JAe8HwzUC7KlZlbJ&FVoYL|X3O)(SBs03$Q2)#<^PIB{(b+MV@H*rl{RJ0
z?1^d9`qu50wRPjfCs&eIC!|J$`@w_YVelw;96Sl02G4@$!HeK!@G5v6yb0b0?}GQi
bhu~xIDfk?G3BCs3g73kP%!JgRKa>9gy=^?M

delta 761
zcmXBQ)lwB;07YSs-G$iQjftJu*xfD_JFq)IU3Ot%cXy+5?C#b($Jg-A-*L};v+q~R
z?_W7ng6(A@nQ3JcBAKa3M6yaY$u2o0r{t2{l1K7NKFKcyq@Wa%!cs(vN{kefSSc<g
zq@<LR(o#msN;xSn6{Mn6lFCv=s!BDfE;Xd4)RNj#N9syFsV{NTKpILTX)H~osl-b&
zX)Z0KrL>aP(ni`!J83T+q@yHAC+RF*q^oq3?$SdNrKj|g-qJ_<N<Zl@17x5KlEE@W
zhRQG*E+b^5jFQnZMna#lGET-zl1z|^GD#-O6qzd1WV+0dnUXBCWVXzaxiU}Y%K}*_
zi)67Zk)^UsmdgrRDJhaFt7NsT5oN8cll8JeHp(X1EL&u&Y?JMhCOc%O?2_HGN77}l
z?34X+Kn}_wIV?xys2r2yazakZDLE}?<gA>N^KwBh$|bohSLCW(lk0LrZptmWEg5o0
z?#eyMyhZfPm`IlN+(Z*1e=>R!y_Bt1%T)zqYs5rKMPg&J{9lR4zaKPb!q|#)lc&$0
zHzj%IfVjR{(;LJ^i>-@KiU#+C2f@SOQSdl;5<Cr_1<!*Q!OP%P@H%)Cybaz3?}HD)
Z$KX@&IrtKM4Za26gC803Nk88t{sp|0J!k*`


From 6d07baa4b006b708d59cd1b2366a918c566760ea Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 9 Feb 2023 09:02:06 +0100
Subject: [PATCH 11/34] WIP, import works now

---
 ENI2/Controls/MaerskListControl.xaml    |  49 ++++--
 ENI2/Controls/MaerskListControl.xaml.cs |  98 ++++++++----
 SQL/table.XtraData.eni.7.9.sql          |  30 ++++
 bsmd.database/DBManager.cs              |  50 +-----
 bsmd.database/DBManagerAsync.cs         | 134 ++++++++++++++++
 bsmd.database/DatabaseEntity.cs         |   4 +-
 bsmd.database/Extensions.cs             |  14 +-
 bsmd.database/MaerskData.cs             | 198 ++++++++++++++++++++++++
 bsmd.database/MessageCore.cs            |  12 +-
 bsmd.database/bsmd.database.csproj      |   2 +
 10 files changed, 488 insertions(+), 103 deletions(-)
 create mode 100644 SQL/table.XtraData.eni.7.9.sql
 create mode 100644 bsmd.database/DBManagerAsync.cs
 create mode 100644 bsmd.database/MaerskData.cs

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index acb952e8..4369abde 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -46,20 +46,45 @@
                 <local:BusyControl x:Name="busyControl" Grid.Column="8" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                                             SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
+                                             SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
+                <local:ENIDataGrid.RowStyle>
+                    <Style TargetType="DataGridRow">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsNextThreeDays}" Value="true">
+                                <Setter Property="Background" Value="LightGreen"></Setter>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding HasNoIdea}" Value="true">
+                                <Setter Property="Background" Value="LightPink"></Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </local:ENIDataGrid.RowStyle>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="IMO/ENI" Binding="{Binding IMOENIDisplay}" IsReadOnly="True" />
-                    <DataGridTextColumn x:Name="gridColumnPONumber" Header="PO number" Binding="{Binding PONumber, Mode=TwoWay}" IsReadOnly="False" />
-                    <DataGridComboBoxColumn x:Name="gridColumnGroup" Header="Group" IsReadOnly="False" SelectedValueBinding="{Binding Flags, Mode=TwoWay}"
+                    <DataGridTextColumn Header="Col A" Binding="{Binding ColA}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Col B" Binding="{Binding ColB}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Ship. Area" Binding="{Binding ColC}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Col D" Binding="{Binding ColD}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Name" Binding="{Binding ColE}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="IMO" Binding="{Binding ColF}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Voy-No in" Binding="{Binding ColG}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Voy-No out" Binding="{Binding ColH}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Terminal" Binding="{Binding ColI}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Oper" Binding="{Binding ColJ}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETA" Binding="{Binding ColK}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETD" Binding="{Binding ColL}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Id" Binding="{Binding ColM}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" />
+
+                    <!--DataGridTextColumn x:Name="gridColumnPONumber" Header="PO number" Binding="{Binding PONumber, Mode=TwoWay}" IsReadOnly="False" /-->
+                    <!--DataGridComboBoxColumn x:Name="gridColumnGroup" Header="Group" IsReadOnly="False" SelectedValueBinding="{Binding Flags, Mode=TwoWay}"
                                             ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value">
-                    </DataGridComboBoxColumn>
-                    <DataGridTextColumn Header="Ship name" Binding="{Binding Shipname}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETA" Binding="{Binding ETA_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETD" Binding="{Binding ETD_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\},  Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
-                    <DataGridTextColumn x:Name="gridColumnATA" Header="ATA" Binding="{Binding POATA, StringFormat=\{0:dd.MM.yyyy\}, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="False" />
-                    <DataGridTextColumn Header="ATD" Binding="{Binding ATD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Hafen" Binding="{Binding PortnameDisplay}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Id" Binding="{Binding DisplayId}" IsReadOnly="True" />
+                    </DataGridComboBoxColumn-->
+                    
+                    <!--DataGridTextColumn Header="ETA" Binding="{Binding ETA_NOA_NOD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" /-->
+                    
+                    <!--DataGridTextColumn x:Name="gridColumnATA" Header="ATA" Binding="{Binding POATA, StringFormat=\{0:dd.MM.yyyy\}, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="False" /-->
+                    <!--DataGridTextColumn Header="ATD" Binding="{Binding ATD, StringFormat=\{0:dd.MM.yyyy HH:mm\}, Converter={util:UtcToLocalDateTimeConverter}}" IsReadOnly="True" /-->
+                    
                 </DataGrid.Columns>
             </local:ENIDataGrid>
         </Grid>
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 648cf13e..f085d15e 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -15,6 +15,7 @@ using System.Runtime.InteropServices;
 
 using bsmd.database;
 using ExcelDataReader;
+using System.Collections.ObjectModel;
 
 namespace ENI2.Controls
 {
@@ -28,6 +29,8 @@ namespace ENI2.Controls
 
         private List<MessageCore> searchResult = new List<MessageCore>();
         private readonly List<MessageCore> filteredResult = new List<MessageCore>();
+        private readonly ObservableCollection<MaerskData> maerskDataList = new ObservableCollection<MaerskData>();
+        private const uint MAX_EMPTY_ROWS_ON_IMPORT = 3; // import breaks if more than this count of empty rows have been read
 
         #endregion
 
@@ -47,11 +50,12 @@ namespace ENI2.Controls
 
         private void POList_Loaded(object sender, RoutedEventArgs e)
         {
-
+            dataGridPOCores.ItemsSource = maerskDataList;
         }
 
         private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
+            /*
             if (e.EditAction == DataGridEditAction.Commit)
             {
                 if (e.Column == gridColumnPONumber)
@@ -103,8 +107,9 @@ namespace ENI2.Controls
                         el.Text = string.Empty;
                         e.Cancel = true;
                     }
-                }
+                }                
             }
+            */
         }
 
         #endregion
@@ -136,7 +141,22 @@ namespace ENI2.Controls
 
             this.dataGridPOCores.SelectedItem = null;
             this.filteredResult.AddRange(searchResult);
-            this.dataGridPOCores.ItemsSource = this.filteredResult;
+            
+        }
+
+        private string ReadFieldAsString(IExcelDataReader reader, int fieldNum)
+        {
+            if (fieldNum >= reader.FieldCount) return null;
+            if (reader.GetFieldType(fieldNum) == typeof(string))
+                return reader.GetString(fieldNum).Clean();
+            if (reader.GetFieldType(fieldNum) == typeof(DateTime))
+                return reader.GetDateTime(fieldNum).ToString();
+            if (reader.GetFieldType(fieldNum) == typeof(int))
+                return reader.GetInt32(fieldNum).ToString();
+            if (reader.GetFieldType(fieldNum) == typeof(double))
+                return ((int) reader.GetDouble(fieldNum)).ToString();
+            Type theType = reader.GetFieldType(fieldNum);
+            return null;
         }
 
         #endregion
@@ -160,7 +180,7 @@ namespace ENI2.Controls
                 FileStream stream;
                 try
                 {
-                    stream = File.Open(ofd.FileName, FileMode.Open, FileAccess.Read);
+                    stream = File.Open(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.Read);
                 }
                 catch (Exception ex)
                 {
@@ -170,40 +190,40 @@ namespace ENI2.Controls
 
                 using (IExcelDataReader reader = ExcelReaderFactory.CreateReader(stream))
                 {
-                    List<MessageCore> importCores = new List<MessageCore>();
+                    List<MaerskData> importData = new List<MaerskData>();
+                    uint emptyRowCnt = 0;
 
                     try
                     {
-                        do
+                        while (reader.Read())
                         {
-                            while (reader.Read())
+                            if (reader.FieldCount < 13)
                             {
-                                if (reader.FieldCount < 13)
-                                {
-                                    throw new InvalidDataException("Sheet must have 13 columns of data");
-                                }
-                                MessageCore core = new MessageCore();
-                                if (reader.IsDBNull(0) && reader.IsDBNull(1)) continue;
-                                /*
-                                if (!reader.IsDBNull(0)) crew.CrewMemberLastName = reader.GetString(0).Clean();
-
-                                if (crew.CrewMemberLastName.Equals("Family Name") || (crew.CrewMemberLastName.Trim().Length == 0)) continue;
-                                if (!reader.IsDBNull(1)) crew.CrewMemberFirstName = reader.GetString(1).Clean();
-                                if (!reader.IsDBNull(2)) crew.CrewMemberGender = GlobalStructures.ParseGender(reader.GetString(2));
-                                if (!reader.IsDBNull(3)) crew.CrewMemberDuty = reader.GetString(3).Clean();
-                                if (!reader.IsDBNull(4)) crew.CrewMemberNationality = reader.GetString(4).Substring(0, 2).ToUpper();
-                                if (!reader.IsDBNull(5)) crew.CrewMemberPlaceOfBirth = reader.GetString(5).Clean();
-                                if (!reader.IsDBNull(6)) crew.CrewMemberCountryOfBirth = reader.GetString(6).Substring(0, 2).ToUpper();
-                                if (!reader.IsDBNull(7)) crew.CrewMemberDateOfBirth = reader.GetDateTime(7);
-                                if (!reader.IsDBNull(8)) crew.CrewMemberIdentityDocumentType = GlobalStructures.ReadIdentityDocumentType(reader.GetString(8));
-                                if (!reader.IsDBNull(9)) crew.CrewMemberIdentityDocumentId = this.getValueAsString(reader, 9).Clean();
-                                if (!reader.IsDBNull(10)) crew.CrewMemberIdentityDocumentIssuingState = reader.GetString(10).Substring(0, 2).ToUpper();
-                                if (!reader.IsDBNull(11)) crew.CrewMemberIdentityDocumentExpiryDate = reader.GetDateTime(11);
-                                if (!reader.IsDBNull(12)) crew.CrewMemberVisaNumber = this.getValueAsString(reader, 12).Clean();
-                                */
-                                importCores.Add(core);
+                                throw new InvalidDataException("Sheet must have 13 columns of data");
                             }
-                        } while (reader.NextResult());
+
+                            MaerskData md = new MaerskData();
+                            md.ColA = ReadFieldAsString(reader, 0);
+                            if (!reader.IsDBNull(1)) md.ColB = ReadFieldAsString(reader, 1);
+                            if (!reader.IsDBNull(2)) md.ColC = ReadFieldAsString(reader, 2);
+                            if (!reader.IsDBNull(3)) md.ColD = ReadFieldAsString(reader, 3);
+                            if (!reader.IsDBNull(4)) md.ColE = ReadFieldAsString(reader, 4);
+                            if (!reader.IsDBNull(5)) md.ColF = ReadFieldAsString(reader, 5);
+                            if (!reader.IsDBNull(6)) md.ColG = ReadFieldAsString(reader, 6);
+                            if (!reader.IsDBNull(7)) md.ColH = ReadFieldAsString(reader, 7);
+                            if (!reader.IsDBNull(8)) md.ColI = ReadFieldAsString(reader, 8);
+                            if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
+                            if (!reader.IsDBNull(10)) { md.ETA = reader.GetDateTime(10); md.ColK = md.ETA.ToString(); }
+                            if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
+                            if (!reader.IsDBNull(12)) md.ColM = ReadFieldAsString(reader, 12);
+                            if (!reader.IsDBNull(13)) md.Remark = ReadFieldAsString(reader, 13);
+
+                            if (!md.ColF.IsNullOrEmpty()) // only add this if IMO is set
+                                importData.Add(md);
+                            else
+                                emptyRowCnt++;
+                            if (emptyRowCnt > MAX_EMPTY_ROWS_ON_IMPORT) break;
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -211,11 +231,21 @@ namespace ENI2.Controls
                     }
 
                     // we only want cores for the next 3 days
-                    if (importCores.Count > 0)
+                    if (importData.Count > 0)
                     {
-                        
+                        // TODO: find matching message cores..
                         
                     }
+
+                    // sort
+                    // importData.Sort((x, y) => DateTime.Compare(x.ETA ?? DateTime.MaxValue, y.ETA ?? DateTime.MaxValue));
+
+                    // merge the result into our grid data source list
+                    // TODO
+
+                    foreach (MaerskData md in importData)
+                        maerskDataList.Add(md);
+                    this.dataGridPOCores.Items.Refresh();
                 }
 
                 stream.Close();
diff --git a/SQL/table.XtraData.eni.7.9.sql b/SQL/table.XtraData.eni.7.9.sql
new file mode 100644
index 00000000..53dec4f1
--- /dev/null
+++ b/SQL/table.XtraData.eni.7.9.sql
@@ -0,0 +1,30 @@
+CREATE TABLE [dbo].[XtraData]
+(
+	[Id] UNIQUEIDENTIFIER NOT NULL PRIMARY KEY, 
+    [ParentId] UNIQUEIDENTIFIER NULL, 
+	[ReferenceId] UNIQUEIDENTIFIER NOT NULL, 
+    [Field1] NVARCHAR(100) NULL,
+	[Field2] NVARCHAR(100) NULL,
+	[Field3] NVARCHAR(100) NULL,
+	[Field4] NVARCHAR(100) NULL,
+	[Field5] NVARCHAR(100) NULL,
+	[Field6] NVARCHAR(100) NULL,
+	[Field7] NVARCHAR(100) NULL,
+	[Field8] NVARCHAR(100) NULL,
+	[Field9] NVARCHAR(100) NULL,
+	[Field10] NVARCHAR(100) NULL,
+	[Field11] NVARCHAR(100) NULL,
+	[Field12] NVARCHAR(100) NULL,
+	[Field13] NVARCHAR(100) NULL,
+	[Field14] NVARCHAR(100) NULL,
+	[Field15] NVARCHAR(100) NULL,
+	[Field16] NVARCHAR(100) NULL,
+	[Field17] NVARCHAR(100) NULL,
+	[Field18] NVARCHAR(100) NULL,
+	[Field19] NVARCHAR(100) NULL,
+	[Field20] NVARCHAR(100) NULL
+)
+
+GO
+
+CREATE INDEX [IX_XtraData_RefId] ON [dbo].[XtraData] ([ReferenceId])
diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index b10acfb1..35dded31 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -29,12 +29,11 @@ namespace bsmd.database
         private static DBManager _instance;
         private static readonly ILog _log = LogManager.GetLogger(typeof(DBManager));
         private static Dictionary<Guid, ReportingParty> allReportingParties;
-        private static Dictionary<string, PortArea> allPortAreas;        
+        private static Dictionary<string, PortArea> allPortAreas;
         private readonly object _lock = new object();
         private bool _closeConnectionAfterUse = false;
         private readonly List<string> truncatedFieldCollection = new List<string>();
         private Dictionary<Type, string> messageHistoryTypeDict;
-        private readonly SemaphoreSlim _asyncSemaphore = new SemaphoreSlim(1);
 
         #endregion
 
@@ -802,14 +801,7 @@ namespace bsmd.database
             if ((this._con == null) ||
                 (this._con.State == ConnectionState.Closed))
                 this.Connect(this.ConnectionString);
-        }
-
-        private async Task CheckConnectionAsync()
-        {
-            if ((this._con == null) ||
-                (this._con.State == ConnectionState.Closed))
-                await this.ConnectAsync(this.ConnectionString);
-        }
+        }        
 
         private void LogNonQueryResult(string query, int queryResult)
         {
@@ -1620,7 +1612,7 @@ namespace bsmd.database
                 {
                     this.CheckConnection();
                     cmd.Connection = this._con;
-                    result = (bool?)cmd.ExecuteScalar();                    
+                    result = (bool?)cmd.ExecuteScalar();
                 }
                 catch (SqlException ex)
                 {
@@ -1688,41 +1680,7 @@ namespace bsmd.database
             }
         }
 
-        #endregion
-
-        #region async DB access methods
-
-        internal async Task<SqlDataReader> PerformCommandAsync(SqlCommand cmd)
-        {
-            SqlDataReader reader = null;
-
-            await _asyncSemaphore.WaitAsync();
-            try
-            {
-                await this.CheckConnectionAsync();
-                cmd.Connection = this._con;
-                reader = await cmd.ExecuteReaderAsync();
-            }
-            catch (SqlException ex)
-            {
-                Trace.WriteLine("SQL Exception:" + ex.Message);
-                _log.Error("Error performing command", ex);
-                _log.DebugFormat("Query: {0}", cmd.CommandText);
-                _log.Debug("Parameters:");
-                for (int i = 0; i < cmd.Parameters.Count; i++)
-                {
-                    _log.DebugFormat("{0}:{1}", cmd.Parameters[i].ParameterName, cmd.Parameters[i].Value);
-                }
-            }
-            finally
-            {
-                _asyncSemaphore.Release();
-            }
-
-            return reader;
-        }
-
-        #endregion
+        #endregion        
 
         #endregion
 
diff --git a/bsmd.database/DBManagerAsync.cs b/bsmd.database/DBManagerAsync.cs
new file mode 100644
index 00000000..304e85bf
--- /dev/null
+++ b/bsmd.database/DBManagerAsync.cs
@@ -0,0 +1,134 @@
+// Copyright (c) 2020-present schick Informatik
+// Description: The new and mighty DB manager that uses async methods and 
+// connection pooling.. will try it out in Maersk/PO numbers and expand over the whole
+// app later
+
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using log4net;
+
+namespace bsmd.database
+{
+    public static class DBManagerAsync
+    {
+        #region Fields
+
+        private static ILog _log = LogManager.GetLogger(typeof(DBManagerAsync));
+        private static readonly SemaphoreSlim _asyncSemaphore = new SemaphoreSlim(1);
+
+        #endregion
+
+        #region Properties
+
+        public static string ConnectionString { get; set; }
+
+        #endregion
+
+        #region public methods
+
+
+
+        #endregion
+
+        #region async DB access methods
+
+        
+
+        internal static async Task<SqlDataReader> PerformCommandAsync(SqlCommand cmd)
+        {
+            SqlDataReader reader = null;
+
+            // await _asyncSemaphore.WaitAsync();
+            try
+            {
+                using (SqlConnection connection = new SqlConnection(ConnectionString))
+                {
+                    await connection.OpenAsync();
+                    reader = await cmd.ExecuteReaderAsync();
+                }
+            }
+            catch (SqlException ex)
+            {
+                Trace.WriteLine("SQL Exception:" + ex.Message);
+                _log.Error("Error performing command", ex);
+                _log.DebugFormat("Query: {0}", cmd.CommandText);
+                _log.Debug("Parameters:");
+                for (int i = 0; i < cmd.Parameters.Count; i++)
+                {
+                    _log.DebugFormat("{0}:{1}", cmd.Parameters[i].ParameterName, cmd.Parameters[i].Value);
+                }
+            }
+            finally
+            {
+                // _asyncSemaphore.Release();
+            }
+
+            return reader;
+        }
+
+        internal static async Task<int> PerformNonQuery(SqlCommand cmd)
+        {
+            int result = -1;
+            // await _asyncSemaphore.WaitAsync();
+            try
+            {
+                using (SqlConnection connection = new SqlConnection(ConnectionString))
+                {
+                    await connection.OpenAsync();
+                    result = await cmd.ExecuteNonQueryAsync();
+                }
+            }
+            catch (SqlException ex)
+            {
+                Trace.WriteLine("SQL Exception:" + ex.Message);
+                _log.Error("Error performing command", ex);
+                _log.DebugFormat("Query: {0}", cmd.CommandText);
+                _log.Debug("Parameters:");
+                for (int i = 0; i < cmd.Parameters.Count; i++)
+                {
+                    _log.DebugFormat("{0}:{1}", cmd.Parameters[i].ParameterName, cmd.Parameters[i].Value);
+                }
+            }
+
+            return result;
+        }
+
+        internal static async Task<int?> PerformReadIntQuery(SqlCommand cmd)
+        {
+            int? result = null;
+
+            try
+            {
+                using (SqlConnection connection = new SqlConnection(ConnectionString))
+                {
+                    object r = await cmd.ExecuteScalarAsync();
+                    if (r == null) { result = null; }
+                    else if (r == DBNull.Value) { result = null; }
+                    else { result = (int)r; }
+                }
+            }
+            catch (SqlException ex)
+            {
+                _log.Error("Error performing command", ex);
+                _log.DebugFormat("Query: {0}", cmd.CommandText);
+                _log.Debug("Parameters:");
+                for (int i = 0; i < cmd.Parameters.Count; i++)
+                {
+                    _log.DebugFormat("{0}:{1}", cmd.Parameters[i].ParameterName, cmd.Parameters[i].Value);
+                }
+            }
+
+            return result;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/bsmd.database/DatabaseEntity.cs b/bsmd.database/DatabaseEntity.cs
index 738df298..749ca348 100644
--- a/bsmd.database/DatabaseEntity.cs
+++ b/bsmd.database/DatabaseEntity.cs
@@ -30,7 +30,7 @@ namespace bsmd.database
     [DataContract]
     public abstract class DatabaseEntity : IDatabaseEntity, IMessageParagraph, IEquatable<DatabaseEntity>, ICloneable
     {
-        protected Guid? id;        
+        protected Guid? id;
         protected string tablename;
         private Guid instance_id = Guid.NewGuid(); // Comparison id in case entity has not been saved        
         private static readonly ILog _log = LogManager.GetLogger(typeof(DatabaseEntity));
@@ -124,7 +124,7 @@ namespace bsmd.database
 
         public abstract void PrepareSave(IDbCommand cmd);
 
-        public virtual void PrepareDelete(IDbCommand cmd) 
+        public virtual void PrepareDelete(IDbCommand cmd)
         {
             SqlCommand scmd = cmd as SqlCommand;
             scmd.CommandText = string.Format("DELETE FROM {0} WHERE Id = @ID", Tablename);
diff --git a/bsmd.database/Extensions.cs b/bsmd.database/Extensions.cs
index 29b03dbb..bcfd3866 100644
--- a/bsmd.database/Extensions.cs
+++ b/bsmd.database/Extensions.cs
@@ -117,11 +117,21 @@ namespace bsmd.database
                 _log.WarnFormat("{0} cannot be parsed as datetime", text);
                 return null;
             }
-        }        
+        }
 
         public static bool IsTimeEmpty(this DateTime datetime)
         {
-            return ((datetime.Hour == 0) && (datetime.Minute == 0) && (datetime.Second == 0));
+            return (datetime.Hour == 0) && (datetime.Minute == 0) && (datetime.Second == 0);
+        }
+
+        /// <summary>
+        /// Returns true if the date is between now and numDays in the future (or past, if numDays is negative)
+        /// </summary>        
+        public static bool IsNextXDays(this DateTime datetime, int numDays)
+        {
+            double diff = (datetime - DateTime.Now).TotalDays;
+            if (numDays >= 0) return diff < numDays && diff > 0;
+            else return diff < numDays && diff < 0;
         }
 
         public static double? TryParseDouble(string text)
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
new file mode 100644
index 00000000..433a0ad1
--- /dev/null
+++ b/bsmd.database/MaerskData.cs
@@ -0,0 +1,198 @@
+// Copyright (c) 2020-present schick Informatik
+// Description:
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace bsmd.database
+{
+
+    /// <summary>
+    /// Extra balcony: Data stored in Maersk Excel sheets must be stored to be exported
+    /// at a later date. In order to do that (and to be a little more flexible in the future)
+    /// we use a generic storage class called "XtraData" that hopefully might be useful in another
+    /// future scenario as well
+    /// </summary>
+    public class MaerskData : DatabaseEntity
+    {
+
+        #region Construction
+        public MaerskData()
+        {
+            this.tablename = "[dbo].[MaerskData]";
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// reference id as set in the database
+        /// </summary>
+        public Guid MessageCoreId { get; set; }
+
+        /// <summary>
+        /// Core instance reference once matched / set
+        /// </summary>
+        public MessageCore Core { get; set; }
+
+        public bool HasNoIdea => ColM.IsNullOrEmpty();
+
+        public bool IsNextThreeDays => ETA.HasValue && ETA.Value.IsNextXDays(3);
+
+        public DateTime? ETA { get; set; }
+
+        public string ColA { get; set; }
+        
+        public string ColB { get; set; }
+        /// <summary>
+        /// Shipping area?
+        /// </summary>
+        public string ColC { get; set; }
+
+        public string ColD { get; set; }
+        /// <summary>
+        /// Vessel name
+        /// </summary>
+        public string ColE { get; set; }
+        /// <summary>
+        /// IMO
+        /// </summary>
+        public string ColF { get; set; }
+        /// <summary>
+        /// Voyage-No incoming
+        /// </summary>
+        public string ColG { get; set; }
+        /// <summary>
+        /// Voyage-No outgoing
+        /// </summary>
+        public string ColH { get; set; }
+        /// <summary>
+        /// Terminal
+        /// </summary>
+        public string ColI { get; set; }
+        /// <summary>
+        /// Operator
+        /// </summary>
+        public string ColJ { get; set; }
+        /// <summary>
+        /// ETA
+        /// </summary>
+        public string ColK { get; set; }
+        /// <summary>
+        /// ETD
+        /// </summary>
+        public string ColL { get; set; }
+        /// <summary>
+        /// Visit-Id
+        /// </summary>
+        public string ColM { get; set; }
+
+        public string Remark { get; set; }
+
+        #endregion
+
+        #region abstract DatabaseEntity method implementation
+
+        public override List<DatabaseEntity> LoadList(IDataReader reader)
+        {
+            List<DatabaseEntity> result = new List<DatabaseEntity>();
+            if (reader != null)
+            {
+                while (reader.Read())
+                {
+                    MaerskData md = new MaerskData();
+
+                    md.id = reader.GetGuid(0);
+                    if (!reader.IsDBNull(1)) md.MessageCoreId = reader.GetGuid(1);
+                    if (!reader.IsDBNull(2)) md.ColA = reader.GetString(2);
+                    if (!reader.IsDBNull(3)) md.ColB = reader.GetString(3);
+                    if (!reader.IsDBNull(4)) md.ColC = reader.GetString(4);
+                    if (!reader.IsDBNull(5)) md.ColD = reader.GetString(5);
+                    if (!reader.IsDBNull(6)) md.ColE = reader.GetString(6);
+                    if (!reader.IsDBNull(7)) md.ColF = reader.GetString(7);
+                    if (!reader.IsDBNull(8)) md.ColG = reader.GetString(8);
+                    if (!reader.IsDBNull(9)) md.ColH = reader.GetString(9);
+                    if (!reader.IsDBNull(10)) md.ColI = reader.GetString(10);
+                    if (!reader.IsDBNull(11)) md.ColJ = reader.GetString(11);
+                    if (!reader.IsDBNull(12)) md.ColK = reader.GetString(12);
+                    if (!reader.IsDBNull(13)) md.ColL = reader.GetString(13);
+                    if (!reader.IsDBNull(14)) md.ColM = reader.GetString(14);
+                    if (!reader.IsDBNull(15)) md.Remark = reader.GetString(15);
+
+                    // try parsing the column to datetime
+                    if (DateTime.TryParse(md.ColK, out DateTime eta))
+                        ETA = eta;
+
+                    result.Add(md);
+                }
+                reader.Close();
+            }
+            return result;
+        }
+
+        public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
+        {
+            string query = string.Format("SELECT Id, ReferenceId, Field1, Field2, Field3, Field4, Field5, Field6, Field7, Field8, Field9, Field10, Field11, Field12 , Field13, Field14 FROM {0} ", this.Tablename);
+
+            switch (filter)
+            {
+                case Message.LoadFilter.BY_ID:
+                    query += " WHERE Id = @ID";
+                    ((SqlCommand)cmd).Parameters.AddWithValue("@ID", criteria[0]);
+                    break;
+                case Message.LoadFilter.BY_CORE:
+                    query += " WHERE ReferenceId = @ID";
+                    ((SqlCommand)cmd).Parameters.AddWithValue("@ID", criteria[0]);
+                    break;
+                default:
+                    break;
+            }
+
+            cmd.CommandText = query;
+        }
+
+        public override void PrepareSave(IDbCommand cmd)
+        {
+            SqlCommand scmd = cmd as SqlCommand;
+
+            scmd.Parameters.AddWithNullableValue("@REF", this.MessageCoreId);
+            scmd.Parameters.AddWithNullableValue("@COLA", this.ColA);
+            scmd.Parameters.AddWithNullableValue("@COLB", this.ColB);
+            scmd.Parameters.AddWithNullableValue("@COLC", this.ColC);
+            scmd.Parameters.AddWithNullableValue("@COLD", this.ColD);
+            scmd.Parameters.AddWithNullableValue("@COLE", this.ColE);
+            scmd.Parameters.AddWithNullableValue("@COLF", this.ColF);
+            scmd.Parameters.AddWithNullableValue("@COLG", this.ColG);
+            scmd.Parameters.AddWithNullableValue("@COLH", this.ColH);
+            scmd.Parameters.AddWithNullableValue("@COLI", this.ColI);
+            scmd.Parameters.AddWithNullableValue("@COLJ", this.ColJ);
+            scmd.Parameters.AddWithNullableValue("@COLK", this.ColK);
+            scmd.Parameters.AddWithNullableValue("@COLL", this.ColL);
+            scmd.Parameters.AddWithNullableValue("@COLM", this.ColM);
+            scmd.Parameters.AddWithNullableValue("@REMARK", this.Remark);
+
+            if (this.IsNew)
+            {
+                this.CreateId();
+                scmd.Parameters.AddWithValue("@ID", this.Id);
+                scmd.CommandText = string.Format("INSERT INTO {0} (Id, ReferenceId, Field1, Field2, Field3, Field4, Field5, Field6, Field7, Field8, Field9, Field10, Field11, Field12, Field13, Field14) " +
+                    "VALUES (@ID, @REF, @COLA, @COLB, @COLC, @COLD, @COLE, @COLF, @COLG, @COLH, @COLI, @COLJ, @COLK, @COLL, @COLM, @REMARK)", this.Tablename);
+            }
+            else
+            {
+                scmd.Parameters.AddWithValue("@ID", this.Id);
+                scmd.CommandText = string.Format("UPDATE {0} SET Field1 = @COLA, Field2 = @COLB, Field3 = @COLC, Field4 = @COLD, Field5 = @COLE, Field6 = @COLF, @Field7 = @COLG, @Field8 = @COLH, " +
+                    "Field9 = @COLI, Field10 = @COLJ, Field11 = @COLK, Field12 = @COLL, Field13 = @COLM, Field14 = @Remark WHERE Id = @ID", this.Tablename);
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/bsmd.database/MessageCore.cs b/bsmd.database/MessageCore.cs
index 191ec9d0..7601f683 100644
--- a/bsmd.database/MessageCore.cs
+++ b/bsmd.database/MessageCore.cs
@@ -621,8 +621,8 @@ namespace bsmd.database
                                     case SearchFilterType.FILTER_ETA:
                                         uint? from = null, to = null;
                                         string[] elems = searchDict[key].Split(':');
-                                        if (!elems[0].IsNullOrEmpty()) from = UInt32.Parse(elems[0]);
-                                        if (!elems[1].IsNullOrEmpty()) to = UInt32.Parse(elems[1]);
+                                        if (!elems[0].IsNullOrEmpty()) from = uint.Parse(elems[0]);
+                                        if (!elems[1].IsNullOrEmpty()) to = uint.Parse(elems[1]);
 
                                         // SQL Logik für die Zeitfilterung: Wenn es bereits eine Tabelle NOA_NOD mit einem Eintrag für ETAToPortOfCall / ETAToKielCanal gibt
                                         // soll dieser Wert als Vergleich herangezogen werden, sonst ETA / ETAKielCanal aus MessageCore
@@ -697,16 +697,14 @@ namespace bsmd.database
                                     case SearchFilterType.FILTER_FLAG_EQ:
                                         {
                                             sb.Append(" MessageCore.Flags = @FLAG ");
-                                            int flag = 0;
-                                            int.TryParse(searchDict[key], out flag);
+                                            int.TryParse(searchDict[key], out int flag);
                                             ((SqlCommand)cmd).Parameters.AddWithValue("@FLAG", flag);
                                             break;
                                         }
                                     case SearchFilterType.FILTER_FLAG_NEQ:
                                         {
-                                            sb.Append(" MessageCore.Flags <> @FLAG ");
-                                            int flag = 0;
-                                            int.TryParse(searchDict[key], out flag);
+                                            sb.Append(" MessageCore.Flags <> @FLAG ");                                            
+                                            int.TryParse(searchDict[key], out int flag);
                                             ((SqlCommand)cmd).Parameters.AddWithValue("@FLAG", flag);
                                             break;
                                         }
diff --git a/bsmd.database/bsmd.database.csproj b/bsmd.database/bsmd.database.csproj
index 96bd3403..2c2d57c7 100644
--- a/bsmd.database/bsmd.database.csproj
+++ b/bsmd.database/bsmd.database.csproj
@@ -111,6 +111,7 @@
     <Compile Include="AGNT_Template.cs" />
     <Compile Include="CallPurpose.cs" />
     <Compile Include="Customer.cs" />
+    <Compile Include="DBManagerAsync.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="HAZ.cs" />
     <Compile Include="HAZPosTemplate.cs" />
@@ -126,6 +127,7 @@
     <Compile Include="ISublistContainer.cs" />
     <Compile Include="LastTenPortFacilitiesCalled.cs" />
     <Compile Include="LookupNameAttribute.cs" />
+    <Compile Include="MaerskData.cs" />
     <Compile Include="MARPOL_Annex_I_Position.cs" />
     <Compile Include="MessageHistory.cs" />
     <Compile Include="NoTypeConverterJsonConverter.cs" />

From a596e197e1bd293f138719818b29233dd0d68cca Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 9 Feb 2023 14:44:44 +0100
Subject: [PATCH 12/34] more work on async loading..

---
 bsmd.database/DBManagerAsync.cs |  16 +++-
 bsmd.database/MessageCore.cs    | 125 ++++++++++++++++++++------------
 2 files changed, 94 insertions(+), 47 deletions(-)

diff --git a/bsmd.database/DBManagerAsync.cs b/bsmd.database/DBManagerAsync.cs
index 304e85bf..90c56bc3 100644
--- a/bsmd.database/DBManagerAsync.cs
+++ b/bsmd.database/DBManagerAsync.cs
@@ -33,13 +33,27 @@ namespace bsmd.database
 
         #region public methods
 
+        #region convenience loading functions
+
+        public static async Task<List<MessageCore>> LoadMaerskCoresByIntervalAsync(Dictionary<MessageCore.SearchFilterType, string> filterDict, bool loadXtraData = false)
+        {
+            SqlCommand cmd = new SqlCommand();
+            MessageCore aMessageCore = new MessageCore();
+            aMessageCore.PrepareLoadCommand(cmd, Message.LoadFilter.SEARCH_CORE_FILTERS, filterDict);
+            SqlDataReader reader = await PerformCommandAsync(cmd);
+            List<MessageCore> result = await aMessageCore.LoadListAsync(reader);
+            return result;
+        }
+
+        #endregion
+
 
 
         #endregion
 
         #region async DB access methods
 
-        
+
 
         internal static async Task<SqlDataReader> PerformCommandAsync(SqlCommand cmd)
         {
diff --git a/bsmd.database/MessageCore.cs b/bsmd.database/MessageCore.cs
index 7601f683..1a395ae3 100644
--- a/bsmd.database/MessageCore.cs
+++ b/bsmd.database/MessageCore.cs
@@ -7,6 +7,7 @@ using System.Data.SqlClient;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using System.Threading.Tasks;
 
 namespace bsmd.database
 {
@@ -466,6 +467,11 @@ namespace bsmd.database
         }
 
         public override void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
+        {
+            this.PrepareLoadCommand(cmd, filter, false, criteria);
+        }
+
+        public void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, bool joinXtraData, params object[] criteria)
         {
             StringBuilder sb = new StringBuilder("SELECT ");
             if (this.ResultLimit > 0)
@@ -492,8 +498,18 @@ namespace bsmd.database
                 }
             }
 
+            if(joinXtraData)
+            {
+                sb.Append(", [XtraData].[Id], [XtraData].[Field1], "); // ist das so schlau?
+            }
+
             sb.AppendFormat(" FROM {0} ", this.Tablename);
 
+            if(joinXtraData)
+            {
+                sb.AppendFormat(" LEFT JOIN XtraData ON [{0}].Id = [XtraData].[ReferenceId] ", this.Tablename);
+            }
+
             this.SetFilters(sb, cmd, filter, criteria);
             bool latestIdSearch = false;
             if(filter == Message.LoadFilter.SEARCH_CORE_FILTERS)
@@ -725,57 +741,74 @@ namespace bsmd.database
             List<DatabaseEntity> result = new List<DatabaseEntity>();
             while(reader.Read())
             {
-                MessageCore core = new MessageCore();
-                core.id = reader.GetGuid(0);
-                if (!reader.IsDBNull(1)) core.VisitId = reader.GetString(1);
-                if (!reader.IsDBNull(2)) core.TransitId = reader.GetString(2);
-                if (!reader.IsDBNull(3)) core.IMO = reader.GetString(3);
-                if (!reader.IsDBNull(4)) core.ENI = reader.GetString(4);
-                if (!reader.IsDBNull(5)) core.PoC = reader.GetString(5);
-                if (!reader.IsDBNull(6)) core.Portname = reader.GetString(6);
-                if (!reader.IsDBNull(7)) core.ETA = reader.GetDateTime(7);
-                if (!reader.IsDBNull(8)) core.CustomerId = reader.GetGuid(8);
-                if (!reader.IsDBNull(9)) core.previous = reader.GetGuid(9);
-                if (!reader.IsDBNull(10)) core.next = reader.GetGuid(10);
-                core.IsTransit = reader.GetBoolean(11);
-                if (!reader.IsDBNull(12)) core.wetris_zz_56_datensatz_id = reader.GetInt32(12);
-                core.BSMDStatusInternal = (BSMDStatus) Enum.ToObject(typeof(BSMDStatus), reader.GetByte(13));
-                core.InitialHIS = (Message.NSWProvider) Enum.ToObject(typeof(Message.NSWProvider), reader.GetByte(14));
-                if (!reader.IsDBNull(15)) core.HerbergFormGuid = reader.GetGuid(15);
-                if (!reader.IsDBNull(16)) core.HerbergFormTemplateGuid = reader.GetGuid(16);
-                if (!reader.IsDBNull(17)) core.HerbergReportType = reader.GetString(17);
-                if (!reader.IsDBNull(18)) core.HerbergEmailContactReportingVessel = reader.GetString(18);
-                if (!reader.IsDBNull(19)) core.HerbergEmail24HrsContact = reader.GetString(19);
-                if (!reader.IsDBNull(20)) core.ETAKielCanal = reader.GetDateTime(20);
-                if (!reader.IsDBNull(21)) core.HerbergRevDate = reader.GetDateTime(21);
-                if (!reader.IsDBNull(22)) core.ReportStatus = (ReportStatusEnum) Enum.ToObject(typeof(ReportStatusEnum), reader.GetByte(22));
-                if (!reader.IsDBNull(23)) core.SietasSheetVersion = reader.GetString(23);
-                if (!reader.IsDBNull(24)) core.Incoming = reader.GetBoolean(24);
-                if (!reader.IsDBNull(25)) core.DefaultReportingPartyId = reader.GetGuid(25);
-                if (!reader.IsDBNull(26)) core.created = reader.GetDateTime(26);
-                if (!reader.IsDBNull(27)) core.changed = reader.GetDateTime(27);
-                if (!reader.IsDBNull(28)) core.CreateExcel = reader.GetBoolean(28);
-                if (!reader.IsDBNull(29)) core.EditedBy = reader.GetString(29);
-                if (!reader.IsDBNull(30)) core.TicketNo = reader.GetString(30);
-                if (!reader.IsDBNull(31)) core.Cancelled = reader.GetBoolean(31);
-                if (!reader.IsDBNull(32)) core.VisitIdOrTransitIdCancellable = reader.GetBoolean(32);
-                if (!reader.IsDBNull(33)) core.BlockedNotificationClasses = reader.GetString(33);
-                if (!reader.IsDBNull(34)) core.FreeNotificationClasses = reader.GetString(34);
-                if (!reader.IsDBNull(35)) core.OwnNotificationClasses = reader.GetString(35);
-                if (!reader.IsDBNull(36)) core.StatusCheckErrorCode = reader.GetString(36);
-                if (!reader.IsDBNull(37)) core.StatusCheckErrorMessage = reader.GetString(37);
-                if (!reader.IsDBNull(38)) core.QueryNSWStatus = reader.GetBoolean(38);
-                if (!reader.IsDBNull(39)) core.ExcelImportComplete = reader.GetBoolean(39);
-                if (!reader.IsDBNull(40)) core.PONumber = reader.GetString(40);
-                if (!reader.IsDBNull(41)) core.Flags = reader.GetInt32(41);
-                if (!reader.IsDBNull(42)) core.POATA = reader.GetDateTime(42);
-
-                result.Add(core);
+                result.Add(ReadRowFromReader(reader));
             }
             reader.Close();
             return result;
         }
 
+        public async Task<List<MessageCore>> LoadListAsync(SqlDataReader reader)
+        {
+            List<MessageCore> result = new List<MessageCore>();
+            
+            while (await reader.ReadAsync())
+            {
+                result.Add(ReadRowFromReader(reader));
+            }
+            reader.Close();
+            return result;
+        }
+
+        private MessageCore ReadRowFromReader(IDataReader reader)
+        {
+            MessageCore core = new MessageCore();
+            core.id = reader.GetGuid(0);
+            if (!reader.IsDBNull(1)) core.VisitId = reader.GetString(1);
+            if (!reader.IsDBNull(2)) core.TransitId = reader.GetString(2);
+            if (!reader.IsDBNull(3)) core.IMO = reader.GetString(3);
+            if (!reader.IsDBNull(4)) core.ENI = reader.GetString(4);
+            if (!reader.IsDBNull(5)) core.PoC = reader.GetString(5);
+            if (!reader.IsDBNull(6)) core.Portname = reader.GetString(6);
+            if (!reader.IsDBNull(7)) core.ETA = reader.GetDateTime(7);
+            if (!reader.IsDBNull(8)) core.CustomerId = reader.GetGuid(8);
+            if (!reader.IsDBNull(9)) core.previous = reader.GetGuid(9);
+            if (!reader.IsDBNull(10)) core.next = reader.GetGuid(10);
+            core.IsTransit = reader.GetBoolean(11);
+            if (!reader.IsDBNull(12)) core.wetris_zz_56_datensatz_id = reader.GetInt32(12);
+            core.BSMDStatusInternal = (BSMDStatus)Enum.ToObject(typeof(BSMDStatus), reader.GetByte(13));
+            core.InitialHIS = (Message.NSWProvider)Enum.ToObject(typeof(Message.NSWProvider), reader.GetByte(14));
+            if (!reader.IsDBNull(15)) core.HerbergFormGuid = reader.GetGuid(15);
+            if (!reader.IsDBNull(16)) core.HerbergFormTemplateGuid = reader.GetGuid(16);
+            if (!reader.IsDBNull(17)) core.HerbergReportType = reader.GetString(17);
+            if (!reader.IsDBNull(18)) core.HerbergEmailContactReportingVessel = reader.GetString(18);
+            if (!reader.IsDBNull(19)) core.HerbergEmail24HrsContact = reader.GetString(19);
+            if (!reader.IsDBNull(20)) core.ETAKielCanal = reader.GetDateTime(20);
+            if (!reader.IsDBNull(21)) core.HerbergRevDate = reader.GetDateTime(21);
+            if (!reader.IsDBNull(22)) core.ReportStatus = (ReportStatusEnum)Enum.ToObject(typeof(ReportStatusEnum), reader.GetByte(22));
+            if (!reader.IsDBNull(23)) core.SietasSheetVersion = reader.GetString(23);
+            if (!reader.IsDBNull(24)) core.Incoming = reader.GetBoolean(24);
+            if (!reader.IsDBNull(25)) core.DefaultReportingPartyId = reader.GetGuid(25);
+            if (!reader.IsDBNull(26)) core.created = reader.GetDateTime(26);
+            if (!reader.IsDBNull(27)) core.changed = reader.GetDateTime(27);
+            if (!reader.IsDBNull(28)) core.CreateExcel = reader.GetBoolean(28);
+            if (!reader.IsDBNull(29)) core.EditedBy = reader.GetString(29);
+            if (!reader.IsDBNull(30)) core.TicketNo = reader.GetString(30);
+            if (!reader.IsDBNull(31)) core.Cancelled = reader.GetBoolean(31);
+            if (!reader.IsDBNull(32)) core.VisitIdOrTransitIdCancellable = reader.GetBoolean(32);
+            if (!reader.IsDBNull(33)) core.BlockedNotificationClasses = reader.GetString(33);
+            if (!reader.IsDBNull(34)) core.FreeNotificationClasses = reader.GetString(34);
+            if (!reader.IsDBNull(35)) core.OwnNotificationClasses = reader.GetString(35);
+            if (!reader.IsDBNull(36)) core.StatusCheckErrorCode = reader.GetString(36);
+            if (!reader.IsDBNull(37)) core.StatusCheckErrorMessage = reader.GetString(37);
+            if (!reader.IsDBNull(38)) core.QueryNSWStatus = reader.GetBoolean(38);
+            if (!reader.IsDBNull(39)) core.ExcelImportComplete = reader.GetBoolean(39);
+            if (!reader.IsDBNull(40)) core.PONumber = reader.GetString(40);
+            if (!reader.IsDBNull(41)) core.Flags = reader.GetInt32(41);
+            if (!reader.IsDBNull(42)) core.POATA = reader.GetDateTime(42);
+
+            return core;
+        }
+
         #endregion
 
         #region public methods

From 6031b5df94ead03d492de0c73a29f09d1b892706 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 12 Feb 2023 14:27:35 +0100
Subject: [PATCH 13/34] WIP

---
 ENI2/Controls/MaerskListControl.xaml    | 10 ++++---
 ENI2/Controls/MaerskListControl.xaml.cs | 30 +++++++++++++++++++--
 bsmd.database/DBManagerAsync.cs         | 35 ++++++++++++++++++-------
 3 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 4369abde..ab188f04 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -31,6 +31,8 @@
                     <ColumnDefinition Width="40" />
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="80" />
@@ -41,9 +43,11 @@
                 <Label Content="To" Grid.Column="2" />
                 <xctk:DateTimePicker x:Name="dateTimePickerTo" Margin="2" Grid.Column="3" Format="ShortDate" />
                 <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
-                <Button x:Name="buttonImport" Grid.Column="6" Margin="2" Content="Import" Click="buttonImport_Click" />
-                <Button x:Name="buttonExport" Grid.Column="7" Margin="2" Content="Export" Click="buttonExport_Click" />
-                <local:BusyControl x:Name="busyControl" Grid.Column="8" />
+                <Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" />
+                <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request Ids" Margin="2" Click="buttonRequestIds_Click" />
+                <Button x:Name="buttonImport" Grid.Column="8" Margin="2" Content="Import" Click="buttonImport_Click" />
+                <Button x:Name="buttonExport" Grid.Column="9" Margin="2" Content="Export" Click="buttonExport_Click" />
+                <local:BusyControl x:Name="busyControl" Grid.Column="10" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index f085d15e..0738f479 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -169,7 +169,7 @@ namespace ENI2.Controls
             this.PerformSearch();
         }
 
-        private void buttonImport_Click(object sender, RoutedEventArgs e)
+        private async void buttonImport_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog ofd = new OpenFileDialog
             {
@@ -233,8 +233,16 @@ namespace ENI2.Controls
                     // we only want cores for the next 3 days
                     if (importData.Count > 0)
                     {
+                        busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
                         // TODO: find matching message cores..
-                        
+                        foreach(MaerskData md in importData)
+                        {
+                            if(!md.ColM.IsNullOrEmpty())
+                            {
+                                md.MessageCore = await DBManagerAsync.LoadCoreByVisitIdAsync(md.ColM);
+                            }
+                        }
+                        busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                     }
 
                     // sort
@@ -257,6 +265,24 @@ namespace ENI2.Controls
 
         }
 
+        private async void buttonSave_Click(object sender, RoutedEventArgs e)
+        {
+            // save the current list to DB (only if the entries have matching cores!)
+            foreach(MaerskData md in this.maerskDataList)
+            {
+                if(md.MessageCore != null)
+                {
+                    await DBManagerAsync.Save(md.MessageCore);
+                }
+            }
+
+        }
+
+        private void buttonRequestIds_Click(object sender, RoutedEventArgs e)
+        {
+            // find all entries from now until 3 days into the future and track parallel requests
+        }
+
         #endregion
 
     }
diff --git a/bsmd.database/DBManagerAsync.cs b/bsmd.database/DBManagerAsync.cs
index 90c56bc3..9c43ffd9 100644
--- a/bsmd.database/DBManagerAsync.cs
+++ b/bsmd.database/DBManagerAsync.cs
@@ -7,8 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -33,6 +31,13 @@ namespace bsmd.database
 
         #region public methods
 
+        public static async Task<int> Save(DatabaseEntity entity)
+        {
+            SqlCommand cmd = new SqlCommand();
+            entity.PrepareSave(cmd);
+            return await PerformNonQueryAsync(cmd);
+        }
+
         #region convenience loading functions
 
         public static async Task<List<MessageCore>> LoadMaerskCoresByIntervalAsync(Dictionary<MessageCore.SearchFilterType, string> filterDict, bool loadXtraData = false)
@@ -41,20 +46,32 @@ namespace bsmd.database
             MessageCore aMessageCore = new MessageCore();
             aMessageCore.PrepareLoadCommand(cmd, Message.LoadFilter.SEARCH_CORE_FILTERS, filterDict);
             SqlDataReader reader = await PerformCommandAsync(cmd);
-            List<MessageCore> result = await aMessageCore.LoadListAsync(reader);
+            return await aMessageCore.LoadListAsync(reader);
+        }
+
+        public static async Task<MessageCore> LoadCoreByVisitIdAsync(string visitId)
+        {
+            SqlCommand cmd = new SqlCommand();
+            MessageCore aMessageCore = new MessageCore();
+            aMessageCore.PrepareLoadCommand(cmd, Message.LoadFilter.BY_VISITID, visitId);
+            SqlDataReader reader = await PerformCommandAsync(cmd);
+            List<MessageCore> resultList = await aMessageCore.LoadListAsync(reader);
+            MessageCore result = null;
+            if(resultList.Count > 0)
+            {
+                if(resultList.Count > 1)
+                    _log.WarnFormat("more than one core found for VISIT-ID {0}", visitId);
+                result = resultList[0];
+            }
             return result;
         }
 
         #endregion
 
-
-
         #endregion
 
         #region async DB access methods
 
-
-
         internal static async Task<SqlDataReader> PerformCommandAsync(SqlCommand cmd)
         {
             SqlDataReader reader = null;
@@ -87,7 +104,7 @@ namespace bsmd.database
             return reader;
         }
 
-        internal static async Task<int> PerformNonQuery(SqlCommand cmd)
+        internal static async Task<int> PerformNonQueryAsync(SqlCommand cmd)
         {
             int result = -1;
             // await _asyncSemaphore.WaitAsync();
@@ -114,7 +131,7 @@ namespace bsmd.database
             return result;
         }
 
-        internal static async Task<int?> PerformReadIntQuery(SqlCommand cmd)
+        internal static async Task<int?> PerformReadIntQueryAsync(SqlCommand cmd)
         {
             int? result = null;
 

From 9f31b3cea48de558d91a7697a6294823cfa57b45 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 13 Feb 2023 09:38:42 +0100
Subject: [PATCH 14/34] Laden korrigiert, Status Enum statt Flags

---
 ENI2/App.xaml.cs                              |  5 +-
 ENI2/Controls/MaerskListControl.xaml          | 18 +++-
 ENI2/Controls/MaerskListControl.xaml.cs       | 71 ++++++++++----
 .../OverViewDetailControl.xaml.cs             |  4 +-
 bsmd.database/DBManagerAsync.cs               | 42 ++++++---
 bsmd.database/MaerskData.cs                   | 93 +++++++++++++------
 bsmd.database/MessageCore.cs                  | 17 +---
 7 files changed, 171 insertions(+), 79 deletions(-)

diff --git a/ENI2/App.xaml.cs b/ENI2/App.xaml.cs
index f8cc4b82..c64a3b6e 100644
--- a/ENI2/App.xaml.cs
+++ b/ENI2/App.xaml.cs
@@ -60,7 +60,10 @@ namespace ENI2
 
             ResetSplashCreated.WaitOne();
 
-            base.OnStartup(e);            
+            base.OnStartup(e);
+
+            // set connectnion string to async loader
+            DBManagerAsync.ConnectionString = ENI2.Properties.Settings.Default.ConnectionString;
 
             // initialize static / localized lookups from sqlite database
 
diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index ab188f04..6285a3ed 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -8,6 +8,7 @@
              xmlns:col="clr-namespace:System.Collections;assembly=mscorlib"
              xmlns:p="clr-namespace:ENI2.Properties"
              xmlns:local="clr-namespace:ENI2.Controls"
+             xmlns:db="clr-namespace:bsmd.database;assembly=bsmd.database"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
@@ -54,16 +55,29 @@
                 <local:ENIDataGrid.RowStyle>
                     <Style TargetType="DataGridRow">
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsNextThreeDays}" Value="true">
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.ID}">
                                 <Setter Property="Background" Value="LightGreen"></Setter>
                             </DataTrigger>
-                            <DataTrigger Binding="{Binding HasNoIdea}" Value="true">
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.NO_ID}">
                                 <Setter Property="Background" Value="LightPink"></Setter>
                             </DataTrigger>
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.UPDATED}">
+                                <Setter Property="Background" Value="LightYellow"></Setter>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.REQUESTING_ID}">
+                                <Setter Property="Background" Value="Yellow"></Setter>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.ID_ASSIGNED}">
+                                <Setter Property="Background" Value="GreenYellow"></Setter>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.NO_ID_AND_DUE}">
+                                <Setter Property="Background" Value="Red"></Setter>
+                            </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </local:ENIDataGrid.RowStyle>
                 <DataGrid.Columns>
+                    <DataGridTextColumn Header="Status" Binding="{Binding Status}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Col A" Binding="{Binding ColA}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Col B" Binding="{Binding ColB}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Ship. Area" Binding="{Binding ColC}" IsReadOnly="True" />
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 0738f479..0eda6839 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -23,12 +23,10 @@ namespace ENI2.Controls
     /// Interaction logic for MaerskListControl.xaml
     /// </summary>
     public partial class MaerskListControl : UserControl
-    {
+    {        
 
         #region Fields        
-
-        private List<MessageCore> searchResult = new List<MessageCore>();
-        private readonly List<MessageCore> filteredResult = new List<MessageCore>();
+        
         private readonly ObservableCollection<MaerskData> maerskDataList = new ObservableCollection<MaerskData>();
         private const uint MAX_EMPTY_ROWS_ON_IMPORT = 3; // import breaks if more than this count of empty rows have been read
 
@@ -116,10 +114,8 @@ namespace ENI2.Controls
 
         #region private methods
 
-        private void PerformSearch()
+        private async void PerformSearch()
         {
-            this.dataGridPOCores.ItemsSource = null;
-            this.filteredResult.Clear();
 
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();            
 
@@ -131,17 +127,25 @@ namespace ENI2.Controls
             filterDict.Add(MessageCore.SearchFilterType.FILTER_FLAG_EQ, "0");
 
             // suche auslösen
-            this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
+            List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
 
             // alle anderen Häfen weg
-            this.searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")));
+            searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")));
 
-            // sortieren nach ETA (kombiniert)
-            searchResult.Sort((x, y) => DateTime.Compare(x.ETADisplay ?? DateTime.MaxValue, y.ETADisplay ?? DateTime.MaxValue));
+            // alles entfernen was keine Maersk Xtra-Data hat (=noch nicht schon einmal importiert wurde)
+            foreach(MessageCore core in searchResult)
+            {
+                MaerskData md = await DBManagerAsync.LoadMaerskDataForCoreAsync(core.Id.Value);
+                if(md != null)
+                {
+                    md.MessageCore = core;
+                    md.MessageCoreId = core.Id.Value;
+                    if(!maerskDataList.Contains(md)) // DatabaseEntity implements IEquatable
+                        this.maerskDataList.Add(md);
+                }
+            }
 
             this.dataGridPOCores.SelectedItem = null;
-            this.filteredResult.AddRange(searchResult);
-            
         }
 
         private string ReadFieldAsString(IExcelDataReader reader, int fieldNum)
@@ -248,11 +252,23 @@ namespace ENI2.Controls
                     // sort
                     // importData.Sort((x, y) => DateTime.Compare(x.ETA ?? DateTime.MaxValue, y.ETA ?? DateTime.MaxValue));
 
-                    // merge the result into our grid data source list
-                    // TODO
-
                     foreach (MaerskData md in importData)
+                    {
+                        md.Status = MaerskData.MDStatus.ID;
+
+                        if (md.ColM.IsNullOrEmpty())
+                        {
+                            md.Status = MaerskData.MDStatus.NO_ID;
+                            if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
+                                md.Status = MaerskData.MDStatus.NO_ID_AND_DUE;
+                        }
+
+                        // TODO: check if data has been updated
+
+                        // TODO: Check if data is already present
+
                         maerskDataList.Add(md);
+                    }
                     this.dataGridPOCores.Items.Refresh();
                 }
 
@@ -281,6 +297,29 @@ namespace ENI2.Controls
         private void buttonRequestIds_Click(object sender, RoutedEventArgs e)
         {
             // find all entries from now until 3 days into the future and track parallel requests
+            List<MaerskData> requestList = new List<MaerskData>();
+            foreach (MaerskData md in this.dataGridPOCores.SelectedItems)
+            {
+                if ((md.MessageCore != null) || (!md.ColM.IsNullOrEmpty())) continue; // already requested
+                requestList.Add(md);
+                md.Status = MaerskData.MDStatus.REQUESTING_ID;
+            }
+            if(requestList.Count == 0)
+            {
+                MessageBox.Show("No valid rows selected", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+            }
+            else
+            {
+                // Todo: 
+
+                // 1) create MessageCore and message classes
+
+                // 2) request dbh Id
+
+                // 3) register watchdog for request completion
+
+            }
+            this.dataGridPOCores.Items.Refresh();
         }
 
         #endregion
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index acfc8e62..a0f1db91 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -417,11 +417,11 @@ namespace ENI2.DetailViewControls
                 mhd.MessageHistories = DBManager.Instance.GetMessageHistories(historyMessage.Id.Value);
                 mhd.RequestReload += () => this.OnRequestReload(this.Core.Id.Value);
                 mhd.Show();
-            }            
+            }
         }
 
         private void contextSendMessage(object sender, RoutedEventArgs e)
-        {            
+        {
             MessageBoxResult result = MessageBox.Show(Properties.Resources.textConfirmSend, Properties.Resources.textConfirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
diff --git a/bsmd.database/DBManagerAsync.cs b/bsmd.database/DBManagerAsync.cs
index 9c43ffd9..7960f426 100644
--- a/bsmd.database/DBManagerAsync.cs
+++ b/bsmd.database/DBManagerAsync.cs
@@ -3,6 +3,7 @@
 // connection pooling.. will try it out in Maersk/PO numbers and expand over the whole
 // app later
 
+using log4net;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
@@ -10,16 +11,13 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
-using log4net;
-
 namespace bsmd.database
 {
     public static class DBManagerAsync
     {
         #region Fields
 
-        private static ILog _log = LogManager.GetLogger(typeof(DBManagerAsync));
-        private static readonly SemaphoreSlim _asyncSemaphore = new SemaphoreSlim(1);
+        private static readonly ILog _log = LogManager.GetLogger(typeof(DBManagerAsync));        
 
         #endregion
 
@@ -66,6 +64,24 @@ namespace bsmd.database
             return result;
         }
 
+        public static async Task<MaerskData> LoadMaerskDataForCoreAsync(Guid messageCoreId)
+        {
+            SqlCommand cmd = new SqlCommand();
+            MaerskData md = new MaerskData();
+            md.PrepareLoadCommand(cmd, Message.LoadFilter.BY_CORE, messageCoreId);
+            SqlDataReader reader = await PerformCommandAsync(cmd);
+            List<MaerskData> resultList = await md.LoadListAsync(reader);
+            MaerskData result = null;
+            if(resultList.Count > 0)
+            {
+                if(resultList.Count > 1)
+                    _log.WarnFormat("more than one xtra data found for core id {0}", messageCoreId);
+                result = resultList[0];
+            }
+            return result;
+        }
+
+
         #endregion
 
         #endregion
@@ -75,15 +91,13 @@ namespace bsmd.database
         internal static async Task<SqlDataReader> PerformCommandAsync(SqlCommand cmd)
         {
             SqlDataReader reader = null;
-
-            // await _asyncSemaphore.WaitAsync();
+            
             try
             {
-                using (SqlConnection connection = new SqlConnection(ConnectionString))
-                {
-                    await connection.OpenAsync();
-                    reader = await cmd.ExecuteReaderAsync();
-                }
+                SqlConnection connection = new SqlConnection(ConnectionString);
+                await connection.OpenAsync();
+                cmd.Connection = connection;
+                reader = await cmd.ExecuteReaderAsync();
             }
             catch (SqlException ex)
             {
@@ -96,10 +110,6 @@ namespace bsmd.database
                     _log.DebugFormat("{0}:{1}", cmd.Parameters[i].ParameterName, cmd.Parameters[i].Value);
                 }
             }
-            finally
-            {
-                // _asyncSemaphore.Release();
-            }
 
             return reader;
         }
@@ -113,6 +123,7 @@ namespace bsmd.database
                 using (SqlConnection connection = new SqlConnection(ConnectionString))
                 {
                     await connection.OpenAsync();
+                    cmd.Connection = connection;
                     result = await cmd.ExecuteNonQueryAsync();
                 }
             }
@@ -139,6 +150,7 @@ namespace bsmd.database
             {
                 using (SqlConnection connection = new SqlConnection(ConnectionString))
                 {
+                    cmd.Connection = connection;
                     object r = await cmd.ExecuteScalarAsync();
                     if (r == null) { result = null; }
                     else if (r == DBNull.Value) { result = null; }
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index 433a0ad1..e5fb45d1 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
@@ -29,6 +30,26 @@ namespace bsmd.database
 
         #endregion
 
+        #region Enums
+
+        public enum MDStatus
+        {
+            [Description("No id")]
+            NO_ID,
+            [Description("Updated")]
+            UPDATED,            
+            [Description("Requesting id")]
+            REQUESTING_ID,
+            [Description("Id assigned")]
+            ID_ASSIGNED,
+            [Description("upcoming without id")]
+            NO_ID_AND_DUE,
+            [Description("Has id")]
+            ID
+        }
+
+        #endregion
+
         #region Properties
 
         /// <summary>
@@ -41,9 +62,7 @@ namespace bsmd.database
         /// </summary>
         public MessageCore Core { get; set; }
 
-        public bool HasNoIdea => ColM.IsNullOrEmpty();
-
-        public bool IsNextThreeDays => ETA.HasValue && ETA.Value.IsNextXDays(3);
+        public MDStatus Status { get; set; }
 
         public DateTime? ETA { get; set; }
 
@@ -106,36 +125,56 @@ namespace bsmd.database
             {
                 while (reader.Read())
                 {
-                    MaerskData md = new MaerskData();
-
-                    md.id = reader.GetGuid(0);
-                    if (!reader.IsDBNull(1)) md.MessageCoreId = reader.GetGuid(1);
-                    if (!reader.IsDBNull(2)) md.ColA = reader.GetString(2);
-                    if (!reader.IsDBNull(3)) md.ColB = reader.GetString(3);
-                    if (!reader.IsDBNull(4)) md.ColC = reader.GetString(4);
-                    if (!reader.IsDBNull(5)) md.ColD = reader.GetString(5);
-                    if (!reader.IsDBNull(6)) md.ColE = reader.GetString(6);
-                    if (!reader.IsDBNull(7)) md.ColF = reader.GetString(7);
-                    if (!reader.IsDBNull(8)) md.ColG = reader.GetString(8);
-                    if (!reader.IsDBNull(9)) md.ColH = reader.GetString(9);
-                    if (!reader.IsDBNull(10)) md.ColI = reader.GetString(10);
-                    if (!reader.IsDBNull(11)) md.ColJ = reader.GetString(11);
-                    if (!reader.IsDBNull(12)) md.ColK = reader.GetString(12);
-                    if (!reader.IsDBNull(13)) md.ColL = reader.GetString(13);
-                    if (!reader.IsDBNull(14)) md.ColM = reader.GetString(14);
-                    if (!reader.IsDBNull(15)) md.Remark = reader.GetString(15);
-
-                    // try parsing the column to datetime
-                    if (DateTime.TryParse(md.ColK, out DateTime eta))
-                        ETA = eta;
-
-                    result.Add(md);
+                    result.Add(ReadRowFromReader(reader));
                 }
                 reader.Close();
             }
             return result;
         }
 
+        public async Task<List<MaerskData>> LoadListAsync(SqlDataReader reader)
+        {
+            List<MaerskData> result = new List<MaerskData>();
+
+            while (await reader.ReadAsync())
+            {
+                result.Add(ReadRowFromReader(reader));
+            }
+            reader.Close();
+            return result;
+        }
+
+        private MaerskData ReadRowFromReader(IDataReader reader)
+        {
+            MaerskData md = null;
+            if (reader != null)
+            {
+                md = new MaerskData();
+
+                md.id = reader.GetGuid(0);
+                if (!reader.IsDBNull(1)) md.MessageCoreId = reader.GetGuid(1);
+                if (!reader.IsDBNull(2)) md.ColA = reader.GetString(2);
+                if (!reader.IsDBNull(3)) md.ColB = reader.GetString(3);
+                if (!reader.IsDBNull(4)) md.ColC = reader.GetString(4);
+                if (!reader.IsDBNull(5)) md.ColD = reader.GetString(5);
+                if (!reader.IsDBNull(6)) md.ColE = reader.GetString(6);
+                if (!reader.IsDBNull(7)) md.ColF = reader.GetString(7);
+                if (!reader.IsDBNull(8)) md.ColG = reader.GetString(8);
+                if (!reader.IsDBNull(9)) md.ColH = reader.GetString(9);
+                if (!reader.IsDBNull(10)) md.ColI = reader.GetString(10);
+                if (!reader.IsDBNull(11)) md.ColJ = reader.GetString(11);
+                if (!reader.IsDBNull(12)) md.ColK = reader.GetString(12);
+                if (!reader.IsDBNull(13)) md.ColL = reader.GetString(13);
+                if (!reader.IsDBNull(14)) md.ColM = reader.GetString(14);
+                if (!reader.IsDBNull(15)) md.Remark = reader.GetString(15);
+
+                // try parsing the column to datetime
+                if (DateTime.TryParse(md.ColK, out DateTime eta))
+                    ETA = eta;
+            }
+            return md;
+        }
+
         public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
         {
             string query = string.Format("SELECT Id, ReferenceId, Field1, Field2, Field3, Field4, Field5, Field6, Field7, Field8, Field9, Field10, Field11, Field12 , Field13, Field14 FROM {0} ", this.Tablename);
diff --git a/bsmd.database/MessageCore.cs b/bsmd.database/MessageCore.cs
index 1a395ae3..b9c1e99a 100644
--- a/bsmd.database/MessageCore.cs
+++ b/bsmd.database/MessageCore.cs
@@ -466,12 +466,7 @@ namespace bsmd.database
             }
         }
 
-        public override void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
-        {
-            this.PrepareLoadCommand(cmd, filter, false, criteria);
-        }
-
-        public void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, bool joinXtraData, params object[] criteria)
+        public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
         {
             StringBuilder sb = new StringBuilder("SELECT ");
             if (this.ResultLimit > 0)
@@ -498,18 +493,8 @@ namespace bsmd.database
                 }
             }
 
-            if(joinXtraData)
-            {
-                sb.Append(", [XtraData].[Id], [XtraData].[Field1], "); // ist das so schlau?
-            }
-
             sb.AppendFormat(" FROM {0} ", this.Tablename);
 
-            if(joinXtraData)
-            {
-                sb.AppendFormat(" LEFT JOIN XtraData ON [{0}].Id = [XtraData].[ReferenceId] ", this.Tablename);
-            }
-
             this.SetFilters(sb, cmd, filter, criteria);
             bool latestIdSearch = false;
             if(filter == Message.LoadFilter.SEARCH_CORE_FILTERS)

From ed1f11c936179620ec9160732acf92e346306350 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 13 Feb 2023 10:19:39 +0100
Subject: [PATCH 15/34] =?UTF-8?q?Simplen=20Excel=20export=20hinzugef=C3=BC?=
 =?UTF-8?q?gt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ENI2/Controls/MaerskListControl.xaml.cs       | 21 ++++++-
 .../OverViewDetailControl.xaml.cs             |  2 +-
 ENI2/ENI2.csproj                              |  1 +
 ENI2/Excel/ExcelManager.cs                    |  7 ++-
 ENI2/Excel/ExcelSimpleWriter.cs               | 59 +++++++++++++++++++
 ENI2/Excel/ExcelWriter.cs                     | 11 ++--
 bsmd.database/MaerskData.cs                   |  2 +-
 7 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 ENI2/Excel/ExcelSimpleWriter.cs

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 0eda6839..572a5788 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -16,6 +16,7 @@ using System.Runtime.InteropServices;
 using bsmd.database;
 using ExcelDataReader;
 using System.Collections.ObjectModel;
+using ENI2.Excel;
 
 namespace ENI2.Controls
 {
@@ -278,7 +279,25 @@ namespace ENI2.Controls
 
         private void buttonExport_Click(object sender, RoutedEventArgs e)
         {
-
+            // Export of the current collection
+            SaveFileDialog sfd = new SaveFileDialog()
+            {
+                Filter = "Excel Files|*.xls;*.xlsx"
+            };
+            if(sfd.ShowDialog() ?? false)
+            {
+                Util.UIHelper.SetBusyState();
+                ExcelManager em = new ExcelManager();
+                try
+                {
+                    List<MaerskData> exportList = new List<MaerskData>(this.maerskDataList);
+                    em.ExportMaersk(exportList, sfd.FileName);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Export failed", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
         }
 
         private async void buttonSave_Click(object sender, RoutedEventArgs e)
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index a0f1db91..5ffcbeb8 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -800,7 +800,7 @@ namespace ENI2.DetailViewControls
                 {
                     MessageBox.Show(ex.Message, "Export failed", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            }
+            }            
         }
 
         #endregion
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index b5972b73..e9efc3aa 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -254,6 +254,7 @@
     <Compile Include="Excel\ExcelComparer.cs" />
     <Compile Include="Excel\ExcelManager.cs" />
     <Compile Include="Excel\ExcelReader.cs" />
+    <Compile Include="Excel\ExcelSimpleWriter.cs" />
     <Compile Include="Excel\ExcelUtil.cs" />
     <Compile Include="Controls\MaerskListControl.xaml.cs">
       <DependentUpon>MaerskListControl.xaml</DependentUpon>
diff --git a/ENI2/Excel/ExcelManager.cs b/ENI2/Excel/ExcelManager.cs
index ee169071..1ca5f6c8 100644
--- a/ENI2/Excel/ExcelManager.cs
+++ b/ENI2/Excel/ExcelManager.cs
@@ -80,11 +80,16 @@ namespace ENI2.Excel
             resultMessage = "";
 
             // Create ExcelWriter
-            using (ExcelWriter ew = new ExcelWriter(fileName, isRefSheet))
+            using (ExcelWriter ew = new ExcelWriter(isRefSheet))
             {
                 ew.WriteData(messages, core, out resultMessage, isRefSheet);
                 ew.Save(fileName);
             }
         }
+
+        internal void ExportMaersk(List<MaerskData> exportList, string fileName)
+        {
+            ExcelSimpleWriter.WriteMaerskList(fileName, exportList);
+        }
     }
 }
diff --git a/ENI2/Excel/ExcelSimpleWriter.cs b/ENI2/Excel/ExcelSimpleWriter.cs
new file mode 100644
index 00000000..4f5f377e
--- /dev/null
+++ b/ENI2/Excel/ExcelSimpleWriter.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Microsoft.Office.Interop.Excel;
+using System.Runtime.InteropServices;
+
+using bsmd.database;
+
+namespace ENI2.Excel
+{
+    static class ExcelSimpleWriter
+    {
+        public static void WriteMaerskList(string filename, List<MaerskData> data)
+        {
+            Application excelApp = new Application();
+            excelApp.DisplayAlerts = false;
+            excelApp.Visible = false;
+            Workbook wb = excelApp.Workbooks.Add(XlWBATemplate.xlWBATWorksheet);
+
+            Worksheet ws = wb.Worksheets[1];
+
+            //            ExcelWorkSheet.Cells[r, c] = "R" + r + "C" + c;
+
+            for (int i = 0; i < data.Count; i++)
+            {
+                MaerskData md = data[i];
+                ws.Cells[i + 1, 1] = md.ColA;
+                ws.Cells[i + 1, 2] = md.ColB;
+                ws.Cells[i + 1, 3] = md.ColC;
+                ws.Cells[i + 1, 4] = md.ColD;
+                ws.Cells[i + 1, 5] = md.ColE;
+                ws.Cells[i + 1, 6] = md.ColF;
+                ws.Cells[i + 1, 7] = md.ColG;
+                ws.Cells[i + 1, 8] = md.ColH;
+                ws.Cells[i + 1, 9] = md.ColI;
+                ws.Cells[i + 1, 10] = md.ColJ;
+                ws.Cells[i + 1, 11] = md.ColK;
+                ws.Cells[i + 1, 12] = md.ColL;
+                ws.Cells[i + 1, 13] = md.ColM ;
+                ws.Cells[i + 1, 14] = md.Remark;
+            }
+
+            wb.SaveAs(filename, XlFileFormat.xlOpenXMLWorkbook, Type.Missing, Type.Missing, Type.Missing,
+                    Type.Missing, XlSaveAsAccessMode.xlNoChange, Type.Missing, Type.Missing, Type.Missing,
+                    Type.Missing, Type.Missing);
+            wb.Saved = true;
+            wb.Close(0);
+
+            Marshal.ReleaseComObject(ws);
+            Marshal.ReleaseComObject(wb);
+
+            excelApp.Quit();
+            Marshal.ReleaseComObject(excelApp);
+        }
+    }
+}
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 6f06015e..817fe971 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -18,11 +18,9 @@ namespace ENI2.Excel
     internal class ExcelWriter : ExcelBase
     {
 
-       
-
         #region Construction
 
-        public ExcelWriter(string filePath, bool isRefSheet)
+        public ExcelWriter(bool isRefSheet)
         {
             string filename = @"Excel\EU-NoAD-Data-Collecting-Tool-5_0.xlsx";
             if (isRefSheet) filename = @"Excel\Reference_Sheet_DE.xlsx";
@@ -31,7 +29,7 @@ namespace ENI2.Excel
             this._workBook = _excelWorkbooks.Open(refFilePath, 0, true, 5, "", "", false, XlPlatform.xlWindows, "", false, false, 0, false, false, false);
 
             this.InitNameFields();
-            
+
         }
 
         #endregion
@@ -194,6 +192,11 @@ namespace ENI2.Excel
 
         }
 
+        public void WriteMaerskList(List<MaerskData> maerskList)
+        {
+
+        }
+
         #endregion
 
         #region private excel field writing
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index e5fb45d1..d5791efe 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -37,7 +37,7 @@ namespace bsmd.database
             [Description("No id")]
             NO_ID,
             [Description("Updated")]
-            UPDATED,            
+            UPDATED,
             [Description("Requesting id")]
             REQUESTING_ID,
             [Description("Id assigned")]

From 2257a78326a8425b7150e10342cec960d21cfe0c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 13 Feb 2023 17:19:40 +0100
Subject: [PATCH 16/34] Requesting ID now works

---
 ENI2/Controls/MaerskListControl.xaml.cs       |  80 +++++++++++--
 ENI2/Controls/MaerskOverviewControl.xaml.cs   |  17 +--
 .../OverViewDetailControl.xaml.cs             |   3 +-
 ENI2/EditControls/VisitIdDialog.xaml.cs       |   6 +-
 ENI2/MainWindow.xaml.cs                       |   2 +-
 ENI2/Util/DatabaseEntityWatchdog.cs           |   2 +-
 bsmd.database/MaerskData.cs                   |  12 +-
 bsmd.database/Util.cs                         | 108 ++++++++++++++++--
 8 files changed, 190 insertions(+), 40 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 572a5788..2bf7cd91 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -17,6 +17,8 @@ using bsmd.database;
 using ExcelDataReader;
 using System.Collections.ObjectModel;
 using ENI2.Excel;
+using ENI2.Locode;
+using ENI2.Util;
 
 namespace ENI2.Controls
 {
@@ -24,12 +26,13 @@ namespace ENI2.Controls
     /// Interaction logic for MaerskListControl.xaml
     /// </summary>
     public partial class MaerskListControl : UserControl
-    {        
+    {
 
         #region Fields        
-        
+
         private readonly ObservableCollection<MaerskData> maerskDataList = new ObservableCollection<MaerskData>();
         private const uint MAX_EMPTY_ROWS_ON_IMPORT = 3; // import breaks if more than this count of empty rows have been read
+        private readonly DatabaseEntityWatchdog _dbWatchDog;
 
         #endregion
 
@@ -41,8 +44,47 @@ namespace ENI2.Controls
             Loaded += POList_Loaded;
             this.dateTimePickerFrom.Value = DateTime.Today.AddDays(-14);
             this.dateTimePickerTo.Value = DateTime.Today.AddDays(14);
+            this._dbWatchDog = new DatabaseEntityWatchdog();
+            this._dbWatchDog.DatabaseEntityChanged += _dbWatchDog_DatabaseEntityChanged;
+            this._dbWatchDog.VisitTransitIdUpdated += _dbWatchDog_VisitTransitIdUpdated;
         }
 
+        private async void _dbWatchDog_VisitTransitIdUpdated(DatabaseEntity entity)
+        {
+            if (entity is MessageCore core)
+            {
+                foreach (MaerskData md in this.maerskDataList)
+                {
+                    if ((md.MessageCore != null) && (md.MessageCore.Id == core.Id))
+                    {
+                        md.MessageCore = core;
+                        md.Status = MaerskData.MDStatus.ID;
+                        md.ColM = core.VisitId;
+                        await DBManagerAsync.Save(md);
+                        this.Dispatcher.Invoke(() =>
+                        {
+                            this.dataGridPOCores.Items.Refresh();
+                        });
+                    }
+                }
+            }
+        }
+
+        private void _dbWatchDog_DatabaseEntityChanged(DatabaseEntity entity)
+        {
+            if (entity is MessageCore core)
+                System.Diagnostics.Trace.WriteLine($"Core state changed to {core.BSMDStatusInternal}");
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Locode of the port that is concerned by this import list. Is to be set in the surrounding container:
+        /// </summary>
+        public string PortLocode { get; set; }
+
         #endregion
 
         #region control event handler
@@ -302,18 +344,21 @@ namespace ENI2.Controls
 
         private async void buttonSave_Click(object sender, RoutedEventArgs e)
         {
+            busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
+
             // save the current list to DB (only if the entries have matching cores!)
             foreach(MaerskData md in this.maerskDataList)
             {
                 if(md.MessageCore != null)
                 {
-                    await DBManagerAsync.Save(md.MessageCore);
+                    await DBManagerAsync.Save(md);
                 }
             }
 
+            busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
         }
 
-        private void buttonRequestIds_Click(object sender, RoutedEventArgs e)
+        private async void buttonRequestIds_Click(object sender, RoutedEventArgs e)
         {
             // find all entries from now until 3 days into the future and track parallel requests
             List<MaerskData> requestList = new List<MaerskData>();
@@ -330,13 +375,34 @@ namespace ENI2.Controls
             else
             {
                 // Todo: 
+                foreach (MaerskData md in requestList)
+                {
+                    // 1) create MessageCore and message classes
+                    md.MessageCore = new MessageCore();
+                    md.MessageCore.InitialHIS = Message.NSWProvider.DBH;
+                    md.MessageCore.IMO = md.ColF;
+                    md.MessageCore.ETA = md.ETA;
+                    md.MessageCore.IsTransit = false;
+                    md.MessageCore.PoC = this.PortLocode;
+                    md.MessageCore.Portname = LocodeDB.PortNameFromLocode(md.MessageCore.PoC);
+                    md.MessageCore.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
+                    md.MessageCore.Incoming = true;
+                    md.MessageCore.DefaultReportingPartyId = App.UserId.Value;
+                    await DBManagerAsync.Save(md.MessageCore);
+                    md.MessageCoreId = md.MessageCore.Id.Value;
+                    await DBManagerAsync.Save(md);
 
-                // 1) create MessageCore and message classes
+                    // Meldeklassen für neuen Anlauf erzeugen
+                    // TODO: pre-set certain fields taken from Maersk data
+                    await bsmd.database.Util.CreateMessagesForCoreAsync(md.MessageCore, null);
 
-                // 2) request dbh Id
+                    // watchdog registrieren
+                    this._dbWatchDog.Register(md.MessageCore);
+                    // 2) request dbh Id
 
-                // 3) register watchdog for request completion
+                    // 3) register watchdog for request completion
 
+                }
             }
             this.dataGridPOCores.Items.Refresh();
         }
diff --git a/ENI2/Controls/MaerskOverviewControl.xaml.cs b/ENI2/Controls/MaerskOverviewControl.xaml.cs
index 79cf4f50..1f443b3c 100644
--- a/ENI2/Controls/MaerskOverviewControl.xaml.cs
+++ b/ENI2/Controls/MaerskOverviewControl.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace ENI2.Controls
 {
@@ -23,6 +10,8 @@ namespace ENI2.Controls
         public MaerskOverviewControl()
         {
             InitializeComponent();
+            this.brvListControl.PortLocode = "DEBRV";
+            this.wvnListControl.PortLocode = "DEWVN";
         }
     }
 }
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 5ffcbeb8..4f241b59 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -787,7 +787,6 @@ namespace ENI2.DetailViewControls
             if (sfd.ShowDialog() ?? false)
             {
                 Util.UIHelper.SetBusyState();
-
                 ExcelManager em = new ExcelManager();
 
                 try
@@ -800,7 +799,7 @@ namespace ENI2.DetailViewControls
                 {
                     MessageBox.Show(ex.Message, "Export failed", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            }            
+            }
         }
 
         #endregion
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index 6453e2f7..cdddb4c4 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -47,7 +47,7 @@ namespace ENI2.EditControls
 
             if(this.locodePoC.LocodeValue == "ZZNOK")
             {
-                this.Core.IsTransit = true;                
+                this.Core.IsTransit = true;
                 this.Core.ETAKielCanal = this.datePickerETA.SelectedDate;
 
             }
@@ -78,7 +78,7 @@ namespace ENI2.EditControls
 
         private void doubleUpDownIMO_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
-            bool hasValue = (doubleUpDownIMO.Value.HasValue && doubleUpDownIMO.Value > 0);
+            bool hasValue = doubleUpDownIMO.Value.HasValue && doubleUpDownIMO.Value > 0;
             doubleUpDownENI.IsReadOnly = hasValue;
             this.CheckComplete();
 
@@ -88,7 +88,7 @@ namespace ENI2.EditControls
 
         private void doubleUpDownENI_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
-            bool hasValue = (doubleUpDownENI.Value.HasValue && doubleUpDownENI.Value > 0);            
+            bool hasValue = doubleUpDownENI.Value.HasValue && doubleUpDownENI.Value > 0;
             doubleUpDownIMO.IsReadOnly = hasValue;
             this.CheckComplete();
         }
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index d2dac9d7..4556ae47 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -405,7 +405,7 @@ namespace ENI2
                     if (!closedDialog.Core.IsDK)
                     {
                         // deutsche Häfen fordern eine Visit-Id an, für DK erfolgt hier nur die Anlage eines Datensatzes
-                        closedDialog.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;                                                
+                        closedDialog.Core.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
                     }
 
                     if (closedDialog.Core.PoC.Equals("ZZNOK"))
diff --git a/ENI2/Util/DatabaseEntityWatchdog.cs b/ENI2/Util/DatabaseEntityWatchdog.cs
index 5cf88a6c..88de8eec 100644
--- a/ENI2/Util/DatabaseEntityWatchdog.cs
+++ b/ENI2/Util/DatabaseEntityWatchdog.cs
@@ -98,7 +98,7 @@ namespace ENI2.Util
                 if (this._watchedEntities.ContainsKey(entity)) // hier wird mit Id verglichen (IEquatable<T> impl.)
                     this._watchedEntities.Remove(entity);
                 if (this._watchedEntities.Count == 0)
-                    this.bgTimer.Stop();               
+                    this.bgTimer.Stop();
             }
         }
 
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index d5791efe..2e88fc5d 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -25,7 +25,7 @@ namespace bsmd.database
         #region Construction
         public MaerskData()
         {
-            this.tablename = "[dbo].[MaerskData]";
+            this.tablename = "[dbo].[XtraData]";
         }
 
         #endregion
@@ -135,12 +135,14 @@ namespace bsmd.database
         public async Task<List<MaerskData>> LoadListAsync(SqlDataReader reader)
         {
             List<MaerskData> result = new List<MaerskData>();
-
-            while (await reader.ReadAsync())
+            if (reader != null)
             {
-                result.Add(ReadRowFromReader(reader));
+                while (await reader.ReadAsync())
+                {
+                    result.Add(ReadRowFromReader(reader));
+                }
+                reader.Close();
             }
-            reader.Close();
             return result;
         }
 
diff --git a/bsmd.database/Util.cs b/bsmd.database/Util.cs
index 00793a32..865d8563 100644
--- a/bsmd.database/Util.cs
+++ b/bsmd.database/Util.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using log4net;
 using System.Globalization;
+using System.Threading.Tasks;
 
 namespace bsmd.database
 {
@@ -110,16 +111,16 @@ namespace bsmd.database
         }
 
         public static bool IsVisitId(string val)
-        {                                    
+        {
             if (val.IsNullOrEmpty()) return false;
             return regexVisit.IsMatch(val);
         }
 
         public static bool IsTransitId(string val)
-        {                        
+        {
             if (val.IsNullOrEmpty()) return false;
             return regexTransit.IsMatch(val);
-        }        
+        }
 
         /// <summary>
         /// Hilfsfunktion für "manuelle" Anlage eines Schiffsanlaufs. Die Objekte sind bereits gespeichert.
@@ -137,8 +138,8 @@ namespace bsmd.database
                     {
                         _log.WarnFormat("Core {0} [{1}] has more than one message class for {2}", core.Id, core.DisplayId, aMessage.MessageNotificationClassDisplay);
                     }
-                    messageDict[aMessage.MessageNotificationClass] = aMessage;                    
-                }                    
+                    messageDict[aMessage.MessageNotificationClass] = aMessage;
+                }
             }
 
             bool isDE, isDK;
@@ -148,7 +149,7 @@ namespace bsmd.database
                 isDK = core.PoC.StartsWith("DK");
 
                 foreach (Message.NotificationClass notificationClass in Enum.GetValues(typeof(Message.NotificationClass)))
-                {                    
+                {
                     if(isDE)
                     {
                         if (notificationClass == Message.NotificationClass.STO) continue;                        
@@ -207,12 +208,105 @@ namespace bsmd.database
                             DBManager.Instance.Save(classElement);
                             message.Elements.Add(classElement);
                         }
-                    }                    
+                    }
                 }
             }
             return result;
         }
 
+        /// <summary>
+        /// Hilfsfunktion für "manuelle" Anlage eines Schiffsanlaufs. Die Objekte sind bereits gespeichert.
+        /// Es werden nur noch nicht vorhandene Meldeklassen erzeugt (Async version)
+        /// </summary>        
+        public static async Task<List<Message>> CreateMessagesForCoreAsync(MessageCore core, List<Message> existingMessages, ReportingParty user = null)
+        {
+            List<Message> result = new List<Message>();
+            Dictionary<Message.NotificationClass, Message> messageDict = new Dictionary<Message.NotificationClass, Message>();
+            if (!existingMessages.IsNullOrEmpty())
+            {
+                foreach (Message aMessage in existingMessages)
+                {
+                    if (messageDict.ContainsKey(aMessage.MessageNotificationClass))
+                    {
+                        _log.WarnFormat("Core {0} [{1}] has more than one message class for {2}", core.Id, core.DisplayId, aMessage.MessageNotificationClassDisplay);
+                    }
+                    messageDict[aMessage.MessageNotificationClass] = aMessage;
+                }
+            }
+
+            bool isDE, isDK;
+            if (core?.PoC != null)
+            {
+                isDE = core.PoC.Equals("ZZNOK") || core.PoC.StartsWith("DE");
+                isDK = core.PoC.StartsWith("DK");
+
+                foreach (Message.NotificationClass notificationClass in Enum.GetValues(typeof(Message.NotificationClass)))
+                {
+                    if (isDE)
+                    {
+                        if (notificationClass == Message.NotificationClass.STO) continue;
+                    }
+                    if (isDK)
+                    {
+                        // gibt es hier etwas, das nicht gebraucht wird? (siehe Mail von Christin, 29.5.17
+                        if ((notificationClass == Message.NotificationClass.MDH) ||
+                            (notificationClass == Message.NotificationClass.BKRA) ||
+                            (notificationClass == Message.NotificationClass.BKRD) ||
+                            (notificationClass == Message.NotificationClass.TOWA) ||
+                            (notificationClass == Message.NotificationClass.TOWD)) continue;
+                    }
+
+                    if (core.IsTransit && (notificationClass == Message.NotificationClass.VISIT)) continue;
+                    if (!core.IsTransit && (notificationClass == Message.NotificationClass.TRANSIT)) continue;
+
+                    Message message;
+
+                    if (!messageDict.ContainsKey(notificationClass))
+                    {
+                        message = new Message();
+                        if (user != null)
+                            message.CreatedBy = string.Format("ENI-2: {0}", user.Logon);
+                        message.MessageCore = core;
+                        message.MessageCoreId = core.Id;
+                        message.MessageNotificationClass = notificationClass;
+                        await DBManagerAsync.Save(message);
+                        result.Add(message);
+                    }
+                    else
+                    {
+                        message = messageDict[notificationClass];
+                    }
+
+                    // abgesehen von "Listen" für die Nachrichtenklassen auch untergeordnete Elemente erzeugen, falls nicht vorhanden!
+                    DatabaseEntity classElement;
+                    if (!Message.IsListClass(notificationClass) && (message.Elements.Count == 0))
+                    {
+                        classElement = DBManager.CreateMessage(notificationClass);
+
+                        // CH: 6.10.17: Für die manuelle Eingabe (wird leider nicht ganz auszuschließen sein) wäre es hilfreich, wenn alle Checkboxen nicht leer sind, sondern False beinhalten.
+                        if (notificationClass == Message.NotificationClass.MDH)
+                        {
+                            ((MDH)classElement).SetBoolsToFalse();
+                        }
+                        if (notificationClass == Message.NotificationClass.BPOL)
+                        {
+                            // Vorbelegung, Spezialwunsch aus BRV 5.2.18
+                            ((BPOL)classElement).CruiseShip = false;
+                            ((BPOL)classElement).StowawaysOnBoard = false;
+                        }
+                        if (classElement != null) // null für Visit/Transit
+                        {
+                            classElement.MessageHeader = message;
+                            await DBManagerAsync.Save(classElement);
+                            message.Elements.Add(classElement);
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+
         public static int? GetNumericIdentifier(ISublistElement element)
         {
             if (element != null)

From 13472ebe91f210cc59e848d322bb4f2909a6348f Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 13 Feb 2023 22:33:55 +0100
Subject: [PATCH 17/34] 7.9.0.0 erste Testversion

---
 ENI2/Controls/MaerskListControl.xaml.cs | 9 ++++++---
 ENI2/ENI2.csproj                        | 2 +-
 bsmd.database/MaerskData.cs             | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 2bf7cd91..23e82bc4 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -259,6 +259,9 @@ namespace ENI2.Controls
                             if (!reader.IsDBNull(6)) md.ColG = ReadFieldAsString(reader, 6);
                             if (!reader.IsDBNull(7)) md.ColH = ReadFieldAsString(reader, 7);
                             if (!reader.IsDBNull(8)) md.ColI = ReadFieldAsString(reader, 8);
+                            if ((md.ColI.Contains("bremerhaven", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEWVN")) ||
+                                (md.ColI.Contains("eurogate", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEBRV")))
+                                throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
                             if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
                             if (!reader.IsDBNull(10)) { md.ETA = reader.GetDateTime(10); md.ColK = md.ETA.ToString(); }
                             if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
@@ -377,7 +380,7 @@ namespace ENI2.Controls
                 // Todo: 
                 foreach (MaerskData md in requestList)
                 {
-                    // 1) create MessageCore and message classes
+                    // create MessageCore and message classes
                     md.MessageCore = new MessageCore();
                     md.MessageCore.InitialHIS = Message.NSWProvider.DBH;
                     md.MessageCore.IMO = md.ColF;
@@ -398,9 +401,9 @@ namespace ENI2.Controls
 
                     // watchdog registrieren
                     this._dbWatchDog.Register(md.MessageCore);
-                    // 2) request dbh Id
+                    
 
-                    // 3) register watchdog for request completion
+                    
 
                 }
             }
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index e9efc3aa..d0b0be56 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index 2e88fc5d..e7ab71db 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -228,7 +228,7 @@ namespace bsmd.database
             else
             {
                 scmd.Parameters.AddWithValue("@ID", this.Id);
-                scmd.CommandText = string.Format("UPDATE {0} SET Field1 = @COLA, Field2 = @COLB, Field3 = @COLC, Field4 = @COLD, Field5 = @COLE, Field6 = @COLF, @Field7 = @COLG, @Field8 = @COLH, " +
+                scmd.CommandText = string.Format("UPDATE {0} SET Field1 = @COLA, Field2 = @COLB, Field3 = @COLC, Field4 = @COLD, Field5 = @COLE, Field6 = @COLF, Field7 = @COLG, Field8 = @COLH, " +
                     "Field9 = @COLI, Field10 = @COLJ, Field11 = @COLK, Field12 = @COLL, Field13 = @COLM, Field14 = @Remark WHERE Id = @ID", this.Tablename);
             }
         }

From c04099edb24b0c835a0a1bb156ade231ebd78fd4 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 14 Feb 2023 07:50:17 +0100
Subject: [PATCH 18/34] Bugfix PRE72H Excel scan and better logging output for
 SEND/REC HIS-Nord

---
 ENI2/Excel/ExcelReader.cs               | 4 ++--
 SendNSWMessageService/NSWSendService.cs | 2 +-
 bsmd.hisnord/Response.cs                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index ab6f628f..afe03d2e 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -295,7 +295,7 @@ namespace ENI2.Excel
                     if (int.TryParse(val, out int parsed))
                     {
                         if ((parsed < 4) && (parsed > 0))
-                            result = (byte)parsed;
+                            result = (byte)(parsed - 1);
                     }
                 }
             }
@@ -362,7 +362,7 @@ namespace ENI2.Excel
                     if (int.TryParse(val, out int parsed))
                     {
                         if ((parsed < 4) && (parsed > 0))
-                            result = (byte)parsed;
+                            result = (byte)(parsed - 1);
                     }
                 }
             }
diff --git a/SendNSWMessageService/NSWSendService.cs b/SendNSWMessageService/NSWSendService.cs
index 0dc3755e..8ef4d838 100644
--- a/SendNSWMessageService/NSWSendService.cs
+++ b/SendNSWMessageService/NSWSendService.cs
@@ -176,7 +176,7 @@ namespace SendNSWMessageService
                             if(message.HIS == Message.NSWProvider.UNDEFINED)
                                 message.HIS = core.InitialHIS;
 
-                            _log.InfoFormat("Sending {0} message to {1}", message.MessageNotificationClass.ToString(), message.HIS.ToString());
+                            _log.InfoFormat("Sending {0} message {1} to {2}", message.MessageNotificationClass.ToString(), message.Id, message.HIS.ToString());
                             
                             // switch über passendes HIS / Schnittstelle
                             switch (message.HIS)
diff --git a/bsmd.hisnord/Response.cs b/bsmd.hisnord/Response.cs
index 4940df8f..b22f04c0 100644
--- a/bsmd.hisnord/Response.cs
+++ b/bsmd.hisnord/Response.cs
@@ -248,8 +248,8 @@ namespace bsmd.hisnord
                                                         DBManager.Instance.Save(messageError);
                                                     }
 
-                                                    _log.InfoFormat("Saving Message {0} Status {1} InternalStatus {2}",
-                                                        aMessage.Id, aMessage.Status, aMessage.InternalStatus);
+                                                    _log.InfoFormat("{0} message {1} returned: Status {2} InternalStatus {3}",
+                                                        aMessage.MessageNotificationClassDisplay, aMessage.Id, aMessage.Status, aMessage.InternalStatus);
 
                                                     DBManager.Instance.Save(aMessage);
 
@@ -260,7 +260,7 @@ namespace bsmd.hisnord
                                                 if (aMessage.InternalStatus == Message.BSMDStatus.SENT)
                                                 {
                                                     aMessageStillInSENTstate = true;
-                                                    _log.InfoFormat("message {0} {1} still in SENT state", aMessage.Id, aMessage.MessageNotificationClassDisplay);
+                                                    _log.DebugFormat("message {0} {1} still in SENT state", aMessage.Id, aMessage.MessageNotificationClassDisplay);
                                                 }
 
                                             }

From d981bc40933f8bb23e414d74ef167dd9d8c4fe56 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 15 Feb 2023 09:21:23 +0100
Subject: [PATCH 19/34] some bugfixes..

---
 ENI2/Controls/MaerskListControl.xaml    | 10 +++---
 ENI2/Controls/MaerskListControl.xaml.cs | 46 +++++++++++++++++--------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 6285a3ed..1251a7a5 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -10,7 +10,7 @@
              xmlns:local="clr-namespace:ENI2.Controls"
              xmlns:db="clr-namespace:bsmd.database;assembly=bsmd.database"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="900">
     <UserControl.Resources>
         <col:ArrayList x:Key="arrList">
             <col:DictionaryEntry Key="None" Value="0" />
@@ -34,6 +34,7 @@
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="80" />
@@ -46,9 +47,10 @@
                 <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
                 <Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" />
                 <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request Ids" Margin="2" Click="buttonRequestIds_Click" />
-                <Button x:Name="buttonImport" Grid.Column="8" Margin="2" Content="Import" Click="buttonImport_Click" />
-                <Button x:Name="buttonExport" Grid.Column="9" Margin="2" Content="Export" Click="buttonExport_Click" />
-                <local:BusyControl x:Name="busyControl" Grid.Column="10" />
+                <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
+                <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
+                <Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" />
+                <local:BusyControl x:Name="busyControl" Grid.Column="11" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 23e82bc4..e61b26aa 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -10,15 +10,13 @@ using System.Windows;
 using System.Windows.Controls;
 using Microsoft.Win32;
 
-using Microsoft.Office.Interop.Excel;
-using System.Runtime.InteropServices;
-
 using bsmd.database;
 using ExcelDataReader;
 using System.Collections.ObjectModel;
 using ENI2.Excel;
 using ENI2.Locode;
 using ENI2.Util;
+using System.Diagnostics;
 
 namespace ENI2.Controls
 {
@@ -259,9 +257,12 @@ namespace ENI2.Controls
                             if (!reader.IsDBNull(6)) md.ColG = ReadFieldAsString(reader, 6);
                             if (!reader.IsDBNull(7)) md.ColH = ReadFieldAsString(reader, 7);
                             if (!reader.IsDBNull(8)) md.ColI = ReadFieldAsString(reader, 8);
-                            if ((md.ColI.Contains("bremerhaven", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEWVN")) ||
-                                (md.ColI.Contains("eurogate", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEBRV")))
-                                throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
+                            if (md.ColI != null)
+                            {
+                                if ((md.ColI.Contains("bremerhaven", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEWVN")) ||
+                                    (md.ColI.Contains("eurogate", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEBRV")))
+                                    throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
+                            }
                             if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
                             if (!reader.IsDBNull(10)) { md.ETA = reader.GetDateTime(10); md.ColK = md.ETA.ToString(); }
                             if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
@@ -325,9 +326,11 @@ namespace ENI2.Controls
         private void buttonExport_Click(object sender, RoutedEventArgs e)
         {
             // Export of the current collection
+            string predefFilename = string.Format("{0}_{1}.xlsx", this.PortLocode, DateTime.Today.ToString("yyyyMMdd"));
             SaveFileDialog sfd = new SaveFileDialog()
             {
-                Filter = "Excel Files|*.xls;*.xlsx"
+                Filter = "Excel Files|*.xlsx;*.xls",
+                FileName = predefFilename
             };
             if(sfd.ShowDialog() ?? false)
             {
@@ -337,6 +340,7 @@ namespace ENI2.Controls
                 {
                     List<MaerskData> exportList = new List<MaerskData>(this.maerskDataList);
                     em.ExportMaersk(exportList, sfd.FileName);
+                    Process.Start(sfd.FileName);
                 }
                 catch (Exception ex)
                 {
@@ -365,12 +369,26 @@ namespace ENI2.Controls
         {
             // find all entries from now until 3 days into the future and track parallel requests
             List<MaerskData> requestList = new List<MaerskData>();
-            foreach (MaerskData md in this.dataGridPOCores.SelectedItems)
+            if (sender == this.buttonRequestIds)
             {
-                if ((md.MessageCore != null) || (!md.ColM.IsNullOrEmpty())) continue; // already requested
-                requestList.Add(md);
-                md.Status = MaerskData.MDStatus.REQUESTING_ID;
+                foreach (MaerskData md in this.dataGridPOCores.SelectedItems)
+                {
+                    if ((md.MessageCore != null) || (!md.ColM.IsNullOrEmpty())) continue; // already requested
+                    requestList.Add(md);
+                }
             }
+            if(sender == this.buttonRequestPlus3)
+            {
+                foreach(MaerskData md in this.maerskDataList)
+                {
+                    if((md.MessageCore == null) && (md.ColM.IsNullOrEmpty()))
+                    {
+                        if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
+                            requestList.Add(md);
+                    }
+                }
+            }
+
             if(requestList.Count == 0)
             {
                 MessageBox.Show("No valid rows selected", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation);
@@ -380,6 +398,8 @@ namespace ENI2.Controls
                 // Todo: 
                 foreach (MaerskData md in requestList)
                 {
+                    md.Status = MaerskData.MDStatus.REQUESTING_ID;
+
                     // create MessageCore and message classes
                     md.MessageCore = new MessageCore();
                     md.MessageCore.InitialHIS = Message.NSWProvider.DBH;
@@ -401,10 +421,6 @@ namespace ENI2.Controls
 
                     // watchdog registrieren
                     this._dbWatchDog.Register(md.MessageCore);
-                    
-
-                    
-
                 }
             }
             this.dataGridPOCores.Items.Refresh();

From d02fe72378c3bbe9cd7fc79002e6e4b6eb93c109 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 16 Feb 2023 07:31:06 +0100
Subject: [PATCH 20/34] MainWindow nochmal etwas verbessert

---
 ENI2/Excel/ExcelReader.cs |  8 ++++----
 ENI2/MainWindow.xaml      | 33 +++++----------------------------
 ENI2/MainWindow.xaml.cs   | 35 ++++++++++++++++++++++-------------
 3 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index afe03d2e..41e315cf 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -553,12 +553,12 @@ namespace ENI2.Excel
                         }
                     }
 
-                    if (val is string)
+                    if (val is string @string)
                     {
-                        if (((string)val).EndsWith("lt", StringComparison.OrdinalIgnoreCase))
-                            val = ((string)val).Substring(0, ((string)val).Length - 2).Trim();
+                        if (@string.EndsWith("lt", StringComparison.OrdinalIgnoreCase))
+                            val = @string.Substring(0, @string.Length - 2).Trim();
                         else
-                            val = ((string)val).Trim();
+                            val = @string.Trim();
                     }
 
                     if (result == null)
diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml
index 223488bf..10ac8200 100644
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@@ -88,6 +88,11 @@
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuItem>
+                <MenuItem x:Name="menuItemNotifications" Header="{x:Static p:Resources.textNotifications}" Click="radioButton_Click" Background="LightBlue"/>
+                <MenuItem x:Name="menuItemStatus" Header="{x:Static p:Resources.textServerStatus}" Click="radioButton_Click" />
+                <MenuItem x:Name="menuItemUserAdministration" Header="{x:Static p:Resources.textUserAdministration}" Click="radioButton_Click" Visibility="Hidden"/>
+                <MenuItem x:Name="menuItemMaersk" Header="{x:Static p:Resources.textPOLists}" Click="radioButton_Click" Visibility="Hidden" />
+                <MenuItem x:Name="labelStatusId" />
                 <MenuItem Header="Help" HorizontalAlignment="Right">
                     <MenuItem Header="About" Click="buttonAbout_Click">
                         <MenuItem.Icon>
@@ -96,34 +101,6 @@
                     </MenuItem>
                 </MenuItem>
             </Menu>
-            <Grid DockPanel.Dock="Top" Height="28" Background="#FFE8F6FF">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid Grid.Column="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="28"/>
-                        <RowDefinition Height="28"/>
-                    </Grid.RowDefinitions>
-                    
-                    <RadioButton Grid.Column="2" x:Name="buttonNotifications" Content="{x:Static p:Resources.textNotifications}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" IsChecked="True" Grid.RowSpan="2" />
-                    <RadioButton Grid.Column="3" x:Name="buttonStatus" Content="{x:Static p:Resources.textServerStatus}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Margin="2,5,0,0" Grid.RowSpan="2" />
-                    <RadioButton Grid.Column="4" x:Name="buttonUserAdmin" Content="{x:Static p:Resources.textUserAdministration}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2"/>
-                    <RadioButton Grid.Column="5" x:Name="buttonPOListe" Content="{x:Static p:Resources.textPOLists}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="auto" Click="radioButton_Click" Background="Transparent" Visibility="Hidden" Margin="2,5,0,0" Grid.RowSpan="2" />
-                    <Label Grid.Column="0" Grid.Row="1" x:Name="labelStatusId" Grid.ColumnSpan="3" Margin="2,2,0,0" HorizontalAlignment="Left"/>
-                </Grid>
-            </Grid>
-
             <Grid DockPanel.Dock="Bottom" Height="22" Background="#FFE8F6FF">
                 <StatusBar>
                     <StatusBar.ItemsPanel>
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index 4556ae47..6f067784 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -49,12 +49,14 @@ namespace ENI2
         private readonly DatabaseEntityWatchdog _dbWatchDog;
         private readonly Dictionary<Guid, ShowIdDialog> showIdDict = new Dictionary<Guid, ShowIdDialog>();
 
+        private MenuItem _selectedMenuItem; // simulate radio button logic
+
         #endregion
 
         #region Construction
 
         public MainWindow()
-        {            
+        {
             Thread.Sleep(500);
             InitializeComponent();
             App.SplashScreen.ShowMessage("loading..");
@@ -68,8 +70,9 @@ namespace ENI2
             this._dbWatchDog.VisitTransitIdUpdated += _dbWatchDog_VisitTransitIdUpdated;
             App.SplashScreen.ShowMessage("done");
             Thread.Sleep(500);
-            App.SplashScreen.LoadComplete();            
-        }        
+            App.SplashScreen.LoadComplete();
+            _selectedMenuItem = menuItemNotifications;
+        }
 
         #endregion
 
@@ -253,15 +256,21 @@ namespace ENI2
 
         private void radioButton_Click(object sender, RoutedEventArgs e)
         {
-            this.rootContainer.Children.Clear();
-            
+            if (sender == _selectedMenuItem) return; // same selected
 
-            if(sender == this.buttonNotifications)
+            this.rootContainer.Children.Clear();
+
+            MenuItem mi = sender as MenuItem;
+            _selectedMenuItem.Background = mi.Background;
+            _selectedMenuItem = mi;
+            _selectedMenuItem.Background = Brushes.LightBlue;
+
+            if(sender == this.menuItemNotifications)
             {
                 this.rootContainer.Children.Add(this.mainFrame);
             
             }
-            else if(sender == this.buttonUserAdmin)
+            else if(sender == this.menuItemUserAdministration)
             {
                 if (this.rpControl == null)
                 {
@@ -271,7 +280,7 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(this.rpControl);
             }
-            else if(sender == this.buttonPOListe)
+            else if(sender == this.menuItemMaersk)
             {
                 if (this.moControl == null)
                 {
@@ -279,7 +288,7 @@ namespace ENI2
                 }
                 this.rootContainer.Children.Add(moControl);
             }
-            else if(sender == this.buttonStatus)
+            else if(sender == this.menuItemStatus)
             {
                 if(this.statusControl == null)
                 {
@@ -646,8 +655,8 @@ namespace ENI2
                     ReportingParty.CurrentReportingParty = this.userEntity;
                     if (this.userEntity.IsAdmin)
                     {
-                        this.buttonUserAdmin.Visibility = Visibility.Visible;
-                        this.buttonPOListe.Visibility = Visibility.Visible;
+                        this.menuItemUserAdministration.Visibility = Visibility.Visible;
+                        this.menuItemMaersk.Visibility = Visibility.Visible;
                         this.sucheControl.AdminMode = true;                        
                     }                    
                     break;
@@ -697,11 +706,11 @@ namespace ENI2
         {
             if(this.showIdDict.Count == 0)
             {
-                this.labelStatusId.Content = "";
+                this.labelStatusId.Header = "";
             } 
             else            
             {
-                this.labelStatusId.Content = string.Format("waiting for {0} id(s)..", this.showIdDict.Count);
+                this.labelStatusId.Header = string.Format("waiting for {0} id(s)..", this.showIdDict.Count);
             }
         }
 

From 65e45f40b8c98f7a89b0475e46d9e5eed50e3bb1 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 16 Feb 2023 07:58:52 +0100
Subject: [PATCH 21/34] =?UTF-8?q?Doppel-Klick=20auf=20den=20Maersk=20PO=20?=
 =?UTF-8?q?Listeneintrag=20=C3=B6ffnet=20die=20Anmeldung=20in=20der=20?=
 =?UTF-8?q?=C3=9Cbersicht,=20falls=20eine=20Messagecore=20vorhanden=20ist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ENI2/Controls/MaerskListControl.xaml        |  3 ++-
 ENI2/Controls/MaerskListControl.xaml.cs     | 28 ++++++++++++++++++++-
 ENI2/Controls/MaerskOverviewControl.xaml.cs | 11 +++++++-
 ENI2/MainWindow.xaml.cs                     | 10 +++++++-
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 1251a7a5..f156af5b 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -53,7 +53,8 @@
                 <local:BusyControl x:Name="busyControl" Grid.Column="11" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
-                                             SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
+                               SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False"
+                               MouseDoubleClick="dataGridPOCores_MouseDoubleClick">
                 <local:ENIDataGrid.RowStyle>
                     <Style TargetType="DataGridRow">
                         <Style.Triggers>
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index e61b26aa..e4e86257 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -85,6 +85,12 @@ namespace ENI2.Controls
 
         #endregion
 
+        #region events
+
+        public event MessageCore.MessageCoreSelectedHandler MessageCoreSelected;
+
+        #endregion
+
         #region control event handler
 
         private void POList_Loaded(object sender, RoutedEventArgs e)
@@ -381,7 +387,7 @@ namespace ENI2.Controls
             {
                 foreach(MaerskData md in this.maerskDataList)
                 {
-                    if((md.MessageCore == null) && (md.ColM.IsNullOrEmpty()))
+                    if((md.MessageCore == null) && md.ColM.IsNullOrEmpty())
                     {
                         if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
                             requestList.Add(md);
@@ -428,5 +434,25 @@ namespace ENI2.Controls
 
         #endregion
 
+        #region grid event handler
+
+        private void dataGridPOCores_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (sender != null)
+            {
+                DataGrid grid = sender as DataGrid;
+                if (grid?.SelectedItems?.Count == 1)
+                {
+                    MaerskData md = grid.SelectedItem as MaerskData;
+                    if(md.MessageCore != null) {
+                        Util.UIHelper.SetBusyState();
+                        this.MessageCoreSelected?.Invoke(md.MessageCore);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
     }
 }
diff --git a/ENI2/Controls/MaerskOverviewControl.xaml.cs b/ENI2/Controls/MaerskOverviewControl.xaml.cs
index 1f443b3c..437ca770 100644
--- a/ENI2/Controls/MaerskOverviewControl.xaml.cs
+++ b/ENI2/Controls/MaerskOverviewControl.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows.Controls;
+using System.Collections.Generic;
+using System.Windows.Controls;
 
 namespace ENI2.Controls
 {
@@ -13,5 +14,13 @@ namespace ENI2.Controls
             this.brvListControl.PortLocode = "DEBRV";
             this.wvnListControl.PortLocode = "DEWVN";
         }
+
+        public List<MaerskListControl> ListControls
+        {
+            get
+            {
+                return new List<MaerskListControl>() { this.brvListControl, this.wvnListControl };
+            }
+        }
     }
 }
diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs
index 6f067784..17d01a82 100644
--- a/ENI2/MainWindow.xaml.cs
+++ b/ENI2/MainWindow.xaml.cs
@@ -82,6 +82,12 @@ namespace ENI2
         {
             if(aMessageCore != null)
             {
+                Dispatcher.BeginInvoke((Action)(() =>
+                {
+                    this.radioButton_Click(this.menuItemNotifications, null);
+                }));
+                
+
                 if (!openTabs.ContainsKey(aMessageCore.Id.Value))
                 {
                     ClosableTabItem searchResultItem = new ClosableTabItem();
@@ -285,6 +291,8 @@ namespace ENI2
                 if (this.moControl == null)
                 {
                     this.moControl = new MaerskOverviewControl();
+                    foreach (MaerskListControl mlc in this.moControl.ListControls)
+                        mlc.MessageCoreSelected += this.AnmeldungenControl_MessageCoreSelected;
                 }
                 this.rootContainer.Children.Add(moControl);
             }
@@ -304,7 +312,7 @@ namespace ENI2
             if(compareExcelDialog == null)
             {
                 this.compareExcelDialog = new CompareExcelDialog();
-                this.compareExcelDialog.Closed += (o, e) => this.compareExcelDialog = null;                
+                this.compareExcelDialog.Closed += (o, e) => this.compareExcelDialog = null;
                 compareExcelDialog.Show();
             }
             else

From 4d9b430cd3314414a1c438839ad0e72ea809a53c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 16 Feb 2023 12:57:53 +0100
Subject: [PATCH 22/34] fixed import / updating

---
 ENI2/Controls/MaerskListControl.xaml.cs       | 50 +++++++++----------
 .../WasteDetailControl.xaml.cs                |  2 +-
 ENI2/ENI2.csproj                              |  2 +-
 bsmd.database/MaerskData.cs                   | 40 ++++++++++++++-
 4 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index e4e86257..54970eb4 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -17,6 +17,7 @@ using ENI2.Excel;
 using ENI2.Locode;
 using ENI2.Util;
 using System.Diagnostics;
+using System.Linq;
 
 namespace ENI2.Controls
 {
@@ -177,7 +178,7 @@ namespace ENI2.Controls
             List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
 
             // alle anderen Häfen weg
-            searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")));
+            searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals(PortLocode)));
 
             // alles entfernen was keine Maersk Xtra-Data hat (=noch nicht schon einmal importiert wurde)
             foreach(MessageCore core in searchResult)
@@ -291,37 +292,36 @@ namespace ENI2.Controls
                     if (importData.Count > 0)
                     {
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
-                        // TODO: find matching message cores..
-                        foreach(MaerskData md in importData)
+                        importData.Sort();
+                        
+                        foreach (MaerskData md in importData)
                         {
-                            if(!md.ColM.IsNullOrEmpty())
+                            if (this.maerskDataList.Contains(md))
                             {
-                                md.MessageCore = await DBManagerAsync.LoadCoreByVisitIdAsync(md.ColM);
+                                MaerskData foundData = this.maerskDataList.First((m) => ((m.ColF != null) ? m.ColF.Equals(md.ColF) : false) && ((m.ColG != null) ? m.ColG.Equals(md.ColG) : false) && ((md.ColH != null) ? md.ColH.Equals(md.ColH) : false));
+                                if (foundData.Update(md))
+                                    foundData.Status = MaerskData.MDStatus.UPDATED;
+                            }
+                            else
+                            {
+                                md.Status = MaerskData.MDStatus.ID;
+
+                                if (!md.ColM.IsNullOrEmpty())
+                                {
+                                    md.MessageCore = await DBManagerAsync.LoadCoreByVisitIdAsync(md.ColM);
+                                }
+                                else
+                                {
+                                    md.Status = MaerskData.MDStatus.NO_ID;
+                                    if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
+                                        md.Status = MaerskData.MDStatus.NO_ID_AND_DUE;
+                                }
+                                maerskDataList.Add(md);
                             }
                         }
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                     }
 
-                    // sort
-                    // importData.Sort((x, y) => DateTime.Compare(x.ETA ?? DateTime.MaxValue, y.ETA ?? DateTime.MaxValue));
-
-                    foreach (MaerskData md in importData)
-                    {
-                        md.Status = MaerskData.MDStatus.ID;
-
-                        if (md.ColM.IsNullOrEmpty())
-                        {
-                            md.Status = MaerskData.MDStatus.NO_ID;
-                            if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
-                                md.Status = MaerskData.MDStatus.NO_ID_AND_DUE;
-                        }
-
-                        // TODO: check if data has been updated
-
-                        // TODO: Check if data is already present
-
-                        maerskDataList.Add(md);
-                    }
                     this.dataGridPOCores.Items.Refresh();
                 }
 
diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index a5fb8751..27c38c04 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -551,7 +551,7 @@ namespace ENI2.DetailViewControls
                                     if (!reader.IsDBNull(8)) waste.WasteDisposalPort = reader.GetString(8).ToUpper();
 
                                     if (!reader.IsDBNull(9)) o = reader.GetValue(9); else o = null;
-                                    if (o != null) waste.WasteAmountGeneratedTillNextPort_MTQ = Convert.ToDouble(o);                                    
+                                    if (o != null) waste.WasteAmountGeneratedTillNextPort_MTQ = Convert.ToDouble(o);
 
                                     importWasteList.Add(waste);
                                     cnt++;
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index d0b0be56..75b090f9 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index e7ab71db..a566f95a 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -19,7 +19,7 @@ namespace bsmd.database
     /// we use a generic storage class called "XtraData" that hopefully might be useful in another
     /// future scenario as well
     /// </summary>
-    public class MaerskData : DatabaseEntity
+    public class MaerskData : DatabaseEntity, IEquatable<MaerskData>, IComparable<MaerskData>
     {
 
         #region Construction
@@ -233,6 +233,44 @@ namespace bsmd.database
             }
         }
 
+        /// <summary>
+        /// Equality means if IMO and Voyage no. In/Out are the same
+        /// </summary>
+        public bool Equals(MaerskData other)
+        {
+            if (this.ColG == null) return false;
+            if (this.ColH == null) return false;
+            if (this.ColF == null) return false;
+            if (other == null) return false;
+            return this.ColF.Equals(other.ColF) && this.ColG.Equals(other.ColG) && this.ColH.Equals(other.ColH);
+        }
+
+        /// <summary>
+        /// Sort-Order is by ETA
+        /// </summary>
+        public int CompareTo(MaerskData other)
+        {
+            if (this.ColK == null) return 0;
+            if (other == null) return 0;
+            return this.ColK.CompareTo(other.ColK);
+        }
+
+        public bool Update(MaerskData md)
+        {
+            bool result = false;
+            if (!md.ColA.IsNullOrEmpty() && !md.ColA.Equals(ColA)) { ColA = md.ColA; result = true; }
+            if (!md.ColB.IsNullOrEmpty() && !md.ColB.Equals(ColB)) { ColB = md.ColB; result = true; }
+            if (!md.ColC.IsNullOrEmpty() && !md.ColC.Equals(ColC)) { ColC = md.ColC; result = true; }
+            if (!md.ColD.IsNullOrEmpty() && !md.ColD.Equals(ColD)) { ColD = md.ColD; result = true; }
+            if (!md.ColE.IsNullOrEmpty() && !md.ColE.Equals(ColE)) { ColE = md.ColE; result = true; }
+            if (!md.ColI.IsNullOrEmpty() && !md.ColI.Equals(ColI)) { ColI = md.ColI; result = true; }
+            if (!md.ColJ.IsNullOrEmpty() && !md.ColJ.Equals(ColJ)) { ColJ = md.ColJ; result = true; }
+            if (!md.ColK.IsNullOrEmpty() && !md.ColK.Equals(ColK)) { ColK = md.ColK; result = true; }
+            if (!md.ColL.IsNullOrEmpty() && !md.ColL.Equals(ColL)) { ColL = md.ColL; result = true; }
+            if (!md.ColM.IsNullOrEmpty() && !md.ColM.Equals(ColM)) { ColM = md.ColM; result = true; }
+            return result;
+        }
+
         #endregion
 
     }

From bcf4c33478c5d4a4d4656049a6017f4c13c02be5 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 17 Feb 2023 09:18:50 +0100
Subject: [PATCH 23/34] Testversion 7.9.0.2 mit Korrekturen

---
 ENI2/Controls/MaerskListControl.xaml    |  8 ++---
 ENI2/Controls/MaerskListControl.xaml.cs | 20 +++++++++--
 ENI2/ENI2.csproj                        |  2 +-
 ENI2/Excel/ExcelSimpleWriter.cs         | 48 ++++++++++++++++---------
 4 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index f156af5b..7e534d56 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -31,9 +31,9 @@
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="40" />
                     <ColumnDefinition Width="120" />
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="80" />
@@ -46,7 +46,7 @@
                 <xctk:DateTimePicker x:Name="dateTimePickerTo" Margin="2" Grid.Column="3" Format="ShortDate" />
                 <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
                 <Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" />
-                <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request Ids" Margin="2" Click="buttonRequestIds_Click" />
+                <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request marked Ids" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
                 <Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" />
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 54970eb4..abdc8b46 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -244,6 +244,7 @@ namespace ENI2.Controls
                 {
                     List<MaerskData> importData = new List<MaerskData>();
                     uint emptyRowCnt = 0;
+                    bool isFirstRow = true;
 
                     try
                     {
@@ -271,7 +272,21 @@ namespace ENI2.Controls
                                     throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
                             }
                             if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
-                            if (!reader.IsDBNull(10)) { md.ETA = reader.GetDateTime(10); md.ColK = md.ETA.ToString(); }
+                            if (!reader.IsDBNull(10)) {
+                                if (reader.GetFieldType(10) == typeof(DateTime))
+                                {
+                                    md.ETA = reader.GetDateTime(10);
+                                }
+                                else
+                                {
+                                    if(isFirstRow)
+                                    {
+                                        isFirstRow = false; // this must be a header row, skip
+                                        continue;
+                                    }
+                                }
+                                md.ColK = md.ETA.ToString();
+                            }
                             if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
                             if (!reader.IsDBNull(12)) md.ColM = ReadFieldAsString(reader, 12);
                             if (!reader.IsDBNull(13)) md.Remark = ReadFieldAsString(reader, 13);
@@ -281,6 +296,7 @@ namespace ENI2.Controls
                             else
                                 emptyRowCnt++;
                             if (emptyRowCnt > MAX_EMPTY_ROWS_ON_IMPORT) break;
+                            if (isFirstRow) isFirstRow = false;
                         }
                     }
                     catch (Exception ex)
@@ -298,7 +314,7 @@ namespace ENI2.Controls
                         {
                             if (this.maerskDataList.Contains(md))
                             {
-                                MaerskData foundData = this.maerskDataList.First((m) => ((m.ColF != null) ? m.ColF.Equals(md.ColF) : false) && ((m.ColG != null) ? m.ColG.Equals(md.ColG) : false) && ((md.ColH != null) ? md.ColH.Equals(md.ColH) : false));
+                                MaerskData foundData = this.maerskDataList.First((m) => (m.ColF != null) && m.ColF.Equals(md.ColF) && (m.ColG != null) && m.ColG.Equals(md.ColG) && (md.ColH != null) && md.ColH.Equals(md.ColH));
                                 if (foundData.Update(md))
                                     foundData.Status = MaerskData.MDStatus.UPDATED;
                             }
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 75b090f9..4dc431f0 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/Excel/ExcelSimpleWriter.cs b/ENI2/Excel/ExcelSimpleWriter.cs
index 4f5f377e..b61bed79 100644
--- a/ENI2/Excel/ExcelSimpleWriter.cs
+++ b/ENI2/Excel/ExcelSimpleWriter.cs
@@ -22,25 +22,41 @@ namespace ENI2.Excel
 
             Worksheet ws = wb.Worksheets[1];
 
-            //            ExcelWorkSheet.Cells[r, c] = "R" + r + "C" + c;
+            // Überschriften erste Zeile
+            ws.Cells[1, 1] = "ETA";
+            ws.Cells[1, 2] = "ETD";
+            ws.Cells[1, 3] = "Rotation name";
+            ws.Cells[1, 4] = "Vessel code";
+            ws.Cells[1, 5] = "Vessel name";
+            ws.Cells[1, 6] = "IMO";
+            ws.Cells[1, 7] = "Arr voy";
+            ws.Cells[1, 8] = "Dep voy";
+            ws.Cells[1, 9] = "Terminal name";
+            ws.Cells[1, 10] = "Operator code";
+            ws.Cells[1, 11] = "Pro arr";
+            ws.Cells[1, 12] = "Pro dep";
+            ws.Cells[1, 13] = "ID";
+            ws.Cells[1, 14] = "Remark";
 
             for (int i = 0; i < data.Count; i++)
             {
-                MaerskData md = data[i];
-                ws.Cells[i + 1, 1] = md.ColA;
-                ws.Cells[i + 1, 2] = md.ColB;
-                ws.Cells[i + 1, 3] = md.ColC;
-                ws.Cells[i + 1, 4] = md.ColD;
-                ws.Cells[i + 1, 5] = md.ColE;
-                ws.Cells[i + 1, 6] = md.ColF;
-                ws.Cells[i + 1, 7] = md.ColG;
-                ws.Cells[i + 1, 8] = md.ColH;
-                ws.Cells[i + 1, 9] = md.ColI;
-                ws.Cells[i + 1, 10] = md.ColJ;
-                ws.Cells[i + 1, 11] = md.ColK;
-                ws.Cells[i + 1, 12] = md.ColL;
-                ws.Cells[i + 1, 13] = md.ColM ;
-                ws.Cells[i + 1, 14] = md.Remark;
+                MaerskData md = data[i];                
+                ws.Cells[i + 2, 1].NumberFormat = "TT/hh:mm";
+                ws.Cells[i + 2, 1] = md.ColA;                
+                ws.Cells[i + 2, 2].NumberFormat = "TT/hh:mm";
+                ws.Cells[i + 2, 2] = md.ColB;
+                ws.Cells[i + 2, 3] = md.ColC;
+                ws.Cells[i + 2, 4] = md.ColD;
+                ws.Cells[i + 2, 5] = md.ColE;
+                ws.Cells[i + 2, 6] = md.ColF;
+                ws.Cells[i + 2, 7] = md.ColG;
+                ws.Cells[i + 2, 8] = md.ColH;
+                ws.Cells[i + 2, 9] = md.ColI;
+                ws.Cells[i + 2, 10] = md.ColJ;
+                ws.Cells[i + 2, 11] = md.ColK;
+                ws.Cells[i + 2, 12] = md.ColL;
+                ws.Cells[i + 2, 13] = md.ColM ;
+                ws.Cells[i + 2, 14] = md.Remark;
             }
 
             wb.SaveAs(filename, XlFileFormat.xlOpenXMLWorkbook, Type.Missing, Type.Missing, Type.Missing,

From 2aef20130be89047af31b29132f5620e486d9dd6 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sun, 19 Feb 2023 11:50:43 +0100
Subject: [PATCH 24/34] 7.9.0.3 kleine Korrekturen

---
 ENI2/Controls/MaerskListControl.xaml.cs | 13 +++++++------
 ENI2/ENI2.csproj                        |  2 +-
 bsmd.database/MaerskData.cs             |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index abdc8b46..4e714f7e 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -1,5 +1,5 @@
-// Copyright (c) 2017 schick Informatik
-// Description: PO Nummer Übersicht. Ergänzung Nummern. Excel Export
+// Copyright (c) 2017 / 2023 schick Informatik
+// Description: Request dbh ids for Maersk data lists
 //
 
 using System;
@@ -395,7 +395,8 @@ namespace ENI2.Controls
             {
                 foreach (MaerskData md in this.dataGridPOCores.SelectedItems)
                 {
-                    if ((md.MessageCore != null) || (!md.ColM.IsNullOrEmpty())) continue; // already requested
+                    if (md.MessageCore?.VisitId.IsNullOrEmpty() == false) continue; // already requested
+                    if (md.ColM?.IsNullOrEmpty() == false) continue; // already something there
                     requestList.Add(md);
                 }
             }
@@ -403,7 +404,8 @@ namespace ENI2.Controls
             {
                 foreach(MaerskData md in this.maerskDataList)
                 {
-                    if((md.MessageCore == null) && md.ColM.IsNullOrEmpty())
+                    if(((md.MessageCore == null) && md.ColM.IsNullOrEmpty()) ||
+                        ((md.MessageCore != null) && md.MessageCore.VisitId.IsNullOrEmpty()))
                     {
                         if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
                             requestList.Add(md);
@@ -416,8 +418,7 @@ namespace ENI2.Controls
                 MessageBox.Show("No valid rows selected", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation);
             }
             else
-            {
-                // Todo: 
+            { 
                 foreach (MaerskData md in requestList)
                 {
                     md.Status = MaerskData.MDStatus.REQUESTING_ID;
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 4dc431f0..521007f1 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>4</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index a566f95a..b41f7e6d 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -250,9 +250,9 @@ namespace bsmd.database
         /// </summary>
         public int CompareTo(MaerskData other)
         {
-            if (this.ColK == null) return 0;
+            if (this.ColA == null) return 0;
             if (other == null) return 0;
-            return this.ColK.CompareTo(other.ColK);
+            return this.ColA.CompareTo(other.ColA);
         }
 
         public bool Update(MaerskData md)

From 521786002b43f264d61f8895aabc732cba10c30a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 22 Feb 2023 09:40:34 +0100
Subject: [PATCH 25/34] 7.9.0.4 Testversion, Status-Festlegung vereinheitlicht,
 Speichern Remark automatisch, kleinere Bugs beseitigt

---
 ENI2/Controls/MaerskListControl.xaml    |   7 +-
 ENI2/Controls/MaerskListControl.xaml.cs | 113 +++++++++++++++++-------
 ENI2/ENI2.csproj                        |   2 +-
 bsmd.database/MaerskData.cs             |  16 ++--
 4 files changed, 96 insertions(+), 42 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 7e534d56..4972c931 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -45,7 +45,7 @@
                 <Label Content="To" Grid.Column="2" />
                 <xctk:DateTimePicker x:Name="dateTimePickerTo" Margin="2" Grid.Column="3" Format="ShortDate" />
                 <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
-                <Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" />
+                <!--Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" /-->
                 <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request marked Ids" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
@@ -67,6 +67,9 @@
                             <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.UPDATED}">
                                 <Setter Property="Background" Value="LightYellow"></Setter>
                             </DataTrigger>
+                            <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.NO_ETA}">
+                                <Setter Property="Background" Value="LightCoral"></Setter>
+                            </DataTrigger>
                             <DataTrigger Binding="{Binding Status}" Value="{x:Static db:MaerskData+MDStatus.REQUESTING_ID}">
                                 <Setter Property="Background" Value="Yellow"></Setter>
                             </DataTrigger>
@@ -94,7 +97,7 @@
                     <DataGridTextColumn Header="ETA" Binding="{Binding ColK}" IsReadOnly="True" />
                     <DataGridTextColumn Header="ETD" Binding="{Binding ColL}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Id" Binding="{Binding ColM}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" />
+                    <DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" x:Name="gridColumnRemark" />
 
                     <!--DataGridTextColumn x:Name="gridColumnPONumber" Header="PO number" Binding="{Binding PONumber, Mode=TwoWay}" IsReadOnly="False" /-->
                     <!--DataGridComboBoxColumn x:Name="gridColumnGroup" Header="Group" IsReadOnly="False" SelectedValueBinding="{Binding Flags, Mode=TwoWay}"
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index abdc8b46..cab09805 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -99,27 +99,26 @@ namespace ENI2.Controls
             dataGridPOCores.ItemsSource = maerskDataList;
         }
 
-        private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
+        private async void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
-            /*
+
             if (e.EditAction == DataGridEditAction.Commit)
             {
-                if (e.Column == gridColumnPONumber)
+                if (e.Column == gridColumnRemark)
                 {
-                    // validate for "true" number
+                    MaerskData maerskData = this.maerskDataList[e.Row.GetIndex()];
+
                     var el = e.EditingElement as System.Windows.Controls.TextBox;
-                    if (!el.Text.IsDigitsOnly())
+                    if (el.Text.Length > 100)
                     {
-                        el.Text = string.Empty;
-                        e.Cancel = true;
-                    }
-                    else
-                    {
-                        // buttonSaveChanges.IsEnabled = true;
-                        MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
-                        editedCore.IsDirty = true;
+                        el.Text = el.Text.Trim().Substring(0, 100);
                     }
+                    maerskData.Remark = el.Text;
+
+                    if (maerskData.MessageCore != null)
+                        await DBManagerAsync.Save(maerskData);
                 }
+                /*
                 if(e.Column == gridColumnGroup)
                 {
                     var el = e.EditingElement as ComboBox;
@@ -153,15 +152,58 @@ namespace ENI2.Controls
                         el.Text = string.Empty;
                         e.Cancel = true;
                     }
-                }                
+                }
+                */
             }
-            */
+            
         }
 
         #endregion
 
         #region private methods
 
+        /// <summary>
+        /// "Status" of a Maersk Data element is a momentary evaluation that is relevant for display purposes only
+        /// It is not saved
+        /// </summary>        
+        private void UpdateStatus(MaerskData md)
+        {
+            // here we set the following: NO_ID, NO_ID_AND_DUE, ID, NO_ETA and DONE
+            // the other status are set during active processing
+            if(md.ETA.HasValue)
+            {
+                if((md.ETA.Value - DateTime.Now).TotalSeconds > 0) // future
+                {
+                    if(!md.ColM.IsNullOrEmpty() || ((md.MessageCore != null) && (!md.MessageCore.VisitId.IsNullOrEmpty())))
+                    {
+                        md.Status = MaerskData.MDStatus.ID;
+                    }
+                    else
+                    {
+                        if(md.ETA.Value.IsNextXDays(3))
+                        {
+                            md.Status = MaerskData.MDStatus.NO_ID_AND_DUE;
+                        }
+                        else
+                        {
+                            md.Status = MaerskData.MDStatus.NO_ID;
+                        }
+                    }
+
+                }
+                else // past
+                {
+                    md.Status = MaerskData.MDStatus.DONE;
+                }
+            }
+            else
+            {
+                // no ETA means done
+                md.Status = MaerskData.MDStatus.NO_ETA;
+            }
+        }
+
+
         private async void PerformSearch()
         {
 
@@ -188,6 +230,7 @@ namespace ENI2.Controls
                 {
                     md.MessageCore = core;
                     md.MessageCoreId = core.Id.Value;
+                    this.UpdateStatus(md);
                     if(!maerskDataList.Contains(md)) // DatabaseEntity implements IEquatable
                         this.maerskDataList.Add(md);
                 }
@@ -250,6 +293,13 @@ namespace ENI2.Controls
                     {
                         while (reader.Read())
                         {
+
+                            if (isFirstRow)
+                            {
+                                isFirstRow = false; // this must be a header row, skip
+                                continue;
+                            }
+
                             if (reader.FieldCount < 13)
                             {
                                 throw new InvalidDataException("Sheet must have 13 columns of data");
@@ -276,16 +326,14 @@ namespace ENI2.Controls
                                 if (reader.GetFieldType(10) == typeof(DateTime))
                                 {
                                     md.ETA = reader.GetDateTime(10);
-                                }
+                                    md.ColK = md.ETA.ToString();
+                                } 
                                 else
                                 {
-                                    if(isFirstRow)
-                                    {
-                                        isFirstRow = false; // this must be a header row, skip
-                                        continue;
-                                    }
-                                }
-                                md.ColK = md.ETA.ToString();
+                                    md.ColK = reader.GetString(10);
+                                    if (DateTime.TryParse(md.ColK, out DateTime aDateTime))
+                                        md.ETA = aDateTime;
+                                }                                
                             }
                             if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
                             if (!reader.IsDBNull(12)) md.ColM = ReadFieldAsString(reader, 12);
@@ -303,8 +351,7 @@ namespace ENI2.Controls
                     {
                         MessageBox.Show("Error reading Excel: " + ex.Message, Properties.Resources.textCaptionError, MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-
-                    // we only want cores for the next 3 days
+                    
                     if (importData.Count > 0)
                     {
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
@@ -314,24 +361,18 @@ namespace ENI2.Controls
                         {
                             if (this.maerskDataList.Contains(md))
                             {
+                                // update record with imported record
                                 MaerskData foundData = this.maerskDataList.First((m) => (m.ColF != null) && m.ColF.Equals(md.ColF) && (m.ColG != null) && m.ColG.Equals(md.ColG) && (md.ColH != null) && md.ColH.Equals(md.ColH));
-                                if (foundData.Update(md))
+                                if(foundData.ETA.HasValue && ((foundData.ETA.Value - DateTime.Now).TotalSeconds > 0) && foundData.Update(md))
                                     foundData.Status = MaerskData.MDStatus.UPDATED;
                             }
                             else
                             {
-                                md.Status = MaerskData.MDStatus.ID;
-
                                 if (!md.ColM.IsNullOrEmpty())
                                 {
                                     md.MessageCore = await DBManagerAsync.LoadCoreByVisitIdAsync(md.ColM);
                                 }
-                                else
-                                {
-                                    md.Status = MaerskData.MDStatus.NO_ID;
-                                    if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
-                                        md.Status = MaerskData.MDStatus.NO_ID_AND_DUE;
-                                }
+                                this.UpdateStatus(md);
                                 maerskDataList.Add(md);
                             }
                         }
@@ -371,6 +412,8 @@ namespace ENI2.Controls
             }
         }
 
+        /*
+
         private async void buttonSave_Click(object sender, RoutedEventArgs e)
         {
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
@@ -387,6 +430,8 @@ namespace ENI2.Controls
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
         }
 
+        */
+
         private async void buttonRequestIds_Click(object sender, RoutedEventArgs e)
         {
             // find all entries from now until 3 days into the future and track parallel requests
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 4dc431f0..c0ecaaf3 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>5</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index a566f95a..baa6f4a2 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -34,7 +34,7 @@ namespace bsmd.database
 
         public enum MDStatus
         {
-            [Description("No id")]
+            [Description("No id and is in the future")]
             NO_ID,
             [Description("Updated")]
             UPDATED,
@@ -42,10 +42,15 @@ namespace bsmd.database
             REQUESTING_ID,
             [Description("Id assigned")]
             ID_ASSIGNED,
-            [Description("upcoming without id")]
+            [Description("upcoming without an id")]
             NO_ID_AND_DUE,
-            [Description("Has id")]
-            ID
+            [Description("Has id and is in the future")]
+            ID,
+            [Description("In the past, id or not")]
+            DONE,
+            [Description("no ETA found on data record")]
+            NO_ETA
+
         }
 
         #endregion
@@ -112,6 +117,7 @@ namespace bsmd.database
         /// </summary>
         public string ColM { get; set; }
 
+        [MaxLength(100)]
         public string Remark { get; set; }
 
         #endregion
@@ -172,7 +178,7 @@ namespace bsmd.database
 
                 // try parsing the column to datetime
                 if (DateTime.TryParse(md.ColK, out DateTime eta))
-                    ETA = eta;
+                    md.ETA = eta;
             }
             return md;
         }

From 6f5e5b66e98d7060f9a4cdfc603476ebd51cc7cb Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 23 Feb 2023 12:28:18 +0100
Subject: [PATCH 26/34] reacted to some more corrections, Version 7.9.0.5

---
 ENI2/Controls/MaerskListControl.xaml.cs       | 52 +++++++++++--------
 .../CopyDeclarationDialog.xaml.cs             |  5 ++
 ENI2/EditControls/VisitIdDialog.xaml.cs       |  7 ++-
 ENI2/Util/DatabaseEntityWatchdog.cs           |  6 ++-
 bsmd.database/MaerskData.cs                   |  8 +--
 5 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 9fb80736..69920a4c 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -60,9 +60,12 @@ namespace ENI2.Controls
                         md.Status = MaerskData.MDStatus.ID;
                         md.ColM = core.VisitId;
                         await DBManagerAsync.Save(md);
+                        _dbWatchDog.UnRegister(core);
                         this.Dispatcher.Invoke(() =>
                         {
                             this.dataGridPOCores.Items.Refresh();
+                            if(_dbWatchDog.Idle)
+                                busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                         });
                     }
                 }
@@ -205,9 +208,9 @@ namespace ENI2.Controls
 
 
         private async void PerformSearch()
-        {
-
-            Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();            
+        {            
+            busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
+            Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
             // Die Suche findet in dem eingestellten Intervall statt
             uint from = this.dateTimePickerFrom.Value.Value.ToUniversalTime().ToUnixTimeStamp();
@@ -218,7 +221,7 @@ namespace ENI2.Controls
 
             // suche auslösen
             List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
-
+            
             // alle anderen Häfen weg
             searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals(PortLocode)));
 
@@ -237,6 +240,7 @@ namespace ENI2.Controls
             }
 
             this.dataGridPOCores.SelectedItem = null;
+            busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
         }
 
         private string ReadFieldAsString(IExcelDataReader reader, int fieldNum)
@@ -306,7 +310,20 @@ namespace ENI2.Controls
                             }
 
                             MaerskData md = new MaerskData();
-                            md.ColA = ReadFieldAsString(reader, 0);
+                            if (!reader.IsDBNull(0))
+                            {
+                                if (reader.GetFieldType(0) == typeof(DateTime))
+                                {
+                                    md.ETA = reader.GetDateTime(0);
+                                    md.ColA = md.ETA.ToString();
+                                }
+                                else
+                                {
+                                    md.ColA = reader.GetString(0);
+                                    if (DateTime.TryParse(md.ColA, out DateTime aDateTime))
+                                        md.ETA = aDateTime;
+                                }
+                            }                            
                             if (!reader.IsDBNull(1)) md.ColB = ReadFieldAsString(reader, 1);
                             if (!reader.IsDBNull(2)) md.ColC = ReadFieldAsString(reader, 2);
                             if (!reader.IsDBNull(3)) md.ColD = ReadFieldAsString(reader, 3);
@@ -322,19 +339,7 @@ namespace ENI2.Controls
                                     throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
                             }
                             if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
-                            if (!reader.IsDBNull(10)) {
-                                if (reader.GetFieldType(10) == typeof(DateTime))
-                                {
-                                    md.ETA = reader.GetDateTime(10);
-                                    md.ColK = md.ETA.ToString();
-                                } 
-                                else
-                                {
-                                    md.ColK = reader.GetString(10);
-                                    if (DateTime.TryParse(md.ColK, out DateTime aDateTime))
-                                        md.ETA = aDateTime;
-                                }                                
-                            }
+                            if (!reader.IsDBNull(10)) md.ColK = ReadFieldAsString(reader, 10);
                             if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
                             if (!reader.IsDBNull(12)) md.ColM = ReadFieldAsString(reader, 12);
                             if (!reader.IsDBNull(13)) md.Remark = ReadFieldAsString(reader, 13);
@@ -362,7 +367,10 @@ namespace ENI2.Controls
                             if (this.maerskDataList.Contains(md))
                             {
                                 // update record with imported record
-                                MaerskData foundData = this.maerskDataList.First((m) => (m.ColF != null) && m.ColF.Equals(md.ColF) && (m.ColG != null) && m.ColG.Equals(md.ColG) && (md.ColH != null) && md.ColH.Equals(md.ColH));
+                                MaerskData foundData = this.maerskDataList.First((m) => (m.ColF != null) ? m.ColF.Equals(md.ColF) : (md.ColF == null) &&
+                                                                                        (m.ColG != null) ? m.ColG.Equals(md.ColG) : (md.ColG == null) &&
+                                                                                        (m.ColH != null) ? m.ColH.Equals(md.ColH) : (md.ColH == null));
+
                                 if(foundData.ETA.HasValue && ((foundData.ETA.Value - DateTime.Now).TotalSeconds > 0) && foundData.Update(md))
                                     foundData.Status = MaerskData.MDStatus.UPDATED;
                             }
@@ -463,14 +471,16 @@ namespace ENI2.Controls
                 MessageBox.Show("No valid rows selected", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation);
             }
             else
-            { 
+            {
+                busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
+
                 foreach (MaerskData md in requestList)
                 {
                     md.Status = MaerskData.MDStatus.REQUESTING_ID;
 
                     // create MessageCore and message classes
                     md.MessageCore = new MessageCore();
-                    md.MessageCore.InitialHIS = Message.NSWProvider.DBH;
+                    md.MessageCore.InitialHIS = Message.NSWProvider.DBH_MAERSK;
                     md.MessageCore.IMO = md.ColF;
                     md.MessageCore.ETA = md.ETA;
                     md.MessageCore.IsTransit = false;
diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
index 4f6a6ec4..2c9e5592 100644
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
@@ -97,6 +97,11 @@ namespace ENI2.EditControls
         private void LocodePoC_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             this.CheckComplete();
+            string locode = this.locodePoC.LocodeValue;
+            if ((locode != null) && (locode.Equals("DEBRV") || locode.Equals("DEBRE")))
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
+            }
         }
 
         private void doubleUpDownIMO_ValueChanged(object sender, System.Windows.RoutedPropertyChangedEventArgs<object> e)
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index cdddb4c4..f9c68776 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -96,6 +96,11 @@ namespace ENI2.EditControls
         private void LocodePoC_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             this.CheckComplete();
+            string locode = this.locodePoC.LocodeValue;
+            if((locode != null) && (locode.Equals("DEBRV") || locode.Equals("DEBRE")))
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
+            }
         }
 
         private void datePickerETA_SelectedDateChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
@@ -128,7 +133,7 @@ namespace ENI2.EditControls
 
             isComplete &= validLocode;
 
-            isComplete &= (comboBoxInitialHIS.SelectedValue != null);
+            isComplete &= comboBoxInitialHIS.SelectedValue != null;
 
             this.EnableOK(isComplete);
         }
diff --git a/ENI2/Util/DatabaseEntityWatchdog.cs b/ENI2/Util/DatabaseEntityWatchdog.cs
index 88de8eec..98f1e3b5 100644
--- a/ENI2/Util/DatabaseEntityWatchdog.cs
+++ b/ENI2/Util/DatabaseEntityWatchdog.cs
@@ -31,6 +31,8 @@ namespace ENI2.Util
             this.bgTimer.Interval = Properties.Settings.Default.changeTimerTimeout;
         }
 
+        public bool Idle => _watchedEntities.Count == 0;
+
         private void BgTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
             lock (this._entityLock)
@@ -91,7 +93,7 @@ namespace ENI2.Util
         }
 
         public void UnRegister(MessageCore entity)
-        {            
+        {
 
             lock (this._entityLock)
             {
@@ -105,7 +107,7 @@ namespace ENI2.Util
         #region private / protected
 
         protected void OnDatabaseEntityChanged(DatabaseEntity entity)
-        {            
+        {
             this.DatabaseEntityChanged?.Invoke(entity);
         }
 
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index d3a0bc6d..f7751bd2 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -177,7 +177,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(15)) md.Remark = reader.GetString(15);
 
                 // try parsing the column to datetime
-                if (DateTime.TryParse(md.ColK, out DateTime eta))
+                if (DateTime.TryParse(md.ColA, out DateTime eta))
                     md.ETA = eta;
             }
             return md;
@@ -244,10 +244,10 @@ namespace bsmd.database
         /// </summary>
         public bool Equals(MaerskData other)
         {
-            if (this.ColG == null) return false;
-            if (this.ColH == null) return false;
-            if (this.ColF == null) return false;
             if (other == null) return false;
+            if (this.ColG == null) return (other.ColG == null);
+            if (this.ColH == null) return (other.ColH == null);
+            if (this.ColF == null) return (other.ColF == null);
             return this.ColF.Equals(other.ColF) && this.ColG.Equals(other.ColG) && this.ColH.Equals(other.ColH);
         }
 

From b175b17feca29abf776a34ee535022e06a050239 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 24 Feb 2023 08:12:32 +0100
Subject: [PATCH 27/34] =?UTF-8?q?SendNSWMessageService=20etwas=20verboser?=
 =?UTF-8?q?=20gemacht=20um=20die=20H=C3=A4nger=20zu=20identifizieren.=20Au?=
 =?UTF-8?q?=C3=9Ferdem=20gibt=20Transmit()=20jetzt=20ein=20boolean=20zur?=
 =?UTF-8?q?=C3=BCck=20und=20nur=20wenn=20der=20Prozess=20auch=20fertig=20w?=
 =?UTF-8?q?ar,=20wird=20das=20Verzeichnis=20gelesen.=20Irgendwo=20ist=20da?=
 =?UTF-8?q?=20eine=20Race=20Condition..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ENI2/ENI2.csproj                        |  2 +-
 SendNSWMessageService/NSWSendService.cs |  8 +++---
 bsmd.hisnord/transmitter.cs             | 35 +++++++++++++------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index c0ecaaf3..97eceeb7 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationRevision>6</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/SendNSWMessageService/NSWSendService.cs b/SendNSWMessageService/NSWSendService.cs
index 8ef4d838..8d2e3b58 100644
--- a/SendNSWMessageService/NSWSendService.cs
+++ b/SendNSWMessageService/NSWSendService.cs
@@ -270,9 +270,11 @@ namespace SendNSWMessageService
                 }
 
                 // external processing for HIS-Nord                
-                bsmd.hisnord.transmitter.CallTransmitter();                                
-                bsmd.hisnord.Request.ReadResponseFiles();                
-                bsmd.hisnord.Response.ReadAnswers();
+                if (bsmd.hisnord.transmitter.Transmit())
+                {
+                    bsmd.hisnord.Request.ReadResponseFiles();
+                    bsmd.hisnord.Response.ReadAnswers();
+                }
 
                 // external processing for dbh
                 bsmd.dbh.MessageController.SendAndReceive();
diff --git a/bsmd.hisnord/transmitter.cs b/bsmd.hisnord/transmitter.cs
index d19895c5..d0b7d117 100644
--- a/bsmd.hisnord/transmitter.cs
+++ b/bsmd.hisnord/transmitter.cs
@@ -10,6 +10,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Threading.Tasks;
 using System.Xml.Serialization;
 using bsmd.database;
 using log4net;
@@ -19,17 +20,17 @@ namespace bsmd.hisnord
     public class transmitter
     {
         private static readonly ILog _log = LogManager.GetLogger(typeof(transmitter));
-        private static int? processId; // Achtung, das müsste getrennt behandelt werden Test <-> Livesystem!		        
+        private static int? processId;
 
-        public static void CallTransmitter()
+        public static bool Transmit()
         {
             string rootDir = Properties.Settings.Default.TransmitterRoot;
 
             if(processId.HasValue)
             {
                 _log.InfoFormat("Transmitter process {0} still running, aborting call", processId);
-                return;
-            }            
+                return false;
+            }
 
             ProcessStartInfo startInfo = new ProcessStartInfo(Path.Combine(rootDir, Properties.Settings.Default.Transmitter));
             startInfo.WorkingDirectory = rootDir;
@@ -42,13 +43,12 @@ namespace bsmd.hisnord
             // Ergebnis ab
 
             using (Process transmitterProcess = new Process())
-            {
-                
+            {                
                 transmitterProcess.Exited += TransmitterProcess_Exited;                
 
                 transmitterProcess.ErrorDataReceived += TransmitterProcess_ErrorDataReceived;
                 transmitterProcess.OutputDataReceived += TransmitterProcess_OutputDataReceived;
-
+                
                 transmitterProcess.StartInfo = startInfo;
                 transmitterProcess.EnableRaisingEvents = true;
                 transmitterProcess.Start();
@@ -59,29 +59,32 @@ namespace bsmd.hisnord
                 processId = transmitterProcess.Id;                
 
                 // _log.DebugFormat("started {0}", transmitterProcess.ProcessName);
-                int timeout = Properties.Settings.Default.BatchTimeoutMins * 1000 * 60; // convert to ms
+                int timeout = Properties.Settings.Default.BatchTimeoutMins * 1000 * 60; // convert to ms                
+
+                _log.InfoFormat($"starting transmitter, process ID: {processId}, timeout {timeout} ms.");
+
                 if (!transmitterProcess.WaitForExit((timeout == 0) ? int.MaxValue : timeout))
                 {
-                    _log.WarnFormat("Transmitter process not exited within {0} minute", Properties.Settings.Default.BatchTimeoutMins);
-                    // dauert zu lang, beende Prozess..
+                    _log.Warn($"Transmitter {processId} not exited within {timeout} ms");                    
                     try
                     {
                         transmitterProcess.Kill();
-                        _log.Info("Transmitter killed");                        
+                        _log.Warn($"Transmitter {processId} killed");                        
                         processId = null;
                     }
                     catch (Exception e)
                     {
-                        _log.WarnFormat("Killing Transmitter failed: {0}", e.Message);
+                        _log.Warn($"Killing Transmitter {processId} failed: {e.Message}");
                     }
                 }
             }
+            return true;
         }
 
         private static void TransmitterProcess_OutputDataReceived(object sender, DataReceivedEventArgs e)
         {
             if(!e.Data.IsNullOrEmpty())
-                _log.Debug(e.Data);
+                _log.Info(e.Data);
         }
 
         private static void TransmitterProcess_ErrorDataReceived(object sender, DataReceivedEventArgs e)
@@ -92,7 +95,7 @@ namespace bsmd.hisnord
 
         private static void TransmitterProcess_Exited(object sender, EventArgs e)
         {
-            _log.Debug("Transmitter process exited");
+            _log.Info("Transmitter process exited");
             processId = null;
         }
 
@@ -103,9 +106,7 @@ namespace bsmd.hisnord
             string resultDir = Path.Combine(Properties.Settings.Default.TransmitterRoot, Properties.Settings.Default.ResultDir);
             string resultFullPath = Path.Combine(resultDir, resultFilename);
             return result.ReadResult(resultFullPath);
-        }
-
-		
+        }		
 		
         /// <summary>
         /// class to read transmitter result xml files

From e0c85b6576aa2b1579995e783cb6263a79db1353 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 24 Feb 2023 18:34:34 +0100
Subject: [PATCH 28/34] Korrekturen gefixt

---
 ENI2/Controls/MaerskListControl.xaml          | 27 +++++++++----------
 ENI2/Controls/MaerskListControl.xaml.cs       | 18 ++++++++++---
 ENI2/ENI2.csproj                              |  2 +-
 .../CopyDeclarationDialog.xaml.cs             |  4 +++
 ENI2/EditControls/NewWithIdDialog.xaml.cs     | 11 ++++++++
 ENI2/EditControls/VisitIdDialog.xaml.cs       |  4 +++
 6 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 4972c931..fe07b036 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -32,13 +32,12 @@
                     <ColumnDefinition Width="40" />
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="50" />
-                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="30" />
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="80" />
-                    <ColumnDefinition Width="30" />
                 </Grid.ColumnDefinitions>
                 <Label Content="From" Grid.Column="0" />
                 <xctk:DateTimePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" Format="ShortDate" />
@@ -50,7 +49,7 @@
                 <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
                 <Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" />
-                <local:BusyControl x:Name="busyControl" Grid.Column="11" />
+                <local:BusyControl x:Name="busyControl" Grid.Column="5" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False"
@@ -84,18 +83,18 @@
                 </local:ENIDataGrid.RowStyle>
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="Status" Binding="{Binding Status}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Col A" Binding="{Binding ColA}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Col B" Binding="{Binding ColB}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Ship. Area" Binding="{Binding ColC}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Col D" Binding="{Binding ColD}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Name" Binding="{Binding ColE}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETA" Binding="{Binding ColA}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETD" Binding="{Binding ColB}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Rotation name" Binding="{Binding ColC}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Vessel code" Binding="{Binding ColD}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Vessel name" Binding="{Binding ColE}" IsReadOnly="True" />
                     <DataGridTextColumn Header="IMO" Binding="{Binding ColF}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Voy-No in" Binding="{Binding ColG}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Voy-No out" Binding="{Binding ColH}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Terminal" Binding="{Binding ColI}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Oper" Binding="{Binding ColJ}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETA" Binding="{Binding ColK}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETD" Binding="{Binding ColL}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Arr voy" Binding="{Binding ColG}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Dep voy" Binding="{Binding ColH}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Terminal name" Binding="{Binding ColI}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Operator code" Binding="{Binding ColJ}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Pro arr" Binding="{Binding ColK}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Pro dep" Binding="{Binding ColL}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Id" Binding="{Binding ColM}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" x:Name="gridColumnRemark" />
 
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 69920a4c..432f4269 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -208,7 +208,7 @@ namespace ENI2.Controls
 
 
         private async void PerformSearch()
-        {            
+        {
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
@@ -221,7 +221,7 @@ namespace ENI2.Controls
 
             // suche auslösen
             List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
-            
+
             // alle anderen Häfen weg
             searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals(PortLocode)));
 
@@ -239,6 +239,7 @@ namespace ENI2.Controls
                 }
             }
 
+            this.SortItemSource();
             this.dataGridPOCores.SelectedItem = null;
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
         }
@@ -258,6 +259,15 @@ namespace ENI2.Controls
             return null;
         }
 
+        private void SortItemSource()
+        {
+            ObservableCollection<MaerskData> temp;
+            temp = new ObservableCollection<MaerskData>(this.maerskDataList.OrderBy(p => p.ColA));
+            this.maerskDataList.Clear();
+            foreach (MaerskData md in temp)
+                this.maerskDataList.Add(md);
+        }
+
         #endregion
 
         #region button event handler
@@ -359,8 +369,7 @@ namespace ENI2.Controls
                     
                     if (importData.Count > 0)
                     {
-                        busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
-                        importData.Sort();
+                        busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;                        
                         
                         foreach (MaerskData md in importData)
                         {
@@ -384,6 +393,7 @@ namespace ENI2.Controls
                                 maerskDataList.Add(md);
                             }
                         }
+                        this.SortItemSource();
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                     }
 
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 97eceeb7..86851fa9 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
index 2c9e5592..9bdeb82c 100644
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
@@ -102,6 +102,10 @@ namespace ENI2.EditControls
             {
                 this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
             }
+            else
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
+            }
         }
 
         private void doubleUpDownIMO_ValueChanged(object sender, System.Windows.RoutedPropertyChangedEventArgs<object> e)
diff --git a/ENI2/EditControls/NewWithIdDialog.xaml.cs b/ENI2/EditControls/NewWithIdDialog.xaml.cs
index 7ba0d309..8f22cc65 100644
--- a/ENI2/EditControls/NewWithIdDialog.xaml.cs
+++ b/ENI2/EditControls/NewWithIdDialog.xaml.cs
@@ -37,6 +37,9 @@ namespace ENI2.EditControls
 
             this.comboBoxInitialHIS.ItemsSource = comboDataSource;
             this.comboBoxInitialHIS.SelectedIndex = 0;
+
+
+
         }
 
         public bool ValidId { get; set; }
@@ -54,6 +57,14 @@ namespace ENI2.EditControls
         private void textBoxVisitTransitId_TextChanged(object sender, TextChangedEventArgs e)
         {
             this.CheckComplete();
+            if(textBoxVisitTransitId.Text.StartsWith("DEBRE") || textBoxVisitTransitId.Text.StartsWith("DEBHV"))
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
+            }
+            else
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
+            }
         }
 
         private void CheckComplete()
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index f9c68776..1f72f918 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -101,6 +101,10 @@ namespace ENI2.EditControls
             {
                 this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
             }
+            else
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
+            }
         }
 
         private void datePickerETA_SelectedDateChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)

From 967a34dc7927e7219ec1980c92d538e2b334e913 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 28 Feb 2023 08:15:35 +0100
Subject: [PATCH 29/34] fixed typo

---
 ENI2/ENI2.csproj                          | 2 +-
 ENI2/EditControls/NewWithIdDialog.xaml.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 86851fa9..887fdad4 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>7</ApplicationRevision>
+    <ApplicationRevision>8</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/EditControls/NewWithIdDialog.xaml.cs b/ENI2/EditControls/NewWithIdDialog.xaml.cs
index 8f22cc65..49fd2a2e 100644
--- a/ENI2/EditControls/NewWithIdDialog.xaml.cs
+++ b/ENI2/EditControls/NewWithIdDialog.xaml.cs
@@ -57,7 +57,7 @@ namespace ENI2.EditControls
         private void textBoxVisitTransitId_TextChanged(object sender, TextChangedEventArgs e)
         {
             this.CheckComplete();
-            if(textBoxVisitTransitId.Text.StartsWith("DEBRE") || textBoxVisitTransitId.Text.StartsWith("DEBHV"))
+            if(textBoxVisitTransitId.Text.StartsWith("DEBRE") || textBoxVisitTransitId.Text.StartsWith("DEBRV"))
             {
                 this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
             }

From 47336e0b8d0c0bc37953efa6b12cb1697bb578ab Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 1 Mar 2023 09:54:24 +0100
Subject: [PATCH 30/34] =?UTF-8?q?Datumsbereich=20Auswahl=20synchronisiert?=
 =?UTF-8?q?=20zwischen=20BRV=20und=20WHV,=20au=C3=9Ferdem=20beim=20Enddatu?=
 =?UTF-8?q?m=20die=20Stunden=20des=20Tages=20addiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ENI2/Controls/MaerskListControl.xaml        |  4 +-
 ENI2/Controls/MaerskListControl.xaml.cs     | 55 +++++++++++++++++++--
 ENI2/Controls/MaerskOverviewControl.xaml.cs | 25 ++++++++++
 ENI2/ENI2.csproj                            |  2 +-
 4 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index fe07b036..8f4391b5 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -40,9 +40,9 @@
                     <ColumnDefinition Width="80" />
                 </Grid.ColumnDefinitions>
                 <Label Content="From" Grid.Column="0" />
-                <xctk:DateTimePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" Format="ShortDate" />
+                <DatePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" SelectedDateChanged="dateTimePickerFrom_SelectedDateChanged"/>
                 <Label Content="To" Grid.Column="2" />
-                <xctk:DateTimePicker x:Name="dateTimePickerTo" Margin="2" Grid.Column="3" Format="ShortDate" />
+                <DatePicker x:Name="dateTimePickerTo" Margin="2" Grid.Column="3" SelectedDateChanged="dateTimePickerFrom_SelectedDateChanged"/>
                 <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
                 <!--Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" /-->
                 <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request marked Ids" Margin="2" Click="buttonRequestIds_Click" />
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 432f4269..1f6e8b6d 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -41,13 +41,27 @@ namespace ENI2.Controls
         {
             InitializeComponent();
             Loaded += POList_Loaded;
-            this.dateTimePickerFrom.Value = DateTime.Today.AddDays(-14);
-            this.dateTimePickerTo.Value = DateTime.Today.AddDays(14);
+            this.dateTimePickerFrom.SelectedDate = DateTime.Today.AddDays(-14);
+            this.dateTimePickerTo.SelectedDate = DateTime.Today.AddDays(14);
             this._dbWatchDog = new DatabaseEntityWatchdog();
             this._dbWatchDog.DatabaseEntityChanged += _dbWatchDog_DatabaseEntityChanged;
             this._dbWatchDog.VisitTransitIdUpdated += _dbWatchDog_VisitTransitIdUpdated;
         }
 
+        #endregion
+
+        #region Events
+
+        public delegate void DateChanged(DateTime date);
+
+        public event DateChanged FromDateChanged;
+
+        public event DateChanged ToDateChanged;
+
+        #endregion
+
+        #region DB Watchdog
+
         private async void _dbWatchDog_VisitTransitIdUpdated(DatabaseEntity entity)
         {
             if (entity is MessageCore core)
@@ -87,6 +101,23 @@ namespace ENI2.Controls
         /// </summary>
         public string PortLocode { get; set; }
 
+        /// <summary>
+        /// synchronize selection props
+        /// </summary>
+        public DateTime? FromDate {
+            get { return this.dateTimePickerFrom.SelectedDate; }
+            set { this.dateTimePickerFrom.SelectedDate = value; }
+        }
+
+        /// <summary>
+        /// synchronize selection props
+        /// </summary>
+        public DateTime? ToDate
+        {
+            get { return this.dateTimePickerTo.SelectedDate; }
+            set { this.dateTimePickerTo.SelectedDate = value; }
+        }
+
         #endregion
 
         #region events
@@ -213,8 +244,9 @@ namespace ENI2.Controls
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
             // Die Suche findet in dem eingestellten Intervall statt
-            uint from = this.dateTimePickerFrom.Value.Value.ToUniversalTime().ToUnixTimeStamp();
-            uint to = this.dateTimePickerTo.Value.Value.ToUniversalTime().ToUnixTimeStamp();
+            uint from = this.dateTimePickerFrom.SelectedDate.Value.ToUniversalTime().ToUnixTimeStamp();
+            DateTime toDate = this.dateTimePickerTo.SelectedDate.Value.ToUniversalTime().Add(new TimeSpan(23, 59, 59));
+            uint to = toDate.ToUnixTimeStamp();
             filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
             // eingeschränkt auf flags
             filterDict.Add(MessageCore.SearchFilterType.FILTER_FLAG_EQ, "0");
@@ -536,5 +568,20 @@ namespace ENI2.Controls
 
         #endregion
 
+        #region DateTime picker event handler
+
+        private void dateTimePickerFrom_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+            if (sender == dateTimePickerFrom)
+                this.FromDateChanged?.Invoke(dateTimePickerFrom.SelectedDate.Value);
+
+            if (sender == dateTimePickerTo)
+                this.ToDateChanged?.Invoke(dateTimePickerTo.SelectedDate.Value);
+
+        }
+
+        #endregion
+
     }
 }
diff --git a/ENI2/Controls/MaerskOverviewControl.xaml.cs b/ENI2/Controls/MaerskOverviewControl.xaml.cs
index 437ca770..45ee4d9e 100644
--- a/ENI2/Controls/MaerskOverviewControl.xaml.cs
+++ b/ENI2/Controls/MaerskOverviewControl.xaml.cs
@@ -13,6 +13,31 @@ namespace ENI2.Controls
             InitializeComponent();
             this.brvListControl.PortLocode = "DEBRV";
             this.wvnListControl.PortLocode = "DEWVN";
+
+            this.brvListControl.FromDateChanged += BrvListControl_FromDateChanged;
+            this.brvListControl.ToDateChanged += BrvListControl_ToDateChanged;
+            this.wvnListControl.FromDateChanged += WvnListControl_FromDateChanged;
+            this.wvnListControl.ToDateChanged += WvnListControl_ToDateChanged;
+        }
+
+        private void WvnListControl_ToDateChanged(System.DateTime date)
+        {
+            this.brvListControl.ToDate = date;
+        }
+
+        private void WvnListControl_FromDateChanged(System.DateTime date)
+        {
+            this.brvListControl.FromDate = date;
+        }
+
+        private void BrvListControl_ToDateChanged(System.DateTime date)
+        {
+            this.wvnListControl.ToDate = date;
+        }
+
+        private void BrvListControl_FromDateChanged(System.DateTime date)
+        {
+            this.wvnListControl.FromDate = date;
         }
 
         public List<MaerskListControl> ListControls
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 887fdad4..2d4a5ef0 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>8</ApplicationRevision>
+    <ApplicationRevision>9</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

From 6fc09ad7da7653883984a514d28c816bffa1721a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 1 Mar 2023 10:49:33 +0100
Subject: [PATCH 31/34] =?UTF-8?q?Filterung=20der=20Ergebnisse=20nach=20dem?=
 =?UTF-8?q?=20Zeitintervall=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ENI2/Controls/MaerskListControl.xaml.cs | 26 ++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 1f6e8b6d..e7bec545 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -270,7 +270,7 @@ namespace ENI2.Controls
                         this.maerskDataList.Add(md);
                 }
             }
-
+            this.TimeFilterItemSource();
             this.SortItemSource();
             this.dataGridPOCores.SelectedItem = null;
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
@@ -291,6 +291,29 @@ namespace ENI2.Controls
             return null;
         }
 
+        private void TimeFilterItemSource()
+        {
+            List<MaerskData> removeList = new List<MaerskData>();
+            foreach (MaerskData md in this.maerskDataList)
+            {
+                if (md.ETA.HasValue)
+                {
+                    if (this.dateTimePickerFrom.SelectedDate.HasValue && (md.ETA.Value < this.dateTimePickerFrom.SelectedDate.Value))
+                        removeList.Add(md);
+
+                    if (this.dateTimePickerTo.SelectedDate.HasValue) {
+
+                        DateTime toDate = this.dateTimePickerTo.SelectedDate.Value.ToUniversalTime().Add(new TimeSpan(23, 59, 59));
+                        if(md.ETA.Value > toDate)
+                            removeList.Add(md);
+                    }
+                }
+            }
+
+            foreach (MaerskData md in removeList)
+                this.maerskDataList.Remove(md);
+        }
+
         private void SortItemSource()
         {
             ObservableCollection<MaerskData> temp;
@@ -425,6 +448,7 @@ namespace ENI2.Controls
                                 maerskDataList.Add(md);
                             }
                         }
+                        this.TimeFilterItemSource();
                         this.SortItemSource();
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                     }

From 97bad2fbc02656f0003771c9ae5b2f2522363775 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 1 Mar 2023 14:53:28 +0100
Subject: [PATCH 32/34] publish

---
 ENI2/ENI2.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 2d4a5ef0..352a2621 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>9</ApplicationRevision>
+    <ApplicationRevision>10</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

From 96a1398d71f6cb9ab65d71ecb8a30becbd6e571c Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 1 Mar 2023 15:14:09 +0100
Subject: [PATCH 33/34] Release Version 7.9

---
 ENI2/App.config             |   4 ++--
 ENI2/ENI2.csproj            |  10 +++++-----
 ENI2/Resources/EUREPORT.png | Bin 42234 -> 39708 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ENI2/App.config b/ENI2/App.config
index 0778764a..4c7c4bc1 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -12,7 +12,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
     </startup>
     <applicationSettings>
         <ENI2.Properties.Settings>
@@ -29,7 +29,7 @@
 				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
+				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 352a2621..8448c5a0 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -18,7 +18,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <PublishUrl>eni_test\</PublishUrl>
+    <PublishUrl>eni2.publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -28,15 +28,15 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://192.168.2.24/eni_test/</InstallUrl>
+    <InstallUrl>http://192.168.2.24/eni2.publish/</InstallUrl>
     <SupportUrl>http://www.textbausteine.net/</SupportUrl>
-    <ProductName>ENI Testversion</ProductName>
+    <ProductName>ENI</ProductName>
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <SuiteName>NSW</SuiteName>
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>10</ApplicationRevision>
+    <ApplicationRevision>11</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
-    <ManifestCertificateThumbprint>F2C2D0164244EC89955EF50201EE24C2A300FF0B</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>62DE8527C377957850DB503DA52FF66F664BD459</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
diff --git a/ENI2/Resources/EUREPORT.png b/ENI2/Resources/EUREPORT.png
index 375b2af774cc1ebfbcfab724756710c3314fda32..a5a38e0c4e30f28c8b64275c1c314435775a38b2 100644
GIT binary patch
literal 39708
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
F{{y9*T1)@{

literal 42234
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


From 7e23f5a98af3e89fe1949d1a45401e928ceadfa5 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 2 Mar 2023 11:02:16 +0100
Subject: [PATCH 34/34] Extra Korrekturen durch Anmerkungen von Basti

---
 ENI2/Controls/MaerskListControl.xaml    |  2 +-
 ENI2/Controls/MaerskListControl.xaml.cs | 12 +++++++-----
 ENI2/ENI2.csproj                        |  2 +-
 ENI2/Excel/ExcelSimpleWriter.cs         |  2 +-
 bsmd.database/Extensions.cs             |  5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 8f4391b5..c45a235f 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -46,7 +46,7 @@
                 <Button x:Name="buttonLoad" Grid.Column="4" Content="Load" Margin="2" Click="buttonLoad_Click" />
                 <!--Button x:Name="buttonSave" Grid.Column="5" Content="Save" Margin="2" Click="buttonSave_Click" /-->
                 <Button x:Name="buttonRequestIds" Grid.Column="6" Content="Request marked Ids" Margin="2" Click="buttonRequestIds_Click" />
-                <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
+                <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +4" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
                 <Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" />
                 <local:BusyControl x:Name="busyControl" Grid.Column="5" />
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index e7bec545..b7410ee6 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -214,7 +214,7 @@ namespace ENI2.Controls
                     }
                     else
                     {
-                        if(md.ETA.Value.IsNextXDays(3))
+                        if(md.ETA.Value.IsNextXDays(4))
                         {
                             md.Status = MaerskData.MDStatus.NO_ID_AND_DUE;
                         }
@@ -271,7 +271,7 @@ namespace ENI2.Controls
                 }
             }
             this.TimeFilterItemSource();
-            this.SortItemSource();
+            // this.SortItemSource();
             this.dataGridPOCores.SelectedItem = null;
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
         }
@@ -404,6 +404,8 @@ namespace ENI2.Controls
                                     throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import");
                             }
                             if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9);
+                            if (md.ColJ == null) continue;
+                            if (!(md.ColJ.Equals("msk", StringComparison.OrdinalIgnoreCase) || md.ColJ.Equals("sgl", StringComparison.OrdinalIgnoreCase))) continue; // skip operator we are not interested in
                             if (!reader.IsDBNull(10)) md.ColK = ReadFieldAsString(reader, 10);
                             if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11);
                             if (!reader.IsDBNull(12)) md.ColM = ReadFieldAsString(reader, 12);
@@ -449,7 +451,7 @@ namespace ENI2.Controls
                             }
                         }
                         this.TimeFilterItemSource();
-                        this.SortItemSource();
+                        // this.SortItemSource();
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                     }
 
@@ -508,7 +510,7 @@ namespace ENI2.Controls
 
         private async void buttonRequestIds_Click(object sender, RoutedEventArgs e)
         {
-            // find all entries from now until 3 days into the future and track parallel requests
+            // find all entries from now until 4 days into the future and track parallel requests
             List<MaerskData> requestList = new List<MaerskData>();
             if (sender == this.buttonRequestIds)
             {
@@ -526,7 +528,7 @@ namespace ENI2.Controls
                     if(((md.MessageCore == null) && md.ColM.IsNullOrEmpty()) ||
                         ((md.MessageCore != null) && md.MessageCore.VisitId.IsNullOrEmpty()))
                     {
-                        if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(3))
+                        if (md.ETA.HasValue && md.ETA.Value.IsNextXDays(4))
                             requestList.Add(md);
                     }
                 }
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 352a2621..a0dc5c09 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>10</ApplicationRevision>
+    <ApplicationRevision>12</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/Excel/ExcelSimpleWriter.cs b/ENI2/Excel/ExcelSimpleWriter.cs
index b61bed79..774f8798 100644
--- a/ENI2/Excel/ExcelSimpleWriter.cs
+++ b/ENI2/Excel/ExcelSimpleWriter.cs
@@ -56,7 +56,7 @@ namespace ENI2.Excel
                 ws.Cells[i + 2, 11] = md.ColK;
                 ws.Cells[i + 2, 12] = md.ColL;
                 ws.Cells[i + 2, 13] = md.ColM ;
-                ws.Cells[i + 2, 14] = md.Remark;
+                // ws.Cells[i + 2, 14] = md.Remark;
             }
 
             wb.SaveAs(filename, XlFileFormat.xlOpenXMLWorkbook, Type.Missing, Type.Missing, Type.Missing,
diff --git a/bsmd.database/Extensions.cs b/bsmd.database/Extensions.cs
index bcfd3866..9392547a 100644
--- a/bsmd.database/Extensions.cs
+++ b/bsmd.database/Extensions.cs
@@ -126,11 +126,12 @@ namespace bsmd.database
 
         /// <summary>
         /// Returns true if the date is between now and numDays in the future (or past, if numDays is negative)
+        /// (regarding full days, ignoring time component
         /// </summary>        
         public static bool IsNextXDays(this DateTime datetime, int numDays)
         {
-            double diff = (datetime - DateTime.Now).TotalDays;
-            if (numDays >= 0) return diff < numDays && diff > 0;
+            double diff = (datetime.Date - DateTime.Now.Date).TotalDays;
+            if (numDays >= 0) return diff <= numDays && diff >= 0;
             else return diff < numDays && diff < 0;
         }