winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 68 Activity

ContextWindow: Use Task.Run to load data outside main thread
All checks were successful
Test / Run tests (push) Successful in 2m29s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2026-04-02 14:18:06 +02:00
parent 1f4fe2129d
commit e593175e72
18 changed files with 241 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Elwig/Windows/AreaComAdminWindow.xaml.cs
View File

@@ -37,10 +37,10 @@ namespace Elwig.Windows {
ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
SearchInput.TextChanged -= SearchInput_TextChanged;
ActiveAreaCommitmentInput.Content = ((string)ActiveAreaCommitmentInput.Content).Replace("2020", $"{Utils.CurrentLastSeason}");
ActiveAreaCommitmentInput.IsChecked = true;
}
private void Window_Loaded(object sender, RoutedEventArgs e) {
ActiveAreaCommitmentInput.IsChecked = true;
protected override async Task OnInit(AppDbContext ctx) {
LockInputs();
}
@@ -52,35 +52,47 @@ namespace Elwig.Windows {
}
private async Task RefreshList(bool updateSort = false) {
using var ctx = new AppDbContext();
var (_, areaComQuery, filter) = await ViewModel.GetFilters(ctx);
var areaComs = await areaComQuery
.Include(a => a.Kg.AtKg)
.Include(a => a.Rd!.Kg.AtKg)
.Include(a => a.WineCult)
.Include(a => a.AreaComType.WineAttr)
.Include(a => a.AreaComType.WineVar)
.ToListAsync();
var vm = ViewModel;
var cursor = Mouse.OverrideCursor != null;
if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
var query = (vm.SearchQuery, vm.ShowOnlyActiveAreaComs);
var (filter, areaComs, areaComCount, stat) = await Task.Run(async () => {
using var ctx = new AppDbContext();
var (_, areaComQuery, filter) = await vm.GetFilters(ctx);
var areaComs = await areaComQuery
.Include(a => a.Kg.AtKg)
.Include(a => a.Rd!.Kg.AtKg)
.Include(a => a.WineCult)
.Include(a => a.AreaComType.WineAttr)
.Include(a => a.AreaComType.WineVar)
.ToListAsync();
if (filter.Count > 0 && areaComs.Count > 0) {
var dict = areaComs.AsParallel()
.ToDictionary(d => d, d => d.SearchScore(ViewModel.TextFilter))
.OrderByDescending(c => c.Value);
var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
areaComs = dict
.Where(a => a.Value > threshold)
.Select(a => a.Key)
.ToList();
}
if (filter.Count > 0 && areaComs.Count > 0) {
var dict = areaComs.AsParallel()
.ToDictionary(d => d, d => d.SearchScore(vm.TextFilter))
.OrderByDescending(c => c.Value);
var threshold = dict.Max(a => a.Value) * 3 / 4;
areaComs = [.. dict
.Where(a => a.Value > threshold)
.Select(a => a.Key)];
}
var areaComCount = await areaComQuery.CountAsync();
var season = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
var stat = await AreaComService.GenerateToolTipData(areaComQuery, season?.MaxKgPerHa ?? 10_000);
return (filter, areaComs, areaComCount, stat);
});
if (!cursor) Mouse.OverrideCursor = null;
if (query != (ViewModel.SearchQuery, ViewModel.ShowOnlyActiveAreaComs)) return;
ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs,
AreaCommitmentList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
AreaCommitmentList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
RefreshInputs();
if (filter.Count == 0) {
ViewModel.StatusAreaCommitments = $"{await areaComQuery.CountAsync():N0}";
var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
var (text, gridData) = await AreaComService.GenerateToolTipData(areaComQuery, s?.MaxKgPerHa ?? 10_000);
ViewModel.StatusAreaCommitments = $"{areaComCount:N0}";
var (text, gridData) = stat;
ViewModel.StatusArea = text;
ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
} else {