fix stuff in file import

PadelClub.xcodeproj/project.pbxproj

@@ -3156,6 +3156,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -3198,6 +3199,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

PadelClub/Data/PlayerRegistration.swift

@@ -160,8 +160,8 @@ final class PlayerRegistration: ModelObject, Storable {
     }
     
     func isSameAs(_ player: PlayerRegistration) -> Bool {
-        firstName.localizedCaseInsensitiveCompare(player.firstName) == .orderedSame &&
+        firstName.trimmedMultiline.localizedCaseInsensitiveCompare(player.firstName.trimmedMultiline) == .orderedSame &&
-        lastName.localizedCaseInsensitiveCompare(player.lastName) == .orderedSame
+        lastName.trimmedMultiline.localizedCaseInsensitiveCompare(player.lastName.trimmedMultiline) == .orderedSame
     }
 
     func tournament() -> Tournament? {

PadelClub/Views/Components/Labels.swift

@@ -21,7 +21,7 @@ struct LabelStructure: View {
 
 struct LabelSettings: View {
     var body: some View {
-        Label("Réglages", systemImage: "slider.horizontal.3").labelStyle(.titleOnly)
+        Label("Réglages du tournoi", systemImage: "slider.horizontal.3").labelStyle(.titleOnly)
     }
 }
 

PadelClub/Views/Player/Components/PlayerPopoverView.swift

@@ -99,7 +99,7 @@ struct PlayerPopoverView: View {
                             .textInputAutocapitalization(.words)
                             .focused($firstNameIsFocused)
                             .onSubmit {
-                                firstName = firstName.trimmed
+                                firstName = firstName.trimmedMultiline
                                 lastNameIsFocused = true
                             }
                             .fixedSize()
@@ -114,7 +114,7 @@ struct PlayerPopoverView: View {
                             .keyboardType(.alphabet)
                             .focused($lastNameIsFocused)
                             .onSubmit {
-                                lastName = lastName.trimmed
+                                lastName = lastName.trimmedMultiline
                                 licenseIsFocused = true
                             }
                             .fixedSize()
@@ -128,7 +128,7 @@ struct PlayerPopoverView: View {
                             .keyboardType(.numberPad)
                             .submitLabel(.next)
                             .onSubmit {
-                                license = license.trimmed
+                                license = license.trimmedMultiline
                                 if requiredField.contains(.license) {
                                     if license.isLicenseNumber {
                                         amountIsFocused = true
@@ -206,7 +206,7 @@ struct PlayerPopoverView: View {
                             Spacer()
                             Button("Confirmer") {
                                 if licenseIsFocused {
-                                    license = license.trimmed
+                                    license = license.trimmedMultiline
                                     if requiredField.contains(.license) {
                                         if license.isLicenseNumber {
                                             amountIsFocused = true
@@ -251,7 +251,7 @@ struct PlayerPopoverView: View {
     }
     
     func createManualPlayer() {
-        let playerRegistration = PlayerRegistration(firstName: firstName, lastName: lastName, licenceId: license.trimmed.isEmpty ? nil : license, rank: rank, sex: PlayerRegistration.PlayerSexType(rawValue: sex))
+        let playerRegistration = PlayerRegistration(firstName: firstName.trimmedMultiline, lastName: lastName.trimmedMultiline, licenceId: license.trimmedMultiline.isEmpty ? nil : license, rank: rank, sex: PlayerRegistration.PlayerSexType(rawValue: sex))
         self.creationCompletionHandler(playerRegistration)
     }
 

PadelClub/Views/Player/PlayerDetailView.swift

@@ -41,6 +41,7 @@ struct PlayerDetailView: View {
                         .multilineTextAlignment(.trailing)
                         .frame(maxWidth: .infinity)
                         .onSubmit(of: .text) {
+                            player.lastName = player.lastName.trimmedMultiline
                             _save()
                         }
                 } label: {
@@ -53,6 +54,7 @@ struct PlayerDetailView: View {
                         .multilineTextAlignment(.trailing)
                         .frame(maxWidth: .infinity)
                         .onSubmit(of: .text) {
+                            player.firstName = player.firstName.trimmedMultiline
                             _save()
                         }
                 } label: {

PadelClub/Views/Team/EditingTeamView.swift

@@ -147,7 +147,7 @@ struct EditingTeamView: View {
                         .frame(maxWidth: .infinity)
                         .submitLabel(.done)
                         .onSubmit(of: .text) {
-                            let trimmed = name.trimmed
+                            let trimmed = name.trimmedMultiline
                             if trimmed.isEmpty {
                                 team.name = nil
                             } else {

PadelClub/Views/Tournament/FileImportView.swift

@@ -311,6 +311,11 @@ struct FileImportView: View {
                         } label: {
                             Text("Équipe\(_filteredTeams.count.pluralSuffix) \(tournament.tournamentCategory.importingRawValue)  \(tournament.federalTournamentAge.importingRawValue) détectée\(_filteredTeams.count.pluralSuffix)")
                         }
+                        LabeledContent {
+                            Text(_filteredTeams.count.formatted())
+                        } label: {
+                            Text("Équipe\(_filteredTeams.count.pluralSuffix) \(tournament.tournamentCategory.importingRawValue)  \(tournament.federalTournamentAge.importingRawValue) détectée\(_filteredTeams.count.pluralSuffix)")
+                        }
                     } footer: {
                         if previousTeams.isEmpty == false {
                             Text("La liste ci-dessous n'est qu'une indication d'évolution par rapport au seul poids d'équipe. Cela ne tient pas compte des dates d'inscriptions, WCs et autres éléments.").foregroundStyle(.logoRed)
@@ -442,11 +447,16 @@ struct FileImportView: View {
         .disabled(validationInProgress)
     }
     
+    private func _getUnfound(tournament: Tournament, fromTeams filteredTeams: [FileImportManager.TeamHolder]) -> Set<TeamRegistration> {
+        let previousTeams = filteredTeams.compactMap({ $0.previousTeam })        
+        let unfound = Set(tournament.unsortedTeams()).subtracting(Set(previousTeams))
+        return unfound
+    }
+    
     private func _validate(tournament: Tournament) async {
         let filteredTeams = filteredTeams(tournament: tournament)
-        let previousTeams = filteredTeams.compactMap({ $0.previousTeam })
         
-        let unfound = Set(tournament.unsortedTeams()).subtracting(Set(previousTeams))
+        let unfound = _getUnfound(tournament: tournament, fromTeams: filteredTeams)
         unfound.forEach { team in
             team.resetPositions()
             team.wildCardBracket = false
@@ -455,7 +465,7 @@ struct FileImportView: View {
         }
         
         do {
-            try self.tournamentStore.teamRegistrations.addOrUpdate(contentOfs: unfound)
+            try tournament.tournamentStore.teamRegistrations.addOrUpdate(contentOfs: unfound)
         } catch {
             Logger.error(error)
         }

PadelClub/Views/Tournament/Screen/AddTeamView.swift

@@ -164,7 +164,7 @@ struct AddTeamView: View {
                 }
             }
         }
-        .navigationBarBackButtonHidden(_isEditingTeam())
+        .navigationBarBackButtonHidden(true)
         .toolbarBackground(.visible, for: .navigationBar)
         .toolbarBackground(.visible, for: .bottomBar)
         .navigationBarTitleDisplayMode(.inline)
@@ -336,6 +336,7 @@ struct AddTeamView: View {
             if let pasteString {
                 Section {
                     TextEditor(text: $editableTextField)
+                        .frame(minHeight: 120, maxHeight: .infinity)
                         .focused($focusedField, equals: .pasteField)
                         .toolbar {
                             ToolbarItemGroup(placement: .keyboard) {
@@ -355,15 +356,17 @@ struct AddTeamView: View {
                     Text("Contenu du presse-papier")
                 } footer: {
                     HStack {
+                        FooterButtonView("éditer") {
+                            self.focusedField = .pasteField
+                        }
                         Spacer()
-                        Button("effacer", role: .destructive) {
+                        FooterButtonView("effacer", role: .destructive) {
                             self.focusedField = nil
                             self.editableTextField = ""
                             self.pasteString = nil
                             self.createdPlayers.removeAll()
                             self.createdPlayerIds.removeAll()
                         }
-                        .buttonStyle(.borderless)
                     }
                 }
             }

PadelClub/Views/Tournament/Screen/TournamentSettingsView.swift

@@ -74,7 +74,7 @@ struct TournamentSettingsView: View {
         }
         .navigationBarTitleDisplayMode(.inline)
         .toolbarBackground(.visible, for: .navigationBar)
-        .navigationTitle("Réglages")
+        .navigationTitle("Réglages du tournoi")
     }
 
 }

PadelClub/Views/Tournament/TournamentInitView.swift

@@ -40,7 +40,7 @@ struct TournamentInitView: View {
                         Image(systemName: "checkmark").foregroundStyle(.green)
                     }
                 } label: {
-                    LabelStructure()
+                    Text("Structure")
                     Text(tournament.structureDescriptionLocalizedLabel())
                 }
             }
@@ -49,7 +49,7 @@ struct TournamentInitView: View {
                 LabeledContent {
                     Text(tournament.localizedTournamentType())
                 } label: {
-                    LabelSettings()
+                    Text("Réglages du tournoi")
                     Text("Formats, terrains, prix et plus")
                 }
             }