From a8a7a5ac3d3ee3335c883018be0e95fe3e80c132 Mon Sep 17 00:00:00 2001 From: Raz Date: Fri, 25 Apr 2025 15:25:43 +0200 Subject: [PATCH] enable online reg for animation --- PadelClub.xcodeproj/project.pbxproj | 12 ++++++------ PadelClub/Data/Tournament.swift | 7 ++++++- PadelClub/Utils/PadelRule.swift | 4 ++++ .../Tournament/Screen/RegistrationSetupView.swift | 7 +++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index bc2c471..a8adf5d 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -3714,7 +3714,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.17; + MARKETING_VERSION = 1.2.18; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3759,7 +3759,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.17; + MARKETING_VERSION = 1.2.18; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3877,7 +3877,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.17; + MARKETING_VERSION = 1.2.18; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3922,7 +3922,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.17; + MARKETING_VERSION = 1.2.18; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3966,7 +3966,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.17; + MARKETING_VERSION = 1.2.18; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4008,7 +4008,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.17; + MARKETING_VERSION = 1.2.18; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift index 918b4d3..6c7abc1 100644 --- a/PadelClub/Data/Tournament.swift +++ b/PadelClub/Data/Tournament.swift @@ -1970,6 +1970,10 @@ defer { matchFormat = roundSmartMatchFormat(5) entryFee = tournamentLevel.entryFee registrationDateLimit = deadline(for: .inscription) + if enableOnlineRegistration, isAnimation() == false { + accountIsRequired = true + licenseIsRequired = true + } } func customizeUsingPreferences() { @@ -1990,7 +1994,8 @@ defer { } func onlineRegistrationCanBeEnabled() -> Bool { - isAnimation() == false + true +// isAnimation() == false } func roundSmartMatchFormat(_ roundIndex: Int) -> MatchFormat { diff --git a/PadelClub/Utils/PadelRule.swift b/PadelClub/Utils/PadelRule.swift index 0e4fe1d..3a2a534 100644 --- a/PadelClub/Utils/PadelRule.swift +++ b/PadelClub/Utils/PadelRule.swift @@ -495,6 +495,10 @@ enum TournamentLevel: Int, Hashable, Codable, CaseIterable, Identifiable { var defaultTeamSortingType: TeamSortingType { switch self { + case .championship: + return .inscriptionDate + case .unlisted: + return .inscriptionDate case .p25, .p100, .p250: return .inscriptionDate default: diff --git a/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift b/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift index a724c65..c59bfc4 100644 --- a/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift +++ b/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift @@ -254,10 +254,9 @@ struct RegistrationSetupView: View { if tournament.isAnimation() { Section { -// Toggle(isOn: $userAccountIsRequired) { -// Text("Compte Padel Club requis pour s'inscrire") -// } -// .disabled(true) + Toggle(isOn: $userAccountIsRequired) { + Text("Compte Padel Club requis pour s'inscrire") + } Toggle(isOn: $licenseIsRequired) { Text("Licence FFT requise pour s'inscrire")