summaryrefslogtreecommitdiff
path: root/lib/scheduling
diff options
context:
space:
mode:
authornfoy <nfoy@purdue.edu>2014-04-22 18:30:11 -0400
committernfoy <nfoy@purdue.edu>2014-04-22 18:30:11 -0400
commite44115cf206804f7a22c5f98ba422d9c61ad81a7 (patch)
treee60532fbbc7639084ca218a196dc4b0e377ba4e7 /lib/scheduling
parentf4373ec761491213a4c5690ef33832f35cbb5e32 (diff)
parentc0ae56e4974a14433a58951c031d4b4c74f57935 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'lib/scheduling')
-rw-r--r--lib/scheduling/elimination.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/scheduling/elimination.rb b/lib/scheduling/elimination.rb
index e718d54..5ce71ca 100644
--- a/lib/scheduling/elimination.rb
+++ b/lib/scheduling/elimination.rb
@@ -1,5 +1,7 @@
+
module Scheduling
class Elimination
+ include Rails.application.routes.url_helpers
def initialize(tournament_stage)
@tournament_stage = tournament_stage
@@ -21,9 +23,9 @@ module Scheduling
match_num = num_matches-1
team_num = 0
# for each grouping of min_players_per_team
- self.tournament.players.each_slice(min_players_per_team) do |team_members|
+ self.tournament.players.each_slice(self.tournament.min_players_per_team) do |team_members|
# if the match is full, move to the next match, otherwise move to the next team
- if (team_num == min_teams_per_match)
+ if (team_num == self.tournament.min_teams_per_match)
match_num -= 1
team_num = 0
else
@@ -42,7 +44,7 @@ module Scheduling
end
end
- def graph
+ def graph(current_user)
matches = @tournament_stage.matches_ordered
# depth of SVG tree
depth = Math.log2(matches.count).floor+1;
@@ -71,7 +73,7 @@ STRING
rx = 50/(depth+1) + 100/(depth+1)*(depth-(Math.log2(i).floor+1))
ry = ( 100/(2**(Math.log2(i).floor)+1) + rh * 1.1 * (2**Math.log2(i).ceil-i))
- str += "\t<a id=\"svg-match-#{i}\" xlink:href=\"# {match_path(matches[i])}\">\n"
+ str += "\t<a id=\"svg-match-#{i}\" xlink:href=\"#{match_path(matches[i])}\"><g>\n"
str += "\t\t<rect height=\"#{rh}%\" width=\"#{rw}%\" x=\"#{rx}%\" y=\"#{ry}%\" fill=\"url(#gradMatch)\" rx=\"5px\" stroke-width=\"2\""
case matches[i].status
when 0
@@ -93,7 +95,7 @@ STRING
color = matches[i].teams.first and matches[i].teams.first.users.include?(current_user) ? "#BCED91" : "white"
str += "\t\t<rect width=\"#{rw-5}%\" height=\"#{rh/4}%\" x=\"#{rx + 2.5}%\" y=\"#{ry + rh/6}%\" fill=\"#{color}\" />\n"
if matches[i].teams.first
- str += '\t\t<text x="#{rx + rw/4}%" y="#{ry + rh/3}%" font-size="#{rh}">Team #{matches[i].teams.first.id}</text>\n'
+ str += "\t\t<text x=\"#{rx + rw/4}%\" y=\"#{ry + rh/3}%\" font-size=\"#{rh}\">Team #{matches[i].teams.first.id}</text>\n"
end
str += "\t\t<text x=\"#{rx + 1.3*rw/3}%\" y=\"#{ry + 5.2*rh/9}%\" font-size=\"#{rh}\"> VS </text>\n"
@@ -113,7 +115,7 @@ STRING
lastrh = rh
lastrw = rw
end
- str += "</a>\n"
+ str += "</g></a>\n"
end
str += '</svg>'