fix 18.2 bug

PadelClub.xcodeproj/project.pbxproj

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

PadelClub/Data/TeamRegistration.swift

@@ -173,7 +173,7 @@ final class TeamRegistration: ModelObject, Storable {
     }
 
     func getPhoneNumbers() -> [String] {
-        return players().compactMap { $0.phoneNumber }.filter({ $0.isMobileNumber() })
+        return players().compactMap { $0.phoneNumber }.filter({ $0.isEmpty == false })
     }
     
     func getMail() -> [String] {

PadelClub/Data/Tournament.swift

@@ -1136,7 +1136,7 @@ defer {
         }
     }
     
-    func registrationIssues() async -> Int {
+    func registrationIssues() -> Int {
         let players : [PlayerRegistration] = unsortedPlayers()
         let selectedTeams : [TeamRegistration] = selectedSortedTeams()
         let callDateIssue : [TeamRegistration] = selectedTeams.filter { $0.callDate != nil && isStartDateIsDifferentThanCallDate($0) }

PadelClub/Views/Calling/Components/PlayersWithoutContactView.swift

@@ -45,7 +45,7 @@ struct PlayersWithoutContactView: View {
                 LabeledContent {
                     Text(withoutPhones.count.formatted())
                 } label: {
-                    Text("Joueurs sans téléphone portable")
+                    Text("Joueurs sans téléphone portable français")
                 }
             }
         } header: {

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

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct InscriptionInfoView: View {
     @EnvironmentObject var dataStore: DataStore
-    @Environment(Tournament.self) var tournament
+    let tournament: Tournament
     
     @State private var players : [PlayerRegistration] = []
     @State private var selectedTeams : [TeamRegistration] = []
@@ -244,30 +244,30 @@ struct InscriptionInfoView: View {
                 Text("importé du fichier beach-padel sans licence valide ou créé sans licence")
             }
         }
-        .task {
+        .onAppear {
-            await _getIssues()
+            DispatchQueue.main.async {
+                _getIssues()
+            }
         }
         .navigationTitle("Synthèse")
         .navigationBarTitleDisplayMode(.inline)
         .toolbarBackground(.visible, for: .navigationBar)
     }
     
-    private func _getIssues() async {
+    private func _getIssues() {
-        Task {
+        players = tournament.unsortedPlayers()
-            players = tournament.unsortedPlayers()
+        selectedTeams = tournament.selectedSortedTeams()
-            selectedTeams = tournament.selectedSortedTeams()
+        callDateIssue = selectedTeams.filter { $0.callDate != nil && tournament.isStartDateIsDifferentThanCallDate($0) }
-            callDateIssue = selectedTeams.filter { $0.callDate != nil && tournament.isStartDateIsDifferentThanCallDate($0) }
+        waitingList = tournament.waitingListTeams(in: selectedTeams, includingWalkOuts: true)
-            waitingList = tournament.waitingListTeams(in: selectedTeams, includingWalkOuts: true)
+        duplicates = tournament.duplicates(in: players)
-            duplicates = tournament.duplicates(in: players)
+        homonyms = tournament.homonyms(in: players)
-            homonyms = tournament.homonyms(in: players)
+        problematicPlayers = players.filter({ $0.sex == nil })
-            problematicPlayers = players.filter({ $0.sex == nil })
+        inadequatePlayers = tournament.inadequatePlayers(in: players)
-            inadequatePlayers = tournament.inadequatePlayers(in: players)
+        ageInadequatePlayers = tournament.ageInadequatePlayers(in: players)
-            ageInadequatePlayers = tournament.ageInadequatePlayers(in: players)
+        let isImported = players.anySatisfy({ $0.isImported() })
-            let isImported = players.anySatisfy({ $0.isImported() })
+        playersWithoutValidLicense = tournament.playersWithoutValidLicense(in: players, isImported: isImported)
-            playersWithoutValidLicense = tournament.playersWithoutValidLicense(in: players, isImported: isImported)
+        entriesFromBeachPadel = tournament.unsortedTeams().filter({ $0.isImported() })
-            entriesFromBeachPadel = tournament.unsortedTeams().filter({ $0.isImported() })
+        playersMissing = selectedTeams.filter({ $0.unsortedPlayers().count < 2 })
-            playersMissing = selectedTeams.filter({ $0.unsortedPlayers().count < 2 })
-        }
     }
 }
 

PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift

@@ -173,8 +173,8 @@ struct InscriptionManagerView: View {
             self.teamsHash = _simpleHash(ids: selectedSortedTeams.map { $0.id })
         }
         self.registrationIssues = nil
-        Task {
+        DispatchQueue.main.async {
-            self.registrationIssues = await tournament.registrationIssues()
+            self.registrationIssues = tournament.registrationIssues()
         }
     }
     
@@ -718,14 +718,7 @@ struct InscriptionManagerView: View {
 
             if tournament.isAnimation() == false {
                 NavigationLink {
-                    InscriptionInfoView()
+                    InscriptionInfoView(tournament: tournament)
-                        .environment(tournament)
-                        .onDisappear {
-                            self.registrationIssues = nil
-                            Task {
-                                self.registrationIssues = await tournament.registrationIssues()
-                            }
-                        }
                 } label: {
                     LabeledContent {
                         if let registrationIssues {