diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-05 19:56:35 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-05 19:56:35 -0400 |
commit | 94d5a5012910b531aaeb040ed01f821dde45961e (patch) | |
tree | abae86c9dadb4670e76fd6657d7c1d97f43c930b /app/models | |
parent | 6cbbb7833ea55123389356579ccccbc59dde4db9 (diff) | |
parent | 7eff9bd40e71ad8b73dc2dd1818fd668e7b09338 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/game.rb | 1 | ||||
-rw-r--r-- | app/models/tournament.rb | 5 | ||||
-rw-r--r-- | app/models/user.rb | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/models/game.rb b/app/models/game.rb index a181c26..ec865d8 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,2 +1,3 @@ class Game < ActiveRecord::Base + has_many :settings, class_name: "GameSetting" end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 22711b1..e408cfe 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -25,7 +25,7 @@ class Tournament < ActiveRecord::Base end end - def setup() + def setup num_teams = (self.players.count/self.min_players_per_team).floor num_matches = num_teams - 1 for i in 1..num_matches @@ -33,8 +33,11 @@ class Tournament < ActiveRecord::Base end match_num = 0 team_num = 0 + #for each grouping of min_players_per_team self.players.each_slice(min_players_per_team) do |players| + #create a new team in the current match self.matches[match_num].teams.push(Team.create(users: players)) + #if the match is full, move to the next match, otherwise move to the next team if (team_num != 0 and team_num % max_teams_per_match == 0) match_num += 1 team_num = 0 diff --git a/app/models/user.rb b/app/models/user.rb index 56c78b4..64dd7ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,6 +14,7 @@ class User < ActiveRecord::Base end def can?(action) + return true case action when :create_tournament return true |