Windows: Add filters to Titles in some AdministrationWindows
Test / Run tests (push) Successful in 2m44s
Test / Run tests (push) Successful in 2m44s
This commit is contained in:
@@ -103,9 +103,9 @@ namespace Elwig.Windows {
|
||||
var cursor = Mouse.OverrideCursor != null;
|
||||
if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
|
||||
var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterOnlyUpcoming, vm.FilterOnlyUpcoming);
|
||||
var (filter, deliveryAncmts, stat) = await Task.Run(async () => {
|
||||
var (filterNames, filter, deliveryAncmts, stat) = await Task.Run(async () => {
|
||||
using var ctx = new AppDbContext();
|
||||
var (_, deliveryAncmtQuery, filter) = await vm.GetFilters(ctx);
|
||||
var (filterNames, deliveryAncmtQuery, filter) = await vm.GetFilters(ctx);
|
||||
var deliveryAncmts = await deliveryAncmtQuery.ToListAsync();
|
||||
|
||||
if (filter.Count > 0 && deliveryAncmts.Count > 0) {
|
||||
@@ -130,11 +130,12 @@ namespace Elwig.Windows {
|
||||
|
||||
var stat = await DeliveryAncmtService.GenerateToolTipData(deliveryAncmtQuery);
|
||||
|
||||
return (filter, deliveryAncmts, stat);
|
||||
return (filterNames, filter, deliveryAncmts, stat);
|
||||
});
|
||||
if (!cursor) Mouse.OverrideCursor = null;
|
||||
if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterOnlyUpcoming, ViewModel.FilterOnlyUpcoming)) return;
|
||||
|
||||
ViewModel.Title = Utils.GetTitle("Anmeldungen", filterNames, filter);
|
||||
ControlUtils.RenewItemsSource(DeliveryAncmtList, deliveryAncmts,
|
||||
DeliveryAncmtList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
|
||||
if (updateSort && DeliveryAncmtList.SelectedItem != null)
|
||||
|
||||
Reference in New Issue
Block a user