From b31b5f61646870f1f9cf4d06ba85947b474831c1 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 26 Mar 2024 17:18:33 +0100
Subject: [PATCH] DeliveryAdminWindow: Show modifiers in DataGrid

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

diff --git a/Elwig/Models/Entities/Delivery.cs b/Elwig/Models/Entities/Delivery.cs
index 83cca06..f3ad394 100644
--- a/Elwig/Models/Entities/Delivery.cs
+++ b/Elwig/Models/Entities/Delivery.cs
@@ -85,10 +85,22 @@ namespace Elwig.Models.Entities {
             .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
             .Select(g => g.Key);
-
         public string SortIdString => string.Join(", ", SortIds);
         public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
+        public IEnumerable<string> Modifiers => Parts
+            .SelectMany(p => p.Modifiers)
+            .Select(m => m.Name)
+            .Distinct()
+            .Order();
+        public IEnumerable<string> FilteredModifiers => FilteredParts
+            .SelectMany(p => p.Modifiers)
+            .Select(m => m.Name)
+            .Distinct()
+            .Order();
+        public string ModifiersString => string.Join(" / ", Modifiers);
+        public string FilteredModifiersString => string.Join(" / ", FilteredModifiers);
+
         public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
         public double FilteredKmw => Utils.AggregateDeliveryPartsKmw(FilteredParts);
 
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index fe90326..d768557 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -177,6 +177,7 @@
                     </DataGridTextColumn>
                     <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"/>
                 </DataGrid.Columns>
             </DataGrid>