9 files changed, 9 insertions, 98 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index 88fe733..9d402b3 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -9,16 +9,12 @@
     <%= f.text_field :tournament_stage_id %>
   </div>
   <div class="field">
-    <%= f.label :name %><br>
-    <%= f.text_field :name %>
-  </div>
-  <div class="field">
     <%= f.label :winner_id %><br>
     <%= f.text_field :winner_id %>
   </div>
   <div class="field">
     <%= f.label :remote_id %><br>
-    <%= f.text_field :remote_id %>
+    <%= f.text_area :remote_id %>
   </div>
   <div class="field">
     <%= f.label :submitted_peer_evaluations %><br>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 03427d8..abca42b 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -13,7 +13,7 @@
 
 	<tbody class="table-hover">
 		<% @tournament.matches.order(:id).reverse.each do |match| %><tr>
-			<td><%= match.name %></td>
+			<td><%= "Match #{match.id}" %></td>
 			<td><%= match.status %></td>
 			<td><%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %></td>
 			<td><%= link_to "Show", tournament_match_path(@tournament, match) %>
@@ -32,80 +32,6 @@
 
 <br>
 
-<div id="match-tree">
-  <SVG version="1.1"
-  baseProfile="full"
-  width="100%" height="<%= @height = [@height, 500].max %>"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
-     <% lastrx = 0
-       lastry = 0 
-       lastrh = 0
-       lastrw = 0 %>
-    <defs>
-    <radialGradient id="gradMatch" cx="50%" cy="50%" r="80%" fx="80%" fy="80%">
-      <stop offset="0%" style="stop-color:#ffd281;
-      stop-opacity:0" />
-      <stop offset="100%" style="stop-color:#ccc;stop-opacity:1" />
-    </radialGradient>
-  </defs>
-   <script type="text/ecmascript"><![CDATA[
-      function redirect(i){
-        window.location.replace("<%= request.original_url %>"+"/"+i);
-      }
-    ]]>
-  </script>
- 
-  <% (1..@matches.count).each do |i| %>
-  <g id="svg-match-<%= i %>" onclick="redirect(<%= @matches[i-1].id %>)" cursor="pointer">
-    <rect height="<%= rh = 100/(2**(@depth-1)+1) - 5 %>%" 
-      width="<%= rw = 100/(@depth+1) - 5 %>%" 
-      x="<%= rx = 50/(@depth+1) + 100/(@depth+1)*(@depth-(Math.log2(i).floor+1)) %>%"
-      y="<%= ry = ( 100/(2**(Math.log2(i).floor)+1) + rh * 1.1 * (2**Math.log2(i).ceil-i)) %>%"
-      fill="url(#gradMatch)"
-      rx="5px"
-      stroke-width="2"
-      <% case @matches[i-1].status %>
-      <% when 0 %>
-        <% if @matches[i-1].teams.count < @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 %>
-    />
-    <rect width="<%= rw-5 %>%" height="<%= rh/4 %>%" x="<%= rx + 2.5 %>%" y="<%= ry + rh/6 %>%" fill="<%= @matches[i-1].teams.first and @matches[i-1].teams.first.users.include?(current_user) ? "#BCED91" : "white" %>"  />
-    <text x="<%= rx + rw/4 %>%" y="<%= ry + rh/3 %>%" font-size="<%= rh %>">
-      <% if @matches[i-1].teams.first %>
-      Team <%= @matches[i-1].teams.first.id %>
-      <% end %>
-    </text>
-    <text x="<%= rx + 1.3*rw/3  %>%" y="<%= ry + 5.2*rh/9 %>%" font-size="<%= rh %>"> VS </text>
-    
-     <rect width="<%= rw-5 %>%" height="<%= rh/4 %>%" x="<%= rx + 2.5 %>%" y="<%= ry + 3*rh/5 %>%" fill="<%= @matches[i-1].teams[1] and @matches[i-1].teams[1].users.include?(current_user) ? "#BCED91" : "white" %>" />
-    <text x="<%= rx + rw/4 %>%" y="<%= ry + 4*rh/5 %>%" font-size="<%= rh %>">
-      <% if @matches[i-1].teams[1] %>
-         Team <%= @matches[i-1].teams[1].id %>
-      <% end %>
-    </text>
-    <% if i > 1 %>
-    <line x1="<%= rx+rw %>%" y1="<%= ry+rh/2 %>%" x2="<%= lastrx %>%" y2="<%= lastry+lastrh/2 %>%" stroke="black" stroke-width="2" >
-    <% end %>
-    <% if Math.log2(i+1) == Math.log2(i+1).ceil %>
-      <% lastrx = rx
-         lastry = ry 
-        lastrh = rh
-        lastrw = rw %>
-    <% end %>
-  </g>
-
-  <% end %>
-</SVG>
-</div>
+<% @tournament.stages_ordered.each do |stage| %>
+	<div class="graph"><%= stage.to_svg %></div>
+<% end %>
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
index f2499ac..bef149d 100644
--- a/app/views/matches/index.json.jbuilder
+++ b/app/views/matches/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@matches) do |match|
-  json.extract! match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations
+  json.extract! match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations
   json.url match_url(match, format: :json)
 end
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
index 5b543ea..145f069 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at
diff --git a/app/views/teams/_form.html.erb b/app/views/teams/_form.html.erb
index cdd4299..fd10129 100644
--- a/app/views/teams/_form.html.erb
+++ b/app/views/teams/_form.html.erb
@@ -11,10 +11,6 @@
     </div>
   <% end %>
 
-  <div class="field">
-    <%= f.label :match_id %><br>
-    <%= f.text_field :match_id %>
-  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb
index 6a3188d..b077e10 100644
--- a/app/views/teams/index.html.erb
+++ b/app/views/teams/index.html.erb
@@ -3,7 +3,6 @@
 <table>
   <thead>
     <tr>
-      <th>Match</th>
       <th></th>
       <th></th>
       <th></th>
@@ -13,7 +12,6 @@
   <tbody>
     <% @teams.each do |team| %>
       <tr>
-        <td><%= team.match %></td>
         <td><%= link_to 'Show', team %></td>
         <td><%= link_to 'Edit', edit_team_path(team) %></td>
         <td><%= link_to 'Destroy', team, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/teams/index.json.jbuilder b/app/views/teams/index.json.jbuilder
index ca0ec8b..b29428b 100644
--- a/app/views/teams/index.json.jbuilder
+++ b/app/views/teams/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@teams) do |team|
-  json.extract! team, :id, :match_id
+  json.extract! team, :id
   json.url team_url(team, format: :json)
 end
diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb
index e41692a..5b18d33 100644
--- a/app/views/teams/show.html.erb
+++ b/app/views/teams/show.html.erb
@@ -1,9 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-<p>
-  <strong>Match:</strong>
-  <%= @team.match %>
-</p>
-
 <%= link_to 'Edit', edit_team_path(@team) %> |
 <%= link_to 'Back', teams_path %>
diff --git a/app/views/teams/show.json.jbuilder b/app/views/teams/show.json.jbuilder
index 8a85dcc..1538019 100644
--- a/app/views/teams/show.json.jbuilder
+++ b/app/views/teams/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @team, :id, :match_id, :created_at, :updated_at
+json.extract! @team, :id, :created_at, :updated_at