|
|
|
|
@ -25,13 +25,11 @@ struct ActivityView: View { |
|
|
|
|
var runningTournaments: [FederalTournamentHolder] { |
|
|
|
|
dataStore.tournaments.filter({ $0.endDate == nil }) |
|
|
|
|
.filter({ federalDataViewModel.isTournamentValidForFilters($0) }) |
|
|
|
|
.sorted(using: SortDescriptor(\.startDate)) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
var endedTournaments: [Tournament] { |
|
|
|
|
dataStore.tournaments.filter({ $0.endDate != nil }) |
|
|
|
|
.filter({ federalDataViewModel.isTournamentValidForFilters($0) }) |
|
|
|
|
.sorted(using: SortDescriptor(\.startDate, order: .reverse)) |
|
|
|
|
} |
|
|
|
|
// |
|
|
|
|
// func _activityStatus() -> String? { |
|
|
|
|
@ -64,11 +62,11 @@ struct ActivityView: View { |
|
|
|
|
List { |
|
|
|
|
switch navigation.agendaDestination! { |
|
|
|
|
case .activity: |
|
|
|
|
EventListView(tournaments: runningTournaments, viewStyle: viewStyle) |
|
|
|
|
EventListView(tournaments: runningTournaments, viewStyle: viewStyle, sortAscending: true) |
|
|
|
|
case .history: |
|
|
|
|
EventListView(tournaments: endedTournaments, viewStyle: viewStyle) |
|
|
|
|
EventListView(tournaments: endedTournaments, viewStyle: viewStyle, sortAscending: false) |
|
|
|
|
case .tenup: |
|
|
|
|
EventListView(tournaments: federalDataViewModel.federalTournaments, viewStyle: viewStyle) |
|
|
|
|
EventListView(tournaments: federalDataViewModel.federalTournaments, viewStyle: viewStyle, sortAscending: true) |
|
|
|
|
.id(uuid) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|