From 41e2a181bac54c965ef2bf7181289c21a83883f6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 22 Apr 2014 17:05:06 -0400 Subject: I HATE CODE --- app/models/tournament_stage.rb | 8 +++- app/views/matches/index.html.erb | 36 +++++++++-------- lib/scheduling/elimination.rb | 80 +++++++++++++++++++++++++++++++++++--- lib/scheduling/elimination.svg.erb | 72 ---------------------------------- 4 files changed, 100 insertions(+), 96 deletions(-) delete mode 100644 lib/scheduling/elimination.svg.erb diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb index a24d7b9..9fa6dcd 100644 --- a/app/models/tournament_stage.rb +++ b/app/models/tournament_stage.rb @@ -19,11 +19,15 @@ class TournamentStage < ActiveRecord::Base def to_svg set_scheduling - return @scheduling.graph(self) + return @scheduling.graph end private def set_scheduling - @scheduling ||= "Scheduling::#{self.scheduling}".constantize.new(self) + if @scheduling.nil? + require "scheduling/#{self.scheduling}" + @scheduling = "Scheduling::#{self.scheduling.capitalize}".constantize.new(self) + end + return @scheduling end end diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index abca42b..058477a 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -12,26 +12,30 @@ - <% @tournament.matches.order(:id).reverse.each do |match| %> - <%= "Match #{match.id}" %> - <%= match.status %> - <%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %> - <%= link_to "Show", tournament_match_path(@tournament, match) %> - <%# If user is the host, let them start the tournment %> - <% if @tournament.hosts.include?(current_user) %> - <%= form_tag(tournament_match_path(@tournament, match), method: "put") do %> - - <% @startable = (match.status == 0) and (match.teams.count >= @tournament.min_teams_per_match) %> - <%= submit_tag("Start Match", :disabled => ! @startable) %> + <% @tournament.stages_ordered.keys.sort.each do |stage_key| %> + <% stage = @tournament.stages_ordered[stage_key] %> + <% stage.matches_ordered.keys.sort.reverse.each do |match_key| %> + <% match = stage.matches_ordered[match_key] %> + <%= "Match #{match.id}" %> + <%= match.status %> + <%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %> + <%= link_to "Show", tournament_match_path(@tournament, match) %> + <%# If user is the host, let them start the tournment %> + <% if @tournament.hosts.include?(current_user) %> + <%= form_tag(tournament_match_path(@tournament, match), method: "put") do %> + + <% @startable = (match.status == 0) and (match.teams.count >= @tournament.min_teams_per_match) %> + <%= submit_tag("Start Match", :disabled => ! @startable) %> + <% end %> <% end %> - <% end %> - - <% end %> + + <% end %> + <% end %>
-<% @tournament.stages_ordered.each do |stage| %> -
<%= stage.to_svg %>
+<% @tournament.stages_ordered.keys.sort.each do |stage_key| %> +
<%= raw @tournament.stages_ordered[stage_key].to_svg %>
<% end %> diff --git a/lib/scheduling/elimination.rb b/lib/scheduling/elimination.rb index 519d08a..e718d54 100644 --- a/lib/scheduling/elimination.rb +++ b/lib/scheduling/elimination.rb @@ -43,13 +43,81 @@ module Scheduling end def graph - require 'erb' - erb_filename = File.join(File.dirname(__FILE__), 'elimination.svg.erb') + matches = @tournament_stage.matches_ordered + # depth of SVG tree + depth = Math.log2(matches.count).floor+1; + # height of SVG + height = [200 * 2**Math.log2(matches.count).floor + 100, 500].max; + lastrx = 0 + lastry = 0 + lastrh = 0 + lastrw = 0 - erb = ERB.new(File.read(erb_filename)) - erb.filename = erb_filename - return erb.result - end + str = <<-STRING + + + + + + + +STRING + (1..matches.count).each do |i| + rh = 100/(2**(depth-1)+1) - 5 + rw = 100/(depth+1) - 5 + 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\n" + str += "\t\t\n" + if matches[i].teams.first + str += '\t\tTeam #{matches[i].teams.first.id}\n' + end + + str += "\t\t VS \n" + + color = matches[i].teams[1] and matches[i].teams[1].users.include?(current_user) ? "#BCED91" : "white" + str += "\t\t\n" + if matches[i].teams[1] + str += "\t\tTeam #{matches[i].teams[1].id}\n" + end + + if i > 1 + str += "\t\t\n" + end + if Math.log2(i+1) == Math.log2(i+1).ceil + lastrx = rx + lastry = ry + lastrh = rh + lastrw = rw + end + str += "\n" + end + str += '' + + return str + end end end diff --git a/lib/scheduling/elimination.svg.erb b/lib/scheduling/elimination.svg.erb deleted file mode 100644 index 91b8f6a..0000000 --- a/lib/scheduling/elimination.svg.erb +++ /dev/null @@ -1,72 +0,0 @@ -<% - -matches = @tournament_stage.matches_ordered -# depth of SVG tree -depth = Math.log2(matches.count).floor+1; -# height of SVG -height = 200 * 2**Math.log2(matches.count).floor + 100; -lastrx = 0 -lastry = 0 -lastrh = 0 -lastrw = 0 - -%> - <% %> - - - - - - - <% (1..matches.count).each do |i| %> - - - <% when 0 %> - <% if matches[i-1].teams.count < @tournament_stage.tournament.min_teams_per_match %> - stroke="red" - fill-opacity="0.6" - <% else %> - stroke="green" - <% end %> - <% when 1 %> - stroke="orange" - <% when 2 %> - stroke="yellow" - <% when 3 %> - stroke="grey" - <% end %> /> - " /> - - <% if matches[i-1].teams.first %> - Team <%= matches[i-1].teams.first.id %> - <% end %> - - VS - " /> - - <% if matches[i-1].teams[1] %> - Team <%= matches[i-1].teams[1].id %> - <% end %> - - <% if i > 1 %> - - <% end %> - <% if Math.log2(i+1) == Math.log2(i+1).ceil %> - <% lastrx = rx - lastry = ry - lastrh = rh - lastrw = rw %> - <% end %> - - <% end %> - -- cgit v1.2.3-2-g168b