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

PadelClub.xcodeproj/project.pbxproj

@@ -3329,7 +3329,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3376,7 +3376,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.3;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

PadelClub/ViewModel/FederalDataViewModel.swift

@@ -90,7 +90,7 @@ class FederalDataViewModel {
             &&
             (ageCategories.isEmpty || tournament.tournaments.anySatisfy({ ageCategories.contains($0.age) }))
             &&
-            (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!))
+            (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!)))
             &&
             (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod))
             &&
@@ -100,7 +100,7 @@ class FederalDataViewModel {
     
     func countForTournamentBuilds(from tournaments: [any FederalTournamentHolder]) -> Int {
         tournaments.filter({ tournament in
-            (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!))
+            (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!)))
             &&
             (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod))
             &&
@@ -151,7 +151,7 @@ class FederalDataViewModel {
         &&
         (ageCategories.isEmpty || ageCategories.contains(build.age))
         &&
-        (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!))
+        (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!)))
         &&
         (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod))
         &&

PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift

@@ -48,6 +48,11 @@ struct TournamentStatusView: View {
                         do {
                             let event = tournament.eventObject()
                             let isLastTournament = event?.tournaments.count == 1
+                            
+                            tournament.isDeleted = true
+                            
+                            try dataStore.tournaments.addOrUpdate(instance: tournament)
+
                             if let event, isLastTournament {
                                 try dataStore.events.delete(instance: event)
                             } else {

PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift

@@ -668,6 +668,7 @@ struct InscriptionManagerView: View {
                 }
             }
         }
+        .id(refreshStatus)
         .searchable(text: $searchField, isPresented: $presentSearch, prompt: Text("Chercher parmi les équipes inscrites"))
         .keyboardType(.alphabet)
         .autocorrectionDisabled()