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] 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)