Merge branch 'main'

PadelClub.xcodeproj/project.pbxproj

@@ -3286,7 +3286,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -3313,7 +3313,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.42;
+				MARKETING_VERSION = 1.0.44;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3334,7 +3334,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@@ -3360,7 +3360,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.42;
+				MARKETING_VERSION = 1.0.44;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

PadelClub/Data/MatchScheduler.swift

@@ -229,14 +229,10 @@ final class MatchScheduler : ModelObject, Storable {
                 return teamsAvailable
             }))
             
-            if rotationIndex > 0 {
+            if rotationIndex > 0, simultaneousStart == false {
                 rotationMatches = rotationMatches.sorted(by: {
                     if counts[$0.groupStageObject!.index] ?? 0 == counts[$1.groupStageObject!.index] ?? 0 {
-                        if simultaneousStart {
-                            return $0.groupStageObject!.orderedIndexOfMatch($0) < $1.groupStageObject!.orderedIndexOfMatch($1)
-                        } else {
-                            return $0.groupStageObject!.index < $1.groupStageObject!.index
-                        }
+                        return $0.groupStageObject!.index < $1.groupStageObject!.index
                     } else {
                         return counts[$0.groupStageObject!.index] ?? 0 < counts[$1.groupStageObject!.index] ?? 0
                     }

PadelClub/Data/Tournament.swift

@@ -1441,6 +1441,14 @@ defer {
             Logger.error(error)
         }
 
+        if self.publishRankings == false {
+            self.publishRankings = true
+            do {
+                try DataStore.shared.tournaments.addOrUpdate(instance: self)
+            } catch {
+                Logger.error(error)
+            }
+        }
         
         return rankings
     }

PadelClub/Utils/URLs.swift

@@ -31,8 +31,8 @@ enum URLs: String, Identifiable {
     case beachPadel = "https://beach-padel.app.fft.fr/beachja/index/"
     //case padelClub = "https://padelclub.app"
     case tenup = "https://tenup.fft.fr"
-    case padelCompetitionGeneralGuide = "https://fft-site.cdn.prismic.io/fft-site/Zqi2PB5LeNNTxlrS_1-REGLESGENERALESDELACOMPETITION-ANNEESPORTIVE2025.pdf"
-    case padelCompetitionSpecificGuide = "https://fft-site.cdn.prismic.io/fft-site/Zqi4ax5LeNNTxlsu_3-CAHIERDESCHARGESDESTOURNOIS-ANNEESPORTIVE2025.pdf"
+    case padelCompetitionGeneralGuide = "https://fft-site.cdn.prismic.io/fft-site/Z2mH0ZbqstJ98yso_CHAPITREIRèglesgénérales.pdf"
+    case padelCompetitionSpecificGuide = "https://fft-site.cdn.prismic.io/fft-site/Z2mHz5bqstJ98ysm_CHAPITREIIICahierdeschargesdestournois.pdf"
     case padelRules = "https://xlr.alwaysdata.net/static/rules/padel-rules-2024.pdf"
     case restingDischarge = "https://club.fft.fr/tennisfirmidecazeville/60120370_d/data_1/pdf/fo/formlairededechargederesponsabilitetournoidepadel.pdf"
     case appReview = "https://apps.apple.com/app/padel-club/id6484163558?mt=8&action=write-review"

PadelClub/Views/Tournament/Screen/Components/InscriptionInfoView.swift

@@ -81,6 +81,7 @@ struct InscriptionInfoView: View {
                 DisclosureGroup {
                     ForEach(callDateIssue) { team in
                         TeamCallView(team: team)
+                            .environment(tournament)
                     }
                 } label: {
                     LabeledContent {