From 548aeb2ce94a2c7c5687eeefac7c91cb25e36799 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 13 Oct 2025 20:38:16 +0200
Subject: [PATCH] DeliveryAdminWindow: Show delivery (part) comments in list

---
 Elwig/Models/Entities/Delivery.cs      | 5 +++++
 Elwig/Windows/DeliveryAdminWindow.xaml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/Elwig/Models/Entities/Delivery.cs b/Elwig/Models/Entities/Delivery.cs
index 9e16c96..0abe63e 100644
--- a/Elwig/Models/Entities/Delivery.cs
+++ b/Elwig/Models/Entities/Delivery.cs
@@ -63,6 +63,11 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
+        [NotMapped]
+        public string[] Comments => [.. Parts.Select(p => p.Comment).Prepend(Comment).Where(c => c != null).Cast<string>()];
+        [NotMapped]
+        public string CommentsString => string.Join(" / ", Comments);
+
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
         public long CTime { get; set; }
         [NotMapped]
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index 9f1f7bb..37c8b32 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -295,6 +295,7 @@
                     <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
                     <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
                     <DataGridTextColumn Header="Zu-/Abschläge" Binding="{Binding FilteredModifiersString}" Width="150"/>
+                    <DataGridTextColumn Header="Kommentar" Binding="{Binding CommentsString}" Width="150"/>
                 </DataGrid.Columns>
             </DataGrid>