summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/tournaments_controller.rb2
-rw-r--r--app/models/tournament.rb14
2 files changed, 12 insertions, 4 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 3583ec3..5155a4f 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -40,7 +40,7 @@ class TournamentsController < ApplicationController
@tournament = Tournament.new(tournament_params)
respond_to do |format|
if @tournament.save
- @tournament.hosts.push(current_user)
+ #@tournament.hosts.push(current_user)
format.html { redirect_to @tournament, notice: 'Tournament was successfully created.' }
format.json { render action: 'show', status: :created, location: @tournament }
else
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 44b22f5..fe781e1 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -25,9 +25,17 @@ class Tournament < ActiveRecord::Base
for i in 0..num_matches
self.matches.create(name: "Match #{i}")
end
- #self.players.each_slice(num_teams) do |team_players|
- # Team.new(users: team_players)
- #end
+ match_num = 0
+ team_num = 0
+ self.players.each_slice(@tournament.max_players) do |players|
+ matches[match_num].teams[team_num] = Team.new(users: players)
+ if (team_num == 0 and team_num % @tournament.max_teams_per_match == 0)
+ match_num += 1
+ team_num = 0
+ else
+ team_num += 1
+ end
+ end
end