From b97913646734e1ddc0e05c1326ea5eb967b2d6c7 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 26 Jul 2025 09:55:01 +0200
Subject: [PATCH] Small adjustments to overview display

---
 .../OverViewDetailControl.xaml                |  8 +--
 bsmd.database/Message.cs                      | 64 ++++++++++++-------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 450dea5f..f2feb1b0 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -96,7 +96,7 @@
                         <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textATDPortOfCall}" Margin="0,0,10,0" />
                         <xctk:DateTimePicker Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Value="{Binding ATDPortOfCall, Mode=TwoWay, Converter={util:UtcToLocalDateTimeConverter}}" Name="dateTimePickerATD" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00"/>
                         
-                        <Label HorizontalAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
+                        <Label HorizontalAlignment="Right" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" Margin="0,0,10,0" />
                         <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="8" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
                         
                         <Label HorizontalContentAlignment="Right" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
@@ -262,7 +262,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                     <DataTemplate>
                                         <!--Image Source="{Binding src:Util.ImageDict[ENINotificationDetailGroup]}" /-->
                                         <!--Image Source="{Binding Source={x:Static src:Util.ImageDict}, Path=[ENINotificationDetailGroup]}"></-->
-                                        <Image Source="{Binding ENINotificationIconString, Converter={util:NullImageConverter}}" />
+                                        <Image Source="{Binding ENINotificationIconString, Converter={util:NullImageConverter}}" Height="20" />
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
@@ -276,7 +276,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
 
-                            <DataGridTextColumn Header="{x:Static p:Resources.textStatus}" Binding="{Binding InternalStatus}" IsReadOnly="True" Width="0.1*">
+                            <DataGridTextColumn Header="{x:Static p:Resources.textStatus}" Binding="{Binding BSMDStatusOverviewDisplay}" IsReadOnly="True" Width="0.1*">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -320,7 +320,7 @@ SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
 
-                            <DataGridTextColumn Header="HIS" Binding="{Binding HIS}" IsReadOnly="True" Width="0.1*">
+                            <DataGridTextColumn Header="HIS" Binding="{Binding HISOverviewDisplay}" IsReadOnly="True" Width="0.1*">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="VerticalAlignment" Value="Center"/>
diff --git a/bsmd.database/Message.cs b/bsmd.database/Message.cs
index 8a3be9b7..1e56b788 100644
--- a/bsmd.database/Message.cs
+++ b/bsmd.database/Message.cs
@@ -66,32 +66,32 @@ namespace bsmd.database
         /// NSW notification class
         /// </summary>
         public enum NotificationClass
-        { 
+        {
             VISIT,      // 0
             TRANSIT,    // 1
             NOA_NOD,    // 2
-            ATA, 
-            ATD, 
+            ATA,
+            ATD,
             SEC,        // 5
-            POBA, 
-            POBD, 
-            NAME, 
-            TIEFA, 
+            POBA,
+            POBD,
+            NAME,
+            TIEFA,
             TIEFD,      // 10
-            BKRA, 
-            BKRD, 
-            STAT, 
-            LADG, 
+            BKRA,
+            BKRD,
+            STAT,
+            LADG,
             INFO,       // 15
-            SERV, 
-            PRE72H, 
-            MDH, 
-            WAS, 
+            SERV,
+            PRE72H,
+            MDH,
+            WAS,
             CREWA,       // 20
-            PASA, 
-            BPOL, 
-            TOWA, 
-            TOWD, 
+            PASA,
+            BPOL,
+            TOWA,
+            TOWD,
             HAZA,       // 25
             HAZD,
             AGNT,
@@ -145,7 +145,7 @@ namespace bsmd.database
             WASRCPT_ID,
             BY_FILE_SEQ_NUM,
             BY_TYPE
-        }        
+        }
 
         /// <summary>
         /// Message Status einer NSW Einzelnachricht
@@ -182,7 +182,7 @@ namespace bsmd.database
 
             [Description("HIS-Nord")]
             DUDR,
-            
+
             [Description("dbh / Maersk")]
             DBH_MAERSK
         }
@@ -213,7 +213,7 @@ namespace bsmd.database
         /// <summary>
         /// Dieser Wert wird vom NSW / HIS vergeben
         /// </summary>
-        public string ClientRequestId { set; get; }        
+        public string ClientRequestId { set; get; }
 
         public Guid? MessageId { get; set; }
 
@@ -269,6 +269,15 @@ namespace bsmd.database
         /// </summary>
         public BSMDStatus InternalStatus { get; set; }
 
+        /// <summary>
+        /// Display helper property for overview status
+        /// </summary>
+        public string BSMDStatusOverviewDisplay {
+            get {
+                return (InternalStatus != BSMDStatus.UNDEFINED) ? InternalStatus.ToString() : "";
+            }
+        }
+
         /// <summary>
         /// Vorheriger Status (z.B. für nach der Report-Generierung), wird nicht immer gesetzt
         /// </summary>
@@ -284,6 +293,17 @@ namespace bsmd.database
         /// </summary>
         public NSWProvider HIS { get; set; }
 
+        /// <summary>
+        /// Display helper property for overview HIS
+        /// </summary>
+        public string HISOverviewDisplay
+        {
+            get
+            {
+                return (HIS != NSWProvider.UNDEFINED) ? HIS.ToString() : string.Empty;
+            }
+        }
+
         /// <summary>
         /// Fehlerliste (Rückgabe vom NSW)
         /// </summary>