Merge branch 'main'

sync2
Raz 1 year ago
commit 93e529c993
  1. 2
      PadelClub/ViewModel/AgendaDestination.swift
  2. 13
      PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift

@ -37,7 +37,7 @@ enum AgendaDestination: Int, CaseIterable, Identifiable, Selectable, Equatable {
func associatedTip() -> (any Tip)? { func associatedTip() -> (any Tip)? {
switch self { switch self {
case .around: case .around:
return PlayerTournamentSearchTip() return nil //PlayerTournamentSearchTip()
default: default:
return nil return nil
} }

@ -33,11 +33,7 @@ struct TournamentLookUpView: View {
Binding { Binding {
locationManager.lastError != nil locationManager.lastError != nil
} set: { value in } set: { value in
if value == false {
locationManager.lastError = nil
}
} }
} }
var body: some View { var body: some View {
@ -182,6 +178,9 @@ struct TournamentLookUpView: View {
federalDataViewModel.searchAttemptCount += 1 federalDataViewModel.searchAttemptCount += 1
federalDataViewModel.dayPeriod = dataStore.appSettings.dayPeriod federalDataViewModel.dayPeriod = dataStore.appSettings.dayPeriod
federalDataViewModel.dayDuration = dataStore.appSettings.dayDuration federalDataViewModel.dayDuration = dataStore.appSettings.dayDuration
federalDataViewModel.levels = Set(levels)
federalDataViewModel.categories = Set(categories)
federalDataViewModel.ageCategories = Set(ages)
Task { Task {
await getNewPage() await getNewPage()
@ -227,6 +226,12 @@ struct TournamentLookUpView: View {
let resultCommand = commands.first(where: { $0.results != nil }) let resultCommand = commands.first(where: { $0.results != nil })
if let newTournaments = resultCommand?.results?.items { if let newTournaments = resultCommand?.results?.items {
newTournaments.forEach { ft in newTournaments.forEach { ft in
// let isValid = ft.tournaments.anySatisfy({ build in
// let ageValid = ages.isEmpty ? true : ages.contains(build.age)
// let levelValid = levels.isEmpty ? true : levels.contains(build.level)
// let categoryValid = categories.isEmpty ? true : categories.contains(build.category)
// return ageValid && levelValid && categoryValid
// })
if tournaments.contains(where: { $0.id == ft.id }) == false { if tournaments.contains(where: { $0.id == ft.id }) == false {
federalDataViewModel.searchedFederalTournaments.append(ft) federalDataViewModel.searchedFederalTournaments.append(ft)
} }

Loading…
Cancel
Save