diff --git a/TournamentStats.xcodeproj/project.pbxproj b/TournamentStats.xcodeproj/project.pbxproj index ec04814..bf64115 100644 --- a/TournamentStats.xcodeproj/project.pbxproj +++ b/TournamentStats.xcodeproj/project.pbxproj @@ -73,13 +73,13 @@ 4DF7613222A56797004B0EF1 /* event2 copie 4 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F622A56796004B0EF1 /* event2 copie 4 */; }; 4DF7613322A56797004B0EF1 /* event1 copie 10 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F722A56796004B0EF1 /* event1 copie 10 */; }; 4DF7613422A56797004B0EF1 /* event2 copie 2 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F822A56796004B0EF1 /* event2 copie 2 */; }; - 4DF7613522A56797004B0EF1 /* event1 copie 3 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F922A56796004B0EF1 /* event1 copie 3 */; }; + 4DF7613522A56797004B0EF1 /* event13 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F922A56796004B0EF1 /* event13 */; }; 4DF7613622A56797004B0EF1 /* event1 copie 15 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FA22A56796004B0EF1 /* event1 copie 15 */; }; 4DF7613722A56797004B0EF1 /* event3 copie 11 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FB22A56796004B0EF1 /* event3 copie 11 */; }; 4DF7613822A56797004B0EF1 /* event3 copie 6 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FC22A56796004B0EF1 /* event3 copie 6 */; }; 4DF7613922A56797004B0EF1 /* event1 copie 14 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FD22A56796004B0EF1 /* event1 copie 14 */; }; 4DF7613A22A56797004B0EF1 /* event4 copie 6 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FE22A56796004B0EF1 /* event4 copie 6 */; }; - 4DF7613B22A56797004B0EF1 /* event1 copie 2 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FF22A56796004B0EF1 /* event1 copie 2 */; }; + 4DF7613B22A56797004B0EF1 /* event11 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760FF22A56796004B0EF1 /* event11 */; }; 4DF7613C22A56797004B0EF1 /* event4 copie in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610022A56796004B0EF1 /* event4 copie */; }; 4DF7613D22A56797004B0EF1 /* event2 copie 12 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610122A56796004B0EF1 /* event2 copie 12 */; }; 4DF7613E22A56797004B0EF1 /* event1 copie 5 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610222A56797004B0EF1 /* event1 copie 5 */; }; @@ -177,13 +177,13 @@ 4DF760F622A56796004B0EF1 /* event2 copie 4 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 4"; sourceTree = ""; }; 4DF760F722A56796004B0EF1 /* event1 copie 10 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 10"; sourceTree = ""; }; 4DF760F822A56796004B0EF1 /* event2 copie 2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 2"; sourceTree = ""; }; - 4DF760F922A56796004B0EF1 /* event1 copie 3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 3"; sourceTree = ""; }; + 4DF760F922A56796004B0EF1 /* event13 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event13; sourceTree = ""; }; 4DF760FA22A56796004B0EF1 /* event1 copie 15 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 15"; sourceTree = ""; }; 4DF760FB22A56796004B0EF1 /* event3 copie 11 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event3 copie 11"; sourceTree = ""; }; 4DF760FC22A56796004B0EF1 /* event3 copie 6 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event3 copie 6"; sourceTree = ""; }; 4DF760FD22A56796004B0EF1 /* event1 copie 14 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 14"; sourceTree = ""; }; 4DF760FE22A56796004B0EF1 /* event4 copie 6 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event4 copie 6"; sourceTree = ""; }; - 4DF760FF22A56796004B0EF1 /* event1 copie 2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 2"; sourceTree = ""; }; + 4DF760FF22A56796004B0EF1 /* event11 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event11; sourceTree = ""; }; 4DF7610022A56796004B0EF1 /* event4 copie */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event4 copie"; sourceTree = ""; }; 4DF7610122A56796004B0EF1 /* event2 copie 12 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 12"; sourceTree = ""; }; 4DF7610222A56797004B0EF1 /* event1 copie 5 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event1 copie 5"; sourceTree = ""; }; @@ -300,8 +300,8 @@ children = ( 4DF760C422A56451004B0EF1 /* event1 */, 4DF760F222A56795004B0EF1 /* event12 */, - 4DF760FF22A56796004B0EF1 /* event1 copie 2 */, - 4DF760F922A56796004B0EF1 /* event1 copie 3 */, + 4DF760FF22A56796004B0EF1 /* event11 */, + 4DF760F922A56796004B0EF1 /* event13 */, 4DF760F522A56796004B0EF1 /* event1 copie 4 */, 4DF7610222A56797004B0EF1 /* event1 copie 5 */, 4DF760E322A56794004B0EF1 /* event1 copie 6 */, @@ -502,7 +502,7 @@ 4DF7612722A56797004B0EF1 /* event4 copie 9 in Resources */, 4DF760B522A47F6D004B0EF1 /* event2 in Resources */, 4DF7614222A56797004B0EF1 /* event3 copie 5 in Resources */, - 4DF7613B22A56797004B0EF1 /* event1 copie 2 in Resources */, + 4DF7613B22A56797004B0EF1 /* event11 in Resources */, 4DF7611B22A56797004B0EF1 /* event4 copie 3 in Resources */, 4DF7613222A56797004B0EF1 /* event2 copie 4 in Resources */, 4DF7612F22A56797004B0EF1 /* event3 copie 8 in Resources */, @@ -527,7 +527,7 @@ 4DF7610D22A56797004B0EF1 /* event2 copie 8 in Resources */, 4DF7613822A56797004B0EF1 /* event3 copie 6 in Resources */, 4DF7614022A56797004B0EF1 /* event2 copie 3 in Resources */, - 4DF7613522A56797004B0EF1 /* event1 copie 3 in Resources */, + 4DF7613522A56797004B0EF1 /* event13 in Resources */, 4DF7612D22A56797004B0EF1 /* event1 copie 11 in Resources */, 4DF760CB22A56765004B0EF1 /* event4 in Resources */, 4DF7610922A56797004B0EF1 /* event3 copie 15 in Resources */, diff --git a/TournamentStats.xcodeproj/project.xcworkspace/xcuserdata/laurent.xcuserdatad/UserInterfaceState.xcuserstate b/TournamentStats.xcodeproj/project.xcworkspace/xcuserdata/laurent.xcuserdatad/UserInterfaceState.xcuserstate index a00495f..c031665 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/event1 copie 2 b/TournamentStats/Events/event1 copie 2 deleted file mode 100644 index 713ff0e..0000000 --- a/TournamentStats/Events/event1 copie 2 +++ /dev/null @@ -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 diff --git a/TournamentStats/Events/event1 copie 3 b/TournamentStats/Events/event1 copie 3 deleted file mode 100644 index 713ff0e..0000000 --- a/TournamentStats/Events/event1 copie 3 +++ /dev/null @@ -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 diff --git a/TournamentStats/Events/event11 b/TournamentStats/Events/event11 new file mode 100644 index 0000000..fd1b967 --- /dev/null +++ b/TournamentStats/Events/event11 @@ -0,0 +1,420 @@ +1 +United StatesDaniel Strelitz +$442,385 +324.2 +Torrance +CA +United States +2 +United StatesShannon Shorr +$273,416 +324.2 +Las Vegas +NV +United States +3 +SerbiaOgnjen Sekularac +$186,050 +324.2 +Belgrade +- +Serbia +4 +United StatesAli Imsirovic +$129,018 +324.2 +Vancouver +WA +United States +5 +United StatesMaria Ho +$91,211 +324.2 +Arcadia +CA +United States +6 +Russian FederationArsenii Karmatckii +$65,764 +324.2 +Ekaterinburg +- +Russian Federation +7 +United StatesMaria Mcalpin +$48,377 +324.2 +Boise +ID +United States +8 +FinlandPauli Ayras +$36,323 +297.2 +Helsinki +- +Finland +9 +AustraliaMichael O'Grady +$27,848 +270.2 +Hoxton Park +NSW +Australia +10 +United StatesRandall Emmett +$21,812 +216.1 +Beverly Hills +CA +United States +11 +TaiwanPete Chen +$21,812 +216.1 +Taipei +- +Taiwan +12 +JamaicaEmile Schiff +$21,812 +216.1 +Ocho Rios +- +Jamaica +13 +United KingdomSimon Deadman +$17,460 +216.1 +Nottingham +- +United Kingdom +14 +United StatesMario Hofler +$17,460 +216.1 +Manomet +MA +United States +15 +United StatesAnthony Zinno +$17,460 +216.1 +Boston +MA +United States +16 +United StatesDaniel Buzgon +$14,292 +216.1 +Marlton +NJ +United States +17 +United StatesBrett Bader +$14,292 +216.1 +Jericho +NY +United States +18 +GermanyGiuseppe Pantaleo +$14,292 +216.1 +Bielefeld +- +Germany +19 +United StatesIan Steinman +$11,969 +216.1 +Mountain View +CA +United States +20 +GermanyAndreas Kniep +$11,969 +216.1 +- +- +Germany +21 +BulgariaKrasimir Yankov +$11,969 +108.1 +Blagoevgrad +- +Bulgaria +22 +United StatesTaylor Hart +$11,969 +108.1 +Newberg +OR +United States +23 +United StatesJeremy Ausmus +$11,969 +108.1 +Las Vegas +NV +United States +24 +United StatesAnthony Alberto +$11,969 +108.1 +Philadelphia +PA +United States +25 +HungaryMarton Czuczor +$11,969 +108.1 +Budapest +- +Hungary +26 +United KingdomNiall Farrell +$11,969 +108.1 +Glasgow +- +United Kingdom +27 +United StatesKeith Ferrera +$11,969 +108.1 +Las Vegas +NV +United States +28 +United StatesRobert Natividad +$10,260 +108.1 +Cerritos +CA +United States +29 +United StatesRalph Wong +$10,260 +108.1 +West Chester +PA +United States +30 +ChinaYang Zhang +$10,260 +108.1 +Dalian +- +China +31 +United StatesSimon Burns +$10,260 +108.1 +- +- +United States +32 +BelgiumJohan Schumancher +$10,260 +108.1 +- +- +Belgium +33 +United KingdomBenjamin Heath +$10,260 +108.1 +- +- +United Kingdom +34 +United StatesAnatoly Filatov +$10,260 +108.1 +Blue Point +NY +United States +35 +ChinaDong Chen +$10,260 +108.1 +Ningbo +- +China +36 +GermanyChristopher Frank +$10,260 +54.0 +Vienna +- +Germany +37 +United StatesRichard Tuhrim +$9,007 +54.0 +New York +NY +United States +38 +AustriaAndreas Eiler +$9,007 +54.0 +Scharding +- +Austria +39 +United StatesFaraz Jaka +$9,007 +54.0 +Delray Beach +FL +United States +40 +United StatesMike Vanier +$9,007 +54.0 +Lincoln +NE +United States +41 +United StatesJason Koon +$9,007 +54.0 +Las Vegas +NV +United States +42 +JapanKazuki Ikeuchi +$9,007 +54.0 +Tokyo +- +Japan +43 +United StatesArdit Kurshumi +$9,007 +54.0 +Revere +MA +United States +44 +GermanyLars Kamphues +$9,007 +54.0 +Wildschoeau +- +Germany +45 +United StatesAaron Mermelstein +$9,007 +54.0 +Miami +FL +United States +46 +United StatesChander Jain +$8,104 +54.0 +Houston +TX +United States +47 +United StatesGaurav Raina +$8,104 +54.0 +Athens +GA +United States +48 +United StatesManoj Ravi +$8,104 +54.0 +Redmond +WA +United States +49 +United KingdomToby Lewis +$8,104 +54.0 +Southampton +- +United Kingdom +50 +United StatesEli Ross +$8,104 +54.0 +Philadelphia +PA +United States +51 +United StatesMatthew Gonzales +$8,104 +54.0 +San Ramon +CA +United States +52 +SwitzerlandElias Gutierrez +$8,104 +54.0 +Georgia +- +Switzerland +53 +United StatesAndrew Lichtenberger +$8,104 +54.0 +Las Vegas +NV +United States +54 +United KingdomJavier Fernandez +$8,104 +54.0 +Cardiff +- +United Kingdom +55 +DenmarkFrederik Brink +$7,476 +54.0 +Copenhagen +- +Denmark +56 +United StatesDaniel Park +$7,476 +54.0 +Bothell +WA +United States +57 +SpainAdrian Mateos +$7,476 +54.0 +Madrid +- +Spain +58 +United StatesOrson Young +$7,476 +54.0 +Oceanport +NJ +United States +59 +United StatesRicky Guan +$7,476 +54.0 +Brooklyn +NY +United States +60 +United StatesFarid Jattin +$7,476 +54.0 +Miami +FL +United States diff --git a/TournamentStats/Events/event13 b/TournamentStats/Events/event13 new file mode 100644 index 0000000..4699be4 --- /dev/null +++ b/TournamentStats/Events/event13 @@ -0,0 +1,308 @@ +1 +IsraelYuval Bronshtein +$96,278 +89.2 +Tel Aviv +- +Israel +2 +United StatesAjay Chabra +$59,491 +89.2 +Hoboken +NJ +United States +3 +United StatesJerry Wong +$39,986 +89.2 +Davie +FL +United States +4 +United StatesSteven Tabb +$27,477 +89.2 +Newton +MA +United States +5 +United StatesMichael Sortino +$19,313 +89.2 +Omaha +NE +United States +6 +GermanyBjorn Geissert +$13,892 +89.2 +Munich +- +Germany +7 +United StatesCraig Chait +$10,232 +89.2 +Newport Beach +CA +United States +8 +United StatesFrank Kassela +$7,722 +89.2 +Chicago +IL +United States +9 +United StatesJameson Painter +$5,974 +89.2 +Las Vegas +NV +United States +10 +BelgiumMichael Gathy +$5,974 +89.2 +Brussels +- +Belgium +11 +United StatesMatthew Smith +$5,974 +89.2 +Lithia +FL +United States +12 +United StatesGalen Hall +$4,741 +178.3 +New York City +NY +United States +13 +TaiwanJames Chen +$4,741 +178.3 +Taichung +- +Taiwan +14 +United StatesAndy Hwang +$4,741 +178.3 +Sugar Land +TX +United States +15 +United StatesYosuke Iwata +$3,862 +178.3 +La Habra +CA +United States +16 +United StatesShaun Deeb +$3,862 +178.3 +Las Vegas +NV +United States +17 +United StatesDave Alfa +$3,862 +178.3 +Austin +TX +United States +18 +United StatesJennifer Harman Traniello +$3,862 +89.2 +Las Vegas +NV +United States +19 +United StatesMelissa Saphier +$3,862 +89.2 +Westport +CT +United States +20 +United StatesRyan Riess +$3,862 +89.2 +East Lansing +MI +United States +21 +United StatesRichard Thomas +$3,862 +89.2 +Carmel +IN +United States +22 +United StatesAbdel Hamid +$3,232 +89.2 +Corpus Christi +TX +United States +23 +United StatesScott Abrams +$3,232 +89.2 +Henderson +NV +United States +24 +United StatesJeffrey Lennon +$3,232 +89.2 +Fresno +CA +United States +25 +United StatesFrederick Li +$3,232 +89.2 +Livingston +NJ +United States +26 +United StatesMark Fraser +$3,232 +89.2 +Las Vegas +NV +United States +27 +United StatesJoseph Ranciato +$3,232 +89.2 +Sacramento +CA +United States +28 +United StatesDon McNamara +$3,232 +44.6 +San Jose +CA +United States +29 +CanadaDaniel Negreanu +$2,780 +44.6 +Toronto +ON +Canada +30 +United StatesStephen Moreschi +$2,780 +44.6 +Redington Beach +FL +United States +31 +United StatesJerry Robinson +$2,780 +44.6 +Raleigh +NC +United States +32 +JapanTomoharu Mori +$2,780 +44.6 +Takatsuki +- +Japan +33 +United KingdomCody Wagner +$2,780 +44.6 +Warrington +- +United Kingdom +34 +United StatesRobert Mather +$2,780 +44.6 +Redding +CA +United States +35 +United StatesJon Turner +$2,780 +44.6 +Las Vegas +NV +United States +36 +United StatesBrian Yoon +$2,460 +44.6 +Las Vegas +NV +United States +37 +ColombiaDaniel Ospina +$2,460 +44.6 +- +- +Colombia +38 +United StatesAshton Berner +$2,460 +44.6 +Henderson +NV +United States +39 +United StatesHarold Kizzire +$2,460 +44.6 +Birmingham +AL +United States +40 +United StatesDustin Wood +$2,460 +44.6 +San Jose +CA +United States +41 +United StatesChong Lee +$2,460 +44.6 +Tacoma +WA +United States +42 +United StatesSung Yi +$2,460 +44.6 +Los Angeles +CA +United States +43 +United StatesRobert Slezak +$2,242 +44.6 +Omaha +NE +United States +44 +United StatesRyan Lenaghan +$2,242 +44.6 +Mobile +AL +United States diff --git a/TournamentStats/NotablePlayers.swift b/TournamentStats/NotablePlayers.swift index 2d717f8..fc225dd 100644 --- a/TournamentStats/NotablePlayers.swift +++ b/TournamentStats/NotablePlayers.swift @@ -43,6 +43,16 @@ class NotablePlayers { "Rainer Kempe", "Olivier Busquet", "Adrian Mateos", + "Ryan Riess", + "Jennifer Harman Traniello", + "Frank Kassela", + "Maria Ho", +// "", +// "", +// "", +// "", +// "", +// "", ] diff --git a/TournamentStats/Seed.swift b/TournamentStats/Seed.swift index 01600d8..866a712 100644 --- a/TournamentStats/Seed.swift +++ b/TournamentStats/Seed.swift @@ -25,7 +25,7 @@ class Seed { static let tournamentsDescriptions = [ TD(date: "31/05/2019", name: "Casino Employees Event", number: 1, buyin: 500, entries: 685, prizePool: 297975), TD(date: "30/05/2019", name: "Super Turbo Bounty", number: 2, buyin: 10000, entries: 204, prizePool: 1917600), - TD(date: "07/06/2019", name: "BIG 50 No-Limit Hold'em", number: 3, buyin: 500, entries: 28371, prizePool: 13509435), + TD(date: "08/06/2019", name: "BIG 50 No-Limit Hold'em", number: 3, buyin: 500, entries: 28371, prizePool: 13509435), TD(date: "02/06/2019", name: "Omaha Hi/Lo 8 or Better", number: 4, buyin: 1500, entries: 853, prizePool: 1151550), TD(date: "03/06/2019", name: "High Roller No-Limit Hold'em for the 50th Annual", number: 5, buyin: 50000, entries: 110, prizePool: 5280000), TD(date: "03/06/2019", name: "Limit Mixed Triple Draw", number: 6, buyin: 2500, entries: 296, prizePool: 666000), @@ -35,10 +35,12 @@ class Seed { TD(date: "06/06/2019", name: "Dealers Choice", number: 10, buyin: 150, entries: 470, prizePool: 634500), 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: "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), + TD(date: "07/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 13, buyin: 1500, entries: 296, prizePool: 399600), + TD(date: "08/06/2019", name: "HORSE", number: 14, buyin: 1500, entries: 751, prizePool: 1013850), + TD(date: "08/06/2019", name: "Heads-Up No-Limit Hold'em", number: 15, buyin: 10000, entries: 112, prizePool: 1052800), + TD(date: "08/06/2019", name: "No-Limit Hold'em 6-Handed", number: 16, buyin: 1500, entries: 1832, prizePool: 2473200), +// TD(date: "08/06/2019", name: "No-Limit Hold'em Shootout", number: 17, buyin: 1500, entries: 917, prizePool: 1237950), +// TD(date: "08/06/2019", name: "Omaha Hi-Lo 8 or Better", number: 18, buyin: 10000, entries: 1832, prizePool: 2473200), ] diff --git a/TournamentStats/core/Formatters.swift b/TournamentStats/core/Formatters.swift index 57fd534..e0d546d 100644 --- a/TournamentStats/core/Formatters.swift +++ b/TournamentStats/core/Formatters.swift @@ -8,6 +8,29 @@ import Foundation +extension Locale { + + func countryCode(from countryName: String) -> String? { + return NSLocale.isoCountryCodes.first { (code) -> Bool in + let name = self.localizedString(forRegionCode: code) + return name == countryName + } + } + + func flagoji(from countryName: String) -> String? { + if let countryCode = self.countryCode(from: countryName) { + let base : UInt32 = 127397 + var s = "" + for v in countryCode.uppercased().unicodeScalars { + s.unicodeScalars.append(UnicodeScalar(base + v.value)!) + } + return s + } + return nil + } + +} + class Formatter { static var currency: NumberFormatter { diff --git a/TournamentStats/realm/Model.swift b/TournamentStats/realm/Model.swift index 8736c8d..4f694a8 100644 --- a/TournamentStats/realm/Model.swift +++ b/TournamentStats/realm/Model.swift @@ -47,6 +47,14 @@ class Player : Object, Named { @objc dynamic var country: String = "" @objc dynamic var notable: Bool = false + var formattedName: String { + if let flagoji = Locale.current.flagoji(from: self.country) { + return "\(flagoji) \(self.name)" + } else { + return self.name + } + } + let results = LinkingObjects(fromType: Result.self, property: "player") } diff --git a/TournamentStats/report/structures/CumulatedResults.swift b/TournamentStats/report/structures/CumulatedResults.swift index b177856..c9f6b33 100644 --- a/TournamentStats/report/structures/CumulatedResults.swift +++ b/TournamentStats/report/structures/CumulatedResults.swift @@ -52,7 +52,7 @@ class CumulatedResults : CSVRepresentable, HTMLRepresentable { func html() -> String { var strings: [String] = [] - strings.append(self.player.name) + strings.append(self.player.formattedName) strings.append(self.total.currencyFormatted) strings.append("\(self.numberOfCashes)") let all = strings.joined(separator: "") diff --git a/TournamentStats/report/structures/PlayerResult.swift b/TournamentStats/report/structures/PlayerResult.swift index b97b70e..c432273 100644 --- a/TournamentStats/report/structures/PlayerResult.swift +++ b/TournamentStats/report/structures/PlayerResult.swift @@ -26,7 +26,7 @@ struct PlayerResult : HTMLRepresentable { func html() -> String { var strings: [String] = [] - strings.append(self.result.player?.name ?? "") + strings.append(self.result.player?.formattedName ?? "") strings.append(self.result.rank.rankFormatted) strings.append(result.earnings.currencyFormatted) strings.append("\(tournament.number)") diff --git a/TournamentStats/report/structures/TournamentWinner.swift b/TournamentStats/report/structures/TournamentWinner.swift index 6aeb92a..58f853f 100644 --- a/TournamentStats/report/structures/TournamentWinner.swift +++ b/TournamentStats/report/structures/TournamentWinner.swift @@ -29,7 +29,7 @@ struct TournamentWinner : HTMLRepresentable { strings.append("\(tournament.number)") strings.append(tournament.buyin.currencyFormatted) strings.append(tournament.name) - strings.append(result.player?.name ?? "") + strings.append(result.player?.formattedName ?? "") strings.append(result.earnings.currencyFormatted) let all = strings.joined(separator: "") return "\(all)" diff --git a/TournamentStats/utils/CSVUtils.swift b/TournamentStats/utils/CSVUtils.swift index 7cc752a..5f3e636 100644 --- a/TournamentStats/utils/CSVUtils.swift +++ b/TournamentStats/utils/CSVUtils.swift @@ -37,8 +37,10 @@ extension Array where Element : HTMLRepresentable { func writeHTML(fileName: String, limit: Int? = 10) { - var html = "\n" + var html = "
\n" + html.append("") html.append(Element.htmlHeaders()) + html.append("\n") let max = limit ?? Int.max for (index, rep) in self.enumerated() { html.append("\n") @@ -50,8 +52,6 @@ extension Array where Element : HTMLRepresentable { } html.append("\n
") - - do { try FileWriter.writeToDocumentDirectory(content: html, fileName: fileName) } catch {