1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Commit Graph

159 Commits

Author SHA1 Message Date
43d7089b44 Associated wrestlers and tournaments through weights 2015-03-28 14:48:36 +00:00
d7bbd32460 Formatting code and deleting uneeded methods 2015-03-28 14:43:14 +00:00
7b5ffaff29 Removed old pool views 2015-03-27 19:09:12 +00:00
7146c401cf Test 5 match rule for bracket size 5-16 2015-03-27 19:07:49 +00:00
12b27ef3bc Ordered wrestlers by seed in bracket 2015-03-27 16:35:55 +00:00
a821c28cf7 Created one page for all pools 2015-03-27 16:33:09 +00:00
86faf8b2a4 Tested serialization in poolbracket integration test 2015-03-27 13:07:32 +00:00
f166da9a2f Fixed two pool to semi view 2015-03-27 12:56:23 +00:00
4b6b20c912 Created integration test for poolbracket matchups 2015-03-27 12:52:35 +00:00
819d735480 Cleaned scaffold tests and set up fixtures needed for now. 2015-03-26 16:55:33 +00:00
a1fbcc4a9f Added weight_max to matchup 2015-03-25 13:08:36 +00:00
06a4d1b95d Fixed matchup object to hash and hash to object 2015-03-25 12:56:19 +00:00
e0f6c129c7 Had to convert all Matchups to hash and back to objects for serialization 2015-03-25 12:32:38 +00:00
a0083ab939 Currently not saving tournament.matchups_array 2015-03-25 01:42:10 +00:00
862c69e431 Changed tournament.matchups to tournament.matchups_array 2015-03-25 00:49:23 +00:00
0b4c9075b1 Idk 2015-03-25 00:43:21 +00:00
a6f78a6dc6 Persisting matchups 2015-03-25 00:15:27 +00:00
5fe8c394a2 Create seed for each type of poolbracket 2015-03-24 21:09:59 +00:00
79f44d4600 Updated bracket views for all pool bracket types 2015-03-24 21:06:09 +00:00
5c14165d6f Updated procfile for puma 2015-03-24 14:40:20 +00:00
458c0a8723 poolbracket.rb updated for different brackets 2015-03-24 14:21:18 +00:00
c1081ef64a Generate blank matchups for pool brackets 2015-03-23 19:14:58 +00:00
b00d11a222 Merge branch 'master' of heroku.com:wrestlingapp 2015-03-23 18:20:02 +00:00
27883597ca Set up blank bracket matches for fourPools 2015-03-23 18:17:06 +00:00
20f9b7f016 Cleaned up a little bit of code 2015-03-23 11:59:56 +00:00
b3b4fdb6e5 Revert "Moved generateMatches to tournament. Trying to reduce queries and speed"
This reverts commit 0e5dabac8a.
2015-03-17 09:34:43 -04:00
662a1ad498 Revert "Still trying to generate matches from tournament."
This reverts commit e3a1323d39.
2015-03-17 09:34:36 -04:00
e3a1323d39 Still trying to generate matches from tournament. 2015-03-17 09:32:11 -04:00
0e5dabac8a Moved generateMatches to tournament. Trying to reduce queries and speed
up page load.
2015-03-17 09:26:30 -04:00
c86f678fd1 Moved poolNumber generation to weight. 2015-03-17 09:06:21 -04:00
d6a9abffac Update seeds on one page. 2015-03-16 15:06:45 -04:00
8d6fab3428 Trying to get two pool seeds corrected 2015-03-16 12:47:55 -04:00
83703e58bf Two pool separate seeds better 2015-03-16 12:43:27 -04:00
4413c81100 Two pools view needed five rounds 2015-03-16 12:39:27 -04:00
6452aee07a Removed delayed job and generate matches 2015-03-16 09:13:12 -04:00
2843760779 Create bracket views with upcomingMatches 2015-03-16 08:35:56 -04:00
7b9422fd6c Filter wrestlers per pool for matchups. 2015-03-16 08:13:41 -04:00
05c340eb94 Reducing queries for upcoming matches 2015-03-16 08:06:08 -04:00
e8dd332bbc Add boutNumber to upcomgingMatches 2015-03-12 15:18:06 -04:00
dc9639cf1c Calculate matchups for pools. This breaks generating matches. 2015-03-12 15:03:38 -04:00
d68cebc6e4 Compiled assets before deploy 2015-02-11 11:24:15 -05:00
4d8a58a36a Still working on dataTables for heroku 2015-02-11 11:20:42 -05:00
56d2778624 Rearranging application.css 2015-02-11 11:19:06 -05:00
2b52295a0e Changed depricated setting 2015-02-11 11:14:43 -05:00
984222b9d7 Added ruby version to gemfile 2015-02-11 11:14:32 -05:00
c7ea29f2e3 Re-arranging requires in application.js 2015-02-11 11:11:29 -05:00
2d053500ed Still trying to get dataTables working in production 2015-02-11 11:03:59 -05:00
750071627e Trying to get dataTables working in Heroku 2015-02-11 11:00:05 -05:00
fbe6b8cd78 Updated Gemfile.lock 2015-02-11 10:51:43 -05:00
bdec6c0463 Added dataTables for matches and tournaments. 2015-02-11 10:50:25 -05:00