bug fix import
clubs
Raz 1 year ago
parent 4be9b0aedf
commit 67edd56c5e
  1. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 2
      PadelClub/Utils/PadelRule.swift
  3. 2
      PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift
  4. 17
      PadelClub/Views/Tournament/FileImportView.swift

@ -1935,7 +1935,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 104; CURRENT_PROJECT_VERSION = 105;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -1985,7 +1985,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 104; CURRENT_PROJECT_VERSION = 105;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;

@ -173,7 +173,7 @@ enum FederalTournamentAge: Int, Hashable, Codable, CaseIterable, Identifiable {
var importingRawValue: String { var importingRawValue: String {
switch self { switch self {
case .unlisted: case .unlisted:
return "Senior" return "Animation"
case .a11_12: case .a11_12:
return "11/12 ans" return "11/12 ans"
case .a13_14: case .a13_14:

@ -40,7 +40,7 @@ struct TournamentConfigurationView: View {
} }
Picker(selection: $tournament.federalCategory, label: Text("Catégorie")) { Picker(selection: $tournament.federalCategory, label: Text("Catégorie")) {
ForEach(TournamentCategory.allCases) { type in ForEach(TournamentCategory.allCases) { type in
Text(type.localizedLabel(.title)).tag(type) Text(type.localizedLabel(.wide)).tag(type)
} }
} }
Picker(selection: $tournament.federalAgeCategory, label: Text("Limite d'âge")) { Picker(selection: $tournament.federalAgeCategory, label: Text("Limite d'âge")) {

@ -125,7 +125,11 @@ struct FileImportView: View {
Text($0.localizedLabel).tag($0) Text($0.localizedLabel).tag($0)
} }
} label: { } label: {
Text("Source du fichier") Text("Source")
}
if fileProvider == .customAutoSearch {
Text("Padel Club essaiera de chercher les joueurs dans la base fédérale automatiquement")
} }
RowButtonView("Démarrer l'importation") { RowButtonView("Démarrer l'importation") {
@ -142,17 +146,10 @@ struct FileImportView: View {
if fileProvider == .frenchFederation { if fileProvider == .frenchFederation {
let footerString = "Fichier provenant de [beach-padel.app.fft.fr](\(URLs.beachPadel.rawValue))" let footerString = "Fichier provenant de [beach-padel.app.fft.fr](\(URLs.beachPadel.rawValue))"
Text(.init(footerString)) Text(.init(footerString))
} else if fileProvider == .custom { } else if fileProvider == .custom || fileProvider == .customAutoSearch {
FooterButtonView("Voir le format du fichier") { FooterButtonView("Voir le format du fichier") {
presentFormatHelperView = true presentFormatHelperView = true
} }
} else if fileProvider == .customAutoSearch {
HStack {
Text("Padel Club essaiera de chercher les joueurs dans la base fédérale automatiquement")
FooterButtonView("Voir le format du fichier") {
presentFormatHelperView = true
}
}
} }
} }
@ -237,7 +234,7 @@ struct FileImportView: View {
if filteredTeams.isEmpty && teams.isEmpty == false && multiImport == false { if filteredTeams.isEmpty && teams.isEmpty == false && multiImport == false {
@Bindable var tournament = tournament @Bindable var tournament = tournament
Section { Section {
Text("Aucune équipe \(tournament.tournamentCategory.importingRawValue) \(tournament.federalAgeCategory.importingRawValue) détectée mais \(teams.count) équipes sont dans le fichier") Text("Aucune équipe \(tournament.tournamentCategory.importingRawValue) \(tournament.federalAgeCategory.importingRawValue.lowercased()) détectée mais \(teams.count) équipes sont dans le fichier")
Picker(selection: $tournament.tournamentCategory) { Picker(selection: $tournament.tournamentCategory) {
ForEach([TournamentCategory.men, TournamentCategory.women, TournamentCategory.mix]) { category in ForEach([TournamentCategory.men, TournamentCategory.women, TournamentCategory.mix]) { category in
Text(category.importingRawValue).tag(category) Text(category.importingRawValue).tag(category)

Loading…
Cancel
Save