diff --git a/Elwig/Models/Entities/Delivery.cs b/Elwig/Models/Entities/Delivery.cs index 3f23042..9e16c96 100644 --- a/Elwig/Models/Entities/Delivery.cs +++ b/Elwig/Models/Entities/Delivery.cs @@ -1,4 +1,5 @@ using Elwig.Helpers; +using Elwig.Helpers.Billing; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; @@ -108,16 +109,16 @@ namespace Elwig.Models.Entities { public int Weight => Parts.Select(p => p.Weight).Sum(); public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum(); - public IEnumerable SortIds => Parts - .GroupBy(p => p.SortId) + public IEnumerable Vaributes => Parts + .GroupBy(p => (p.SortId, p.AttrId, p.CultId)) .OrderByDescending(g => g.Select(p => p.Weight).Sum()) - .Select(g => g.Key); - public IEnumerable FilteredSortIds => FilteredParts - .GroupBy(p => p.SortId) + .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId)); + public IEnumerable FilteredVaributes => FilteredParts + .GroupBy(p => (p.SortId, p.AttrId, p.CultId)) .OrderByDescending(g => g.Select(p => p.Weight).Sum()) - .Select(g => g.Key); - public string SortIdString => string.Join(", ", SortIds); - public string FilteredSortIdString => string.Join(", ", FilteredSortIds); + .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId)); + public string VaributeString => string.Join(", ", Vaributes); + public string FilteredVaributeString => string.Join(", ", FilteredVaributes); public Brush? Color => Parts.Select(p => p.Variety.Color).Distinct().SingleOrDefault(); public Brush? FilteredColor => FilteredParts.Select(p => p.Variety.Color).Distinct().SingleOrDefault(); diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml index 7a512a9..9f1f7bb 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAdminWindow.xaml @@ -265,13 +265,18 @@ - + + + +