diff --git a/PadelClub/Views/Cashier/Event/EventCreationView.swift b/PadelClub/Views/Cashier/Event/EventCreationView.swift index 913862f..5ba6f87 100644 --- a/PadelClub/Views/Cashier/Event/EventCreationView.swift +++ b/PadelClub/Views/Cashier/Event/EventCreationView.swift @@ -64,7 +64,7 @@ struct EventCreationView: View { } } - TextField("Nom de l'événement", text: $eventName, axis: .vertical) + TextField("Description de l'événement", text: $eventName, axis: .vertical) .lineLimit(2) .keyboardType(.alphabet) .multilineTextAlignment(.leading) diff --git a/PadelClub/Views/Cashier/Event/EventSettingsView.swift b/PadelClub/Views/Cashier/Event/EventSettingsView.swift index 593cfe8..58b5428 100644 --- a/PadelClub/Views/Cashier/Event/EventSettingsView.swift +++ b/PadelClub/Views/Cashier/Event/EventSettingsView.swift @@ -46,7 +46,7 @@ struct EventSettingsView: View { var body: some View { Form { Section { - TextField("Nom de l'événement", text: $eventName, axis: .vertical) + TextField("Description de l'événement", text: $eventName, axis: .vertical) .lineLimit(2) .keyboardType(.alphabet) .multilineTextAlignment(.leading) diff --git a/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift b/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift index 70467d6..41e586e 100644 --- a/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift +++ b/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift @@ -37,6 +37,16 @@ struct TournamentSubscriptionView: View { LabeledContent("Épreuve") { Text(build.buildHolderTitle()) } + + LabeledContent("JAP") { + Text(federalTournament.umpireLabel()) + } + LabeledContent("Mail") { + Text(federalTournament.mailLabel()) + } + LabeledContent("Téléphone") { + Text(federalTournament.phoneLabel()) + } } header: { Text("Informations") } @@ -67,28 +77,18 @@ struct TournamentSubscriptionView: View { } } } header: { - HStack { - Text("Poids") - Spacer() - Text(selectedPlayers.map { $0.rank }.reduce(0, +).formatted()) - } - } - - Section { - LabeledContent("JAP") { - Text(federalTournament.umpireLabel()) - } - LabeledContent("Mail") { - Text(federalTournament.mailLabel()) - } - LabeledContent("Téléphone") { - Text(federalTournament.phoneLabel()) + if selectedPlayers.isEmpty == false { + HStack { + Text("Poids de l'équipe") + Spacer() + Text(selectedPlayers.map { $0.rank }.reduce(0, +).formatted()) + } } } if let courrielEngagement = federalTournament.courrielEngagement { Section { - RowButtonView("Contacter par email") { + RowButtonView("S'inscrire par email") { contactType = .mail(date: nil, recipients: [courrielEngagement], bccRecipients: nil, body: messageBody, subject: messageSubject, tournamentBuild: build as? TournamentBuild) } } @@ -97,7 +97,7 @@ struct TournamentSubscriptionView: View { if let installation = federalTournament.installation, let telephone = installation.telephone { if telephone.isMobileNumber() { Section { - RowButtonView("Contacter par message") { + RowButtonView("S'inscrire par message") { contactType = .message(date: nil, recipients: [telephone], body: messageBodyShort, tournamentBuild: build as? TournamentBuild) } } @@ -108,6 +108,14 @@ struct TournamentSubscriptionView: View { Label("Appeler", systemImage: "phone") } } + + Section { + Text(messageBody) + } header: { + Text("Message preparé par Padel Club") + } footer: { + CopyPasteButtonView(pasteValue: messageBody) + } } } diff --git a/PadelClub/Views/Tournament/TournamentInitView.swift b/PadelClub/Views/Tournament/TournamentInitView.swift index 25fd1dd..969f6ff 100644 --- a/PadelClub/Views/Tournament/TournamentInitView.swift +++ b/PadelClub/Views/Tournament/TournamentInitView.swift @@ -22,7 +22,12 @@ struct TournamentInitView: View { LabeledContent { Text(tournaments.count.formatted() + " tournoi" + tournaments.count.pluralSuffix) } label: { - Text("Gestion de l'événement") + Text("Réglages de l'événement") + if let eventName = event.name, eventName.isEmpty == false { + Text(eventName).foregroundStyle(.secondary) + } else { + Text("Aucune description").foregroundStyle(.secondary) + } } } } diff --git a/PadelClub/Views/Tournament/TournamentView.swift b/PadelClub/Views/Tournament/TournamentView.swift index fa14f46..7dbe23b 100644 --- a/PadelClub/Views/Tournament/TournamentView.swift +++ b/PadelClub/Views/Tournament/TournamentView.swift @@ -131,7 +131,7 @@ struct TournamentView: View { } NavigationLink(value: Screen.event) { - Text("Gestion de l'événement") + Text("Réglages de l'événement") } } @@ -176,7 +176,7 @@ struct TournamentView: View { } NavigationLink(value: Screen.event) { - Text("Gestion de l'événement") + Text("Réglages de l'événement") } NavigationLink(value: Screen.settings) { LabelSettings()