Windows: Add filters to Titles in some AdministrationWindows
Test / Run tests (push) Successful in 2m44s

This commit is contained in:
2026-09-01 16:24:27 +02:00
parent 1bdfff28f1
commit c789f93159
10 changed files with 32 additions and 20 deletions
+4 -4
View File
@@ -7,7 +7,6 @@ using Elwig.ViewModels;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
@@ -147,9 +146,9 @@ namespace Elwig.Windows {
var cursor = Mouse.OverrideCursor != null;
if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
var query = (vm.SearchQuery, vm.ShowOnlyActiveMembers);
var (members, stat) = await Task.Run(async () => {
var (filterNames, members, stat, filter) = await Task.Run(async () => {
using var ctx = new AppDbContext();
var (_, memberQuery, filter) = await vm.GetFilters(ctx);
var (filterNames, memberQuery, filter) = await vm.GetFilters(ctx);
var members = await memberQuery
.Include(m => m.EmailAddresses)
.Include(m => m.TelephoneNumbers)
@@ -184,11 +183,12 @@ namespace Elwig.Windows {
SharesActive = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite),
}).ToListAsync()).Select(g => (g.Count, g.Shares, g.SharesRed, g.SharesWhite, g.SharesDormant, g.SharesTotal, g.SharesActive)).ToList();
return (members, stat[0]);
return (filterNames, members, stat[0], filter);
});
if (!cursor) Mouse.OverrideCursor = null;
if (query != (ViewModel.SearchQuery, ViewModel.ShowOnlyActiveMembers)) return;
ViewModel.Title = Utils.GetTitle("Mitglieder", filterNames, filter);
ControlUtils.RenewItemsSource(MemberList, members,
MemberList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
if (updateSort && MemberList.SelectedItem != null)