diff --git a/Elwig/Documents/DeliveryJournal.cshtml.cs b/Elwig/Documents/DeliveryJournal.cshtml.cs index 2e4e24f..25ebed3 100644 --- a/Elwig/Documents/DeliveryJournal.cshtml.cs +++ b/Elwig/Documents/DeliveryJournal.cshtml.cs @@ -17,10 +17,11 @@ namespace Elwig.Documents { } public DeliveryJournal(string filter, IQueryable deliveries) : - this(filter, (IEnumerable)deliveries + this(filter, deliveries .Include(p => p.Delivery) .Include(p => p.Delivery.Member) - .Include(p => p.Variant)) { } + .Include(p => p.Variant) + .ToList()) { } public DeliveryJournal(AppDbContext ctx, DateOnly date) : this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index b93cc4c..3001b09 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -285,7 +285,12 @@ namespace Elwig.Windows { deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value); filterNames.Add(SeasonInput.Value.ToString() ?? ""); } - IQueryable dpq = deliveryQuery.SelectMany(d => d.Parts).OrderBy(p => p.Delivery.DateString).ThenBy(p => p.Delivery.TimeString); + IQueryable dpq = deliveryQuery + .SelectMany(d => d.Parts) + .OrderBy(p => p.Delivery.DateString) + .ThenBy(p => p.Delivery.TimeString) + .ThenBy(p => p.Delivery.LsNr) + .ThenBy(p => p.DPNr); // TODO add filter for: // attributes