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

fix stuff

Browse Source
multistore
Razmig Sarkissian 1 year ago
parent 8dffc0a3e6
commit cd730f3f03
6 changed files with 195 additions and 108 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. 2
      PadelClub/Data/Tournament.swift
  2. 64
      PadelClub/Views/Calling/CallView.swift
  3. 44
      PadelClub/Views/Tournament/Screen/TableStructureView.swift
  4. 51
      PadelClub/Views/Tournament/Screen/TournamentRankView.swift
  5. 128
      PadelClub/Views/Tournament/TournamentBuildView.swift
  6. 2
      PadelClub/Views/Tournament/TournamentView.swift

2
PadelClub/Data/Tournament.swift
Unescape View File

@ -1066,7 +1066,7 @@ class Tournament : ModelObject, Storable {
return Array(allMatches.filter({ $0.hasEnded() }).sorted(by: \.computedEndDateForSorting).reversed().prefix(_limit))
}
func finalRanking() -> [Int: [String]] {
func finalRanking() async -> [Int: [String]] {
var teams: [Int: [String]] = [:]
var ids: Set<String> = Set<String>()
let rounds = rounds()

64
PadelClub/Views/Calling/CallView.swift
Unescape View File

@ -85,7 +85,7 @@ struct CallView: View {
}
}
var finalMessage: String {
func finalMessage(reSummon: Bool) -> String {
ContactType.callingMessage(tournament: tournament, startDate: callDate, roundLabel: roundLabel, matchFormat: matchFormat, reSummon: reSummon)
}
@ -94,7 +94,7 @@ struct CallView: View {
}
var body: some View {
let callWord = reSummon ? "Reconvoquer" : "Convoquer"
let callWord : String = (reSummon ? "Reconvoquer" : "Convoquer")
HStack {
if teams.count == 1 {
if let previousCallDate = teams.first?.callDate, Calendar.current.compare(previousCallDate, to: callDate, toGranularity: .minute) != .orderedSame {
@ -105,23 +105,10 @@ struct CallView: View {
} else {
Text(callWord + " ces \(teams.count) paires par")
}
Button {
self._payTournamentAndExecute {
self._contactByMessage()
}
} label: {
Text("sms")
.underline()
}
_summonMenu(byMessage: true)
Text("ou")
Button {
self._payTournamentAndExecute {
self._contactByMail()
}
} label: {
Text("mail")
.underline()
}
_summonMenu(byMessage: false)
}
.font(.subheadline)
.buttonStyle(.borderless)
@ -182,6 +169,39 @@ struct CallView: View {
})
}
@ViewBuilder
private func _summonMenu(byMessage: Bool) -> some View {
if reSummon {
Menu {
Button("Convoquer") {
_summon(byMessage: byMessage, reSummon: false)
}
Button("Re-convoquer") {
_summon(byMessage: byMessage, reSummon: true)
}
} label: {
Text(byMessage ? "sms" : "mail")
.underline()
}
} else {
Button(byMessage ? "sms" : "mail") {
_summon(byMessage: byMessage, reSummon: false)
}
}
}
private func _summon(byMessage: Bool, reSummon: Bool) {
self._payTournamentAndExecute {
if byMessage {
self._contactByMessage(reSummon: reSummon)
} else {
self._contactByMail(reSummon: reSummon)
}
}
}
fileprivate func _payTournamentAndExecute(_ handler: () -> ()) {
do {
try tournament.payIfNecessary()
@ -191,12 +211,12 @@ struct CallView: View {
}
}
fileprivate func _contactByMessage() {
contactType = .message(date: callDate, recipients: teams.flatMap { $0.getPhoneNumbers() }, body: finalMessage, tournamentBuild: nil)
fileprivate func _contactByMessage(reSummon: Bool) {
contactType = .message(date: callDate, recipients: teams.flatMap { $0.getPhoneNumbers() }, body: finalMessage(reSummon: reSummon), tournamentBuild: nil)
}
fileprivate func _contactByMail() {
contactType = .mail(date: callDate, recipients: tournament.umpireMail(), bccRecipients: teams.flatMap { $0.getMail() }, body: finalMessage, subject: tournament.tournamentTitle(), tournamentBuild: nil)
fileprivate func _contactByMail(reSummon: Bool) {
contactType = .mail(date: callDate, recipients: tournament.umpireMail(), bccRecipients: teams.flatMap { $0.getMail() }, body: finalMessage(reSummon: reSummon), subject: tournament.tournamentTitle(), tournamentBuild: nil)
}
}

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

@ -6,6 +6,7 @@
//
import SwiftUI
import LeStorage
struct TableStructureView: View {
@Environment(Tournament.self) private var tournament: Tournament
@ -133,6 +134,24 @@ struct TableStructureView: View {
Text("Équipes en tableau final")
}
}
Section {
RowButtonView("Sauver sans reconstuire l'existant") {
_saveWithoutRebuild()
}
}
Section {
RowButtonView("Recontruire les poules", role:.destructive) {
_save(rebuildEverything: false)
}
}
Section {
RowButtonView("Tout refaire", role: .destructive) {
_save(rebuildEverything: true)
}
}
}
.focused($stepperFieldIsFocused)
.onChange(of: stepperFieldIsFocused) {
@ -204,17 +223,17 @@ struct TableStructureView: View {
}
}
.confirmationDialog("Refaire la structure", isPresented: $presentRefreshStructureWarning, actions: {
Button("Sauver sans reconstuire l'existant") {
_saveWithoutRebuild()
}
if requirements.allSatisfy({ $0 == .groupStage }) {
Button("Refaire les poules") {
_save(rebuildEverything: false)
}
Button("Recontruire les poules") {
_save(rebuildEverything: false)
}
Button("Tout refaire", role: .destructive) {
_save(rebuildEverything: true)
}
}, message: {
ForEach(Array(requirements)) { requirement in
Text(requirement.rebuildingRequirementMessage)
@ -227,6 +246,21 @@ struct TableStructureView: View {
.navigationBarTitleDisplayMode(.inline)
}
private func _saveWithoutRebuild() {
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)
}
dismiss()
}
private func _save(rebuildEverything: Bool = false) {
_verifyValueIntegrity()

51
PadelClub/Views/Tournament/Screen/TournamentRankView.swift
Unescape View File

@ -13,6 +13,7 @@ struct TournamentRankView: View {
@EnvironmentObject var dataStore: DataStore
@State private var rankings: [Int: [TeamRegistration]] = [:]
@State private var calculating = false
var body: some View {
List {
@ -144,19 +145,59 @@ struct TournamentRankView: View {
}
}
}
.overlay(content: {
if calculating {
ProgressView()
}
})
.onAppear {
let finalRanks = tournament.finalRanking()
finalRanks.keys.sorted().forEach { rank in
if let rankedTeamIds = finalRanks[rank] {
rankings[rank] = rankedTeamIds.compactMap { Store.main.findById($0) }
}
calculating = true
Task {
await calculateRankings()
calculating = false
}
}
.navigationTitle("Classement")
.navigationBarTitleDisplayMode(.inline)
.toolbarBackground(.visible, for: .navigationBar)
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
if let url = tournament.shareURL(.rankings) {
actionForURL(url)
}
}
}
}
func calculateRankings() async {
let finalRanks = await tournament.finalRanking()
finalRanks.keys.sorted().forEach { rank in
if let rankedTeamIds = finalRanks[rank] {
rankings[rank] = rankedTeamIds.compactMap { Store.main.findById($0) }
}
}
}
@ViewBuilder
func actionForURL(_ url: URL, removeSource: Bool = false) -> some View {
Menu {
Button {
UIApplication.shared.open(url)
} label: {
Label("Voir", systemImage: "safari")
}
ShareLink(item: url) {
Label("Partager le lien", systemImage: "link")
}
} label: {
Image(systemName: "square.and.arrow.up")
}
.frame(maxWidth: .infinity)
.buttonStyle(.borderless)
}
private func _save() {
do {
try dataStore.teamRegistrations.addOrUpdate(contentOfs: tournament.unsortedTeams())

128
PadelClub/Views/Tournament/TournamentBuildView.swift
Unescape View File

@ -19,66 +19,63 @@ struct TournamentBuildView: View {
var body: some View {
let state = tournament.state()
if tournament.hasEnded() {
Section {
Section {
if tournament.hasEnded() {
NavigationLink(value: Screen.rankings) {
Text("Classement final des équipes")
}
}
}
Section {
if tournament.groupStageCount > 0 {
NavigationLink(value: Screen.groupStage) {
LabeledContent {
if let groupStageStatus {
Text(groupStageStatus).lineLimit(1)
.multilineTextAlignment(.trailing)
} else {
ProgressView()
}
} label: {
Text("Poules")
if tournament.shouldVerifyGroupStage {
Text("Vérifier les poules").foregroundStyle(.logoRed)
}
if state == .running || state == .finished {
TournamentInscriptionView(tournament: tournament)
TournamentBroadcastRowView(tournament: tournament)
}
NavigationLink(value: Screen.cashier) {
let tournamentStatus = cashierStatus
LabeledContent {
if let tournamentStatus {
Text(tournamentStatus.completion)
} else {
ProgressView()
}
} label: {
Text("Encaissement")
if let tournamentStatus {
Text(tournamentStatus.label).lineLimit(1)
} else {
Text(" ")
}
}
.task {
groupStageStatus = await tournament.groupStageStatus()
}
}
.task {
cashierStatus = await tournament.cashierStatus()
}
if tournament.rounds().isEmpty == false {
NavigationLink(value: Screen.round) {
if state != .finished {
NavigationLink(value: Screen.schedule) {
let tournamentStatus = scheduleStatus
LabeledContent {
if let bracketStatus {
Text(bracketStatus).lineLimit(1)
.multilineTextAlignment(.trailing)
if let tournamentStatus {
Text(tournamentStatus.completion)
} else {
ProgressView()
}
} label: {
Text("Tableau")
if tournament.shouldVerifyBracket {
Text("Vérifier la tableau").foregroundStyle(.logoRed)
Text("Horaires")
if let tournamentStatus {
Text(tournamentStatus.label).lineLimit(1)
} else {
Text(" ")
}
}
}
.task {
bracketStatus = await tournament.bracketStatus()
scheduleStatus = await tournament.scheduleStatus()
}
}
}
Section {
if state == .running || state == .finished {
TournamentBroadcastRowView(tournament: tournament)
}
if state == .running || state == .finished {
NavigationLink(value: Screen.cashier) {
let tournamentStatus = cashierStatus
NavigationLink(value: Screen.call) {
let tournamentStatus = callStatus
LabeledContent {
if let tournamentStatus {
Text(tournamentStatus.completion)
@ -86,7 +83,7 @@ struct TournamentBuildView: View {
ProgressView()
}
} label: {
Text("Encaissement")
Text("Convocations")
if let tournamentStatus {
Text(tournamentStatus.label).lineLimit(1)
} else {
@ -95,58 +92,53 @@ struct TournamentBuildView: View {
}
}
.task {
cashierStatus = await tournament.cashierStatus()
callStatus = await tournament.callStatus()
}
}
}
if state != .finished {
NavigationLink(value: Screen.schedule) {
let tournamentStatus = scheduleStatus
Section {
if tournament.groupStageCount > 0 {
NavigationLink(value: Screen.groupStage) {
LabeledContent {
if let tournamentStatus {
Text(tournamentStatus.completion)
if let groupStageStatus {
Text(groupStageStatus).lineLimit(1)
.multilineTextAlignment(.trailing)
} else {
ProgressView()
}
} label: {
Text("Horaires")
if let tournamentStatus {
Text(tournamentStatus.label).lineLimit(1)
} else {
Text(" ")
Text("Poules")
if tournament.shouldVerifyGroupStage {
Text("Vérifier les poules").foregroundStyle(.logoRed)
}
}
}
.task {
scheduleStatus = await tournament.scheduleStatus()
groupStageStatus = await tournament.groupStageStatus()
}
}
NavigationLink(value: Screen.call) {
let tournamentStatus = callStatus
if tournament.rounds().isEmpty == false {
NavigationLink(value: Screen.round) {
LabeledContent {
if let tournamentStatus {
Text(tournamentStatus.completion)
if let bracketStatus {
Text(bracketStatus).lineLimit(1)
.multilineTextAlignment(.trailing)
} else {
ProgressView()
}
} label: {
Text("Convocations")
if let tournamentStatus {
Text(tournamentStatus.label).lineLimit(1)
} else {
Text(" ")
Text("Tableau")
if tournament.shouldVerifyBracket {
Text("Vérifier la tableau").foregroundStyle(.logoRed)
}
}
}
.task {
callStatus = await tournament.callStatus()
bracketStatus = await tournament.bracketStatus()
}
}
if state == .running || state == .finished {
TournamentInscriptionView(tournament: tournament)
}
}
}
}

2
PadelClub/Views/Tournament/TournamentView.swift
Unescape View File

@ -67,8 +67,8 @@ struct TournamentView: View {
TournamentInitView(tournament: tournament)
TournamentBuildView(tournament: tournament)
case .running:
TournamentRunningView(tournament: tournament)
TournamentBuildView(tournament: tournament)
TournamentRunningView(tournament: tournament)
case .finished:
TournamentBuildView(tournament: tournament)
TournamentRunningView(tournament: tournament)

Write Preview
Loading…
Cancel
Save