Updating tournament data

TournamentStats.xcodeproj/project.pbxproj

@@ -66,7 +66,7 @@
 		4DF7612B22A56797004B0EF1 /* event4 copie 8 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760EF22A56795004B0EF1 /* event4 copie 8 */; };
 		4DF7612C22A56797004B0EF1 /* event5 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F022A56795004B0EF1 /* event5 */; };
 		4DF7612D22A56797004B0EF1 /* event1 copie 11 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F122A56795004B0EF1 /* event1 copie 11 */; };
-		4DF7612E22A56797004B0EF1 /* event1 copie in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F222A56795004B0EF1 /* event1 copie */; };
+		4DF7612E22A56797004B0EF1 /* event12 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F222A56795004B0EF1 /* event12 */; };
 		4DF7612F22A56797004B0EF1 /* event3 copie 8 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F322A56795004B0EF1 /* event3 copie 8 */; };
 		4DF7613022A56797004B0EF1 /* event2 copie 10 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F422A56795004B0EF1 /* event2 copie 10 */; };
 		4DF7613122A56797004B0EF1 /* event1 copie 4 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F522A56796004B0EF1 /* event1 copie 4 */; };
@@ -170,7 +170,7 @@
 		4DF760EF22A56795004B0EF1 /* event4 copie 8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event4 copie 8"; sourceTree = "<group>"; };
 		4DF760F022A56795004B0EF1 /* event5 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event5; sourceTree = "<group>"; };
 		4DF760F122A56795004B0EF1 /* event1 copie 11 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 11"; sourceTree = "<group>"; };
-		4DF760F222A56795004B0EF1 /* event1 copie */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie"; sourceTree = "<group>"; };
+		4DF760F222A56795004B0EF1 /* event12 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event12; sourceTree = "<group>"; };
 		4DF760F322A56795004B0EF1 /* event3 copie 8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event3 copie 8"; sourceTree = "<group>"; };
 		4DF760F422A56795004B0EF1 /* event2 copie 10 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 10"; sourceTree = "<group>"; };
 		4DF760F522A56796004B0EF1 /* event1 copie 4 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 4"; sourceTree = "<group>"; };
@@ -299,7 +299,7 @@
 			isa = PBXGroup;
 			children = (
 				4DF760C422A56451004B0EF1 /* event1 */,
-				4DF760F222A56795004B0EF1 /* event1 copie */,
+				4DF760F222A56795004B0EF1 /* event12 */,
 				4DF760FF22A56796004B0EF1 /* event1 copie 2 */,
 				4DF760F922A56796004B0EF1 /* event1 copie 3 */,
 				4DF760F522A56796004B0EF1 /* event1 copie 4 */,
@@ -536,7 +536,7 @@
 				4DF7611522A56797004B0EF1 /* event1 copie 9 in Resources */,
 				4DF7611422A56797004B0EF1 /* event10 in Resources */,
 				4DF7610B22A56797004B0EF1 /* event2 copie 13 in Resources */,
-				4DF7612E22A56797004B0EF1 /* event1 copie in Resources */,
+				4DF7612E22A56797004B0EF1 /* event12 in Resources */,
 				4DF7612222A56797004B0EF1 /* event1 copie 13 in Resources */,
 				4DF7611122A56797004B0EF1 /* event3 copie 12 in Resources */,
 				4DF7613A22A56797004B0EF1 /* event4 copie 6 in Resources */,

TournamentStats/Events/event1 copie

@@ -1,618 +0,0 @@
-1
-United StatesNicholas Haynes
-$62,248
-Tampa
-FL
-United States
-2
-United StatesIsaac Hanson
-$38,447
-Las Vegas
-NV
-United States
-3
-United StatesJorge Ruiz
-$26,642
-West Wendover
-NV
-United States
-4
-United StatesJesse Kertland
-$18,758
-Ellensburg
-WA
-United States
-5
-CanadaAdam Lamers
-$13,421
-Edmonton
-AB
-Canada
-6
-CanadaJeffrey Fast
-$9,761
-Welland
-ON
-Canada
-7
-United StatesChristopher Bowen
-$7,219
-San Francisco
-CA
-United States
-8
-United StatesJoseph Appler
-$5,430
-Utica
-NY
-United States
-9
-United StatesTravis Williams
-$4,155
-Laurel
-MD
-United States
-10
-United StatesErrol Krupiarz
-$3,236
-Sussex
-NJ
-United States
-11
-United StatesCosmo Andoloro
-$3,236
-Woodinville
-WA
-United States
-12
-United StatesZachary Lee
-$3,236
-Las Vegas
-NV
-United States
-13
-United States Justin Wong
-$2,565
-Piscataway
-NJ
-United States
-14
-United StatesAustin Roberts
-$2,565
-Henderson
-NV
-United States
-15
-United StatesDarrin Phillips
-$2,565
-Las Vegas
-NV
-United States
-16
-United StatesJesse Odenheimer
-$2,071
-Bozeman
-MT
-United States
-17
-United StatesSergey Babayan
-$2,071
-Burien
-WA
-United States
-18
-United StatesYun Zheng
-$2,071
-Philadelphia
-PA
-United States
-19
-United StatesDerek Shoemaker
-$1,703
-Yakima
-WA
-United States
-20
-CanadaShane Patreau
-$1,703
-Lansdowne
-ON
-Canada
-21
-United StatesMiguel Cardenas
-$1,703
-Rocklin
-CA
-United States
-22
-United StatesJoseph Lamberta
-$1,703
-Bartlett
-IL
-United States
-23
-United StatesPatrick Chung
-$1,703
-Seattle
-WA
-United States
-24
-United StatesSteven Mcloughlin
-$1,703
-Las Vegas
-NV
-United States
-25
-United StatesAmanda Wheeler
-$1,703
-Las Vegas
-NV
-United States
-26
-United StatesBradley Helm
-$1,703
-Scottsdale
-AZ
-United States
-27
-United StatesRobert Ostler
-$1,703
-San Diego
-CA
-United States
-28
-FranceJulien Martini
-$5,055
-Paris
--
-France
-29
-United StatesDavid "ODB" Baker
-$5,055
-Sahuarita
-AZ
-United States
-30
-United StatesDoug Lorgeree
-$5,055
-Buffalo Grove
-IL
-United States
-31
-Russian FederationAndrey Zhigalov
-$4,419
-Moscow
--
-Russian Federation
-32
-United StatesScott Abrams
-$4,419
-Henderson
-NV
-United States
-33
-Russian FederationVladimir Shchemelev
-$4,419
-St Petersburg
--
-Russian Federation
-34
-United StatesJoel Tushnet
-$4,419
-Tarzana
-CA
-United States
-35
-United StatesCody Espeseth
-$4,419
-Merrifield
-MN
-United States
-36
-United StatesRandy Ohel
-$4,419
-Las Vegas
-NV
-United States
-37
-AustriaIsmael Bojang
-$3,994
-Vienna
--
-Austria
-38
-United StatesTroy Evans
-$3,994
-Mount Pleasant
-SC
-United States
-39
-United StatesSteven Wolansky
-$3,994
-Cooper City
-FL
-United States
-40
-United StatesAndrew Woodmancey
-$3,994
-Coconut Creek
-FL
-United States
-41
-United StatesDavid Moskowitz
-$3,994
-Sunset Beach
-CA
-United States
-42
-United StatesJoshua Tieman
-$3,994
-Chicago
-IL
-United States
-43
-United StatesChristopher McHugh
-$3,737
-Las Vegas
-NV
-United States
-44
-United StatesBariscan Betil
-$3,737
-Philadelphia
-PA
-United States
-45
-AustraliaJames Obst
-$3,737
-Melbourne
--
-Australia
-46
-United StatesJon Friedberg
-$1,063
-Las Vegas
-NV
-United States
-47
-United StatesCorey Eiferle
-$1,063
-De Witt
-MI
-United States
-48
-United StatesThomas Timmons
-$1,063
-Diberville
-MS
-United States
-49
-United StatesRios Dagoberto
-$1,063
-Coral Gables
-FL
-United States
-50
-United StatesMark Fucile
-$1,063
-Las Vegas
-NV
-United States
-51
-United StatesPatrick Fewell
-$1,063
-N Las Vegas
-NV
-United States
-52
-United StatesIan Feller
-$1,063
-Tampa
-FL
-United States
-53
-United StatesFilimon Zamora
-$1,063
-Orange Cove
-CA
-United States
-54
-United StatesCecil Simms
-$1,063
-Renton
-WA
-United States
-55
-United StatesEric Fenzke
-$944
-Thousand Oaks
-CA
-United States
-56
-United StatesCarlos Aldaz
-$944
-Socorro
-TX
-United States
-57
-United StatesRichard Maxie
-$944
-Primm
-NV
-United States
-58
-United StatesJustin Slavin
-$944
-Port Orange
-FL
-United States
-59
-United StatesGregorios Lamprinos
-$944
-Las Vegas
-NV
-United States
-60
-United StatesFredric David
-$944
-Las Vegas
-NV
-United States
-61
-United StatesMelchor Espiritu
-$944
-Las Vegas
-NV
-United States
-62
-United StatesThomas Kubin
-$944
-St. Louis
-MI
-United States
-63
-United StatesKeith Lauder III
-$944
-Jamestown
-ND
-United States
-64
-United StatesJordan Ragan
-$857
-Henderson
-NV
-United States
-65
-United StatesMichael Parker
-$857
-Las Vegas
-NV
-United States
-66
-United StatesDaniel Goldman
-$857
-Redondo Beach
-CA
-United States
-67
-United StatesRick Marting
-$857
-Las Vegas
-NV
-United States
-68
-United StatesJoshua Greville
-$857
-Hamilton
--
-United States
-69
-United StatesMike Majerus
-$857
-Las Vegas
-NV
-United States
-70
-United StatesVincent Ikeh
-$857
-South Gate
-CA
-United States
-71
-United StatesJeremy Daum
-$857
-Rochester
-NY
-United States
-72
-United StatesScott Hecker
-$857
-Fort Lauderdale
-FL
-United States
-73
-United StatesBrian Matthiessen
-$794
-Omaha
-NE
-United States
-74
-United StatesAsad Abdullah
-$794
-Boston
-MA
-United States
-75
-United StatesStephen Duvall
-$794
-Lemoore
-CA
-United States
-76
-United StatesWen Wang
-$794
-Weatherby Lake
-MO
-United States
-77
-United StatesFrank Nguyen
-$794
-Las Vegas
-NV
-United States
-78
-United StatesLap Nguyen
-$794
-Las Vegas
-NV
-United States
-79
-United StatesCarlo Argentino
-$794
-Baltimore
-MD
-United States
-80
-United StatesAndrew Proesch
-$794
-Maplewood
-MN
-United States
-81
-United StatesBenjamin Chang
-$794
-Renton
-WA
-United States
-82
-United StatesChris Conner
-$751
-Rosamond
-CA
-United States
-83
-United StatesBrian Mikesh
-$751
-Little Canada
-MN
-United States
-84
-United StatesLeon Wheeler
-$751
-Las Vegas
-NV
-United States
-85
-United StatesKurtis Hendrickson
-$751
-Las Vegas
-NV
-United States
-86
-United StatesAdrian Hollie
-$751
-Los Angeles
-CA
-United States
-87
-United StatesBohao Zhu
-$751
-Sacramento
-CA
-United States
-88
-United StatesMatthew Schlesinger
-$751
-N Las Vegas
-NV
-United States
-89
-United StatesMatthew Mich
-$751
-Oskaloosa
-IA
-United States
-90
-United StatesJason Bardol
-$751
-Henderson
-NV
-United States
-91
-United StatesArmando Osuna
-$726
-Las Vegas
-NV
-United States
-92
-United StatesBrian Wong
-$726
-Las Vegas
-NV
-United States
-93
-United StatesGene Lee
-$726
-Chicago
-IL
-United States
-94
-United StatesBrian Burgess
-$726
-Bullhead City
-AZ
-United States
-95
-United StatesTomasz Trelski
-$726
-Middletown
-CT
-United States
-96
-United StatesChaan Thomas
-$726
-Las Vegas
-NV
-United States
-97
-United StatesJohn Postl
-$726
-Warren
-MI
-United States
-98
-United StatesJeramie Contreras
-$726
-Hudson
-WI
-United States
-99
-United StatesEvan Zlock
-$726
-Las Vegas
-NV
-United States
-100
-United StatesBrett Janiga
-$726
-Columbia Falls
-MT
-United States
-101
-United StatesSpencer Bennett
-$726
-Sacramento
-CA
-United States
-102
-United StatesWilliam Strough
-$726
-Peculiar
-MO
-United States
-103
-United StatesTimothy Schonherr
-$726
-Berkley
-MI
-United States

TournamentStats/Importer.swift

@@ -70,6 +70,7 @@ class Importer {
 
         for i in 0..<rows.count {
             let row: String = rows[i]
+            
             let index = i % numberOfColumns
             let currentColumn = columns[index]
             

TournamentStats/Seed.swift

@@ -31,11 +31,14 @@ class Seed {
         TD(date: "03/06/2019", name: "Limit Mixed Triple Draw", number: 6, buyin: 2500, entries: 296, prizePool: 666000),
         TD(date: "03/06/2019", name: "WSOP.com ONLINE No-Limit Hold'em", number: 7, buyin: 400, entries: 2825, prizePool: 1017000),
         TD(date: "05/06/2019", name: "Short Deck No-Limit Hold'em", number: 8, buyin: 10000, entries: 114, prizePool: 1071600),
-        TD(date: "06/06/2019", name: "No-Limit Hold'em Deepstack", number: 9, buyin: 600, entries: 6151, prizePool: 3229275),
+        TD(date: "06/06/2019", name: "No-Limit Hold'em Deepstack", number: 9, buyin: 600, entries: 6150, prizePool: 3229275),
         TD(date: "06/06/2019", name: "Dealers Choice", number: 10, buyin: 150, entries: 470, prizePool: 634500),
-        TD(date: "06/06/2019", name: "No-Limit Hold'em", number: 11, buyin: 5000, entries: 400, prizePool: 1860000),
+        TD(date: "07/06/2019", name: "No-Limit Hold'em", number: 11, buyin: 5000, entries: 400, prizePool: 1860000),
         TD(date: "06/06/2019", name: "No-Limit Hold'em Super Turbo Bounty", number: 12, buyin: 1000, entries: 2452, prizePool: 1471200),
-//        TD(date: "06/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 13, buyin: 1500, entrants: 114, prizePool: 1071600),
+        TD(date: "07/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 13, buyin: 1500, entries: 296, prizePool: 1071600),
+        TD(date: "07/06/2019", name: "HORSE", number: 14, buyin: 1500, entries: 751, prizePool: 1013850),
+        TD(date: "07/06/2019", name: "Heads-Up No-Limit Hold'em", number: 15, buyin: 10000, entries: 112, prizePool: 1052800),
+        TD(date: "07/06/2019", name: "No-Limit Hold'em 6-Handed", number: 16, buyin: 1500, entries: 1832, prizePool: 2473200),
 
     ]
     

TournamentStats/realm/Model.swift

@@ -14,7 +14,7 @@ class Festival : Object, Named {
     
     @objc dynamic var name: String = ""
     let tournaments = List<Tournament>()
-
+    
 }
 
 class Tournament : Object, Named {
@@ -28,12 +28,15 @@ class Tournament : Object, Named {
     @objc dynamic var prizepool: Double = 0.0
     @objc dynamic var entries: Int = 0
     
+    static var defaultColumns: [Columns] = [.rank, .player, .earnings, .poy, .city, .state, .country]
+    
     var rows: [Columns] {
         switch self.number {
         case 1, 8: return [.rank, .player, .earnings, .city, .state, .country]
-        default: return [.rank, .player, .earnings, .poy, .city, .state, .country]
+        default: return Tournament.defaultColumns
         }
     }
+    
 }
 
 class Player : Object, Named {
@@ -43,9 +46,9 @@ class Player : Object, Named {
     @objc dynamic var state: String?
     @objc dynamic var country: String = ""
     @objc dynamic var notable: Bool = false
-
+    
     let results = LinkingObjects(fromType: Result.self, property: "player")
-
+    
 }
 
 class Result : Object, CSVRepresentable {
@@ -54,9 +57,9 @@ class Result : Object, CSVRepresentable {
     @objc dynamic var player: Player?
     @objc dynamic var earnings: Double = 0.0
     @objc dynamic var poyPoints: Double = 0.0
-
+    
     let tournaments = LinkingObjects(fromType: Tournament.self, property: "results")
-
+    
     static func csvHeaders() -> String {
         var strings: [String] = []
         strings.append("Name")
@@ -64,7 +67,7 @@ class Result : Object, CSVRepresentable {
         strings.append("POY Points")
         return strings.joined(separator: ",")
     }
-
+    
     func csv() -> String {
         var strings: [String] = []