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

merge main

Browse Source
sync
Laurent 8 months ago
parent a6c7fddf0c 563404d92b
commit 37c0ac62e9
12 changed files with 178 additions and 90 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. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 6
      PadelClub/Data/Round.swift
  3. 53
      PadelClub/Data/TeamRegistration.swift
  4. 15
      PadelClub/Data/Tournament.swift
  5. 14
      PadelClub/Views/GroupStage/GroupStageView.swift
  6. 47
      PadelClub/Views/Match/Components/PlayerBlockView.swift
  7. 7
      PadelClub/Views/Team/Components/TeamWeightView.swift
  8. 15
      PadelClub/Views/Team/TeamPickerView.swift
  9. 25
      PadelClub/Views/Team/TeamRowView.swift
  10. 15
      PadelClub/Views/Tournament/Screen/AddTeamView.swift
  11. 15
      PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
  12. 38
      PadelClub/Views/Tournament/Screen/TableStructureView.swift

4
PadelClub.xcodeproj/project.pbxproj
Unescape View File

@ -3650,7 +3650,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.23;
MARKETING_VERSION = 1.1.25;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -3695,7 +3695,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.23;
MARKETING_VERSION = 1.1.25;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

6
PadelClub/Data/Round.swift
Unescape View File

@ -644,9 +644,9 @@ defer {
let roundCount = RoundRule.numberOfRounds(forTeams: currentRoundMatchCount)
var loserBracketMatchFormat = tournamentObject()?.loserBracketMatchFormat
if let parentRound {
loserBracketMatchFormat = tournamentObject()?.loserBracketSmartMatchFormat(parentRound.index)
}
// if let parentRound {
// loserBracketMatchFormat = tournamentObject()?.loserBracketSmartMatchFormat(parentRound.index)
// }
let rounds = (0..<roundCount).map { //index 0 is the final
let round = Round(tournament: tournament, index: $0, matchFormat: loserBracketMatchFormat)

53
PadelClub/Data/TeamRegistration.swift
Unescape View File

@ -650,8 +650,7 @@ final class TeamRegistration: BaseTeamRegistration, SideStorable {
func wildcardLabel() -> String? {
if isWildCard() {
let wildcardLabel: String = ["wildcard", (wildCardBracket ? "tableau" : "poule")]
.joined(separator: " ")
let wildcardLabel: String = ["Wildcard", (wildCardBracket ? "Tableau" : "Poule")].joined(separator: " ")
return wildcardLabel
} else {
return nil
@ -700,22 +699,48 @@ final class TeamRegistration: BaseTeamRegistration, SideStorable {
unsortedPlayers().count > 0
}
func bracketMatchTitleAndQualifiedStatus() -> String? {
let v = groupStageObject()?.groupStageTitle()
var base = "Qualifié"
if qualified {
if let groupStageTitle = groupStageObject()?.groupStageTitle() {
base = base + " (\(groupStageTitle))"
func teamInitialPositionBracket() -> String? {
let round = initialMatch()?.roundAndMatchTitle()
if let round {
return round
}
return nil
}
func teamInitialPositionGroupStage() -> String? {
let groupStage = self.groupStageObject()
let group = groupStage?.groupStageTitle(.title)
var groupPositionLabel: String? = nil
if let finalPosition = groupStage?.finalPosition(ofTeam: self) {
groupPositionLabel = (finalPosition + 1).ordinalFormatted()
} else if let groupStagePosition {
groupPositionLabel = "\(groupStagePosition + 1)"
}
if let group {
if let groupPositionLabel {
return [group, "#\(groupPositionLabel)"].joined(separator: " ")
} else {
return group
}
}
return nil
}
let suffix = qualified ? nil : groupStageObject()?.groupStageTitle()
let initalMatchTitle = initialMatch()?.roundAndMatchTitle() ?? suffix
let values = [qualified ? base : nil, initalMatchTitle].compactMap({ $0 })
if values.isEmpty {
return nil
func qualifiedStatus(hideBracketStatus: Bool = false) -> String? {
let teamInitialPositionBracket = teamInitialPositionBracket()
let groupStageTitle = teamInitialPositionGroupStage()
let base: String? = qualified ? "Qualifié" : nil
if let groupStageTitle, let teamInitialPositionBracket, hideBracketStatus == false {
return [base, groupStageTitle, ">", teamInitialPositionBracket].compactMap({ $0 }).joined(separator: " ")
} else if let groupStageTitle {
return [base, groupStageTitle].compactMap({ $0 }).joined(separator: " ")
} else if hideBracketStatus == false {
return teamInitialPositionBracket
}
return values.joined(separator: " -> ")
return nil
}
func insertOnServer() {

15
PadelClub/Data/Tournament.swift
Unescape View File

@ -1612,7 +1612,7 @@ defer {
var _groupStages = [GroupStage]()
for index in 0..<groupStageCount {
let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, format: groupStageSmartMatchFormat())
let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, format: groupStageFormat)
_groupStages.append(groupStage)
}
@ -1631,7 +1631,7 @@ defer {
let matchCount = RoundRule.numberOfMatches(forTeams: minimalBracketTeamCount ?? bracketTeamCount())
let rounds = (0..<roundCount).map { //index 0 is the final
return Round(tournament: id, index: $0, matchFormat: roundSmartMatchFormat($0), loserBracketMode: loserBracketMode)
return Round(tournament: id, index: $0, matchFormat: matchFormat, loserBracketMode: loserBracketMode)
}
if rounds.isEmpty {
@ -1726,10 +1726,19 @@ defer {
}
}
func removeWildCards() {
let wcs = unsortedTeams().filter({ $0.isWildCard() && $0.unsortedPlayers().isEmpty })
do {
try tournamentStore?.teamRegistrations.delete(contentOfs: wcs)
} catch {
Logger.error(error)
}
}
func setGroupStageTeams(randomize: Bool) {
let groupStages = groupStages()
let max = groupStages.map { $0.size }.reduce(0,+)
var chunks = selectedSortedTeams().suffix(max).chunked(into: groupStageCount)
var chunks = selectedSortedTeams().filter({ $0.wildCardBracket == false }).suffix(max).chunked(into: groupStageCount)
for (index, _) in chunks.enumerated() {
if randomize {
chunks[index].shuffle()

14
PadelClub/Views/GroupStage/GroupStageView.swift
Unescape View File

@ -140,12 +140,16 @@ struct GroupStageView: View {
GroupStageTeamView(groupStage: groupStage, team: team)
.environment(self.tournament)
} label: {
let players = team.players()
VStack(alignment: .leading, spacing: 4.0) {
HStack(spacing: 6.0) {
Text("#\(groupStagePosition + 1)")
if groupStage.tournamentObject()?.hideWeight() == false {
if players.isEmpty == false, groupStage.tournamentObject()?.hideWeight() == false {
Text("Poids \(team.weight)")
}
if players.isEmpty == false, team.isWildCard() {
Text("wildcard").foregroundStyle(.logoRed).font(.caption).italic()
}
Spacer()
if team.qualified {
Text("qualifié")
@ -156,8 +160,14 @@ struct GroupStageView: View {
VStack(alignment: .leading) {
if let teamName = team.name, teamName.isEmpty == false {
Text(teamName).foregroundStyle(.secondary).font(.footnote)
} else if players.isEmpty {
if team.isWildCard() {
Text("Place réservée wildcard")
} else {
Text("Place réservée")
}
}
ForEach(team.players()) { player in
ForEach(players) { player in
Text(player.playerLabel()).lineLimit(1)
.overlay {
if player.hasArrived && team.isHere() == false {

47
PadelClub/Views/Match/Components/PlayerBlockView.swift
Unescape View File

@ -74,29 +74,38 @@ struct PlayerBlockView: View {
var body: some View {
HStack {
VStack(alignment: .leading) {
if let team {
if let teamScore, teamScore.luckyLoser != nil, match.isLoserBracket == false {
Text("Repêchée").italic().font(.caption)
ZStack(alignment: .leading) {
VStack {
if let teamName = team?.name {
Text(teamName).foregroundStyle(.secondary).font(.footnote)
}
Text("longLabelPlayerOne").lineLimit(1)
Text("longLabelPlayerTwo").lineLimit(1)
}
.opacity(0)
if let teamName = team.name {
Text(teamName).foregroundStyle(.secondary).font(.footnote)
}
ForEach(team.players()) { player in
Text(player.playerLabel()).lineLimit(1)
.italic(player.isHere() == false)
.foregroundStyle(player.isHere() == false ? .secondary : .primary)
}
} else {
ZStack(alignment: .leading) {
VStack {
if let teamName = team?.name {
Text(teamName).foregroundStyle(.secondary).font(.footnote)
if let team {
if let teamScore, teamScore.luckyLoser != nil, match.isLoserBracket == false {
Text("Repêchée").italic().font(.caption)
}
if let teamName = team.name {
Text(teamName).foregroundStyle(.secondary).font(.footnote)
} else if team.players().isEmpty {
if team.isWildCard() {
Text("Place réservée wildcard")
} else {
Text("Place réservée")
}
}
VStack(alignment: .leading) {
ForEach(team.players()) { player in
Text(player.playerLabel()).lineLimit(1)
.italic(player.isHere() == false)
.foregroundStyle(player.isHere() == false ? .secondary : .primary)
}
Text("longLabelPlayerOne").lineLimit(1)
Text("longLabelPlayerTwo").lineLimit(1)
}
.opacity(0)
} else {
VStack(alignment: .leading) {
ForEach(_defaultLabel(), id: \.self) { name in
Text(name)

7
PadelClub/Views/Team/Components/TeamWeightView.swift
Unescape View File

@ -11,9 +11,14 @@ struct TeamWeightView: View {
@EnvironmentObject var dataStore: DataStore
let team: TeamRegistration
var teamPosition: TeamPosition? = nil
var teamIndex: Int?
init(team: TeamRegistration, teamPosition: TeamPosition? = nil, teamIndex: Int? = nil) {
self.team = team
self.teamPosition = teamPosition
self.teamIndex = teamIndex ?? team.tournamentObject()?.indexOf(team: team)
}
var displayWeight: Bool {
team.shouldDisplayRankAndWeight() && team.tournamentObject()?.hideWeight() == false
}

15
PadelClub/Views/Team/TeamPickerView.swift
Unescape View File

@ -121,7 +121,9 @@ struct TeamPickerView: View {
}
}
@ViewBuilder
private func _teamListView(_ teams: [TeamRegistration]) -> some View {
let selectedSortedTeams = tournament.selectedSortedTeams()
ForEach(teams) { team in
if searchField.isEmpty || team.contains(searchField) {
Button {
@ -134,15 +136,10 @@ struct TeamPickerView: View {
// presentTeamPickerView = false
// }
} label: {
VStack(alignment: .leading) {
if let roundAndMatchTitle = team.bracketMatchTitleAndQualifiedStatus() {
Text(roundAndMatchTitle)
.font(.headline)
.frame(maxWidth: .infinity, alignment: .leading)
}
TeamRowView(team: team)
}
.contentShape(Rectangle())
let teamIndex = team.index(in: selectedSortedTeams)
TeamRowView(team: team, teamIndex: teamIndex)
.environment(\.isEditingTournamentSeed, .constant(false))
.contentShape(Rectangle())
}
.frame(maxWidth: .infinity)
.buttonStyle(.plain)

25
PadelClub/Views/Team/TeamRowView.swift
Unescape View File

@ -9,7 +9,6 @@ import SwiftUI
struct TeamRowView: View {
@EnvironmentObject var dataStore: DataStore
@Environment(\.isEditingTournamentSeed) private var isEditingTournamentSeed
var team: TeamRegistration
var teamPosition: TeamPosition? = nil
@ -22,9 +21,7 @@ struct TeamRowView: View {
TeamWeightView(team: team, teamPosition: teamPosition, teamIndex: teamIndex)
} label: {
VStack(alignment: .leading) {
if isEditingTournamentSeed.wrappedValue == false {
TeamHeadlineView(team: team)
}
TeamHeadlineView(team: team)
TeamView(team: team)
}
if displayCallDate {
@ -78,23 +75,19 @@ struct TeamRowView: View {
}
struct TeamHeadlineView: View {
@Environment(\.isEditingTournamentSeed) private var isEditingTournamentSeed
let team: TeamRegistration
var body: some View {
HStack {
if let groupStage = team.groupStageObject() {
HStack {
Text(groupStage.groupStageTitle(.title))
if let finalPosition = groupStage.finalPosition(ofTeam: team) {
Text((finalPosition + 1).ordinalFormatted())
}
}
} else if let round = team.initialRound() {
Text(round.roundTitle(.wide))
VStack(alignment: .leading) {
if let wildcardLabel = team.wildcardLabel() {
Text(wildcardLabel).italic().foregroundStyle(.logoRed).font(.caption)
}
if let wildcardLabel = team.wildcardLabel() {
Text(wildcardLabel).italic().foregroundStyle(.red).font(.caption)
if let qualifiedStatus = team.qualifiedStatus(hideBracketStatus: isEditingTournamentSeed.wrappedValue == true) {
Text(qualifiedStatus)
.font(.caption)
.foregroundStyle(.secondary)
}
}
}

15
PadelClub/Views/Tournament/Screen/AddTeamView.swift
Unescape View File

@ -216,6 +216,7 @@ struct AddTeamView: View {
let first = strings.first ?? ""
handlePasteString(first)
}
.disabled(_limitPlayerCount())
.foregroundStyle(.master)
.labelStyle(.titleAndIcon)
.buttonBorderShape(.capsule)
@ -236,6 +237,7 @@ struct AddTeamView: View {
} label: {
Label("Coller", systemImage: "doc.on.clipboard").labelStyle(.iconOnly)
}
.disabled(_limitPlayerCount())
.foregroundStyle(.master)
.labelStyle(.iconOnly)
.buttonBorderShape(.capsule)
@ -258,12 +260,20 @@ struct AddTeamView: View {
tournament.unsortedPlayers()
}
private func _limitPlayerCount() -> Bool {
if tournament.isAnimation() {
return false
}
return _currentSelection().count >= tournament.significantPlayerCount()
}
@ViewBuilder
private func _managementView() -> some View {
Section {
RowButtonView("Ajouter via la base fédérale") {
presentPlayerSearch = true
}
.disabled(_limitPlayerCount())
} footer: {
if let rankSourceDate = tournament.rankSourceDate {
Text("Cherchez dans la base fédérale de \(rankSourceDate.monthYearFormatted), vous y trouverez tous les joueurs ayant participé à au moins un tournoi dans les 12 derniers mois.")
@ -288,6 +298,7 @@ struct AddTeamView: View {
presentPlayerCreation = true
}
}
.disabled(_limitPlayerCount())
} footer: {
Text("Si le joueur n'a pas encore de licence ou n'a pas encore participé à une compétition, vous pouvez le créer vous-même.")
}
@ -541,6 +552,10 @@ struct AddTeamView: View {
// } else {
// Text("Préparation de l'équipe")
}
} footer: {
if _limitPlayerCount() {
Text("Taille maximum de l'équipe atteinte, supprimer un joueur pour pouvoir en rajouter un autre").foregroundStyle(.logoRed)
}
}

15
PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
Unescape View File

@ -49,14 +49,15 @@ struct TournamentStatusView: View {
let event = tournament.eventObject()
let isLastTournament = event?.tournaments.count == 1
tournament.isDeleted = true
try dataStore.tournaments.addOrUpdate(instance: tournament)
if let event, isLastTournament {
try dataStore.events.delete(instance: event)
if tournament.onlineTeams().isEmpty == false {
tournament.isDeleted = true
try dataStore.tournaments.addOrUpdate(instance: tournament)
} else {
try dataStore.tournaments.delete(instance: tournament)
if let event, isLastTournament {
try dataStore.events.delete(instance: event)
} else {
try dataStore.tournaments.delete(instance: tournament)
}
}
if eventDismiss == false || isLastTournament {
navigation.path = NavigationPath()

38
PadelClub/Views/Tournament/Screen/TableStructureView.swift
Unescape View File

@ -81,12 +81,7 @@ struct TableStructureView: View {
Text(structurePreset.localizedDescriptionStructurePresetTitle())
}
.onChange(of: structurePreset) {
teamCount = structurePreset.tableDimension() + structurePreset.teamsInQualifiers() - structurePreset.qualifiedPerGroupStage() * structurePreset.groupStageCount()
groupStageCount = structurePreset.groupStageCount()
teamsPerGroupStage = structurePreset.teamsPerGroupStage()
qualifiedPerGroupStage = structurePreset.qualifiedPerGroupStage()
groupStageAdditionalQualified = 0
buildWildcards = tournament.level.wildcardArePossible()
_updatePreset()
}
}
@ -293,8 +288,27 @@ struct TableStructureView: View {
Section {
RowButtonView("Remise-à-zéro", role: .destructive) {
tournament.removeWildCards()
tournament.deleteGroupStages()
tournament.deleteStructure()
if structurePreset != .manual {
structurePreset = PadelTournamentStructurePreset.manual
} else {
_updatePreset()
}
tournament.teamCount = teamCount
tournament.groupStageCount = groupStageCount
tournament.teamsPerGroupStage = teamsPerGroupStage
tournament.qualifiedPerGroupStage = qualifiedPerGroupStage
tournament.groupStageAdditionalQualified = groupStageAdditionalQualified
do {
try dataStore.tournaments.addOrUpdate(instance: tournament)
} catch {
Logger.error(error)
}
}
}
}
@ -443,11 +457,12 @@ struct TableStructureView: View {
tournament.groupStageAdditionalQualified = groupStageAdditionalQualified
if rebuildEverything {
tournament.deleteAndBuildEverything(preset: structurePreset)
tournament.removeWildCards()
if structurePreset.hasWildcards(), buildWildcards {
tournament.addWildCardIfNeeded(structurePreset.wildcardBrackets(), .bracket)
tournament.addWildCardIfNeeded(structurePreset.wildcardQualifiers(), .groupStage)
}
tournament.deleteAndBuildEverything(preset: structurePreset)
} else if (rebuildEverything == false && requirements.contains(.groupStage)) {
tournament.deleteGroupStages()
tournament.buildGroupStages()
@ -466,6 +481,15 @@ struct TableStructureView: View {
}
}
private func _updatePreset() {
teamCount = structurePreset.tableDimension() + structurePreset.teamsInQualifiers() - structurePreset.qualifiedPerGroupStage() * structurePreset.groupStageCount()
groupStageCount = structurePreset.groupStageCount()
teamsPerGroupStage = structurePreset.teamsPerGroupStage()
qualifiedPerGroupStage = structurePreset.qualifiedPerGroupStage()
groupStageAdditionalQualified = 0
buildWildcards = tournament.level.wildcardArePossible()
}
private func _verifyValueIntegrity() {
if teamCount > 128 {
teamCount = 128

Write Preview
Loading…
Cancel
Save