staxriver
/
PadelClubData
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a way to filter out tournament in ongoing view

Browse Source
main
Razmig Sarkissian 2 weeks ago
parent 4d3679f95c
commit f0f04e9f64
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      PadelClubData/Data/DataStore.swift

4
PadelClubData/Data/DataStore.swift
Unescape View File

@ -332,7 +332,7 @@ public class DataStore: ObservableObject {
_lastRunningAndNextCheckDate = nil _lastRunningAndNextCheckDate = nil
} }
public func runningAndNextMatches() -> [Match] { public func runningAndNextMatches(_ selectedTournaments: Set<String> = Set()) -> [Match] {
let dateNow : Date = Date() let dateNow : Date = Date()
if let lastCheck = _lastRunningAndNextCheckDate, if let lastCheck = _lastRunningAndNextCheckDate,
let cachedMatches = _cachedRunningAndNextMatches, let cachedMatches = _cachedRunningAndNextMatches,
@ -340,7 +340,7 @@ public class DataStore: ObservableObject {
return cachedMatches return cachedMatches
} }
let lastTournaments = self.tournaments.filter { $0.isDeleted == false && $0.startDate <= dateNow && $0.hasEnded() == false }.sorted(by: \Tournament.startDate, order: .descending).prefix(10) let lastTournaments = self.tournaments.filter { (selectedTournaments.isEmpty || selectedTournaments.contains($0.id)) && $0.isDeleted == false && ($0.startDate <= dateNow || $0.startDate >= dateNow.addingTimeInterval(86_400)) && $0.hasEnded() == false }.sorted(by: \Tournament.startDate, order: .descending).prefix(10)
var runningMatches: [Match] = [] var runningMatches: [Match] = []
for tournament in lastTournaments { for tournament in lastTournaments {

Write Preview
Loading…
Cancel
Save