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

Fixes user id stuff

Browse Source
multistore
Laurent 1 year ago
parent effaef46b3
commit a17d1a543b
6 changed files with 12 additions and 16 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. 12
      PadelClub/Data/DataStore.swift
  2. 2
      PadelClub/Views/Calling/CallMessageCustomizationView.swift
  3. 4
      PadelClub/Views/Club/ClubsView.swift
  4. 2
      PadelClub/Views/Club/CreateClubView.swift
  5. 2
      PadelClub/Views/Planning/PlanningSettingsView.swift
  6. 6
      PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift

12
PadelClub/Data/DataStore.swift
Unescape View File

@ -139,8 +139,8 @@ class DataStore: ObservableObject {
fileprivate func _fixMissingClubCreatorIfNecessary(_ clubsCollection: StoredCollection<Club>) {
for club in clubsCollection {
if club.creator == nil && self.user.username.count > 0 {
club.creator = self.user.id
if let userId = Store.main.userId, club.creator == nil {
club.creator = userId
clubsCollection.writeChangeAndInsertOnServer(instance: club)
}
}
@ -148,14 +148,10 @@ class DataStore: ObservableObject {
fileprivate func _fixMissingEventCreatorIfNecessary(_ eventsCollection: StoredCollection<Event>) {
for event in eventsCollection {
if event.creator == nil && self.user.username.count > 0 {
event.creator = self.user.id
if let userId = Store.main.userId, event.creator == nil {
event.creator = userId
do {
try event.insertOnServer()
// try eventsCollection.writeChangeAndInsertOnServer(instance: event)
// for tournament in event.tournaments {
// try self.tournaments.writeChangeAndInsertOnServer(instance: tournament)
// }
} catch {
Logger.error(error)
}

2
PadelClub/Views/Calling/CallMessageCustomizationView.swift
Unescape View File

@ -206,7 +206,7 @@ struct CallMessageCustomizationView: View {
@ViewBuilder
private func _clubNameView() -> some View {
if let eventClub = tournament.eventObject()?.clubObject() {
let hasBeenCreated: Bool = eventClub.hasBeenCreated(by: dataStore.user.id)
let hasBeenCreated: Bool = eventClub.hasBeenCreated(by: Store.main.userId)
Section {
TextField("Nom du club", text: $customClubName, axis: .vertical)
.lineLimit(2)

4
PadelClub/Views/Club/ClubsView.swift
Unescape View File

@ -48,7 +48,7 @@ struct ClubsView: View {
.buttonStyle(.plain)
} else {
NavigationLink {
ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing)
ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing)
} label: {
ClubRowView(club: club)
}
@ -74,7 +74,7 @@ struct ClubsView: View {
.buttonStyle(.plain)
} else {
NavigationLink {
ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing)
ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing)
} label: {
ClubRowView(club: club)
}

2
PadelClub/Views/Club/CreateClubView.swift
Unescape View File

@ -48,7 +48,7 @@ struct CreateClubView: View {
let existingOrCreatedClub = Club.findOrCreate(name: club.name, code: club.code, city: club.city, zipCode: club.zipCode)
//update existing club if rights ok / freshly created club with data input from user
if existingOrCreatedClub.hasBeenCreated(by: dataStore.user.id) {
if existingOrCreatedClub.hasBeenCreated(by: Store.main.userId) {
existingOrCreatedClub.update(fromClub: club)
}

2
PadelClub/Views/Planning/PlanningSettingsView.swift
Unescape View File

@ -68,7 +68,7 @@ struct PlanningSettingsView: View {
let verb = tournament.courtCount > 1 ? "seront" : "sera"
Text("En réduisant les terrains maximum, seul\(plural) le\(plural) \(tournament.courtCount) premier\(plural) terrain\(plural) \(verb) utilisé\(plural)") + Text(", par contre, si vous augmentez le nombre de terrains, vous pourrez plutôt préciser quel terrain n'est pas disponible.")
} else if tournament.courtCount > club.courtCount {
let isCreatedByUser = club.hasBeenCreated(by: dataStore.user.id)
let isCreatedByUser = club.hasBeenCreated(by: Store.main.userId)
Button {
do {
club.courtCount = tournament.courtCount

6
PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift
Unescape View File

@ -75,7 +75,7 @@ struct TournamentClubSettingsView: View {
let verb = tournament.courtCount > 1 ? "seront" : "sera"
Text("En réduisant les terrains maximum, seul\(plural) le\(plural) \(tournament.courtCount) premier\(plural) terrain\(plural) \(verb) utilisé\(plural)") + Text(", par contre, si vous augmentez le nombre de terrains, vous pourrez plutôt préciser quel terrain n'est pas disponible.")
} else if tournament.courtCount > club.courtCount {
let isCreatedByUser = club.hasBeenCreated(by: dataStore.user.id)
let isCreatedByUser = club.hasBeenCreated(by: Store.main.userId)
Button {
do {
club.courtCount = tournament.courtCount
@ -100,7 +100,7 @@ struct TournamentClubSettingsView: View {
if let selectedClub {
ClubCourtSetupView(club: selectedClub, displayContext: selectedClub.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing, selectedCourt: $selectedCourt)
ClubCourtSetupView(club: selectedClub, displayContext: selectedClub.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing, selectedCourt: $selectedCourt)
.onChange(of: selectedClub.courtCount) {
tournament.courtCount = max(tournament.courtCount, selectedClub.courtCount)
do {
@ -112,7 +112,7 @@ struct TournamentClubSettingsView: View {
}
}
.navigationDestination(item: $showClubDetail) { club in
ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing)
ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing)
}
.navigationDestination(item: $selectedCourt) { court in
CourtView(court: court)

Write Preview
Loading…
Cancel
Save