From 28973c4bcfb30fc8ae5ce5de1468d99e0cae9c86 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Tue, 2 Sep 2025 17:24:00 +0200 Subject: [PATCH] v1.2.48 fix p1000 dates --- PadelClubData/Data/Tournament.swift | 10 ++++++---- PadelClubData/ViewModel/PadelRule.swift | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PadelClubData/Data/Tournament.swift b/PadelClubData/Data/Tournament.swift index d50bb0f..0fab86a 100644 --- a/PadelClubData/Data/Tournament.swift +++ b/PadelClubData/Data/Tournament.swift @@ -1662,11 +1662,11 @@ defer { } } - public func initSettings(templateTournament: Tournament?) { + public func initSettings(templateTournament: Tournament?, overrideTeamCount: Bool = true) { setupDefaultPrivateSettings(templateTournament: templateTournament) setupUmpireSettings(defaultTournament: nil) //default is not template, default is for event sharing settings if let templateTournament { - setupRegistrationSettings(templateTournament: templateTournament) + setupRegistrationSettings(templateTournament: templateTournament, overrideTeamCount: overrideTeamCount) } setupFederalSettings() } @@ -1739,7 +1739,7 @@ defer { } } - public func setupRegistrationSettings(templateTournament: Tournament) { + public func setupRegistrationSettings(templateTournament: Tournament, overrideTeamCount: Bool = true) { self.enableOnlineRegistration = templateTournament.enableOnlineRegistration self.unregisterDeltaInHours = templateTournament.unregisterDeltaInHours self.accountIsRequired = templateTournament.accountIsRequired @@ -1748,7 +1748,9 @@ defer { self.maximumPlayerPerTeam = templateTournament.maximumPlayerPerTeam self.waitingListLimit = templateTournament.waitingListLimit self.teamCountLimit = templateTournament.teamCountLimit - self.teamCount = templateTournament.teamCount + if overrideTeamCount { + self.teamCount = templateTournament.teamCount + } self.enableOnlinePayment = templateTournament.enableOnlinePayment self.onlinePaymentIsMandatory = templateTournament.onlinePaymentIsMandatory self.enableOnlinePaymentRefund = templateTournament.enableOnlinePaymentRefund diff --git a/PadelClubData/ViewModel/PadelRule.swift b/PadelClubData/ViewModel/PadelRule.swift index 2c8a0cb..2c954c8 100644 --- a/PadelClubData/ViewModel/PadelRule.swift +++ b/PadelClubData/ViewModel/PadelRule.swift @@ -2178,7 +2178,7 @@ public enum TournamentDeadlineType: String, CaseIterable { case definitiveBroadcastList = "Publication définitive" public func daysOffset(level: TournamentLevel) -> Int { - if level == .p500 { + if level == .p500 || level == .p1000 { switch self { case .inscription: return -6