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 Modifiers => Parts + .SelectMany(p => p.Modifiers) + .Select(m => m.Name) + .Distinct() + .Order(); + public IEnumerable 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 @@ +