diff --git a/PadelClubData/Data/TeamRegistration.swift b/PadelClubData/Data/TeamRegistration.swift index 8e38721..3ed6fd0 100644 --- a/PadelClubData/Data/TeamRegistration.swift +++ b/PadelClubData/Data/TeamRegistration.swift @@ -400,6 +400,12 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable { ].joined(separator: exportFormat.separator()) } } + + public func teamLastNames() -> [String] { + players().map { p in + p.lastName + } + } public var computedRegistrationDate: Date { return registrationDate ?? .distantFuture diff --git a/PadelClubData/Data/Tournament.swift b/PadelClubData/Data/Tournament.swift index 9bb4fed..92dd988 100644 --- a/PadelClubData/Data/Tournament.swift +++ b/PadelClubData/Data/Tournament.swift @@ -243,10 +243,13 @@ defer { case .rawText: return (selectedSortedTeams.compactMap { $0.pasteData(exportFormat) } + ["Liste d'attente"] + waitingListTeams(in: selectedSortedTeams, includingWalkOuts: true).compactMap { $0.pasteData(exportFormat) }).joined(separator: exportFormat.newLineSeparator(2)) case .csv: - let headers = ["N°", "Nom Prénom", "rang", "Nom Prénom", "rang", "poids"].joined(separator: exportFormat.separator()) + let headers = ["N°", "Nom Prénom", "rang", "Nom Prénom", "rang", "poids", "Paire"].joined(separator: exportFormat.separator()) var teamPaste = [headers] for (index, team) in selectedSortedTeams.enumerated() { - teamPaste.append(team.pasteData(exportFormat, index + 1)) + var teamData = team.pasteData(exportFormat, index + 1) + teamData.append(exportFormat.separator()) + teamData.append(team.teamLastNames().joined(separator: " / ")) + teamPaste.append(teamData) } return teamPaste.joined(separator: exportFormat.newLineSeparator()) }