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

DeliveryJournal: Fix ordering

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

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

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