diff --git a/Elwig/Windows/AreaComAdminWindow.xaml.cs b/Elwig/Windows/AreaComAdminWindow.xaml.cs index a8d191e..7029974 100644 --- a/Elwig/Windows/AreaComAdminWindow.xaml.cs +++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs @@ -78,8 +78,8 @@ namespace Elwig.Windows { List filterNames = new(); IQueryable areaComQuery = Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr); if (ActiveAreaCommitmentInput.IsChecked == true) { - areaComQuery = areaComQuery.Where(a => a.YearTo == null); - filterNames.Add("ohne Enddatum"); + areaComQuery = areaComQuery.Where(a => (a.YearFrom <= Utils.CurrentNextSeason) && (a.YearTo == null || a.YearTo >= Utils.CurrentNextSeason)); + filterNames.Add("aktiv"); } var filterVar = new List();