|
|
|
@ -867,7 +867,7 @@ defer { |
|
|
|
|
|
|
|
|
|
|
|
let defaultSorting : [MySortDescriptor<TeamRegistration>] = _defaultSorting() |
|
|
|
let defaultSorting : [MySortDescriptor<TeamRegistration>] = _defaultSorting() |
|
|
|
|
|
|
|
|
|
|
|
let _completeTeams = _teams.sorted(using: defaultSorting, order: .ascending).filter { $0.isWildCard() == false }.prefix(teamCount).sorted(by: \.initialWeight) |
|
|
|
let _completeTeams = _teams.sorted(using: defaultSorting, order: .ascending).filter { $0.isWildCard() == false }.prefix(teamCount).sorted(using: [.keyPath(\.initialWeight), .keyPath(\.id)], order: .ascending) |
|
|
|
|
|
|
|
|
|
|
|
let wcGroupStage = _teams.filter { $0.wildCardGroupStage }.sorted(using: _currentSelectionSorting, order: .ascending) |
|
|
|
let wcGroupStage = _teams.filter { $0.wildCardGroupStage }.sorted(using: _currentSelectionSorting, order: .ascending) |
|
|
|
|
|
|
|
|
|
|
|
@ -2100,7 +2100,7 @@ defer { |
|
|
|
private func _defaultSorting() -> [MySortDescriptor<TeamRegistration>] { |
|
|
|
private func _defaultSorting() -> [MySortDescriptor<TeamRegistration>] { |
|
|
|
switch teamSorting { |
|
|
|
switch teamSorting { |
|
|
|
case .rank: |
|
|
|
case .rank: |
|
|
|
[.keyPath(\TeamRegistration.initialWeight), .keyPath(\TeamRegistration.registrationDate!), .keyPath(\TeamRegistration.id)] |
|
|
|
[.keyPath(\TeamRegistration.initialWeight), .keyPath(\TeamRegistration.id)] |
|
|
|
case .inscriptionDate: |
|
|
|
case .inscriptionDate: |
|
|
|
[.keyPath(\TeamRegistration.registrationDate!), .keyPath(\TeamRegistration.initialWeight), .keyPath(\TeamRegistration.id)] |
|
|
|
[.keyPath(\TeamRegistration.registrationDate!), .keyPath(\TeamRegistration.initialWeight), .keyPath(\TeamRegistration.id)] |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2112,7 +2112,7 @@ defer { |
|
|
|
&& federalTournamentAge == build.age |
|
|
|
&& federalTournamentAge == build.age |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private let _currentSelectionSorting : [MySortDescriptor<TeamRegistration>] = [.keyPath(\.weight), .keyPath(\.registrationDate!), .keyPath(\.id)] |
|
|
|
private let _currentSelectionSorting : [MySortDescriptor<TeamRegistration>] = [.keyPath(\.weight), .keyPath(\.id)] |
|
|
|
|
|
|
|
|
|
|
|
private func _matchSchedulers() -> [MatchScheduler] { |
|
|
|
private func _matchSchedulers() -> [MatchScheduler] { |
|
|
|
return self.tournamentStore.matchSchedulers.filter { $0.tournament == self.id } |
|
|
|
return self.tournamentStore.matchSchedulers.filter { $0.tournament == self.id } |
|
|
|
|