From a3f76e4a771f41847841dfcf5bb60fbf405419d1 Mon Sep 17 00:00:00 2001 From: Raz Date: Wed, 25 Sep 2024 12:44:28 +0200 Subject: [PATCH] fix stuff --- .../Views/Cashier/Event/TournamentConfiguratorView.swift | 1 + PadelClub/Views/Player/PlayerDetailView.swift | 5 ----- PadelClub/Views/Team/EditingTeamView.swift | 4 ---- PadelClub/Views/Tournament/Screen/BroadcastView.swift | 9 +++++---- .../Screen/Components/TournamentLevelPickerView.swift | 9 +++++++++ .../Views/Tournament/Screen/TournamentRankView.swift | 3 ++- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift b/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift index 68483c3..9333ee9 100644 --- a/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift +++ b/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift @@ -27,6 +27,7 @@ struct TournamentConfigurationView: View { } .onChange(of: tournament.federalLevelCategory) { if tournament.federalLevelCategory == .unlisted { + tournament.hideTeamsWeight = true tournament.federalCategory = .unlisted tournament.federalAgeCategory = .unlisted } else { diff --git a/PadelClub/Views/Player/PlayerDetailView.swift b/PadelClub/Views/Player/PlayerDetailView.swift index e5a203c..f80848e 100644 --- a/PadelClub/Views/Player/PlayerDetailView.swift +++ b/PadelClub/Views/Player/PlayerDetailView.swift @@ -168,17 +168,12 @@ struct PlayerDetailView: View { } } } - .scrollDismissesKeyboard(.immediately) .onChange(of: player.hasArrived) { _save() } .onChange(of: player.sex) { _save() } - .onChange(of: player.computedRank) { - player.team()?.updateWeight(inTournamentCategory: tournament.tournamentCategory) - _save() - } .navigationBarBackButtonHidden(focusedField != nil) .toolbar(content: { if focusedField != nil { diff --git a/PadelClub/Views/Team/EditingTeamView.swift b/PadelClub/Views/Team/EditingTeamView.swift index e60c949..bd32b32 100644 --- a/PadelClub/Views/Team/EditingTeamView.swift +++ b/PadelClub/Views/Team/EditingTeamView.swift @@ -216,8 +216,6 @@ struct EditingTeamView: View { case .failed: self.sentError = .messageFailed case .sent: - let uncalledTeams = team.getPhoneNumbers().isEmpty - if networkMonitor.connected == false { self.contactType = nil if team.getPhoneNumbers().isEmpty == false { @@ -248,8 +246,6 @@ struct EditingTeamView: View { self.contactType = nil self.sentError = .mailFailed case .sent: - let uncalledTeams = team.getMail().isEmpty - if networkMonitor.connected == false { self.contactType = nil if team.getMail().isEmpty == false { diff --git a/PadelClub/Views/Tournament/Screen/BroadcastView.swift b/PadelClub/Views/Tournament/Screen/BroadcastView.swift index 2ded795..d687e29 100644 --- a/PadelClub/Views/Tournament/Screen/BroadcastView.swift +++ b/PadelClub/Views/Tournament/Screen/BroadcastView.swift @@ -105,6 +105,11 @@ struct BroadcastView: View { Toggle(isOn: $tournament.isPrivate) { Text("Tournoi privé") } + + Toggle(isOn: $tournament.hideTeamsWeight) { + Text("Masquer les poids des équipes") + } + } footer: { let verb : String = tournament.isPrivate ? "est" : "sera" let footerString = " Le tournoi \(verb) masqué sur le site [Padel Club](\(URLs.main.rawValue))" @@ -155,10 +160,6 @@ struct BroadcastView: View { Text("Publication prévue") } } - - Toggle(isOn: $tournament.hideTeamsWeight) { - Text("Masquer les poids des équipes") - } } header: { Text("Liste des équipes") } footer: { diff --git a/PadelClub/Views/Tournament/Screen/Components/TournamentLevelPickerView.swift b/PadelClub/Views/Tournament/Screen/Components/TournamentLevelPickerView.swift index 4e3bc69..bc81b41 100644 --- a/PadelClub/Views/Tournament/Screen/Components/TournamentLevelPickerView.swift +++ b/PadelClub/Views/Tournament/Screen/Components/TournamentLevelPickerView.swift @@ -20,8 +20,17 @@ struct TournamentLevelPickerView: View { } .onChange(of: tournament.federalLevelCategory) { if tournament.federalLevelCategory == .unlisted { + tournament.hideTeamsWeight = true tournament.federalCategory = .unlisted tournament.federalAgeCategory = .unlisted + } else { + tournament.hideTeamsWeight = false + if tournament.federalCategory == .unlisted { + tournament.federalCategory = .men + } + if tournament.federalAgeCategory == .unlisted { + tournament.federalAgeCategory = .senior + } } } diff --git a/PadelClub/Views/Tournament/Screen/TournamentRankView.swift b/PadelClub/Views/Tournament/Screen/TournamentRankView.swift index b0ed71a..dc06df0 100644 --- a/PadelClub/Views/Tournament/Screen/TournamentRankView.swift +++ b/PadelClub/Views/Tournament/Screen/TournamentRankView.swift @@ -250,8 +250,9 @@ struct TournamentRankView: View { } } } + + Spacer() if tournament.isAnimation() == false && key > 0 { - Spacer() VStack(alignment: .trailing) { HStack(alignment: .lastTextBaseline, spacing: 0.0) { Text(tournament.tournamentLevel.points(for: key - 1, count: tournament.teamCount).formatted(.number.sign(strategy: .always())))