merge

PadelClub/Data/Round.swift

@@ -498,7 +498,7 @@ defer {
                 return seedInterval.localizedLabel(displayStyle)
             }
             print("Round pas trouvé", id, parent, index)
-            return "Round pas trouvé"
+            return "--"
         }
         return RoundRule.roundName(fromRoundIndex: index, displayStyle: displayStyle)
     }
@@ -574,7 +574,7 @@ defer {
         let matches = (0..<matchCount).map { //0 is final match
             let roundIndex = RoundRule.roundIndex(fromMatchIndex: $0)
             let round = rounds[roundIndex]
-            return Match(round: round.id, index: $0, matchFormat: loserBracketMatchFormat, name: round.roundTitle())
+            return Match(round: round.id, index: $0, matchFormat: loserBracketMatchFormat)
         }
         
         do {
@@ -582,7 +582,19 @@ defer {
         } catch {
             Logger.error(error)
         }
-         
+
+        matches.forEach { //0 is final match
+            let roundIndex = RoundRule.roundIndex(fromMatchIndex: $0.index)
+            let round = rounds[roundIndex]
+            $0.name = round.roundTitle()
+        }
+        
+        do {
+            try self.tournamentStore.matches.addOrUpdate(contentOfs: matches)
+        } catch {
+            Logger.error(error)
+        }
+
         loserRounds().forEach { round in
             round.buildLoserBracket()
         }

PadelClub/ViewModel/SearchViewModel.swift

@@ -57,11 +57,11 @@ class SearchViewModel: ObservableObject, Identifiable {
     }
     
     var debounceTrigger: Double {
-        dataSet == .national ? 0.4 : 0.1
+        (dataSet == .national || dataSet == .ligue) ? 0.4 : 0.1
     }
     
     var throttleTrigger: Double {
-        dataSet == .national ? 0.15 : 0.1
+        (dataSet == .national || dataSet == .ligue) ? 0.15 : 0.1
     }
     
     var contentUnavailableMessage: String {
@@ -90,7 +90,7 @@ class SearchViewModel: ObservableObject, Identifiable {
     }
     
     func showIndex() -> Bool {
-        if dataSet == .national { return false }
+        if (dataSet == .national || dataSet == .ligue) { return false }
         if filterOption == .all { return false }
         return true
     }
@@ -419,7 +419,7 @@ enum SortOption: Int, CaseIterable, Identifiable {
         case .name:
             return [SortDescriptor(\ImportedPlayer.lastName, order: ascending ? .forward : .reverse), SortDescriptor(\ImportedPlayer.rank), SortDescriptor(\ImportedPlayer.assimilation)]
         case .rank:
-            if dataSet == .national {
+            if (dataSet == .national || dataSet == .ligue) {
                 return [SortDescriptor(\ImportedPlayer.rank, order: ascending ? .forward : .reverse)]
             } else {
                 return [SortDescriptor(\ImportedPlayer.rank, order: ascending ? .forward : .reverse), SortDescriptor(\ImportedPlayer.assimilation), SortDescriptor(\ImportedPlayer.lastName)]

PadelClub/Views/Shared/SelectablePlayerListView.swift

@@ -277,7 +277,7 @@ struct MySearchView: View {
     }
     
     var specificBugFixUUID: String {
-        if searchViewModel.dataSet == .national {
+        if searchViewModel.dataSet == .national || searchViewModel.dataSet == .ligue {
             return UUID().uuidString
         } else {
             if searchViewModel.tokens.isEmpty && isSearching {
@@ -306,7 +306,7 @@ struct MySearchView: View {
                     } header: {
                         Text(searchViewModel.selectedPlayers.count.formatted() + " " + searchViewModel.filterOption.localizedPlayerLabel + searchViewModel.selectedPlayers.count.pluralSuffix)
                     }
-                } else if (searchViewModel.isPresented == true && searchViewModel.dataSet == .national && searchViewModel.searchText.isEmpty == true) {
+                } else if (searchViewModel.isPresented == true && searchViewModel.dataSet == .national && searchViewModel.dataSet == .ligue && searchViewModel.searchText.isEmpty == true) {
                 } else {
                     Section {
                         ForEach(players, id: \.self) { player in
@@ -322,7 +322,7 @@ struct MySearchView: View {
             .id(specificBugFixUUID)
         } else {
             List {
-                if searchViewModel.dataSet == .national {
+                if searchViewModel.dataSet == .national || searchViewModel.dataSet == .ligue {
                     if searchViewModel.allowSingleSelection {
                         Section {
                             ForEach(players) { player in