Bump verion to 0.3.4

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,19 @@ namespace Elwig.Documents {
             Deliveries = deliveries;
         }
 
+        public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
+            this(filter, deliveries
+                .Include(p => p.Delivery)
+                .Include(p => p.Delivery.Member)
+                .Include(p => p.Variant)
+                .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.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)) { }
     }
 }

Elwig/Elwig.csproj

@@ -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>
 

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -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
@@ -422,14 +427,14 @@ namespace Elwig.Windows {
                 } else if (filterKmwGt > 0) {
                     filterNames.Add($"ab {filterKmwGt:N1} °KMW");
                 } else if (filterKmwLt > 0) {
-                    filterNames.Add($"bis {filterKmwLt:N1} °KMW");
+                    filterNames.Add($"unter {filterKmwLt:N1} °KMW");
                 }
                 if (filterOeGt > 0 && filterOeLt > 0) {
                     filterNames.Add($"{filterOeGt:N1}–{filterOeLt:N1} °Oe");
                 } else if (filterOeGt > 0) {
                     filterNames.Add($"ab {filterOeGt:N1} °Oe");
                 } else if (filterOeLt > 0) {
-                    filterNames.Add($"bis {filterOeLt:N1} °Oe");
+                    filterNames.Add($"unter {filterOeLt:N1} °Oe");
                 }
                 if (filterTimeGt != null && filterTimeLt != null) {
                     filterNames.Add($"{filterTimeGt}–{filterTimeLt}");