From 969fa5094f1827d6e42cf125dd707fc9c554f435 Mon Sep 17 00:00:00 2001 From: Raz Date: Wed, 6 Nov 2024 18:26:44 +0100 Subject: [PATCH] filter tournaments by deleted false --- PadelClub/Views/Navigation/Umpire/UmpireStatisticView.swift | 4 ++-- PadelClub/Views/Player/PlayerStatisticView.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PadelClub/Views/Navigation/Umpire/UmpireStatisticView.swift b/PadelClub/Views/Navigation/Umpire/UmpireStatisticView.swift index cf1aea4..a82674b 100644 --- a/PadelClub/Views/Navigation/Umpire/UmpireStatisticView.swift +++ b/PadelClub/Views/Navigation/Umpire/UmpireStatisticView.swift @@ -17,7 +17,7 @@ struct UmpireStatisticView: View { let countedWalkoutPlayers: [String: Int] init() { - let teams = DataStore.shared.tournaments.flatMap({ $0.unsortedTeams() }) + let teams = DataStore.shared.tournaments.filter { $0.isDeleted == false }.flatMap({ $0.unsortedTeams() }) let wos = teams.filter({ $0.walkOut }) self.walkoutTeams = wos @@ -38,7 +38,7 @@ struct UmpireStatisticView: View { } self.players = Array(uniquePlayersDict.values).sorted(by: { a, b in - playerCountDict[a.licenceId!.strippedLicense!]! > playerCountDict[b.licenceId!.strippedLicense!]! + playerWalkOutCountDict[a.licenceId!.strippedLicense!]! > playerWalkOutCountDict[b.licenceId!.strippedLicense!]! }) self.countedPlayers = playerCountDict self.countedWalkoutPlayers = playerWalkOutCountDict diff --git a/PadelClub/Views/Player/PlayerStatisticView.swift b/PadelClub/Views/Player/PlayerStatisticView.swift index 08fa3c4..5a2faf3 100644 --- a/PadelClub/Views/Player/PlayerStatisticView.swift +++ b/PadelClub/Views/Player/PlayerStatisticView.swift @@ -15,7 +15,7 @@ struct PlayerStatisticView: View { init(player: PlayerRegistration) { self.player = player - self.teams = DataStore.shared.tournaments.flatMap({ $0.unsortedTeams() }).filter({ $0.includes(player: player) + self.teams = DataStore.shared.tournaments.filter { $0.isDeleted == false }.flatMap({ $0.unsortedTeams() }).filter({ $0.includes(player: player) }) }