From dd91369c6b15e16fcef1bbd4a7bfce0912a08040 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Sep 2025 12:49:15 +0200 Subject: [PATCH 1/3] animation fix in debug --- PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift b/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift index df86047..9d4b9a5 100644 --- a/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift +++ b/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift @@ -237,6 +237,7 @@ struct TournamentLookUpView: View { } private func _gatherNumbers() { + searching = true Task { print("Doing.....") let tournamentsToFetch = tournaments.enumerated().filter { (idx, tournament) in @@ -279,6 +280,7 @@ struct TournamentLookUpView: View { print("Completed batch \(batchIndex + 1) of \(batches.count)") } + searching = false print(".....Done") } } From 7259777ba58ebbdbe64633414bd2f41752425a2b Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Sep 2025 13:15:57 +0200 Subject: [PATCH 2/3] fix tournament menu --- .../Views/Tournament/TournamentView.swift | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/PadelClub/Views/Tournament/TournamentView.swift b/PadelClub/Views/Tournament/TournamentView.swift index 9e36c51..b4621d7 100644 --- a/PadelClub/Views/Tournament/TournamentView.swift +++ b/PadelClub/Views/Tournament/TournamentView.swift @@ -234,20 +234,36 @@ struct TournamentView: View { Button { navigation.openTournamentInOrganizer(tournament) } label: { - Label("Voir dans le gestionnaire", systemImage: "line.diagonal.arrow") + Label("Gestionnaire", systemImage: "pin") } Divider() } - NavigationLink(value: Screen.event) { - Label("Événement", systemImage: "wrench.and.screwdriver") - } - NavigationLink(value: Screen.settings) { - Label("Tournoi", systemImage: "wrench.and.screwdriver") + Menu { + NavigationLink(value: Screen.event) { + Text("Événement") + } + 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) { - Text("Convocations") + Label("Convocations", systemImage: "calendar.badge.clock") } if tournament.tournamentLevel.haveDeadlines() { @@ -258,20 +274,16 @@ struct TournamentView: View { .toolbarBackground(.visible, for: .navigationBar) .navigationTitle("Rappel des délais") } label: { - Text("Rappel des délais") + Label("Rappel des délais", systemImage: "calendarcalendar.badge.exclamationmark") } } - - NavigationLink(value: Screen.structure) { - LabelStructure() - } - + 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) { - Text("Statistiques") + Label("Statistiques", systemImage: "123.rectangle") } @@ -304,11 +316,6 @@ struct TournamentView: View { // Label("Partager", systemImage: "square.and.arrow.up") // } - Divider() - - NavigationLink(value: Screen.stateSettings) { - Label("Tournoi", systemImage: "trash") - } } label: { LabelOptions() .popoverTip(tournamentRunningTip) From 64d0d7c30743e8b781569593af98b8747beeada5 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 26 Sep 2025 13:45:08 +0200 Subject: [PATCH 3/3] fix issue with merge --- PadelClub/Views/Tournament/TournamentView.swift | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/PadelClub/Views/Tournament/TournamentView.swift b/PadelClub/Views/Tournament/TournamentView.swift index ca4eb25..f7c9cc1 100644 --- a/PadelClub/Views/Tournament/TournamentView.swift +++ b/PadelClub/Views/Tournament/TournamentView.swift @@ -256,6 +256,7 @@ struct TournamentView: View { NavigationLink(value: Screen.stateSettings) { Label("Gestion", systemImage: "trash") } + .disabled(self.tournament.sharing) } label: { Label("Réglages", systemImage: "wrench.and.screwdriver") @@ -315,19 +316,7 @@ struct TournamentView: View { NavigationLink(value: Screen.share) { Label("Partager", systemImage: "square.and.arrow.up") } - - if self.tournament.sharing == nil { - Divider() - - NavigationLink(value: Screen.stateSettings) { - Text("Gestion du tournoi") - Text("Annuler, supprimer ou terminer le tournoi") - } - Divider() - - NavigationLink(value: Screen.stateSettings) { - Label("Tournoi", systemImage: "trash") - } + } label: { LabelOptions() .popoverTip(tournamentRunningTip)