diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index d465514..ed25363 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -3632,7 +3632,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3658,7 +3658,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.2; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3678,7 +3678,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; @@ -3703,7 +3703,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.2; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3795,7 +3795,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3821,7 +3821,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.1; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3841,7 +3841,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; @@ -3866,7 +3866,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.1; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift index a0c5c80..2925f8f 100644 --- a/PadelClub/Data/Tournament.swift +++ b/PadelClub/Data/Tournament.swift @@ -19,7 +19,7 @@ final class Tournament: BaseTournament { func shouldRefreshTeams() -> Bool { guard let lastTeamRefresh else { return true } - return lastTeamRefresh.timeIntervalSinceNow < -60 + return lastTeamRefresh.timeIntervalSinceNow < -600 } @ObservationIgnored @@ -2337,6 +2337,10 @@ defer { // MARK: - Status func shouldTournamentBeOver() async -> Bool { + return false + if tournamentStore?.store.fileCollectionsAllLoaded() == false { + return false + } #if _DEBUGING_TIME //DEBUGING TIME let start = Date() defer { @@ -2378,24 +2382,19 @@ defer { func refreshTeamList() async { guard StoreCenter.main.isAuthenticated else { return } + guard tournamentStore?.store.fileCollectionsAllLoaded() == true else { return } guard shouldRefreshTeams(), refreshInProgress == false, enableOnlineRegistration, hasEnded() == false else { return } - await MainActor.run { - refreshInProgress = true - } + refreshInProgress = true do { try await self.tournamentStore?.playerRegistrations.loadDataFromServerIfAllowed(clear: true) try await self.tournamentStore?.teamScores.loadDataFromServerIfAllowed(clear: true) try await self.tournamentStore?.teamRegistrations.loadDataFromServerIfAllowed(clear: true) - await MainActor.run { - refreshInProgress = false - lastTeamRefresh = Date() - } + refreshInProgress = false + lastTeamRefresh = Date() } catch { Logger.error(error) - await MainActor.run { - refreshInProgress = false - lastTeamRefresh = Date() - } + refreshInProgress = false + lastTeamRefresh = Date() } } diff --git a/PadelClub/Views/Navigation/Umpire/UmpireView.swift b/PadelClub/Views/Navigation/Umpire/UmpireView.swift index 78adfb1..c6d5b5b 100644 --- a/PadelClub/Views/Navigation/Umpire/UmpireView.swift +++ b/PadelClub/Views/Navigation/Umpire/UmpireView.swift @@ -121,14 +121,14 @@ struct UmpireView: View { Text("Il s'agit des clubs qui sont utilisés pour récupérer les tournois tenup.") } - Section { - NavigationLink { - UmpireStatisticView() - } label: { - Text("Statistiques de participations") - } - } - +// Section { +// NavigationLink { +// UmpireStatisticView() +// } label: { +// Text("Statistiques de participations") +// } +// } +// Section { @Bindable var user = dataStore.user diff --git a/PadelClub/Views/Player/PlayerDetailView.swift b/PadelClub/Views/Player/PlayerDetailView.swift index 52036ae..9905c45 100644 --- a/PadelClub/Views/Player/PlayerDetailView.swift +++ b/PadelClub/Views/Player/PlayerDetailView.swift @@ -220,13 +220,13 @@ struct PlayerDetailView: View { } } - Section { - NavigationLink { - PlayerStatisticView(player: player) - } label: { - Text("Statistiques de participations") - } - } +// Section { +// NavigationLink { +// PlayerStatisticView(player: player) +// } label: { +// Text("Statistiques de participations") +// } +// } } .onChange(of: [player.hasArrived, player.captain, player.coach]) { _save()