Compare commits
	
		
			2 Commits
		
	
	
		
			2bb8205da0
			...
			v0.3.4
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| de298ffef1 | |||
| eaf7b6bd41 | 
@@ -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,7 +7,7 @@
 | 
			
		||||
    <UseWPF>true</UseWPF>
 | 
			
		||||
    <PreserveCompilationContext>true</PreserveCompilationContext>
 | 
			
		||||
    <ApplicationIcon>elwig.ico</ApplicationIcon>
 | 
			
		||||
    <Version>0.3.3</Version>
 | 
			
		||||
    <Version>0.3.4</Version>
 | 
			
		||||
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
 | 
			
		||||
  </PropertyGroup>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user