multistore
Razmig Sarkissian 1 year ago
parent 90605c6112
commit aff79f892f
  1. 1
      PadelClub/Data/GroupStage.swift
  2. 12
      PadelClub/Data/Match.swift
  3. 4
      PadelClub/Data/MatchScheduler.swift
  4. 10
      PadelClub/Data/TeamRegistration.swift
  5. 10
      PadelClub/Data/TeamScore.swift
  6. 7
      PadelClub/Data/Tournament.swift
  7. 2
      PadelClub/Views/Cashier/CashierView.swift
  8. 8
      PadelClub/Views/Club/ClubDetailView.swift
  9. 2
      PadelClub/Views/GroupStage/GroupStageSettingsView.swift
  10. 5
      PadelClub/Views/GroupStage/GroupStageView.swift
  11. 5
      PadelClub/Views/Match/Components/MatchDateView.swift
  12. 1
      PadelClub/Views/Match/MatchDetailView.swift
  13. 9
      PadelClub/Views/Navigation/MainView.swift
  14. 2
      PadelClub/Views/Navigation/Ongoing/OngoingView.swift
  15. 6
      PadelClub/Views/Navigation/Toolbox/ToolboxView.swift
  16. 21
      PadelClub/Views/Navigation/Umpire/UmpireView.swift
  17. 7
      PadelClub/Views/Planning/PlanningSettingsView.swift
  18. 2
      PadelClub/Views/Tournament/Screen/BroadcastView.swift
  19. 7
      PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift
  20. 11
      PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift
  21. 3
      PadelClub/Views/Tournament/Screen/PrintSettingsView.swift
  22. 2
      PadelClub/Views/Tournament/Screen/TournamentCashierView.swift
  23. 7
      PadelClub/Views/Tournament/TournamentInitView.swift
  24. 9
      PadelClubTests/ServerDataTests.swift

@ -179,7 +179,6 @@ class GroupStage: ModelObject, Storable {
} }
func availableToStart(playedMatches: [Match], in runningMatches: [Match]) -> [Match] { func availableToStart(playedMatches: [Match], in runningMatches: [Match]) -> [Match] {
return []
return playedMatches.filter({ $0.canBeStarted(inMatches: runningMatches) && $0.isRunning() == false }) return playedMatches.filter({ $0.canBeStarted(inMatches: runningMatches) && $0.isRunning() == false })
} }

@ -36,8 +36,9 @@ class Match: ModelObject, Storable {
//var order: Int //var order: Int
var disabled: Bool = false var disabled: Bool = false
private(set) var courtIndex: Int? private(set) var courtIndex: Int?
var confirmed: Bool = false
internal init(round: String? = nil, groupStage: String? = nil, startDate: Date? = nil, endDate: Date? = nil, index: Int, matchFormat: MatchFormat? = nil, servingTeamId: String? = nil, winningTeamId: String? = nil, losingTeamId: String? = nil, name: String? = nil, disabled: Bool = false, courtIndex: Int? = nil) { internal init(round: String? = nil, groupStage: String? = nil, startDate: Date? = nil, endDate: Date? = nil, index: Int, matchFormat: MatchFormat? = nil, servingTeamId: String? = nil, winningTeamId: String? = nil, losingTeamId: String? = nil, name: String? = nil, disabled: Bool = false, courtIndex: Int? = nil, confirmed: Bool = false) {
self.round = round self.round = round
self.groupStage = groupStage self.groupStage = groupStage
self.startDate = startDate self.startDate = startDate
@ -51,6 +52,7 @@ class Match: ModelObject, Storable {
self.disabled = disabled self.disabled = disabled
self.name = name self.name = name
self.courtIndex = courtIndex self.courtIndex = courtIndex
self.confirmed = confirmed
// self.broadcasted = broadcasted // self.broadcasted = broadcasted
// self.order = order // self.order = order
} }
@ -162,6 +164,7 @@ class Match: ModelObject, Storable {
func cleanScheduleAndSave(_ targetStartDate: Date? = nil) { func cleanScheduleAndSave(_ targetStartDate: Date? = nil) {
startDate = targetStartDate startDate = targetStartDate
confirmed = targetStartDate == nil ? false : true
endDate = nil endDate = nil
followingMatch()?.cleanScheduleAndSave(nil) followingMatch()?.cleanScheduleAndSave(nil)
_loserMatch()?.cleanScheduleAndSave(nil) _loserMatch()?.cleanScheduleAndSave(nil)
@ -548,6 +551,8 @@ class Match: ModelObject, Storable {
startDate = fromStartDate startDate = fromStartDate
endDate = toEndDate endDate = toEndDate
} }
confirmed = true
} }
func courtName() -> String? { func courtName() -> String? {
@ -734,7 +739,7 @@ class Match: ModelObject, Storable {
} }
func isRunning() -> Bool { // at least a match has started func isRunning() -> Bool { // at least a match has started
hasStarted() && hasEnded() == false confirmed && hasStarted() && hasEnded() == false
} }
func hasStarted() -> Bool { // meaning at least one match is over func hasStarted() -> Bool { // meaning at least one match is over
@ -785,6 +790,7 @@ class Match: ModelObject, Storable {
case _name = "name" case _name = "name"
// case _order = "order" // case _order = "order"
case _disabled = "disabled" case _disabled = "disabled"
case _confirmed = "confirmed"
} }
func encode(to encoder: Encoder) throws { func encode(to encoder: Encoder) throws {
@ -855,6 +861,8 @@ class Match: ModelObject, Storable {
} else { } else {
try container.encodeNil(forKey: ._courtIndex) try container.encodeNil(forKey: ._courtIndex)
} }
try container.encode(confirmed, forKey: ._confirmed)
} }
func insertOnServer() throws { func insertOnServer() throws {

@ -90,6 +90,7 @@ class MatchScheduler : ModelObject, Storable {
matches.forEach({ matches.forEach({
$0.removeCourt() $0.removeCourt()
$0.startDate = nil $0.startDate = nil
$0.confirmed = false
}) })
var lastDate : Date = tournament.startDate var lastDate : Date = tournament.startDate
@ -565,6 +566,7 @@ class MatchScheduler : ModelObject, Storable {
if (roundId == nil && matchId == nil) || $0.startDate?.isEarlierThan(startDate) == false { if (roundId == nil && matchId == nil) || $0.startDate?.isEarlierThan(startDate) == false {
$0.startDate = nil $0.startDate = nil
$0.removeCourt() $0.removeCourt()
$0.confirmed = false
} }
}) })
@ -590,6 +592,7 @@ class MatchScheduler : ModelObject, Storable {
flattenedMatches[index...].forEach { flattenedMatches[index...].forEach {
$0.startDate = nil $0.startDate = nil
$0.removeCourt() $0.removeCourt()
$0.confirmed = false
} }
} }
} else if let roundId { } else if let roundId {
@ -598,6 +601,7 @@ class MatchScheduler : ModelObject, Storable {
flattenedMatches[index...].forEach { flattenedMatches[index...].forEach {
$0.startDate = nil $0.startDate = nil
$0.removeCourt() $0.removeCourt()
$0.confirmed = false
} }
} }
} }

@ -69,6 +69,16 @@ class TeamRegistration: ModelObject, Storable {
try Store.main.deleteDependencies(items: self.unsortedPlayers()) try Store.main.deleteDependencies(items: self.unsortedPlayers())
} }
func hasArrived() {
let unsortedPlayers = unsortedPlayers()
unsortedPlayers.forEach({ $0.hasArrived = true })
do {
try DataStore.shared.playerRegistrations.addOrUpdate(contentOfs: unsortedPlayers)
} catch {
Logger.error(error)
}
}
func isSeedable() -> Bool { func isSeedable() -> Bool {
bracketPosition == nil && groupStage == nil bracketPosition == nil && groupStage == nil
} }

@ -17,15 +17,15 @@ class TeamScore: ModelObject, Storable {
var id: String = Store.randomId() var id: String = Store.randomId()
var match: String var match: String
var teamRegistration: String? var teamRegistration: String?
var playerRegistrations: [String] = [] //var playerRegistrations: [String] = []
var score: String? var score: String?
var walkOut: Int? var walkOut: Int?
var luckyLoser: Int? var luckyLoser: Int?
init(match: String, teamRegistration: String? = nil, playerRegistrations: [String], score: String? = nil, walkOut: Int? = nil, luckyLoser: Int? = nil) { init(match: String, teamRegistration: String? = nil, score: String? = nil, walkOut: Int? = nil, luckyLoser: Int? = nil) {
self.match = match self.match = match
self.teamRegistration = teamRegistration self.teamRegistration = teamRegistration
self.playerRegistrations = playerRegistrations // self.playerRegistrations = playerRegistrations
self.score = score self.score = score
self.walkOut = walkOut self.walkOut = walkOut
self.luckyLoser = luckyLoser self.luckyLoser = luckyLoser
@ -65,7 +65,7 @@ class TeamScore: ModelObject, Storable {
case _id = "id" case _id = "id"
case _match = "match" case _match = "match"
case _teamRegistration = "teamRegistration" case _teamRegistration = "teamRegistration"
case _playerRegistrations = "playerRegistrations" //case _playerRegistrations = "playerRegistrations"
case _score = "score" case _score = "score"
case _walkOut = "walkOut" case _walkOut = "walkOut"
case _luckyLoser = "luckyLoser" case _luckyLoser = "luckyLoser"
@ -83,7 +83,7 @@ class TeamScore: ModelObject, Storable {
try container.encodeNil(forKey: ._teamRegistration) try container.encodeNil(forKey: ._teamRegistration)
} }
try container.encode(playerRegistrations, forKey: ._playerRegistrations) //try container.encode(playerRegistrations, forKey: ._playerRegistrations)
if let score = score { if let score = score {
try container.encode(score, forKey: ._score) try container.encode(score, forKey: ._score)

@ -50,6 +50,7 @@ class Tournament : ModelObject, Storable {
var publishBrackets: Bool = false var publishBrackets: Bool = false
var shouldVerifyGroupStage: Bool = false var shouldVerifyGroupStage: Bool = false
var shouldVerifyBracket: Bool = false var shouldVerifyBracket: Bool = false
var hideTeamsWeight: Bool = false
@ObservationIgnored @ObservationIgnored
var navigationPath: [Screen] = [] var navigationPath: [Screen] = []
@ -94,9 +95,10 @@ class Tournament : ModelObject, Storable {
case _publishBrackets = "publishBrackets" case _publishBrackets = "publishBrackets"
case _shouldVerifyGroupStage = "shouldVerifyGroupStage" case _shouldVerifyGroupStage = "shouldVerifyGroupStage"
case _shouldVerifyBracket = "shouldVerifyBracket" case _shouldVerifyBracket = "shouldVerifyBracket"
case _hideTeamsWeight = "hideTeamsWeight"
} }
internal init(event: String? = nil, name: String? = nil, startDate: Date = Date(), endDate: Date? = nil, creationDate: Date = Date(), isPrivate: Bool = false, groupStageFormat: MatchFormat? = nil, roundFormat: MatchFormat? = nil, loserRoundFormat: MatchFormat? = nil, groupStageSortMode: GroupStageOrderingMode, groupStageCount: Int = 4, rankSourceDate: Date? = nil, dayDuration: Int = 1, teamCount: Int = 24, teamSorting: TeamSortingType? = nil, federalCategory: TournamentCategory, federalLevelCategory: TournamentLevel, federalAgeCategory: FederalTournamentAge, closedRegistrationDate: Date? = nil, groupStageAdditionalQualified: Int = 0, courtCount: Int = 2, prioritizeClubMembers: Bool = false, qualifiedPerGroupStage: Int = 1, teamsPerGroupStage: Int = 4, entryFee: Double? = nil, additionalEstimationDuration: Int = 0, isDeleted: Bool = false, publishTeams: Bool = false, publishSummons: Bool = false, publishGroupStages: Bool = false, publishBrackets: Bool = false, shouldVerifyBracket: Bool = false, shouldVerifyGroupStage: Bool = false) { internal init(event: String? = nil, name: String? = nil, startDate: Date = Date(), endDate: Date? = nil, creationDate: Date = Date(), isPrivate: Bool = false, groupStageFormat: MatchFormat? = nil, roundFormat: MatchFormat? = nil, loserRoundFormat: MatchFormat? = nil, groupStageSortMode: GroupStageOrderingMode, groupStageCount: Int = 4, rankSourceDate: Date? = nil, dayDuration: Int = 1, teamCount: Int = 24, teamSorting: TeamSortingType? = nil, federalCategory: TournamentCategory, federalLevelCategory: TournamentLevel, federalAgeCategory: FederalTournamentAge, closedRegistrationDate: Date? = nil, groupStageAdditionalQualified: Int = 0, courtCount: Int = 2, prioritizeClubMembers: Bool = false, qualifiedPerGroupStage: Int = 1, teamsPerGroupStage: Int = 4, entryFee: Double? = nil, additionalEstimationDuration: Int = 0, isDeleted: Bool = false, publishTeams: Bool = false, publishSummons: Bool = false, publishGroupStages: Bool = false, publishBrackets: Bool = false, shouldVerifyBracket: Bool = false, shouldVerifyGroupStage: Bool = false, hideTeamsWeight: Bool = false) {
self.event = event self.event = event
self.name = name self.name = name
self.startDate = startDate self.startDate = startDate
@ -130,6 +132,7 @@ class Tournament : ModelObject, Storable {
self.publishGroupStages = publishGroupStages self.publishGroupStages = publishGroupStages
self.shouldVerifyBracket = shouldVerifyBracket self.shouldVerifyBracket = shouldVerifyBracket
self.shouldVerifyGroupStage = shouldVerifyGroupStage self.shouldVerifyGroupStage = shouldVerifyGroupStage
self.hideTeamsWeight = hideTeamsWeight
} }
required init(from decoder: Decoder) throws { required init(from decoder: Decoder) throws {
@ -170,6 +173,7 @@ class Tournament : ModelObject, Storable {
publishBrackets = try container.decodeIfPresent(Bool.self, forKey: ._publishBrackets) ?? false publishBrackets = try container.decodeIfPresent(Bool.self, forKey: ._publishBrackets) ?? false
shouldVerifyBracket = try container.decodeIfPresent(Bool.self, forKey: ._shouldVerifyBracket) ?? false shouldVerifyBracket = try container.decodeIfPresent(Bool.self, forKey: ._shouldVerifyBracket) ?? false
shouldVerifyGroupStage = try container.decodeIfPresent(Bool.self, forKey: ._shouldVerifyGroupStage) ?? false shouldVerifyGroupStage = try container.decodeIfPresent(Bool.self, forKey: ._shouldVerifyGroupStage) ?? false
hideTeamsWeight = try container.decodeIfPresent(Bool.self, forKey: ._hideTeamsWeight) ?? false
} }
fileprivate static let _numberFormatter: NumberFormatter = NumberFormatter() fileprivate static let _numberFormatter: NumberFormatter = NumberFormatter()
@ -281,6 +285,7 @@ class Tournament : ModelObject, Storable {
try container.encode(publishGroupStages, forKey: ._publishGroupStages) try container.encode(publishGroupStages, forKey: ._publishGroupStages)
try container.encode(shouldVerifyBracket, forKey: ._shouldVerifyBracket) try container.encode(shouldVerifyBracket, forKey: ._shouldVerifyBracket)
try container.encode(shouldVerifyGroupStage, forKey: ._shouldVerifyGroupStage) try container.encode(shouldVerifyGroupStage, forKey: ._shouldVerifyGroupStage)
try container.encode(hideTeamsWeight, forKey: ._hideTeamsWeight)
} }
fileprivate func _encodePayment(container: inout KeyedEncodingContainer<CodingKeys>) throws { fileprivate func _encodePayment(container: inout KeyedEncodingContainer<CodingKeys>) throws {

@ -21,7 +21,7 @@ struct CashierView: View {
init(tournament: Tournament, teams: [TeamRegistration]) { init(tournament: Tournament, teams: [TeamRegistration]) {
self.tournaments = [tournament] self.tournaments = [tournament]
self.teams = teams self.teams = teams
if tournament.hasEnded(), tournament.paidCompletion() < 100.0 { if tournament.hasEnded(), tournament.players().anySatisfy({ $0.hasPaid() == false }) {
_filterOption = .init(wrappedValue: .didNotPay) _filterOption = .init(wrappedValue: .didNotPay)
} }
if teams.filter({ $0.callDate != nil }).isEmpty { if teams.filter({ $0.callDate != nil }).isEmpty {

@ -142,6 +142,14 @@ struct ClubDetailView: View {
ClubCourtSetupView(club: club, displayContext: displayContext, selectedCourt: $selectedCourt) ClubCourtSetupView(club: club, displayContext: displayContext, selectedCourt: $selectedCourt)
if let padelClubLink = club.shareURL() {
Section {
Link(destination: padelClubLink) {
Text("Accéder au club sur le site Padel Club")
}
}
}
if let federalLink = club.federalLink() { if let federalLink = club.federalLink() {
Section { Section {
LabeledContent("Code Club") { LabeledContent("Code Club") {

@ -105,6 +105,7 @@ struct GroupStageSettingsView: View {
tournament.deleteGroupStages() tournament.deleteGroupStages()
tournament.buildGroupStages() tournament.buildGroupStages()
generationDone = true generationDone = true
tournament.shouldVerifyGroupStage = false
_save() _save()
} }
} }
@ -115,6 +116,7 @@ struct GroupStageSettingsView: View {
tournament.groupStageOrderingMode = mode tournament.groupStageOrderingMode = mode
tournament.refreshGroupStages() tournament.refreshGroupStages()
generationDone = true generationDone = true
tournament.shouldVerifyGroupStage = false
_save() _save()
} }
} }

@ -150,6 +150,11 @@ struct GroupStageView: View {
} }
} }
} }
.contextMenu {
Button("équipe présente") {
team.hasArrived()
}
}
} }
.listRowView(isActive: team.qualified, color: .master) .listRowView(isActive: team.qualified, color: .master)
} else { } else {

@ -29,10 +29,12 @@ struct MatchDateView: View {
if match.startDate == nil && isReady { if match.startDate == nil && isReady {
Button("Démarrer") { Button("Démarrer") {
match.startDate = Date() match.startDate = Date()
match.confirmed = true
_save() _save()
} }
Button("Échauffement") { Button("Échauffement") {
match.startDate = Calendar.current.date(byAdding: .minute, value: 5, to: Date()) match.startDate = Calendar.current.date(byAdding: .minute, value: 5, to: Date())
match.confirmed = true
_save() _save()
} }
} else { } else {
@ -40,6 +42,7 @@ struct MatchDateView: View {
Button("Démarrer maintenant") { Button("Démarrer maintenant") {
match.startDate = Date() match.startDate = Date()
match.endDate = nil match.endDate = nil
match.confirmed = true
_save() _save()
} }
} else { } else {
@ -69,7 +72,7 @@ struct MatchDateView: View {
if showPrefix { if showPrefix {
Text("en cours").font(.footnote).foregroundStyle(.secondary) Text("en cours").font(.footnote).foregroundStyle(.secondary)
} }
if match.isReady() { if match.isReady() && match.confirmed {
Text(startDate, style: .timer) Text(startDate, style: .timer)
.monospacedDigit() .monospacedDigit()
.foregroundStyle(Color.master) .foregroundStyle(Color.master)

@ -300,6 +300,7 @@ struct MatchDetailView: View {
Button(role: .destructive) { Button(role: .destructive) {
match.startDate = nil match.startDate = nil
match.endDate = nil match.endDate = nil
match.confirmed = false
save() save()
} label: { } label: {
Text("Supprimer l'horaire") Text("Supprimer l'horaire")

@ -44,6 +44,10 @@ struct MainView: View {
} }
)} )}
var matches: [Match] {
dataStore.matches.filter({ $0.confirmed && $0.startDate != nil && $0.endDate == nil && $0.courtIndex != nil })
}
var body: some View { var body: some View {
TabView(selection: selectedTabHandler) { TabView(selection: selectedTabHandler) {
ActivityView() ActivityView()
@ -52,10 +56,15 @@ struct MainView: View {
.tabItem(for: .tournamentOrganizer) .tabItem(for: .tournamentOrganizer)
OngoingView() OngoingView()
.tabItem(for: .ongoing) .tabItem(for: .ongoing)
.badge(matches.count)
ToolboxView() ToolboxView()
.tabItem(for: .toolbox) .tabItem(for: .toolbox)
UmpireView() UmpireView()
.tabItem(for: .umpire) .tabItem(for: .umpire)
// .badge(
// Text("!")
// .font(.headline)
// )
// PadelClubView() // PadelClubView()
// .tabItem(for: .padelClub) // .tabItem(for: .padelClub)
} }

@ -18,7 +18,7 @@ struct OngoingView: View {
var matches: [Match] { var matches: [Match] {
let sorting = sortByField ? fieldSorting : defaultSorting let sorting = sortByField ? fieldSorting : defaultSorting
let now = Date() let now = Date()
return dataStore.matches.filter({ $0.startDate != nil && $0.startDate! < now && $0.endDate == nil && $0.courtIndex != nil }).sorted(using: sorting, order: .ascending) return dataStore.matches.filter({ $0.confirmed && $0.startDate != nil && $0.endDate == nil && $0.courtIndex != nil }).sorted(using: sorting, order: .ascending)
} }
var body: some View { var body: some View {

@ -82,6 +82,12 @@ struct ToolboxView: View {
} }
#endif #endif
Section {
Link(destination: URLs.main.url) {
Text("Accéder au site Padel Club")
}
}
Section { Section {
NavigationLink { NavigationLink {
SelectablePlayerListView() SelectablePlayerListView()

@ -65,6 +65,16 @@ struct UmpireView: View {
if let currentPlayerData { if let currentPlayerData {
//todo palmares //todo palmares
ImportedPlayerView(player: currentPlayerData) ImportedPlayerView(player: currentPlayerData)
.contextMenu {
Button("Copier ma licence") {
UIPasteboard.general.string = currentPlayerData.formattedLicense()
}
Button("Supprimer ma fiche") {
dataStore.user.licenceId = nil
self.dataStore.saveUser()
}
}
// NavigationLink { // NavigationLink {
// //
// } label: { // } label: {
@ -75,18 +85,9 @@ struct UmpireView: View {
presentSearchView = true presentSearchView = true
} }
} }
} header: {
if currentPlayerData != nil {
Text("Ma fiche joueur")
}
} footer: { } footer: {
if dataStore.user.licenceId == nil { if dataStore.user.licenceId == nil {
Text("Si vous avez participé à un tournoi dans les 12 derniers mois, Padel Club peut vous retrouver.") Text("Si vous avez participé à un tournoi dans les 12 derniers mois, Padel Club peut vous retrouver.")
} else {
Button("supprimer", role: .destructive) {
dataStore.user.licenceId = nil
self.dataStore.saveUser()
}
} }
} }
@ -181,11 +182,11 @@ struct UmpireView: View {
do { do {
try dataStore.clubs.addOrUpdate(instance: userClub) try dataStore.clubs.addOrUpdate(instance: userClub)
user.setUserClub(userClub) user.setUserClub(userClub)
self.dataStore.saveUser()
} catch { } catch {
Logger.error(error) Logger.error(error)
} }
} }
self.dataStore.saveUser()
} }
}) })
} }

@ -104,7 +104,10 @@ struct PlanningSettingsView: View {
Section { Section {
RowButtonView("Supprimer tous les horaires", role: .destructive) { RowButtonView("Supprimer tous les horaires", role: .destructive) {
do { do {
allMatches.forEach({ $0.startDate = nil }) allMatches.forEach({
$0.startDate = nil
$0.confirmed = false
})
try dataStore.matches.addOrUpdate(contentOfs: allMatches) try dataStore.matches.addOrUpdate(contentOfs: allMatches)
allGroupStages.forEach({ $0.startDate = nil }) allGroupStages.forEach({ $0.startDate = nil })
@ -126,7 +129,7 @@ struct PlanningSettingsView: View {
if roundsWithDate.isEmpty == false { if roundsWithDate.isEmpty == false {
Text("Des dates de démarrages ont été indiqué pour les manches et seront prises en compte.") Text("Des dates de démarrages ont été indiqué pour les manches et seront prises en compte.")
} }
RowButtonView("Horaire intelligent", role: .destructive, confirmationMessage: "L") { RowButtonView("Horaire intelligent", role: .destructive) {
schedulingDone = false schedulingDone = false
await _setupSchedule() await _setupSchedule()
_save() _save()

@ -40,6 +40,7 @@ struct BroadcastView: View {
.tipStyle(tint: nil) .tipStyle(tint: nil)
} }
if tournament.isPrivate == false {
Section { Section {
LabeledContent { LabeledContent {
if tournament.areTeamsPublished() { if tournament.areTeamsPublished() {
@ -157,6 +158,7 @@ struct BroadcastView: View {
} }
} }
} }
}
//todo waitinglist & info //todo waitinglist & info

@ -52,6 +52,13 @@ struct TournamentClubSettingsView: View {
Section { Section {
TournamentFieldsManagerView(localizedStringKey: "Terrains pour le tournoi", count: $tournament.courtCount) TournamentFieldsManagerView(localizedStringKey: "Terrains pour le tournoi", count: $tournament.courtCount)
.onChange(of: tournament.courtCount) {
do {
try dataStore.tournaments.addOrUpdate(instance: tournament)
} catch {
Logger.error(error)
}
}
if let event = tournament.eventObject() { if let event = tournament.eventObject() {
NavigationLink { NavigationLink {

@ -135,8 +135,9 @@ struct InscriptionManagerView: View {
} }
} }
.onAppear { .onAppear {
if self.teamsHash == nil { let selectedSortedTeams = tournament.selectedSortedTeams()
self.teamsHash = _simpleHash(ids: tournament.selectedSortedTeams().map { $0.id }) if self.teamsHash == nil, selectedSortedTeams.isEmpty == false {
self.teamsHash = _simpleHash(ids: selectedSortedTeams.map { $0.id })
} }
} }
.onDisappear { .onDisappear {
@ -424,6 +425,11 @@ struct InscriptionManagerView: View {
let teamIndex = team.index(in: sortedTeams) let teamIndex = team.index(in: sortedTeams)
Section { Section {
TeamDetailView(team: team) TeamDetailView(team: team)
.contextMenu {
Button("équipe présente") {
team.hasArrived()
}
}
} header: { } header: {
TeamHeaderView(team: team, teamIndex: teamIndex, tournament: tournament) TeamHeaderView(team: team, teamIndex: teamIndex, tournament: tournament)
} footer: { } footer: {
@ -606,7 +612,6 @@ struct InscriptionManagerView: View {
private func _informationView(count: Int) -> some View { private func _informationView(count: Int) -> some View {
Section { Section {
let unsortedTeams = tournament.unsortedTeams()
let walkoutTeams = tournament.walkoutTeams() let walkoutTeams = tournament.walkoutTeams()
let unsortedTeamsWithoutWO = tournament.unsortedTeamsWithoutWO() let unsortedTeamsWithoutWO = tournament.unsortedTeamsWithoutWO()

@ -72,10 +72,7 @@ struct PrintSettingsView: View {
} label: { } label: {
Text("Aperçu du tableau") Text("Aperçu du tableau")
} }
}
ForEach(tournament.groupStages()) { groupStage in ForEach(tournament.groupStages()) { groupStage in
Section {
NavigationLink { NavigationLink {
WebView(htmlRawData: HtmlService.groupstage(groupStage: groupStage).html(headName: generator.displayHeads, withRank: generator.displayRank, withScore: false), loadStatusChanged: { loaded, error, webView in WebView(htmlRawData: HtmlService.groupstage(groupStage: groupStage).html(headName: generator.displayHeads, withRank: generator.displayRank, withScore: false), loadStatusChanged: { loaded, error, webView in
if let error { if let error {

@ -100,7 +100,7 @@ struct TournamentCashierView: View {
init(tournament: Tournament) { init(tournament: Tournament) {
self.tournament = tournament self.tournament = tournament
if tournament.hasEnded() { if tournament.hasEnded() {
if tournament.paidCompletion() == 100.0 { if tournament.players().anySatisfy({ $0.hasPaid() == false }) == false {
_selectedDestination = .init(wrappedValue: .summary) _selectedDestination = .init(wrappedValue: .summary)
} else { } else {
_selectedDestination = .init(wrappedValue: .all(tournament)) _selectedDestination = .init(wrappedValue: .all(tournament))

@ -43,8 +43,11 @@ struct TournamentInitView: View {
NavigationLink(value: Screen.broadcast) { NavigationLink(value: Screen.broadcast) {
LabeledContent { LabeledContent {
Image(systemName: tournament.isPrivate ? "tv.slash" : "checkmark") if tournament.isPrivate {
.foregroundStyle(tournament.isPrivate ? .logoRed : .green) Text("tournoi privé").foregroundStyle(.logoRed)
} else {
Text("Automatique")
}
} label: { } label: {
Text("Publication") Text("Publication")
} }

@ -255,7 +255,7 @@ final class ServerDataTests: XCTestCase {
let rounds: [Round] = try await Store.main.service().get() let rounds: [Round] = try await Store.main.service().get()
let parentRoundId = rounds.first?.id let parentRoundId = rounds.first?.id
let match: Match = Match(round: parentRoundId, groupStage: nil, startDate: Date(), endDate: Date(), index: 2, matchFormat: MatchFormat.twoSets, servingTeamId: teamRegistrationId, winningTeamId: teamRegistrationId, losingTeamId: teamRegistrationId, disabled: true, courtIndex: 1) let match: Match = Match(round: parentRoundId, groupStage: nil, startDate: Date(), endDate: Date(), index: 2, matchFormat: MatchFormat.twoSets, servingTeamId: teamRegistrationId, winningTeamId: teamRegistrationId, losingTeamId: teamRegistrationId, disabled: true, courtIndex: 1, confirmed: true)
let m: Match = try await Store.main.service().post(match) let m: Match = try await Store.main.service().post(match)
assert(m.round == match.round) assert(m.round == match.round)
@ -269,6 +269,7 @@ final class ServerDataTests: XCTestCase {
assert(m.losingTeamId == match.losingTeamId) assert(m.losingTeamId == match.losingTeamId)
assert(m.disabled == match.disabled) assert(m.disabled == match.disabled)
assert(m.courtIndex == match.courtIndex) assert(m.courtIndex == match.courtIndex)
assert(m.confirmed == match.confirmed)
} }
@ -284,15 +285,11 @@ final class ServerDataTests: XCTestCase {
assertionFailure("missing teamRegistrations in database") assertionFailure("missing teamRegistrations in database")
return return
} }
let playerRegistrations: [PlayerRegistration] = try await Store.main.service().get() let teamScore = TeamScore(match: matchId, teamRegistration: teamRegistrationId, score: "6/6", walkOut: 1, luckyLoser: 1)
let regs = playerRegistrations.prefix(upTo: 2).map { $0.id }
let teamScore = TeamScore(match: matchId, teamRegistration: teamRegistrationId, playerRegistrations: regs, score: "6/6", walkOut: 1, luckyLoser: 1)
let ts: TeamScore = try await Store.main.service().post(teamScore) let ts: TeamScore = try await Store.main.service().post(teamScore)
assert(ts.match == teamScore.match) assert(ts.match == teamScore.match)
assert(ts.teamRegistration == teamScore.teamRegistration) assert(ts.teamRegistration == teamScore.teamRegistration)
assert(ts.playerRegistrations == teamScore.playerRegistrations)
assert(ts.score == teamScore.score) assert(ts.score == teamScore.score)
assert(ts.walkOut == teamScore.walkOut) assert(ts.walkOut == teamScore.walkOut)
assert(ts.luckyLoser == teamScore.luckyLoser) assert(ts.luckyLoser == teamScore.luckyLoser)

Loading…
Cancel
Save