From 4d51d53103ed16f07cb41662697038e17027d562 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sat, 5 Apr 2014 00:54:35 -0400 Subject: Commenting my crazy. --- app/models/tournament.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/models') 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 -- cgit v1.2.3-2-g168b From 7eff9bd40e71ad8b73dc2dd1818fd668e7b09338 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sat, 5 Apr 2014 15:53:45 -0400 Subject: Updated Settings, renaming, tournament views and misc. --- app/models/game.rb | 1 + app/models/user.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'app/models') 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/user.rb b/app/models/user.rb index d1698bd..bae4eac 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 when :edit_tournament -- cgit v1.2.3-2-g168b From 6cbbb7833ea55123389356579ccccbc59dde4db9 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Sat, 5 Apr 2014 19:56:18 -0400 Subject: Match status 1 page --- app/models/user.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/models') diff --git a/app/models/user.rb b/app/models/user.rb index d1698bd..56c78b4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -16,8 +16,11 @@ class User < ActiveRecord::Base def can?(action) case action when :create_tournament + return true when :edit_tournament + return true when :join_tournament + return true when :delete_tournament when :create_game -- cgit v1.2.3-2-g168b