This commit is contained in:
@ -1,9 +1,5 @@
|
||||
using Elwig.Helpers;
|
||||
using Elwig.Models.Entities;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System;
|
||||
using Elwig.Models.Dtos;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Elwig.Documents {
|
||||
public class DeliveryJournal : Document {
|
||||
@ -11,25 +7,15 @@ namespace Elwig.Documents {
|
||||
public new static string Name => "Lieferjournal";
|
||||
|
||||
public string Filter;
|
||||
public IEnumerable<DeliveryPart> Deliveries;
|
||||
public IEnumerable<DeliveryJournalRow> Deliveries;
|
||||
|
||||
public DeliveryJournal(string filter, IEnumerable<DeliveryPart> deliveries) : base($"{Name} {filter}") {
|
||||
public DeliveryJournal(string filter, IEnumerable<DeliveryJournalRow> deliveries) : base($"{Name} {filter}") {
|
||||
Filter = filter;
|
||||
Deliveries = deliveries;
|
||||
}
|
||||
|
||||
public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
|
||||
this(filter, deliveries
|
||||
.Include(p => p.Delivery).ThenInclude(d => d.Member)
|
||||
.Include(p => p.Variety)
|
||||
.ToList()) { }
|
||||
|
||||
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.DateString)
|
||||
.ThenBy(p => p.Delivery.TimeString)
|
||||
.ThenBy(p => p.Delivery.LsNr)
|
||||
.ThenBy(p => p.DPNr)) { }
|
||||
public DeliveryJournal(string filter, DeliveryJournalData data) :
|
||||
this(filter, data.Rows) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user