sync2
Raz 1 year ago
parent 4d625cb19a
commit a3f76e4a77
  1. 1
      PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift
  2. 5
      PadelClub/Views/Player/PlayerDetailView.swift
  3. 4
      PadelClub/Views/Team/EditingTeamView.swift
  4. 9
      PadelClub/Views/Tournament/Screen/BroadcastView.swift
  5. 9
      PadelClub/Views/Tournament/Screen/Components/TournamentLevelPickerView.swift
  6. 3
      PadelClub/Views/Tournament/Screen/TournamentRankView.swift

@ -27,6 +27,7 @@ struct TournamentConfigurationView: View {
} }
.onChange(of: tournament.federalLevelCategory) { .onChange(of: tournament.federalLevelCategory) {
if tournament.federalLevelCategory == .unlisted { if tournament.federalLevelCategory == .unlisted {
tournament.hideTeamsWeight = true
tournament.federalCategory = .unlisted tournament.federalCategory = .unlisted
tournament.federalAgeCategory = .unlisted tournament.federalAgeCategory = .unlisted
} else { } else {

@ -168,17 +168,12 @@ struct PlayerDetailView: View {
} }
} }
} }
.scrollDismissesKeyboard(.immediately)
.onChange(of: player.hasArrived) { .onChange(of: player.hasArrived) {
_save() _save()
} }
.onChange(of: player.sex) { .onChange(of: player.sex) {
_save() _save()
} }
.onChange(of: player.computedRank) {
player.team()?.updateWeight(inTournamentCategory: tournament.tournamentCategory)
_save()
}
.navigationBarBackButtonHidden(focusedField != nil) .navigationBarBackButtonHidden(focusedField != nil)
.toolbar(content: { .toolbar(content: {
if focusedField != nil { if focusedField != nil {

@ -216,8 +216,6 @@ struct EditingTeamView: View {
case .failed: case .failed:
self.sentError = .messageFailed self.sentError = .messageFailed
case .sent: case .sent:
let uncalledTeams = team.getPhoneNumbers().isEmpty
if networkMonitor.connected == false { if networkMonitor.connected == false {
self.contactType = nil self.contactType = nil
if team.getPhoneNumbers().isEmpty == false { if team.getPhoneNumbers().isEmpty == false {
@ -248,8 +246,6 @@ struct EditingTeamView: View {
self.contactType = nil self.contactType = nil
self.sentError = .mailFailed self.sentError = .mailFailed
case .sent: case .sent:
let uncalledTeams = team.getMail().isEmpty
if networkMonitor.connected == false { if networkMonitor.connected == false {
self.contactType = nil self.contactType = nil
if team.getMail().isEmpty == false { if team.getMail().isEmpty == false {

@ -105,6 +105,11 @@ struct BroadcastView: View {
Toggle(isOn: $tournament.isPrivate) { Toggle(isOn: $tournament.isPrivate) {
Text("Tournoi privé") Text("Tournoi privé")
} }
Toggle(isOn: $tournament.hideTeamsWeight) {
Text("Masquer les poids des équipes")
}
} footer: { } footer: {
let verb : String = tournament.isPrivate ? "est" : "sera" let verb : String = tournament.isPrivate ? "est" : "sera"
let footerString = " Le tournoi \(verb) masqué sur le site [Padel Club](\(URLs.main.rawValue))" let footerString = " Le tournoi \(verb) masqué sur le site [Padel Club](\(URLs.main.rawValue))"
@ -155,10 +160,6 @@ struct BroadcastView: View {
Text("Publication prévue") Text("Publication prévue")
} }
} }
Toggle(isOn: $tournament.hideTeamsWeight) {
Text("Masquer les poids des équipes")
}
} header: { } header: {
Text("Liste des équipes") Text("Liste des équipes")
} footer: { } footer: {

@ -20,8 +20,17 @@ struct TournamentLevelPickerView: View {
} }
.onChange(of: tournament.federalLevelCategory) { .onChange(of: tournament.federalLevelCategory) {
if tournament.federalLevelCategory == .unlisted { if tournament.federalLevelCategory == .unlisted {
tournament.hideTeamsWeight = true
tournament.federalCategory = .unlisted tournament.federalCategory = .unlisted
tournament.federalAgeCategory = .unlisted tournament.federalAgeCategory = .unlisted
} else {
tournament.hideTeamsWeight = false
if tournament.federalCategory == .unlisted {
tournament.federalCategory = .men
}
if tournament.federalAgeCategory == .unlisted {
tournament.federalAgeCategory = .senior
}
} }
} }

@ -250,8 +250,9 @@ struct TournamentRankView: View {
} }
} }
} }
if tournament.isAnimation() == false && key > 0 {
Spacer() Spacer()
if tournament.isAnimation() == false && key > 0 {
VStack(alignment: .trailing) { VStack(alignment: .trailing) {
HStack(alignment: .lastTextBaseline, spacing: 0.0) { HStack(alignment: .lastTextBaseline, spacing: 0.0) {
Text(tournament.tournamentLevel.points(for: key - 1, count: tournament.teamCount).formatted(.number.sign(strategy: .always()))) Text(tournament.tournamentLevel.points(for: key - 1, count: tournament.teamCount).formatted(.number.sign(strategy: .always())))

Loading…
Cancel
Save