From 731a7eff9c671598e06494f5aa770cb5fbedb959 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 29 Sep 2025 14:31:42 +0200
Subject: [PATCH] changed some details across various trello cards

---
 ENI2/ControlTemplates.xaml                                 | 4 ++--
 ENI2/DetailViewControls/PortNotificationDetailControl.xaml | 2 +-
 ENI2/Excel/ExcelUtil.cs                                    | 4 ++--
 bsmd.database/WasteDisposalServiceProvider_Template.cs     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ENI2/ControlTemplates.xaml b/ENI2/ControlTemplates.xaml
index 519c417a..611e140b 100644
--- a/ENI2/ControlTemplates.xaml
+++ b/ENI2/ControlTemplates.xaml
@@ -56,7 +56,7 @@
         </Grid>
     </ControlTemplate>
 
-
+
 
 
     <!-- Validation Error Template for a DataGrid Row -->
@@ -80,7 +80,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-
+
 
 
     <Style TargetType="{x:Type ToolTip}" >
diff --git a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
index 66f0794a..61071e28 100644
--- a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
+++ b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
@@ -24,7 +24,7 @@
         </col:ArrayList>
     </UserControl.Resources>
     <GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+        <ScrollViewer>
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="50" />
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 43aa8c01..ae7c9913 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -1470,7 +1470,7 @@ namespace ENI2.Excel
                             bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", 82 + i));
 
                             string crewNameString = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 82 + i));
-                            poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty();
+                            poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty() && (crewNameString.Length > 1);
 
                             // if crew members joined is set explicitly to true and the name is empty, still set the field to true
                             if (!(poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false) && (PortOfCallLast30DaysCrewMembersJoinedFlag ?? false))
@@ -1691,7 +1691,7 @@ namespace ENI2.Excel
                     l10fc.PortFacilityDateOfArrival = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 54 + i));
                     l10fc.PortFacilityDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("H{0}", 54 + i));
 
-                    string sLevel = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 54 + i), 1);
+                    string sLevel = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 54 + i));
                     if (!sLevel.IsNullOrEmpty())
                     {
                         if (sLevel.Contains('1')) l10fc.PortFacilityShipSecurityLevel = 1;
diff --git a/bsmd.database/WasteDisposalServiceProvider_Template.cs b/bsmd.database/WasteDisposalServiceProvider_Template.cs
index 308f62b9..bb92a63d 100644
--- a/bsmd.database/WasteDisposalServiceProvider_Template.cs
+++ b/bsmd.database/WasteDisposalServiceProvider_Template.cs
@@ -98,7 +98,7 @@ namespace bsmd.database
         public int CompareTo(object obj)
         {
             if (obj is WasteDisposalServiceProvider_Template template)
-                this.Remark?.CompareTo(template.Remark ?? "");
+                return this.Remark?.CompareTo(template.Remark ?? "") ?? 0;
             return 0;
         }