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

fix stuff

Browse Source
club_update
Razmig Sarkissian 1 year ago
parent 5bc0acfd56
commit 9dfcfc1441
10 changed files with 160 additions and 54 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. 8
      PadelClub.xcodeproj/project.pbxproj
  2. 12
      PadelClub/Data/Tournament.swift
  3. 7
      PadelClub/Utils/URLs.swift
  4. 36
      PadelClub/Views/Cashier/Event/EventSettingsView.swift
  5. 5
      PadelClub/Views/Cashier/Event/EventView.swift
  6. 25
      PadelClub/Views/Tournament/Screen/BroadcastView.swift
  7. 29
      PadelClub/Views/Tournament/Screen/Components/CloseDatePicker.swift
  8. 68
      PadelClub/Views/Tournament/Screen/Components/EventClubSettingsView.swift
  9. 19
      PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift
  10. 5
      PadelClub/Views/Tournament/Shared/TournamentBroadcastRowView.swift

8
PadelClub.xcodeproj/project.pbxproj
Unescape View File

@ -228,6 +228,7 @@
FFC91B012BD85C2F00B29808 /* Court.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFC91B002BD85C2F00B29808 /* Court.swift */; };
FFC91B032BD85E2400B29808 /* CourtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFC91B022BD85E2400B29808 /* CourtView.swift */; };
FFCEDA4C2C2C08EA00F8C0F2 /* PlayersWithoutContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFCEDA4B2C2C08EA00F8C0F2 /* PlayersWithoutContactView.swift */; };
FFCF76072C3BE9BC006C8C3D /* CloseDatePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFCF76062C3BE9BC006C8C3D /* CloseDatePicker.swift */; };
FFCFBFFE2BBBE86600B82851 /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = FFCFBFFD2BBBE86600B82851 /* Algorithms */; };
FFCFC00C2BBC3D1E00B82851 /* EditScoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFCFC0012BBC39A600B82851 /* EditScoreView.swift */; };
FFCFC00E2BBC3D4600B82851 /* PointSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFCFC00D2BBC3D4600B82851 /* PointSelectionView.swift */; };
@ -562,6 +563,7 @@
FFC91B002BD85C2F00B29808 /* Court.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Court.swift; sourceTree = "<group>"; };
FFC91B022BD85E2400B29808 /* CourtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourtView.swift; sourceTree = "<group>"; };
FFCEDA4B2C2C08EA00F8C0F2 /* PlayersWithoutContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayersWithoutContactView.swift; sourceTree = "<group>"; };
FFCF76062C3BE9BC006C8C3D /* CloseDatePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloseDatePicker.swift; sourceTree = "<group>"; };
FFCFC0012BBC39A600B82851 /* EditScoreView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditScoreView.swift; sourceTree = "<group>"; };
FFCFC00D2BBC3D4600B82851 /* PointSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointSelectionView.swift; sourceTree = "<group>"; };
FFCFC0112BBC3E1A00B82851 /* PointView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointView.swift; sourceTree = "<group>"; };
@ -1131,6 +1133,7 @@
FF025AE22BD0EBA900A86CF8 /* TournamentMatchFormatsSettingsView.swift */,
FF025AE42BD0EBB800A86CF8 /* TournamentGeneralSettingsView.swift */,
FF6087E92BE25EF1004E1E47 /* TournamentStatusView.swift */,
FFCF76062C3BE9BC006C8C3D /* CloseDatePicker.swift */,
);
path = Components;
sourceTree = "<group>";
@ -1587,6 +1590,7 @@
C4FC2E2B2C2C0E4D0021F3BF /* TournamentStore.swift in Sources */,
FF5647132C0B6F390081F995 /* LoserRoundSettingsView.swift in Sources */,
FF3795662B9399AA004EA093 /* Persistence.swift in Sources */,
FFCF76072C3BE9BC006C8C3D /* CloseDatePicker.swift in Sources */,
FF1DF49B2BD8D23900822FA0 /* BarButtonView.swift in Sources */,
FFF964502BC25E3700EEF017 /* PlanningView.swift in Sources */,
FF967CEC2BAECB9900A9A3BD /* Match.swift in Sources */,
@ -1902,7 +1906,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -1946,7 +1950,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6;

12
PadelClub/Data/Tournament.swift
Unescape View File

@ -801,7 +801,17 @@ defer {
}
#endif
var _sortedTeams : [TeamRegistration] = []
let _teams = unsortedTeams().filter({ $0.walkOut == false })
var _teams = unsortedTeams().filter({ $0.walkOut == false })
if let closedRegistrationDate {
_teams = _teams.filter({ team in
if let registrationDate = team.registrationDate {
return registrationDate <= closedRegistrationDate
} else {
return true
}
})
}
let defaultSorting : [MySortDescriptor<TeamRegistration>] = _defaultSorting()

7
PadelClub/Utils/URLs.swift
Unescape View File

@ -8,10 +8,11 @@
import Foundation
enum URLs: String, Identifiable {
case activationHost = "https://padelclub.app" // xlr.alwaysdata.net
case activationHost = "https://xlr.alwaysdata.net" // xlr.alwaysdata.net
case subscriptions = "https://apple.co/2Th4vqI"
case main = "https://padelclub.app/"
case api = "https://padelclub.app/roads/"
case main = "https://xlr.alwaysdata.net/"
case api = "https://xlr.alwaysdata.net/roads/"
case beachPadel = "https://beach-padel.app.fft.fr/beachja/index/"
//case padelClub = "https://padelclub.app"
case tenup = "https://tenup.fft.fr"

36
PadelClub/Views/Cashier/Event/EventSettingsView.swift
Unescape View File

@ -62,25 +62,27 @@ struct EventSettingsView: View {
}
}
let eventLinksPasteData = eventLinksPasteData()
Section {
Text(eventLinksPasteData)
.italic()
.multilineTextAlignment(.leading)
let links : [PageLink] = [.teams, .summons, .groupStages, .matches, .rankings]
Picker(selection: $pageLink) {
ForEach(links) { pageLink in
Text(pageLink.localizedLabel()).tag(pageLink)
if event.club != nil {
let eventLinksPasteData = eventLinksPasteData()
Section {
Text(eventLinksPasteData)
.italic()
.multilineTextAlignment(.leading)
let links : [PageLink] = [.teams, .summons, .groupStages, .matches, .rankings]
Picker(selection: $pageLink) {
ForEach(links) { pageLink in
Text(pageLink.localizedLabel()).tag(pageLink)
}
} label: {
Text("Choisir une page en particulier")
}
} label: {
Text("Choisir une page en particulier")
.pickerStyle(.menu)
ShareLink("Partagez ce message", item: eventLinksPasteData)
} header: {
Text("Liens à partager")
}
.pickerStyle(.menu)
ShareLink("Partagez ce message", item: eventLinksPasteData)
} header: {
Text("Liens à partager")
}
}
.toolbar {

5
PadelClub/Views/Cashier/Event/EventView.swift
Unescape View File

@ -70,6 +70,11 @@ struct EventView: View {
let event: Event
@State private var selectedDestination: EventDestination?
init(event: Event) {
self.event = event
_selectedDestination = State(wrappedValue: event.club == nil ? .club(event) : nil)
}
func allDestinations() -> [EventDestination] {
[.club(event), .tournaments(event), .cashier]
}

25
PadelClub/Views/Tournament/Screen/BroadcastView.swift
Unescape View File

@ -36,7 +36,7 @@ struct BroadcastView: View {
Section {
ContentUnavailableView {
Label("Créer votre compte Padel Club", systemImage: "person.bust")
} description: {
let message = "Un compte est nécessaire pour publier le tournoi sur [Padel Club](\(URLs.main.rawValue)) et profiter de toutes les pages du site, comme le mode TV pour transformer l'expérience de vos tournois !"
Text(.init(message))
@ -51,6 +51,29 @@ struct BroadcastView: View {
}
}
}
} else if tournament.club() == nil {
Section {
ContentUnavailableView {
Text("Aucun club associé à votre tournoi")
} description: {
Text("Vous avez besoin d'associer un club à votre tournoi pour pouvoir publier celui-ci sur Padel Club.")
} actions: {
NavigationLink {
ClubsView() { club in
if let event = tournament.eventObject() {
event.club = club.id
do {
try dataStore.events.addOrUpdate(instance: event)
} catch {
Logger.error(error)
}
}
}
} label: {
Text("Choisir un club")
}
}
}
} else {
Section {
TipView(tournamentPublishingTip) { action in

29
PadelClub/Views/Tournament/Screen/Components/CloseDatePicker.swift
Unescape View File

@ -0,0 +1,29 @@
//
// CloseDatePicker.swift
// PadelClub
//
// Created by Razmig Sarkissian on 08/07/2024.
//
import SwiftUI
import LeStorage
struct CloseDatePicker: View {
@State var closedRegistrationDate: Date
@Environment(Tournament.self) var tournament: Tournament
@EnvironmentObject var dataStore: DataStore
var body: some View {
DatePicker(selection: $closedRegistrationDate) {
Text("Date de clôture")
}
.onChange(of: closedRegistrationDate) {
tournament.closedRegistrationDate = closedRegistrationDate
do {
try dataStore.tournaments.addOrUpdate(instance: tournament)
} catch {
Logger.error(error)
}
}
}
}

68
PadelClub/Views/Tournament/Screen/Components/EventClubSettingsView.swift
Unescape View File

@ -16,38 +16,45 @@ struct EventClubSettingsView: View {
var body: some View {
List {
let selectedClub = event.clubObject()
Section {
NavigationLink {
ClubsView() { club in
event.club = club.id
do {
try dataStore.events.addOrUpdate(instance: event)
} catch {
Logger.error(error)
if let selectedClub = event.clubObject() {
Section {
NavigationLink {
ClubsView() { club in
_setClub(club: club)
}
}
} label: {
if let selectedClub = event.clubObject() {
} label: {
ClubRowView(club: selectedClub)
} else {
Text("Choisir un club")
}
}
} header: {
Text("Lieu de l'événement")
} footer: {
HStack {
Spacer()
FooterButtonView("détails du club") {
showClubDetail = selectedClub
} header: {
Text("Lieu de l'événement")
} footer: {
HStack {
Spacer()
FooterButtonView("détails du club") {
showClubDetail = selectedClub
}
}
}
}
if let selectedClub {
ClubCourtSetupView(club: selectedClub, displayContext: selectedClub.hasBeenCreated(by: StoreCenter.main.userId) ? .edition : .lockedForEditing, selectedCourt: $selectedCourt)
} else {
Section {
ContentUnavailableView {
Text("Aucun club associé à votre tournoi")
} description: {
Text("Vous avez besoin d'associer un club à votre tournoi pour pouvoir publier celui-ci sur Padel Club.")
} actions: {
NavigationLink {
ClubsView() { club in
_setClub(club: club)
}
} label: {
Text("Choisir un club")
}
}
}
}
}
.navigationDestination(item: $showClubDetail) { club in
@ -57,6 +64,15 @@ struct EventClubSettingsView: View {
CourtView(court: court)
}
}
private func _setClub(club: Club) {
event.club = club.id
do {
try dataStore.events.addOrUpdate(instance: event)
} catch {
Logger.error(error)
}
}
}
//#Preview {

19
PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift
Unescape View File

@ -511,6 +511,14 @@ struct InscriptionManagerView: View {
private func _teamRegisteredView() -> some View {
List {
if let closedRegistrationDate = tournament.closedRegistrationDate {
Section {
CloseDatePicker(closedRegistrationDate: closedRegistrationDate)
} footer: {
Text("Toutes les équipes ayant été inscrites après la date de clôture seront en liste d'attente.")
}
}
if presentSearch == false {
_rankHandlerView()
_relatedTips()
@ -660,6 +668,14 @@ struct InscriptionManagerView: View {
@ViewBuilder
private func _inscriptionTipsView() -> some View {
List {
if let closedRegistrationDate = tournament.closedRegistrationDate {
Section {
CloseDatePicker(closedRegistrationDate: closedRegistrationDate)
} footer: {
Text("Toutes les équipes ayant été inscrites après la date de clôture seront en liste d'attente.")
}
}
Section {
TipView(fileTip) { action in
@ -760,9 +776,6 @@ struct InscriptionManagerView: View {
}
} label: {
Text("Problèmes détéctés")
if let closedRegistrationDate = tournament.closedRegistrationDate {
Text("clôturé le " + closedRegistrationDate.formatted())
}
}
}
}

5
PadelClub/Views/Tournament/Shared/TournamentBroadcastRowView.swift
Unescape View File

@ -13,8 +13,9 @@ struct TournamentBroadcastRowView: View {
var body: some View {
NavigationLink(value: Screen.broadcast) {
let club = tournament.eventObject()?.club
LabeledContent {
if StoreCenter.main.userId == nil {
if StoreCenter.main.userId == nil || club == nil {
Image(systemName: "exclamationmark.circle.fill")
.foregroundStyle(.logoYellow)
} else {
@ -28,6 +29,8 @@ struct TournamentBroadcastRowView: View {
Text("Publication")
if StoreCenter.main.userId == nil {
Text("Créez un compte pour publier !")
} else if club == nil {
Text("Associez un club pour publier !")
}
}
}

Write Preview
Loading…
Cancel
Save