fix summon and re-importing stuff

PadelClub.xcodeproj/project.pbxproj

@@ -1919,7 +1919,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@@ -1957,7 +1957,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;

PadelClub/Data/Tournament.swift

@@ -863,12 +863,20 @@ class Tournament : ModelObject, Storable {
     
     func importTeams(_ teams: [FileImportManager.TeamHolder]) {
         var teamsToImport = [TeamRegistration]()
+        let players = players().filter { $0.licenceId != nil }
         teams.forEach { team in
             if let previousTeam = team.previousTeam {
                 previousTeam.updatePlayers(team.players, inTournamentCategory: team.tournamentCategory)
                 teamsToImport.append(previousTeam)
             } else {
-                let newTeam = addTeam(team.players, registrationDate: team.registrationDate)
+                var registrationDate = team.registrationDate
+                if let previousPlayer = players.first(where: { player in
+                    let ids = team.players.compactMap({ $0.licenceId })
+                    return ids.contains(player.licenceId!)
+                }), let previousTeamRegistrationDate = previousPlayer.team()?.registrationDate {
+                    registrationDate = previousTeamRegistrationDate
+                }
+                let newTeam = addTeam(team.players, registrationDate: registrationDate)
                 teamsToImport.append(newTeam)
             }
         }

PadelClub/Utils/ContactManager.swift

@@ -56,7 +56,7 @@ extension ContactType {
         return text
     }
     
-    static func callingMessage(tournament: Tournament?, startDate: Date?, roundLabel: String, matchFormat: MatchFormat?) -> String {
+    static func callingMessage(tournament: Tournament?, startDate: Date?, roundLabel: String, matchFormat: MatchFormat?, reSummon: Bool = false) -> String {
         
         let useFullCustomMessage = DataStore.shared.user.summonsUseFullCustomMessage
 
@@ -80,10 +80,12 @@ extension ContactType {
             [entryFeeMessage, message].compacted().map { $0.trimmed }.joined(separator: "\n\n")
         }
         
+        var intro = reSummon ? "Suite à des forfaits, vous êtes finalement" : "Vous êtes"
+
         if let tournament {
-            return "Bonjour,\n\nVous êtes \(localizedCalled) pour jouer en  \(roundLabel.lowercased()) du \(tournament.tournamentTitle(.short)) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(signature)"
+            return "Bonjour,\n\n\(intro) \(localizedCalled) pour jouer en  \(roundLabel.lowercased()) du \(tournament.tournamentTitle(.short)) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(signature)"
         } else {
-            return "Bonjour,\n\nVous êtes \(localizedCalled) \(roundLabel) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\nMerci de confirmer en répondant à ce message et de prévenir votre partenaire !\n\n\(signature)"
+            return "Bonjour,\n\n\(intro) \(localizedCalled) \(roundLabel) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\nMerci de confirmer en répondant à ce message et de prévenir votre partenaire !\n\n\(signature)"
         }
     }
 }

PadelClub/Views/Calling/CallView.swift

@@ -81,11 +81,15 @@ struct CallView: View {
     }
     
     var finalMessage: String {
-        ContactType.callingMessage(tournament: tournament, startDate: callDate, roundLabel: roundLabel, matchFormat: matchFormat)
+        ContactType.callingMessage(tournament: tournament, startDate: callDate, roundLabel: roundLabel, matchFormat: matchFormat, reSummon: reSummon)
+    }
+    
+    var reSummon: Bool {
+        teams.allSatisfy({ $0.called() })
     }
 
     var body: some View {
-        let callWord = teams.allSatisfy({ $0.called() }) ? "Reconvoquer" : "Convoquer"
+        let callWord = reSummon ? "Reconvoquer" : "Convoquer"
         HStack {
             if teams.count == 1 {
                 if let previousCallDate = teams.first?.callDate, Calendar.current.compare(previousCallDate, to: callDate, toGranularity: .minute) != .orderedSame {

PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift

@@ -538,7 +538,7 @@ struct InscriptionManagerView: View {
                 Text(unsortedTeams.count.formatted() + "/" + tournament.teamCount.formatted()).font(.largeTitle)
             } label: {
                 Text("Paire\(unsortedTeams.count.pluralSuffix) inscrite\(unsortedTeams.count.pluralSuffix)")
-                Text("dont \(walkoutTeams.count.pluralSuffix) forfaite\(walkoutTeams.count.pluralSuffix)")
+                Text("dont \(walkoutTeams.count) forfait\(walkoutTeams.count.pluralSuffix)")
             }
             
             let unsortedTeamsWithoutWO = tournament.unsortedTeamsWithoutWO()