winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

DeliveryJournal: Fix ordering 2

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-09-29 15:38:30 +02:00
parent 2bb8205da0
commit eaf7b6bd41
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Elwig/Documents/DeliveryJournal.cshtml.cs
View File

@ -17,10 +17,11 @@ namespace Elwig.Documents {
}
public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
this(filter, (IEnumerable<DeliveryPart>)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

7
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -285,7 +285,12 @@ namespace Elwig.Windows {
deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value);
filterNames.Add(SeasonInput.Value.ToString() ?? "");
}
IQueryable<DeliveryPart> dpq = deliveryQuery.SelectMany(d => d.Parts).OrderBy(p => p.Delivery.DateString).ThenBy(p => p.Delivery.TimeString);
IQueryable<DeliveryPart> 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