summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-03-07 19:03:17 -0500
committerTomer Kimia <tkimia@purdue.edu>2014-03-07 19:03:17 -0500
commita9c41421fdc9f6a080e46e38214d6b8547c56410 (patch)
tree818fa49f938beff63241900e60d800ac098b1bad
parentfbac4c86b00ade6172c74da55d5561604c00e6b3 (diff)
parentdf5170df8cc9a0a4cd547ce6713e94074e636dfc (diff)
such progress, very bar
Merge branch 'master' of https://github.com/LukeShu/leaguer
-rw-r--r--app/models/tournament.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 79d8b24..69bedf5 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -22,14 +22,14 @@ class Tournament < ActiveRecord::Base
def setup(tournament)
num_teams = (self.players.count/self.max_players_per_team).floor
num_matches = num_teams - 1
- for i in 0..num_matches
+ for i in 1..num_matches
self.matches.create(name: "Match #{i}")
end
match_num = 0
team_num = 0
self.players.each_slice(tournament.max_players_per_team) do |players|
self.matches[match_num].teams.push(Team.create(users: players))
- if (team_num == 0 and team_num % tournament.max_teams_per_match == 0)
+ if (team_num != 0 and team_num % tournament.max_teams_per_match == 0)
match_num += 1
team_num = 0
else