staxriver
/
PadelClub
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://stax.alwaysdata.net/gitea/staxriver/PadelClub

Browse Source
club_update
Laurent 1 year ago
parent 8dc20c6fba 4d19fc4cb6
commit 9714645560
9 changed files with 65 additions and 47 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      PadelClub/Views/Cashier/CashierView.swift
  2. 8
      PadelClub/Views/Components/CopyPasteButtonView.swift
  3. 1
      PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift
  4. 2
      PadelClub/Views/Navigation/Ongoing/OngoingView.swift
  5. 9
      PadelClub/Views/Player/Components/EditablePlayerView.swift
  6. 45
      PadelClub/Views/Player/PlayerDetailView.swift
  7. 44
      PadelClub/Views/Team/EditingTeamView.swift
  8. 1
      PadelClub/Views/Tournament/Screen/Components/InscriptionInfoView.swift
  9. 1
      PadelClub/Views/Tournament/Screen/TournamentCashierView.swift

1
PadelClub/Views/Cashier/CashierView.swift
Unescape View File

@ -187,6 +187,7 @@ class CashierViewModel: ObservableObject {
struct CashierView: View { struct CashierView: View {
@EnvironmentObject var dataStore: DataStore @EnvironmentObject var dataStore: DataStore
@EnvironmentObject var tournament: TournamentStore
@EnvironmentObject var cashierViewModel: CashierViewModel @EnvironmentObject var cashierViewModel: CashierViewModel
var tournaments : [Tournament] var tournaments : [Tournament]

8
PadelClub/Views/Components/CopyPasteButtonView.swift
Unescape View File

@ -15,13 +15,9 @@ struct CopyPasteButtonView: View {
Button { Button {
let pasteboard = UIPasteboard.general let pasteboard = UIPasteboard.general
pasteboard.string = pasteValue pasteboard.string = pasteValue
copied = true
} label: { } label: {
HStack(spacing: 0) { Label(copied ? "copié" : "copier", systemImage: "doc.on.doc").symbolVariant(copied ? .fill : .none)
Label(copied ? "copié" : "copier", systemImage: "doc.on.doc")
if copied == true {
Image(systemName: "checkmark")
}
}
} }
} }
} }

1
PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift
Unescape View File

@ -42,6 +42,7 @@ struct GroupStageTeamView: View {
Section { Section {
ForEach(team.players()) { player in ForEach(team.players()) { player in
EditablePlayerView(player: player, editingOptions: [.licenceId, .name, .payment]) EditablePlayerView(player: player, editingOptions: [.licenceId, .name, .payment])
.environmentObject(tournament.tournamentStore)
} }
} }

2
PadelClub/Views/Navigation/Ongoing/OngoingView.swift
Unescape View File

@ -77,7 +77,7 @@ struct OngoingView: View {
} }
.pickerStyle(.segmented) .pickerStyle(.segmented)
.fixedSize() .fixedSize()
.offset(y: -4) .offset(y: -3)
} }
} }
} }

9
PadelClub/Views/Player/Components/EditablePlayerView.swift
Unescape View File

@ -39,6 +39,9 @@ struct EditablePlayerView: View {
Logger.error(error) Logger.error(error)
} }
} }
Button("Annuler", role: .cancel) {
shouldPresentLicenceIdEdition = false
}
} }
.alert("Prénom", isPresented: $presentFirstNameUpdate) { .alert("Prénom", isPresented: $presentFirstNameUpdate) {
TextField("Prénom", text: $player.firstName) TextField("Prénom", text: $player.firstName)
@ -49,6 +52,9 @@ struct EditablePlayerView: View {
Logger.error(error) Logger.error(error)
} }
} }
Button("Annuler", role: .cancel) {
presentFirstNameUpdate = false
}
} }
.alert("Nom", isPresented: $presentLastNameUpdate) { .alert("Nom", isPresented: $presentLastNameUpdate) {
TextField("Nom", text: $player.lastName) TextField("Nom", text: $player.lastName)
@ -59,6 +65,9 @@ struct EditablePlayerView: View {
Logger.error(error) Logger.error(error)
} }
} }
Button("Annuler", role: .cancel) {
presentLastNameUpdate = false
}
} }
.onChange(of: editedLicenceId) { .onChange(of: editedLicenceId) {
self.player.licenceId = editedLicenceId self.player.licenceId = editedLicenceId

45
PadelClub/Views/Player/PlayerDetailView.swift
Unescape View File

@ -33,6 +33,8 @@ struct PlayerDetailView: View {
var body: some View { var body: some View {
Form { Form {
Section { Section {
Toggle("Joueur sur place", isOn: $player.hasArrived)
LabeledContent { LabeledContent {
TextField("Nom", text: $player.lastName) TextField("Nom", text: $player.lastName)
.keyboardType(.alphabet) .keyboardType(.alphabet)
@ -101,11 +103,7 @@ struct PlayerDetailView: View {
Text("Calculé en fonction du sexe") Text("Calculé en fonction du sexe")
} }
} }
Section {
Toggle("Joueur sur place", isOn: $player.hasArrived)
}
Section { Section {
LabeledContent { LabeledContent {
TextField("Licence", text: $licenceId) TextField("Licence", text: $licenceId)
@ -119,9 +117,12 @@ struct PlayerDetailView: View {
} }
} label: { } label: {
Text("Licence") Text("Licence")
CopyPasteButtonView(pasteValue: player.licenceId?.strippedLicense)
} }
} footer: {
CopyPasteButtonView(pasteValue: player.licenceId?.strippedLicense)
}
Section {
LabeledContent { LabeledContent {
TextField("Téléphone", text: $phoneNumber) TextField("Téléphone", text: $phoneNumber)
.keyboardType(.namePhonePad) .keyboardType(.namePhonePad)
@ -134,9 +135,12 @@ struct PlayerDetailView: View {
} }
} label: { } label: {
Text("Téléphone") Text("Téléphone")
CopyPasteButtonView(pasteValue: player.phoneNumber)
} }
} footer: {
CopyPasteButtonView(pasteValue: player.phoneNumber)
}
Section {
LabeledContent { LabeledContent {
TextField("Email", text: $email) TextField("Email", text: $email)
.keyboardType(.emailAddress) .keyboardType(.emailAddress)
@ -149,8 +153,9 @@ struct PlayerDetailView: View {
} }
} label: { } label: {
Text("Email") Text("Email")
CopyPasteButtonView(pasteValue: player.email)
} }
} footer: {
CopyPasteButtonView(pasteValue: player.email)
} }
} }
@ -177,17 +182,19 @@ struct PlayerDetailView: View {
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.toolbarBackground(.visible, for: .navigationBar) .toolbarBackground(.visible, for: .navigationBar)
.toolbar { .toolbar {
ToolbarItem(placement: .keyboard) { if focusedField == ._rank || focusedField == ._computedRank {
Button("Valider") { ToolbarItem(placement: .keyboard) {
if focusedField == ._rank { Button("Valider") {
player.setComputedRank(in: tournament) if focusedField == ._rank {
player.team()?.updateWeight(inTournamentCategory: tournament.tournamentCategory) player.setComputedRank(in: tournament)
_save() player.team()?.updateWeight(inTournamentCategory: tournament.tournamentCategory)
} else if focusedField == ._computedRank { _save()
player.team()?.updateWeight(inTournamentCategory: tournament.tournamentCategory) } else if focusedField == ._computedRank {
_save() player.team()?.updateWeight(inTournamentCategory: tournament.tournamentCategory)
_save()
}
focusedField = nil
} }
focusedField = nil
} }
} }
} }

44
PadelClub/Views/Team/EditingTeamView.swift
Unescape View File

@ -60,14 +60,15 @@ struct EditingTeamView: View {
.environment(tournament) .environment(tournament)
} label: { } label: {
Text("Chercher à remplacer") Text("Chercher à remplacer")
.underline()
} }
} }
} }
Section { Section {
DatePicker(selection: $registrationDate) { DatePicker(selection: $registrationDate) {
Text("Date d'inscription") Text("Inscription")
Text(registrationDate.localizedWeekDay()) Text(registrationDate.localizedWeekDay().capitalized)
} }
if let callDate = team.callDate { if let callDate = team.callDate {
LabeledContent() { LabeledContent() {
@ -78,9 +79,7 @@ struct EditingTeamView: View {
} else { } else {
Text("Cette équipe n'a pas été convoquée") Text("Cette équipe n'a pas été convoquée")
} }
}
Section {
Toggle(isOn: hasArrived) { Toggle(isOn: hasArrived) {
Text("Équipe sur place") Text("Équipe sur place")
} }
@ -132,25 +131,28 @@ struct EditingTeamView: View {
})) { })) {
Text("Forfait") Text("Forfait")
} }
}
Section { LabeledContent {
TextField("Nom de l'équipe", text: $name) TextField("Nom", text: $name)
.autocorrectionDisabled() .autocorrectionDisabled()
.keyboardType(.alphabet) .keyboardType(.alphabet)
.frame(maxWidth: .infinity) .keyboardType(.alphabet)
.submitLabel(.done) .multilineTextAlignment(.trailing)
.onSubmit(of: .text) { .frame(maxWidth: .infinity)
let trimmed = name.trimmed .submitLabel(.done)
if trimmed.isEmpty { .onSubmit(of: .text) {
team.name = nil let trimmed = name.trimmed
} else { if trimmed.isEmpty {
team.name = trimmed team.name = nil
} else {
team.name = trimmed
}
_save()
} }
} label: {
_save() Text("Nom de l'équipe")
} }
} }
Section { Section {

1
PadelClub/Views/Tournament/Screen/Components/InscriptionInfoView.swift
Unescape View File

@ -164,6 +164,7 @@ struct InscriptionInfoView: View {
DisclosureGroup { DisclosureGroup {
ForEach(playersWithoutValidLicense) { ForEach(playersWithoutValidLicense) {
EditablePlayerView(player: $0, editingOptions: [.licenceId]) EditablePlayerView(player: $0, editingOptions: [.licenceId])
.environmentObject(tournament.tournamentStore)
} }
} label: { } label: {
LabeledContent { LabeledContent {

1
PadelClub/Views/Tournament/Screen/TournamentCashierView.swift
Unescape View File

@ -152,6 +152,7 @@ struct TournamentCashierView: View {
} }
} }
.environment(tournament) .environment(tournament)
.environmentObject(tournament.tournamentStore)
.environmentObject(cashierViewModel) .environmentObject(cashierViewModel)
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.toolbarBackground(.visible, for: .navigationBar) .toolbarBackground(.visible, for: .navigationBar)

Write Preview
Loading…
Cancel
Save