compilation improvements

multistore
Laurent 1 year ago
parent 717b081dd9
commit 1eab4c44b7
  1. 2
      PadelClub/Data/TeamScore.swift
  2. 2
      PadelClub/Views/Navigation/Agenda/ActivityView.swift
  3. 3
      PadelClub/Views/Navigation/MainView.swift
  4. 6
      PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift
  5. 4
      PadelClub/Views/Tournament/TournamentView.swift

@ -45,7 +45,7 @@ class TeamScore: ModelObject, Storable {
// MARK: - Computed dependencies
func matchObject() -> Match? {
return Store.main.findById(self.match)
return DataStore.shared.matches.findById(self.match)
}
var team: TeamRegistration? {

@ -10,7 +10,7 @@ import SwiftUI
struct ActivityView: View {
@EnvironmentObject var dataStore: DataStore
@Environment(NavigationViewModel.self) private var navigation
@State private var federalDataViewModel: FederalDataViewModel = .shared
@State private var federalDataViewModel: FederalDataViewModel = FederalDataViewModel.shared
@State private var searchText: String = ""
@State private var presentFilterView: Bool = false

@ -45,7 +45,8 @@ struct MainView: View {
)}
var matches: [Match] {
return dataStore.matches.filter { $0.confirmed && $0.startDate != nil && $0.endDate == nil && $0.courtIndex != nil }
return dataStore.matches.filter { match in
match.confirmed && match.startDate != nil && match.endDate == nil && match.courtIndex != nil }
}
private func _isConnected() -> Bool {

@ -37,7 +37,11 @@ struct DebugSettingsView: View {
}
fileprivate var _synchronized: String {
return "\(PListReader.readBool(plist: "local", key: "synchronized"))"
if let synchronized = PListReader.readBool(plist: "local", key: "synchronized") {
return "\(synchronized)"
} else {
return "not specified"
}
}
fileprivate var _canSynchronize: String {

@ -15,8 +15,8 @@ struct TournamentView: View {
@State var tournament: Tournament
var presentationContext: PresentationContext = .agenda
let tournamentSelectionTip = TournamentSelectionTip()
let tournamentRunningTip = TournamentRunningTip()
let tournamentSelectionTip: TournamentSelectionTip = TournamentSelectionTip()
let tournamentRunningTip: TournamentRunningTip = TournamentRunningTip()
var selectedTournamentId: Binding<String> { Binding(
get: { tournament.id },

Loading…
Cancel
Save