v1.2.60

PadelClub.xcodeproj/project.pbxproj

@@ -3245,7 +3245,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -3272,7 +3272,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.59;
+				MARKETING_VERSION = 1.2.60;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3293,7 +3293,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@@ -3319,7 +3319,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.59;
+				MARKETING_VERSION = 1.2.60;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

PadelClub/Views/Navigation/Ongoing/OngoingContainerView.swift

@@ -16,6 +16,15 @@ class OngoingViewModel {
     var destination: OngoingDestination? = .running
     var hideUnconfirmedMatches: Bool = false
     var hideNotReadyMatches: Bool = false
+    var selectedTournaments: Set<String> = Set() {
+        didSet {
+            DataStore.shared.resetOngoingCache()
+        }
+    }
+    
+    func tournaments() -> [Tournament] {
+        Set(DataStore.shared.runningAndNextMatches().compactMap({ $0.currentTournament() })).sorted(by: \.startDate)
+    }
     
     func areFiltersEnabled() -> Bool {
         hideUnconfirmedMatches || hideNotReadyMatches
@@ -24,7 +33,7 @@ class OngoingViewModel {
     let defaultSorting : [MySortDescriptor<Match>] = [.keyPath(\Match.startDate!), .keyPath(\Match.index), .keyPath(\Match.courtIndexForSorting)]
 
     var runningAndNextMatches: [Match] {
-        DataStore.shared.runningAndNextMatches().sorted(using: defaultSorting, order: .ascending)
+        DataStore.shared.runningAndNextMatches(selectedTournaments).sorted(using: defaultSorting, order: .ascending)
     }
     
     var filteredRunningAndNextMatches: [Match] {
@@ -57,32 +66,33 @@ struct OngoingContainerView: View {
             .toolbarBackground(.visible, for: .navigationBar)
             .navigationTitle("Programmation")
             .toolbar {
-                if ongoingViewModel.destination == .followUp {
+                ToolbarItem(placement: .topBarLeading) {
-                    ToolbarItem(placement: .topBarLeading) {
+                    Menu {
-                        Menu {
+                        NavigationLink {
+                            List(selection: $ongoingViewModel.selectedTournaments) {
+                                ForEach(ongoingViewModel.tournaments()) { tournament in
+                                    TournamentCellView(tournament: tournament)
+                                        .tag(tournament.id)
+                                }
+                            }
+                            .environment(\.editMode, Binding.constant(EditMode.active))
+                            .navigationTitle("Tournois visibles")
+                            .navigationBarTitleDisplayMode(.inline)
+                            .toolbarBackground(.visible, for: .navigationBar)
+                        } label: {
+                            Label("Tournois visibles", systemImage: "circle.grid.2x2.topleft.checkmark.filled")
+                        }
+                        if ongoingViewModel.destination == .followUp {
+                            Divider()
                             Toggle(isOn: $ongoingViewModel.hideUnconfirmedMatches) {
                                 Text("masquer non confirmés")
                             }
                             Toggle(isOn: $ongoingViewModel.hideNotReadyMatches) {
                                 Text("masquer incomplets")
                             }
-                        } label: {
-                            Image(systemName: "line.3.horizontal.decrease.circle")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(minHeight: 32)
                         }
-                        .symbolVariant(ongoingViewModel.areFiltersEnabled() ? .fill : .none)
-                    }
-                }
-                ToolbarItem(placement: .topBarTrailing) {
-                    Button {
-                        showMatchPicker = true
                     } label: {
-                        Image(systemName: "rectangle.stack.badge.plus")
+                        Image(systemName: "line.3.horizontal.decrease")
-                            .resizable()
-                            .scaledToFit()
-                            .frame(minHeight: 32)
                     }
                 }
             }