Merge branch 'main'

#Conflicts:
#	PadelClub/Views/Tournament/TournamentView.swift
sync3
Razmig Sarkissian 1 month ago
commit 0a613e6376
  1. 2
      PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift
  2. 40
      PadelClub/Views/Tournament/TournamentView.swift

@ -237,6 +237,7 @@ struct TournamentLookUpView: View {
} }
private func _gatherNumbers() { private func _gatherNumbers() {
searching = true
Task { Task {
print("Doing.....") print("Doing.....")
let tournamentsToFetch = tournaments.enumerated().filter { (idx, tournament) in let tournamentsToFetch = tournaments.enumerated().filter { (idx, tournament) in
@ -279,6 +280,7 @@ struct TournamentLookUpView: View {
print("Completed batch \(batchIndex + 1) of \(batches.count)") print("Completed batch \(batchIndex + 1) of \(batches.count)")
} }
searching = false
print(".....Done") print(".....Done")
} }
} }

@ -234,20 +234,36 @@ struct TournamentView: View {
Button { Button {
navigation.openTournamentInOrganizer(tournament) navigation.openTournamentInOrganizer(tournament)
} label: { } label: {
Label("Voir dans le gestionnaire", systemImage: "line.diagonal.arrow") Label("Gestionnaire", systemImage: "pin")
} }
Divider() Divider()
} }
NavigationLink(value: Screen.event) { Menu {
Label("Événement", systemImage: "wrench.and.screwdriver") NavigationLink(value: Screen.event) {
} Text("Événement")
NavigationLink(value: Screen.settings) { }
Label("Tournoi", systemImage: "wrench.and.screwdriver") NavigationLink(value: Screen.settings) {
Text("Tournoi")
}
NavigationLink(value: Screen.structure) {
LabelStructure()
}
Divider()
NavigationLink(value: Screen.stateSettings) {
Label("Gestion", systemImage: "trash")
}
} label: {
Label("Réglages", systemImage: "wrench.and.screwdriver")
} }
NavigationLink(value: Screen.call) { NavigationLink(value: Screen.call) {
Text("Convocations") Label("Convocations", systemImage: "calendar.badge.clock")
} }
if tournament.tournamentLevel.haveDeadlines() { if tournament.tournamentLevel.haveDeadlines() {
@ -258,20 +274,16 @@ struct TournamentView: View {
.toolbarBackground(.visible, for: .navigationBar) .toolbarBackground(.visible, for: .navigationBar)
.navigationTitle("Rappel des délais") .navigationTitle("Rappel des délais")
} label: { } label: {
Text("Rappel des délais") Label("Rappel des délais", systemImage: "calendarcalendar.badge.exclamationmark")
} }
} }
NavigationLink(value: Screen.structure) {
LabelStructure()
}
NavigationLink(value: Screen.cashier) { NavigationLink(value: Screen.cashier) {
Text(tournament.isFree() ? "Présence" : "Encaissement") Label(tournament.isFree() ? "Présence" : "Encaissement", systemImage: tournament.isFree() ? "person.crop.circle.badge.checkmark" : "eurosign.circle")
} }
NavigationLink(value: Screen.statistics) { NavigationLink(value: Screen.statistics) {
Text("Statistiques") Label("Statistiques", systemImage: "123.rectangle")
} }

Loading…
Cancel
Save