diff --git a/TournamentStats.xcodeproj/project.pbxproj b/TournamentStats.xcodeproj/project.pbxproj index b6d563d..bcf2f3d 100644 --- a/TournamentStats.xcodeproj/project.pbxproj +++ b/TournamentStats.xcodeproj/project.pbxproj @@ -303,7 +303,6 @@ isa = PBXGroup; children = ( 4DF760C422A56451004B0EF1 /* event1 */, - 4DF760EE22A56795004B0EF1 /* event29 */, 4DF760D922A56794004B0EF1 /* event1 copie 9 */, 4DF760F722A56796004B0EF1 /* event1 copie 10 */, 4DF760F122A56795004B0EF1 /* event1 copie 11 */, @@ -341,10 +340,7 @@ 4DF760FB22A56796004B0EF1 /* event3 copie 11 */, 4DF760D522A56794004B0EF1 /* event3 copie 12 */, 4DF760E722A56795004B0EF1 /* event3 copie 13 */, - 4DF760E422A56794004B0EF1 /* event31 */, - 4DF760CD22A56793004B0EF1 /* event28 */, 4DF760CA22A56765004B0EF1 /* event4 */, - 4DF7610022A56796004B0EF1 /* event27 */, 4DF760F022A56795004B0EF1 /* event5 */, 4DF7610322A56797004B0EF1 /* event6 */, 4DF760D022A56793004B0EF1 /* event7 */, @@ -366,6 +362,10 @@ 4DF760DF22A56794004B0EF1 /* event23 */, 4DF7610222A56797004B0EF1 /* event24 */, 4DF760DE22A56794004B0EF1 /* event25 */, + 4DF7610022A56796004B0EF1 /* event27 */, + 4DF760CD22A56793004B0EF1 /* event28 */, + 4DF760EE22A56795004B0EF1 /* event29 */, + 4DF760E422A56794004B0EF1 /* event31 */, ); path = Events; sourceTree = ""; diff --git a/TournamentStats.xcodeproj/project.xcworkspace/xcuserdata/laurent.xcuserdatad/UserInterfaceState.xcuserstate b/TournamentStats.xcodeproj/project.xcworkspace/xcuserdata/laurent.xcuserdatad/UserInterfaceState.xcuserstate index b512c1d..473ae1b 100644 Binary files a/TournamentStats.xcodeproj/project.xcworkspace/xcuserdata/laurent.xcuserdatad/UserInterfaceState.xcuserstate and b/TournamentStats.xcodeproj/project.xcworkspace/xcuserdata/laurent.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TournamentStats/Events/event31 b/TournamentStats/Events/event31 index 8bc97f7..ee93337 100644 --- a/TournamentStats/Events/event31 +++ b/TournamentStats/Events/event31 @@ -1,3 +1,17 @@ +1 +United KingdomThomas Cazayous +$414,766 +111 +London +- +United Kingdom +2 +United StatesNicholas Howard +$256,314 +111 +Manlius +NY +United States 3 United StatesUpeshka De Silva $172,658 diff --git a/TournamentStats/NotablePlayers.swift b/TournamentStats/NotablePlayers.swift index 0918d3a..7c03688 100644 --- a/TournamentStats/NotablePlayers.swift +++ b/TournamentStats/NotablePlayers.swift @@ -68,8 +68,8 @@ class NotablePlayers { "Scott Clements", "Brian Hastings", "Daniel Alaei", - // "", - // "", + "Joe Cada", + "Sylvain Loosli", // "", // "", // "", diff --git a/TournamentStats/report/Queries.swift b/TournamentStats/report/Queries.swift index 02c62e1..975a3af 100644 --- a/TournamentStats/report/Queries.swift +++ b/TournamentStats/report/Queries.swift @@ -26,9 +26,12 @@ class Queries { }) } - static func mostCashes(realm: Realm) -> [CumulatedResults] { + static func mostCashes(realm: Realm, notable: Bool = false) -> [CumulatedResults] { - let players = realm.objects(Player.self) + var players = realm.objects(Player.self) + if (notable) { + players = players.filter("notable = true") + } var crArray: [CumulatedResults] = [] for player in players { diff --git a/TournamentStats/report/ReportGenerator.swift b/TournamentStats/report/ReportGenerator.swift index 92f27f1..b70f107 100644 --- a/TournamentStats/report/ReportGenerator.swift +++ b/TournamentStats/report/ReportGenerator.swift @@ -80,6 +80,7 @@ class ReportGenerator { Queries.cashesByCountry(realm: realm).writeHTML(fileName: "reports/countryCashes.html") Queries.averageEvent(realm: realm).writeHTML(fileName: "reports/averageEvent.html") + Queries.mostCashes(realm: realm, notable: true).writeHTML(fileName: "reports/notablesMostCashes.html") }