diff --git a/Elwig/Documents/DeliveryJournal.cshtml.cs b/Elwig/Documents/DeliveryJournal.cshtml.cs index 9a513c4..2e4e24f 100644 --- a/Elwig/Documents/DeliveryJournal.cshtml.cs +++ b/Elwig/Documents/DeliveryJournal.cshtml.cs @@ -1,5 +1,6 @@ using Elwig.Helpers; using Elwig.Models; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; @@ -15,11 +16,18 @@ namespace Elwig.Documents { Deliveries = deliveries; } + public DeliveryJournal(string filter, IQueryable deliveries) : + this(filter, (IEnumerable)deliveries + .Include(p => p.Delivery) + .Include(p => p.Delivery.Member) + .Include(p => p.Variant)) { } + public DeliveryJournal(AppDbContext ctx, DateOnly date) : this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts .Where(p => p.Delivery.DateString == date.ToString("yyy-MM-dd")) - .OrderBy(p => p.Delivery.LsNr) - .ThenBy(p => p.DPNr) - .ToList()) { } + .OrderBy(p => p.Delivery.DateString) + .ThenBy(p => p.Delivery.TimeString) + .ThenBy(p => p.Delivery.LsNr) + .ThenBy(p => p.DPNr)) { } } }