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

fix stuff around data import and search players

Browse Source
multistore
Razmig Sarkissian 1 year ago
parent 9753adbe51
commit b961b8919b
3 changed files with 6 additions and 88 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. 88
      PadelClub.xcodeproj/project.pbxproj
  2. 2
      PadelClub/ViewModel/SearchViewModel.swift
  3. 4
      PadelClub/Views/Navigation/Umpire/PadelClubView.swift

88
PadelClub.xcodeproj/project.pbxproj
Unescape View File

@ -66,48 +66,6 @@
FF0E0B6D2BC254C6005F00A9 /* TournamentScheduleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF0E0B6C2BC254C6005F00A9 /* TournamentScheduleView.swift */; };
FF0EC5202BB16F680056B6D1 /* SwiftParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF0EC51D2BB16F680056B6D1 /* SwiftParser.swift */; };
FF0EC5222BB173E70056B6D1 /* UpdateSourceRankDateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF0EC5212BB173E70056B6D1 /* UpdateSourceRankDateView.swift */; };
FF0EC54E2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-02-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5382BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-02-2023.csv */; };
FF0EC54F2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-08-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5482BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-08-2022.csv */; };
FF0EC5502BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-12-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5352BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-12-2022.csv */; };
FF0EC5512BB195E20056B6D1 /* CLASSEMENT PADEL DAMES-07-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5232BB195CA0056B6D1 /* CLASSEMENT PADEL DAMES-07-2023.csv */; };
FF0EC5522BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-02-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5412BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-02-2023.csv */; };
FF0EC5532BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-09-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC53D2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-09-2022.csv */; };
FF0EC5542BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-04-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC53A2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-04-2023.csv */; };
FF0EC5552BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_2-08-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5282BB195CA0056B6D1 /* CLASSEMENT PADEL MESSIEURS_2-08-2023.csv */; };
FF0EC5562BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-10-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC53E2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-10-2022.csv */; };
FF0EC5572BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-10-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5332BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-10-2022.csv */; };
FF0EC5582BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-3-05-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5422BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-3-05-2023.csv */; };
FF0EC5592BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-03-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC52D2BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-03-2023.csv */; };
FF0EC55A2BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_2-07-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5272BB195CA0056B6D1 /* CLASSEMENT PADEL MESSIEURS_2-07-2023.csv */; };
FF0EC55B2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-01-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC52B2BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-01-2023.csv */; };
FF0EC55C2BB195E20056B6D1 /* CLASSEMENT PADEL DAMES-08-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5242BB195CA0056B6D1 /* CLASSEMENT PADEL DAMES-08-2023.csv */; };
FF0EC55D2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-04-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC52E2BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-04-2023.csv */; };
FF0EC55E2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-05-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC52F2BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-05-2023.csv */; };
FF0EC55F2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-03-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5392BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-03-2023.csv */; };
FF0EC5602BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_3-08-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC52A2BB195CA0056B6D1 /* CLASSEMENT PADEL MESSIEURS_3-08-2023.csv */; };
FF0EC5612BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-05-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5462BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-05-2023.csv */; };
FF0EC5622BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-05-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC53B2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-05-2023.csv */; };
FF0EC5632BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-06-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC53C2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-06-2023.csv */; };
FF0EC5642BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-11-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC53F2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-11-2022.csv */; };
FF0EC5652BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-12-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5402BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-12-2022.csv */; };
FF0EC5662BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-02-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC52C2BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-02-2023.csv */; };
FF0EC5672BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-03-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5442BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-03-2023.csv */; };
FF0EC5682BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-06-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5302BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-06-2023.csv */; };
FF0EC5692BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-11-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC54B2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-11-2022.csv */; };
FF0EC56A2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-12-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC54C2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-12-2022.csv */; };
FF0EC56B2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-06-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5472BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-06-2023.csv */; };
FF0EC56C2BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_1-07-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5252BB195CA0056B6D1 /* CLASSEMENT PADEL MESSIEURS_1-07-2023.csv */; };
FF0EC56D2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-3-06-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5432BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-3-06-2023.csv */; };
FF0EC56E2BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_1-08-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5262BB195CA0056B6D1 /* CLASSEMENT PADEL MESSIEURS_1-08-2023.csv */; };
FF0EC56F2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-09-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5322BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-09-2022.csv */; };
FF0EC5702BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-08-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5312BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-08-2022.csv */; };
FF0EC5712BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-01-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5362BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-01-2023.csv */; };
FF0EC5722BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-09-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5492BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-09-2022.csv */; };
FF0EC5732BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_3-07-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5292BB195CA0056B6D1 /* CLASSEMENT PADEL MESSIEURS_3-07-2023.csv */; };
FF0EC5742BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-01-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5372BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-01-2023.csv */; };
FF0EC5752BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-11-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5342BB195CA0056B6D1 /* CLASSEMENT-PADEL-DAMES-11-2022.csv */; };
FF0EC5762BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-04-2023.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC5452BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-04-2023.csv */; };
FF0EC5772BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-10-2022.csv in Resources */ = {isa = PBXBuildFile; fileRef = FF0EC54A2BB195CA0056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-10-2022.csv */; };
FF11627A2BCF8109000C4809 /* CallMessageCustomizationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF1162792BCF8109000C4809 /* CallMessageCustomizationView.swift */; };
FF11627D2BCF941A000C4809 /* CashierSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11627C2BCF941A000C4809 /* CashierSettingsView.swift */; };
FF1162812BCF945C000C4809 /* TournamentCashierView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF1162802BCF945C000C4809 /* TournamentCashierView.swift */; };
@ -1464,9 +1422,6 @@
files = (
C425D4082B6D249E002A7B48 /* Preview Assets.xcassets in Resources */,
FF44421C2BE39FA2008BBF0B /* Launch Screen.storyboard in Resources */,
FF0EC54E2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-02-2023.csv in Resources */,
FF0EC54F2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-08-2022.csv in Resources */,
FF0EC5502BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-12-2022.csv in Resources */,
FF1F4B832BFA02A4000B4573 /* tournament-template.html in Resources */,
FF1F4B842BFA02A4000B4573 /* groupstagescore-template.html in Resources */,
FF1F4B852BFA02A4000B4573 /* player-template.html in Resources */,
@ -1477,49 +1432,10 @@
FF1F4B8A2BFA02A4000B4573 /* groupstage-template.html in Resources */,
FF1F4B8B2BFA02A4000B4573 /* groupstageentrant-template.html in Resources */,
FF1F4B8C2BFA02A4000B4573 /* match-template.html in Resources */,
FF0EC5512BB195E20056B6D1 /* CLASSEMENT PADEL DAMES-07-2023.csv in Resources */,
FF0EC5522BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-02-2023.csv in Resources */,
FF0EC5532BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-09-2022.csv in Resources */,
FF0EC5542BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-04-2023.csv in Resources */,
FF0EC5552BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_2-08-2023.csv in Resources */,
FFF0241E2BF48B15001F14B4 /* Localizable.strings in Resources */,
FF0EC5562BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-10-2022.csv in Resources */,
FF0EC5572BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-10-2022.csv in Resources */,
FF0EC5582BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-3-05-2023.csv in Resources */,
FF0EC5592BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-03-2023.csv in Resources */,
C45BAE3B2BC6DF10002EEC8A /* SyncedProducts.storekit in Resources */,
FF0EC55A2BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_2-07-2023.csv in Resources */,
C4EC6F572BE92CAC000CEAB4 /* local.plist in Resources */,
FF0EC55B2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-01-2023.csv in Resources */,
FF0EC55C2BB195E20056B6D1 /* CLASSEMENT PADEL DAMES-08-2023.csv in Resources */,
FF0EC55D2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-04-2023.csv in Resources */,
FF0EC55E2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-05-2023.csv in Resources */,
FF0EC55F2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-03-2023.csv in Resources */,
FF0EC5602BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_3-08-2023.csv in Resources */,
FF0EC5612BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-05-2023.csv in Resources */,
FF0EC5622BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-05-2023.csv in Resources */,
FF0EC5632BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-06-2023.csv in Resources */,
FF0EC5642BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-11-2022.csv in Resources */,
FF0EC5652BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-12-2022.csv in Resources */,
FF0EC5662BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-02-2023.csv in Resources */,
FF0EC5672BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-03-2023.csv in Resources */,
FF0EC5682BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-06-2023.csv in Resources */,
FF0EC5692BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-11-2022.csv in Resources */,
FF0CA5752BDA4AE10080E843 /* PrivacyInfo.xcprivacy in Resources */,
FF0EC56A2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-12-2022.csv in Resources */,
FF0EC56B2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-06-2023.csv in Resources */,
FF0EC56C2BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_1-07-2023.csv in Resources */,
FF0EC56D2BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-3-06-2023.csv in Resources */,
FF0EC56E2BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_1-08-2023.csv in Resources */,
FF0EC56F2BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-09-2022.csv in Resources */,
FF0EC5702BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-08-2022.csv in Resources */,
FF0EC5712BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-01-2023.csv in Resources */,
FF0EC5722BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-09-2022.csv in Resources */,
FF0EC5732BB195E20056B6D1 /* CLASSEMENT PADEL MESSIEURS_3-07-2023.csv in Resources */,
FF0EC5742BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-2-01-2023.csv in Resources */,
FF0EC5752BB195E20056B6D1 /* CLASSEMENT-PADEL-DAMES-11-2022.csv in Resources */,
FF0EC5762BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-04-2023.csv in Resources */,
FF0EC5772BB195E20056B6D1 /* CLASSEMENT-PADEL-MESSIEURS-10-2022.csv in Resources */,
C425D4052B6D249E002A7B48 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -1939,7 +1855,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 38;
CURRENT_PROJECT_VERSION = 39;
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@ -1977,7 +1893,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 38;
CURRENT_PROJECT_VERSION = 39;
DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6;

2
PadelClub/ViewModel/SearchViewModel.swift
Unescape View File

@ -155,9 +155,9 @@ class SearchViewModel: ObservableObject, Identifiable {
if let wordsPredicates {
predicates.append(wordsPredicates)
} else {
predicates.append(NSPredicate(format: "canonicalFullName contains[cd] %@", searchText))
predicates.append(NSPredicate(format: "license contains[cd] %@", searchText))
}
predicates.append(NSPredicate(format: "canonicalFullName contains[cd] %@", searchText))
}
case .ligue:
if canonicalVersionWithoutPunctuation.isEmpty {

4
PadelClub/Views/Navigation/Umpire/PadelClubView.swift
Unescape View File

@ -93,8 +93,10 @@ struct PadelClubView: View {
}
Section {
RowButtonView("Télécharger les données des mois précédents", role: .destructive) { _downloadPreviousDate()
RowButtonView("Télécharger les données précédentes", role: .destructive) { _downloadPreviousDate()
}
} footer: {
Text("Padel Club va récupérer les données des mois précédents")
}
if importingFiles {

Write Preview
Loading…
Cancel
Save