From f0745eae4efa396dca927350d37c18d72385543a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 27 Aug 2026 11:20:22 +0200 Subject: [PATCH] Elwig: Fix LINQ queries containing DateTime.Today --- Elwig/Services/DeliveryAncmtService.cs | 3 ++- Elwig/Services/DeliveryScheduleService.cs | 5 +++-- Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Elwig/Services/DeliveryAncmtService.cs b/Elwig/Services/DeliveryAncmtService.cs index 8c55af7..594caed 100644 --- a/Elwig/Services/DeliveryAncmtService.cs +++ b/Elwig/Services/DeliveryAncmtService.cs @@ -45,7 +45,8 @@ namespace Elwig.Services { deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == s.Year && a.DsNr == s.DsNr); filterNames.Add($"{s.Date:dd.MM.yyyy} – {s.Branch.Name} – {s.Description}"); } else { - deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(DateTime.Today.ToString("yyyy-MM-dd")) >= 0)); + var today = DateTime.Today; + deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(today.ToString("yyyy-MM-dd")) >= 0)); filterNames.Add($"{vm.FilterSeason}"); } diff --git a/Elwig/Services/DeliveryScheduleService.cs b/Elwig/Services/DeliveryScheduleService.cs index b32098b..2ca367b 100644 --- a/Elwig/Services/DeliveryScheduleService.cs +++ b/Elwig/Services/DeliveryScheduleService.cs @@ -49,8 +49,9 @@ namespace Elwig.Services { filterNames.Add($"{vm.FilterSeason}"); } if (vm.FilterOnlyUpcoming) { - deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.DateString.CompareTo(DateTime.Today.ToString("yyyy-MM-dd")) >= 0); - filterNames.Add($"ab {DateTime.Today:dd.MM.yyyy}"); + var today = DateTime.Today; + deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.DateString.CompareTo(today.ToString("yyyy-MM-dd")) >= 0); + filterNames.Add($"ab {today:dd.MM.yyyy}"); } var filterVar = new List(); diff --git a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs index ea757ca..136d815 100644 --- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs @@ -91,8 +91,9 @@ namespace Elwig.Windows { .ToListAsync(); list.ForEach(v => v.Schedule.AnnouncedWeightOverride = v.AnnouncedWeight); var deliverySchedules = list.Select(v => v.Schedule).ToList(); + var today = DateTime.Today; ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules - .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(DateTime.Today.ToString("yyyy-MM-dd")) >= 0) + .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(today.ToString("yyyy-MM-dd")) >= 0) .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First); ControlUtils.RenewItemsSource(DeliveryScheduleInput, deliverySchedules, DeliveryScheduleInput_SelectionChanged); }