multistore
Razmig Sarkissian 2 years ago
parent c70661b394
commit 5ea1357655
  1. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 6
      PadelClub/Data/Tournament.swift
  3. 2
      PadelClub/Views/Tournament/Screen/BroadcastView.swift
  4. 2
      PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
  5. 2
      PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift

@ -1830,7 +1830,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@ -1868,7 +1868,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;

@ -1361,9 +1361,9 @@ class Tournament : ModelObject, Storable {
private func _defaultSorting() -> [MySortDescriptor<TeamRegistration>] { private func _defaultSorting() -> [MySortDescriptor<TeamRegistration>] {
switch teamSorting { switch teamSorting {
case .rank: case .rank:
[.keyPath(\TeamRegistration.initialWeight), .keyPath(\TeamRegistration.registrationDate!), .keyPath(\.canonicalName)] [.keyPath(\TeamRegistration.initialWeight), .keyPath(\TeamRegistration.registrationDate!)]
case .inscriptionDate: case .inscriptionDate:
[.keyPath(\TeamRegistration.registrationDate!), .keyPath(\TeamRegistration.initialWeight), .keyPath(\.canonicalName)] [.keyPath(\TeamRegistration.registrationDate!), .keyPath(\TeamRegistration.initialWeight)]
} }
} }
@ -1373,7 +1373,7 @@ class Tournament : ModelObject, Storable {
&& federalTournamentAge == build.age && federalTournamentAge == build.age
} }
private let _currentSelectionSorting : [MySortDescriptor<TeamRegistration>] = [.keyPath(\.weight), .keyPath(\.registrationDate!), .keyPath(\.canonicalName)] private let _currentSelectionSorting : [MySortDescriptor<TeamRegistration>] = [.keyPath(\.weight), .keyPath(\.registrationDate!)]
override func deleteDependencies() throws { override func deleteDependencies() throws {
try Store.main.deleteDependencies(items: self.unsortedTeams()) try Store.main.deleteDependencies(items: self.unsortedTeams())

@ -52,8 +52,8 @@ struct BroadcastView: View {
} else { } else {
Text("Publication prévue") Text("Publication prévue")
} }
Text("Les horaires de convocations ne seront pas publiés")
} }
Text("Les horaires de convocations ne seront pas publiés").foregroundStyle(.secondary)
} header: { } header: {
Text("Liste des équipes") Text("Liste des équipes")
} footer: { } footer: {

@ -73,7 +73,7 @@ struct TournamentStatusView: View {
Text("Tournoi privé") Text("Tournoi privé")
} }
} footer: { } footer: {
Text("Le tournoi sera masqué sur le site padelclub.app") Text(.init("Le tournoi sera masqué sur le site [Padel Club](\(URLs.main)"))
} }
} }
.toolbarBackground(.visible, for: .navigationBar) .toolbarBackground(.visible, for: .navigationBar)

@ -149,7 +149,7 @@ struct InscriptionManagerView: View {
rankingDateSourcePickerView(showDateInLabel: true) rankingDateSourcePickerView(showDateInLabel: true)
if tournament.teamSorting == .inscriptionDate { if tournament.teamSorting == .inscriptionDate {
Divider() Divider()
_prioritizeClubMembersButton() //_prioritizeClubMembersButton()
Button("Bloquer une place") { Button("Bloquer une place") {
_createTeam() _createTeam()

Loading…
Cancel
Save