|
|
|
@ -22,6 +22,7 @@ let padelBeachImportTip = PadelBeachImportTip() |
|
|
|
struct InscriptionManagerView: View { |
|
|
|
struct InscriptionManagerView: View { |
|
|
|
@EnvironmentObject var dataStore: DataStore |
|
|
|
@EnvironmentObject var dataStore: DataStore |
|
|
|
@EnvironmentObject var networkMonitor: NetworkMonitor |
|
|
|
@EnvironmentObject var networkMonitor: NetworkMonitor |
|
|
|
|
|
|
|
@Environment(\.dismiss) var dismiss |
|
|
|
|
|
|
|
|
|
|
|
@FetchRequest( |
|
|
|
@FetchRequest( |
|
|
|
sortDescriptors: [], |
|
|
|
sortDescriptors: [], |
|
|
|
@ -29,6 +30,8 @@ struct InscriptionManagerView: View { |
|
|
|
private var fetchPlayers: FetchedResults<ImportedPlayer> |
|
|
|
private var fetchPlayers: FetchedResults<ImportedPlayer> |
|
|
|
|
|
|
|
|
|
|
|
var tournament: Tournament |
|
|
|
var tournament: Tournament |
|
|
|
|
|
|
|
var cancelShouldDismiss: Bool = false |
|
|
|
|
|
|
|
|
|
|
|
@State private var searchField: String = "" |
|
|
|
@State private var searchField: String = "" |
|
|
|
@State private var presentSearch: Bool = false |
|
|
|
@State private var presentSearch: Bool = false |
|
|
|
@State private var presentPlayerSearch: Bool = false |
|
|
|
@State private var presentPlayerSearch: Bool = false |
|
|
|
@ -101,20 +104,15 @@ struct InscriptionManagerView: View { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let categoryOption: PlayerFilterOption |
|
|
|
init(tournament: Tournament, pasteString: String? = nil) { |
|
|
|
let filterable: Bool |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
init(tournament: Tournament) { |
|
|
|
|
|
|
|
self.tournament = tournament |
|
|
|
self.tournament = tournament |
|
|
|
_currentRankSourceDate = State(wrappedValue: tournament.rankSourceDate) |
|
|
|
if let pasteString { |
|
|
|
switch tournament.tournamentCategory { |
|
|
|
_pasteString = .init(wrappedValue: pasteString) |
|
|
|
case .women: |
|
|
|
_fetchPlayers = FetchRequest<ImportedPlayer>(sortDescriptors: [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)], predicate: Self._pastePredicate(pasteField: pasteString, mostRecentDate: tournament.rankSourceDate, filterOption: tournament.tournamentCategory.playerFilterOption)) |
|
|
|
categoryOption = .female |
|
|
|
_autoSelect = .init(wrappedValue: true) |
|
|
|
filterable = false |
|
|
|
cancelShouldDismiss = true |
|
|
|
default: |
|
|
|
|
|
|
|
categoryOption = .all |
|
|
|
|
|
|
|
filterable = true |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
_currentRankSourceDate = State(wrappedValue: tournament.rankSourceDate) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func _clearScreen() { |
|
|
|
private func _clearScreen() { |
|
|
|
@ -337,6 +335,9 @@ struct InscriptionManagerView: View { |
|
|
|
editedTeam = nil |
|
|
|
editedTeam = nil |
|
|
|
createdPlayers.removeAll() |
|
|
|
createdPlayers.removeAll() |
|
|
|
createdPlayerIds.removeAll() |
|
|
|
createdPlayerIds.removeAll() |
|
|
|
|
|
|
|
if cancelShouldDismiss { |
|
|
|
|
|
|
|
dismiss() |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
@ -515,7 +516,7 @@ struct InscriptionManagerView: View { |
|
|
|
RowButtonView("Créer une équipe") { |
|
|
|
RowButtonView("Créer une équipe") { |
|
|
|
Task { |
|
|
|
Task { |
|
|
|
await MainActor.run() { |
|
|
|
await MainActor.run() { |
|
|
|
fetchPlayers.nsPredicate = _pastePredicate(pasteField: searchField, mostRecentDate: SourceFileManager.shared.mostRecentDateAvailable) |
|
|
|
fetchPlayers.nsPredicate = Self._pastePredicate(pasteField: searchField, mostRecentDate: SourceFileManager.shared.mostRecentDateAvailable, filterOption: _filterOption()) |
|
|
|
fetchPlayers.nsSortDescriptors = [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)] |
|
|
|
fetchPlayers.nsSortDescriptors = [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)] |
|
|
|
pasteString = searchField |
|
|
|
pasteString = searchField |
|
|
|
} |
|
|
|
} |
|
|
|
@ -572,7 +573,7 @@ struct InscriptionManagerView: View { |
|
|
|
guard let first = strings.first else { return } |
|
|
|
guard let first = strings.first else { return } |
|
|
|
Task { |
|
|
|
Task { |
|
|
|
await MainActor.run { |
|
|
|
await MainActor.run { |
|
|
|
fetchPlayers.nsPredicate = _pastePredicate(pasteField: first, mostRecentDate: SourceFileManager.shared.mostRecentDateAvailable) |
|
|
|
fetchPlayers.nsPredicate = Self._pastePredicate(pasteField: first, mostRecentDate: SourceFileManager.shared.mostRecentDateAvailable, filterOption: _filterOption()) |
|
|
|
fetchPlayers.nsSortDescriptors = [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)] |
|
|
|
fetchPlayers.nsSortDescriptors = [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)] |
|
|
|
pasteString = first |
|
|
|
pasteString = first |
|
|
|
autoSelect = true |
|
|
|
autoSelect = true |
|
|
|
@ -641,14 +642,7 @@ struct InscriptionManagerView: View { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func _filterOption() -> PlayerFilterOption { |
|
|
|
private func _filterOption() -> PlayerFilterOption { |
|
|
|
switch tournament.tournamentCategory { |
|
|
|
return tournament.tournamentCategory.playerFilterOption |
|
|
|
case .men: |
|
|
|
|
|
|
|
return .male |
|
|
|
|
|
|
|
case .women: |
|
|
|
|
|
|
|
return .female |
|
|
|
|
|
|
|
case .mix: |
|
|
|
|
|
|
|
return .all |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ViewBuilder |
|
|
|
@ViewBuilder |
|
|
|
@ -672,7 +666,7 @@ struct InscriptionManagerView: View { |
|
|
|
if let paste = UIPasteboard.general.string { |
|
|
|
if let paste = UIPasteboard.general.string { |
|
|
|
Task { |
|
|
|
Task { |
|
|
|
await MainActor.run { |
|
|
|
await MainActor.run { |
|
|
|
fetchPlayers.nsPredicate = _pastePredicate(pasteField: paste, mostRecentDate: SourceFileManager.shared.mostRecentDateAvailable) |
|
|
|
fetchPlayers.nsPredicate = Self._pastePredicate(pasteField: paste, mostRecentDate: SourceFileManager.shared.mostRecentDateAvailable, filterOption: _filterOption()) |
|
|
|
fetchPlayers.nsSortDescriptors = [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)] |
|
|
|
fetchPlayers.nsSortDescriptors = [NSSortDescriptor(keyPath: \ImportedPlayer.rank, ascending: true)] |
|
|
|
pasteString = paste |
|
|
|
pasteString = paste |
|
|
|
autoSelect = true |
|
|
|
autoSelect = true |
|
|
|
@ -739,7 +733,7 @@ struct InscriptionManagerView: View { |
|
|
|
LabeledContent { |
|
|
|
LabeledContent { |
|
|
|
Text(max(0, unsortedTeamsWithoutWO.count - tournament.teamCount).formatted()).font(.largeTitle) |
|
|
|
Text(max(0, unsortedTeamsWithoutWO.count - tournament.teamCount).formatted()).font(.largeTitle) |
|
|
|
} label: { |
|
|
|
} label: { |
|
|
|
Text("Liste d'attente") |
|
|
|
Text("Attente") |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
NavigationLink { |
|
|
|
NavigationLink { |
|
|
|
@ -807,7 +801,7 @@ struct InscriptionManagerView: View { |
|
|
|
selectionSearchField ?? pasteString |
|
|
|
selectionSearchField ?? pasteString |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func _pastePredicate(pasteField: String, mostRecentDate: Date?) -> NSPredicate? { |
|
|
|
static private func _pastePredicate(pasteField: String, mostRecentDate: Date?, filterOption: PlayerFilterOption) -> NSPredicate? { |
|
|
|
let text = pasteField.canonicalVersion |
|
|
|
let text = pasteField.canonicalVersion |
|
|
|
|
|
|
|
|
|
|
|
let nameComponents = text.components(separatedBy: .whitespacesAndNewlines).compactMap { $0.isEmpty ? nil : $0 }.filter({ $0 != "de" && $0 != "la" && $0 != "le" && $0.count > 1 }) |
|
|
|
let nameComponents = text.components(separatedBy: .whitespacesAndNewlines).compactMap { $0.isEmpty ? nil : $0 }.filter({ $0 != "de" && $0 != "la" && $0 != "le" && $0.count > 1 }) |
|
|
|
@ -816,9 +810,9 @@ struct InscriptionManagerView: View { |
|
|
|
//self.wordsCount = nameComponents.count |
|
|
|
//self.wordsCount = nameComponents.count |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if _filterOption() == .male { |
|
|
|
if filterOption == .male { |
|
|
|
andPredicates.append(NSPredicate(format: "male == YES")) |
|
|
|
andPredicates.append(NSPredicate(format: "male == YES")) |
|
|
|
} else if _filterOption() == .female { |
|
|
|
} else if filterOption == .female { |
|
|
|
andPredicates.append(NSPredicate(format: "male == NO")) |
|
|
|
andPredicates.append(NSPredicate(format: "male == NO")) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -1244,9 +1238,9 @@ struct InscriptionManagerView: View { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#Preview { |
|
|
|
//#Preview { |
|
|
|
NavigationStack { |
|
|
|
// NavigationStack { |
|
|
|
InscriptionManagerView(tournament: Tournament.mock()) |
|
|
|
// InscriptionManagerView(tournament: Tournament.mock()) |
|
|
|
.environment(Tournament.mock()) |
|
|
|
// .environment(Tournament.mock()) |
|
|
|
} |
|
|
|
// } |
|
|
|
} |
|
|
|
//} |
|
|
|
|
