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

Merge branch 'main' of https://gitea.staxriver.com/staxriver/PadelClub

Browse Source
sync3
Laurent 6 months ago
parent 8b12d5e68d 01a9882d66
commit 450966eaf5
3 changed files with 14 additions and 2 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. 12
      PadelClub.xcodeproj/project.pbxproj
  2. 2
      PadelClub/Views/Shared/SelectablePlayerListView.swift
  3. 2
      PadelClub/Views/Team/TeamRestingView.swift

12
PadelClub.xcodeproj/project.pbxproj
Unescape View File

@ -156,6 +156,10 @@
FF2EFBF02BDE295E0049CE3B /* SendToAllView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF2EFBEF2BDE295E0049CE3B /* SendToAllView.swift */; };
FF3795622B9396D0004EA093 /* PadelClubApp.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = FF3795602B9396D0004EA093 /* PadelClubApp.xcdatamodeld */; };
FF3795662B9399AA004EA093 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3795652B9399AA004EA093 /* Persistence.swift */; };
FF39B6152DC8825E004E10CE /* PadelClubData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C49770202DC25A23005CD239 /* PadelClubData.framework */; };
FF39B6162DC8825E004E10CE /* PadelClubData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C49770202DC25A23005CD239 /* PadelClubData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
FF39B6172DC88267004E10CE /* PadelClubData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C49770202DC25A23005CD239 /* PadelClubData.framework */; };
FF39B6182DC88267004E10CE /* PadelClubData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C49770202DC25A23005CD239 /* PadelClubData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
FF3A73F32D37C34D007E3032 /* RegistrationInfoSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3A73F22D37C34C007E3032 /* RegistrationInfoSheetView.swift */; };
FF3A73F42D37C34D007E3032 /* RegistrationInfoSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3A73F22D37C34C007E3032 /* RegistrationInfoSheetView.swift */; };
FF3A73F52D37C34D007E3032 /* RegistrationInfoSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3A73F22D37C34C007E3032 /* RegistrationInfoSheetView.swift */; };
@ -822,6 +826,7 @@
dstSubfolderSpec = 10;
files = (
FF4CC04C2C996C0600151637 /* LeStorage.framework in Embed Frameworks */,
FF39B6162DC8825E004E10CE /* PadelClubData.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -833,6 +838,7 @@
dstSubfolderSpec = 10;
files = (
FF70FBCB2C90584900129CC2 /* LeStorage.framework in Embed Frameworks */,
FF39B6182DC88267004E10CE /* PadelClubData.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -993,6 +999,8 @@
FF2EFBEF2BDE295E0049CE3B /* SendToAllView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToAllView.swift; sourceTree = "<group>"; };
FF3795612B9396D0004EA093 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
FF3795652B9399AA004EA093 /* Persistence.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
FF39B60F2DC87FEB004E10CE /* PadelClubData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PadelClubData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FF39B6112DC87FF3004E10CE /* PadelClubData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PadelClubData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FF3A73F22D37C34C007E3032 /* RegistrationInfoSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationInfoSheetView.swift; sourceTree = "<group>"; };
FF3A74312D37DCF2007E3032 /* InscriptionLegendView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InscriptionLegendView.swift; sourceTree = "<group>"; };
FF3F74F52B919E45004CFE0E /* UmpireView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UmpireView.swift; sourceTree = "<group>"; };
@ -1187,6 +1195,7 @@
buildActionMask = 2147483647;
files = (
FF4CC0352C996C0600151637 /* Algorithms in Frameworks */,
FF39B6152DC8825E004E10CE /* PadelClubData.framework in Frameworks */,
FF4CC0362C996C0600151637 /* Zip in Frameworks */,
FF4CC0372C996C0600151637 /* LeStorage.framework in Frameworks */,
);
@ -1197,6 +1206,7 @@
buildActionMask = 2147483647;
files = (
FF70FBB42C90584900129CC2 /* Algorithms in Frameworks */,
FF39B6172DC88267004E10CE /* PadelClubData.framework in Frameworks */,
FF70FBB52C90584900129CC2 /* Zip in Frameworks */,
FF70FBB62C90584900129CC2 /* LeStorage.framework in Frameworks */,
);
@ -1287,6 +1297,8 @@
C425D4592B6D255B002A7B48 /* Frameworks */ = {
isa = PBXGroup;
children = (
FF39B6112DC87FF3004E10CE /* PadelClubData.framework */,
FF39B60F2DC87FEB004E10CE /* PadelClubData.framework */,
C49770202DC25A23005CD239 /* PadelClubData.framework */,
C4D05D462DC10AE5009B053C /* WebKit.framework */,
C49EF0372BDFF3000077B5AA /* LeStorage.framework */,

2
PadelClub/Views/Shared/SelectablePlayerListView.swift
Unescape View File

@ -369,7 +369,7 @@ struct MySearchView: View {
return Array(players)
}
if let searchPredicate = searchViewModel.searchTextPredicate() {
if let searchPredicate = searchViewModel.searchTextPredicate(), searchViewModel.tokens.isEmpty {
let filteredPlayers = players.filter { player in
searchPredicate.evaluate(with: player)
}

2
PadelClub/Views/Team/TeamRestingView.swift
Unescape View File

@ -45,7 +45,7 @@ struct TeamRestingView: View {
}
var sortedTeams: [TeamRegistration] {
return teams
return teams.filter({ $0.isPlaying() == false })
}
var body: some View {

Write Preview
Loading…
Cancel
Save