diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index dd30c39..53b1009 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -3640,7 +3640,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3686,7 +3686,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; @@ -3803,7 +3803,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3849,7 +3849,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; @@ -3895,7 +3895,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3938,7 +3938,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; diff --git a/PadelClub/ViewModel/SearchViewModel.swift b/PadelClub/ViewModel/SearchViewModel.swift index be32ecd..594a489 100644 --- a/PadelClub/ViewModel/SearchViewModel.swift +++ b/PadelClub/ViewModel/SearchViewModel.swift @@ -269,14 +269,14 @@ class SearchViewModel: ObservableObject, Identifiable { let pattern = components.joined(separator: ".*") predicates.append(NSPredicate(format: "canonicalFullName MATCHES[c] %@", pattern)) - // Look for exact matches on first or last name - let words = canonicalVersionWithoutPunctuation.components(separatedBy: .whitespaces) - for word in words where word.count > 2 { - predicates.append( - NSPredicate( - format: "firstName CONTAINS[cd] %@ OR lastName CONTAINS[cd] %@", word, word) - ) - } +// // Look for exact matches on first or last name +// let words = canonicalVersionWithoutPunctuation.components(separatedBy: .whitespaces) +// for word in words where word.count > 2 { +// predicates.append( +// NSPredicate( +// format: "firstName CONTAINS[cd] %@ OR lastName CONTAINS[cd] %@", word, word) +// ) +// } } if predicates.isEmpty { @@ -366,7 +366,10 @@ class SearchViewModel: ObservableObject, Identifiable { if predicates.isEmpty { return nil } - return NSCompoundPredicate(orPredicateWithSubpredicates: predicates) + + + let full = NSCompoundPredicate(orPredicateWithSubpredicates: predicates) + return full } func predicate() -> NSPredicate? { @@ -377,7 +380,7 @@ class SearchViewModel: ObservableObject, Identifiable { ] if let mostRecentDate { - predicates.append(NSPredicate(format: "importDate == %@", mostRecentDate as CVarArg)) + //predicates.append(NSPredicate(format: "importDate == %@", mostRecentDate as CVarArg)) } if hideAssimilation { @@ -489,7 +492,7 @@ class SearchViewModel: ObservableObject, Identifiable { // Add date filter if specified if let mostRecentDate { - andPredicates.append(NSPredicate(format: "importDate == %@", mostRecentDate as CVarArg)) + //andPredicates.append(NSPredicate(format: "importDate == %@", mostRecentDate as CVarArg)) } // Check for slashes (representing alternatives)