winzer/elwig
2
1
Fork 0
Code Issues 11 Pull Requests Actions Releases 57 Activity

DeliveryAncmtAdminWindow: Increase performace by aggregating AnnouncedWeight
All checks were successful
Test / Run tests (push) Successful in 2m23s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-10-07 20:41:15 +02:00
parent a0d4f19f30
commit 7edd888aa2
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Elwig/Models/Entities/DeliverySchedule.cs
View File

@@ -42,7 +42,9 @@ namespace Elwig.Models.Entities {
[Column("max_weight")] [Column("max_weight")]
public int? MaxWeight { get; set; } public int? MaxWeight { get; set; }
[NotMapped] [NotMapped]
public int AnnouncedWeight => Announcements.Sum(a => a.Weight); public int AnnouncedWeight => AnnouncedWeightOverride ?? Announcements.Sum(a => a.Weight);
[NotMapped]
public int? AnnouncedWeightOverride { get; set; }
[NotMapped] [NotMapped]
public double? Percent => (double)AnnouncedWeight / MaxWeight * 100; public double? Percent => (double)AnnouncedWeight / MaxWeight * 100;

9
Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
View File

@@ -83,14 +83,19 @@ namespace Elwig.Windows {
private async Task RefreshDeliveryScheduleList() { private async Task RefreshDeliveryScheduleList() {
using var ctx = new AppDbContext(); using var ctx = new AppDbContext();
var deliverySchedules = await ctx.DeliverySchedules var list = await ctx.DeliverySchedules
.Where(s => s.Year == ViewModel.FilterSeason) .Where(s => s.Year == ViewModel.FilterSeason)
.Include(s => s.Branch) .Include(s => s.Branch)
.Include(s => s.Announcements)
.OrderBy(s => s.DateString) .OrderBy(s => s.DateString)
.ThenBy(s => s.Branch.Name) .ThenBy(s => s.Branch.Name)
.ThenBy(s => s.Description) .ThenBy(s => s.Description)
.Select(s => new {
Schedule = s,
AnnouncedWeight = s.Announcements.Sum(a => a.Weight)
})
.ToListAsync(); .ToListAsync();
list.ForEach(v => v.Schedule.AnnouncedWeightOverride = v.AnnouncedWeight);
var deliverySchedules = list.Select(v => v.Schedule).ToList();
ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
.Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0) .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
.ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First); .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);