fix ligue search players

club_update
Razmig Sarkissian 1 year ago
parent 785cf4ba63
commit c2dc1bd498
  1. 8
      PadelClub/ViewModel/SearchViewModel.swift
  2. 6
      PadelClub/Views/Shared/SelectablePlayerListView.swift

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

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

Loading…
Cancel
Save