From 6b2c902fa3ec22bac4f77034e742c337c7df0963 Mon Sep 17 00:00:00 2001 From: Raz Date: Mon, 5 May 2025 11:28:04 +0200 Subject: [PATCH 1/2] setup framework link for all target --- PadelClub.xcodeproj/project.pbxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index 96eb19b..d7a36cf 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -157,6 +157,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 */; }; @@ -825,6 +829,7 @@ dstSubfolderSpec = 10; files = ( FF4CC04C2C996C0600151637 /* LeStorage.framework in Embed Frameworks */, + FF39B6162DC8825E004E10CE /* PadelClubData.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -836,6 +841,7 @@ dstSubfolderSpec = 10; files = ( FF70FBCB2C90584900129CC2 /* LeStorage.framework in Embed Frameworks */, + FF39B6182DC88267004E10CE /* PadelClubData.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -997,6 +1003,8 @@ FF2EFBEF2BDE295E0049CE3B /* SendToAllView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToAllView.swift; sourceTree = ""; }; FF3795612B9396D0004EA093 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; FF3795652B9399AA004EA093 /* Persistence.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = ""; }; + 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 = ""; }; FF3A74312D37DCF2007E3032 /* InscriptionLegendView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InscriptionLegendView.swift; sourceTree = ""; }; FF3F74F52B919E45004CFE0E /* UmpireView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UmpireView.swift; sourceTree = ""; }; @@ -1191,6 +1199,7 @@ buildActionMask = 2147483647; files = ( FF4CC0352C996C0600151637 /* Algorithms in Frameworks */, + FF39B6152DC8825E004E10CE /* PadelClubData.framework in Frameworks */, FF4CC0362C996C0600151637 /* Zip in Frameworks */, FF4CC0372C996C0600151637 /* LeStorage.framework in Frameworks */, ); @@ -1201,6 +1210,7 @@ buildActionMask = 2147483647; files = ( FF70FBB42C90584900129CC2 /* Algorithms in Frameworks */, + FF39B6172DC88267004E10CE /* PadelClubData.framework in Frameworks */, FF70FBB52C90584900129CC2 /* Zip in Frameworks */, FF70FBB62C90584900129CC2 /* LeStorage.framework in Frameworks */, ); @@ -1291,6 +1301,8 @@ C425D4592B6D255B002A7B48 /* Frameworks */ = { isa = PBXGroup; children = ( + FF39B6112DC87FF3004E10CE /* PadelClubData.framework */, + FF39B60F2DC87FEB004E10CE /* PadelClubData.framework */, C49770202DC25A23005CD239 /* PadelClubData.framework */, C4D05D462DC10AE5009B053C /* WebKit.framework */, C49EF0372BDFF3000077B5AA /* LeStorage.framework */, From 01a9882d669600865f822493847d37607116fd41 Mon Sep 17 00:00:00 2001 From: Raz Date: Mon, 5 May 2025 13:47:47 +0200 Subject: [PATCH 2/2] fix resting team issue fix ranking search issue --- PadelClub/Views/Shared/SelectablePlayerListView.swift | 2 +- PadelClub/Views/Team/TeamRestingView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PadelClub/Views/Shared/SelectablePlayerListView.swift b/PadelClub/Views/Shared/SelectablePlayerListView.swift index e03b35f..61228b8 100644 --- a/PadelClub/Views/Shared/SelectablePlayerListView.swift +++ b/PadelClub/Views/Shared/SelectablePlayerListView.swift @@ -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) } diff --git a/PadelClub/Views/Team/TeamRestingView.swift b/PadelClub/Views/Team/TeamRestingView.swift index f828cf2..765052b 100644 --- a/PadelClub/Views/Team/TeamRestingView.swift +++ b/PadelClub/Views/Team/TeamRestingView.swift @@ -45,7 +45,7 @@ struct TeamRestingView: View { } var sortedTeams: [TeamRegistration] { - return teams + return teams.filter({ $0.isPlaying() == false }) } var body: some View {