4 files changed, 60 insertions, 43 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index 9fe255c..e2ec73b 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -1,16 +1,5 @@
-<%= form_for(@match) do |f| %>
-  <% if @match.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@match.errors.count, "error") %> prohibited this match from being saved:</h2>
-
-      <ul>
-      <% @match.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
+<%= form_for([@tournament, @tournament.matches.build]) do |f| %>
+  
   <div class="field">
     <%= f.label :status %><br>
     <%= f.number_field :status %>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 8d699f9..d4ddb0e 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -1,30 +1,23 @@
-<h1>Listing matches</h1>
+<h1><%= @tournament.name %> - Matches</h1>
 
-<table>
+
+<table class="table">
   <thead>
     <tr>
       <th>Status</th>
-      <th>Tournament</th>
       <th>Name</th>
       <th>Winner</th>
-      <th>Remote</th>
-      <th></th>
-      <th></th>
       <th></th>
     </tr>
   </thead>
 
-  <tbody>
-    <% @matches.each do |match| %>
+  <tbody class="table-hover">
+    <% @tournament.matches.each do |match| %>
       <tr>
         <td><%= match.status %></td>
-        <td><%= match.tournament %></td>
+        <td><%= match.id%></td>
         <td><%= match.name %></td>
-        <td><%= match.winner %></td>
-        <td><%= match.remote_id %></td>
-        <td><%= link_to 'Show', match %></td>
-        <td><%= link_to 'Edit', edit_match_path(match) %></td>
-        <td><%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to "Show", tournament_match_path(@tournament, match) %>
       </tr>
     <% end %>
   </tbody>
@@ -32,4 +25,17 @@
 
 <br>
 
-<%= link_to 'New Match', new_match_path %>
+
+<SVG version="1.1"
+   baseProfile="full"
+   width="<%= 300 * @matches.count / 2 + 50 %>" height="<%= 200 * @matches.count + 50 %>"
+   xmlns="http://www.w3.org/2000/svg">
+
+   <% (1..@matches.count).each do |i| %>
+    <g class="svg-match">
+      <rect rx="10"
+      
+    </g>
+   <% end %>
+
+</SVG>
diff --git a/app/views/matches/new.html.erb b/app/views/matches/new.html.erb
index bd4c78c..74e7e3a 100644
--- a/app/views/matches/new.html.erb
+++ b/app/views/matches/new.html.erb
@@ -1,5 +1,3 @@
 <h1>New match</h1>
 
 <%= render 'form' %>
-
-<%= link_to 'Back', matches_path %>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 1ee7f1d..4973dc3 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <p>
   <strong>Status:</strong>
   <%= @match.status %>
@@ -7,23 +5,49 @@
 
 <p>
   <strong>Tournament:</strong>
-  <%= @match.tournament %>
+  <%= @match.tournament.id %>
 </p>
 
 <p>
   <strong>Name:</strong>
   <%= @match.name %>
 </p>
+<!--
+	Match Status 0 =>	Pairings Stage
+	Match Status 1 =>	Match Active 
+	Match Status 2 =>	Match Finished (Peer Review Starts) 
+	Match Status 3 => 	Match Completed (Scores Completed OR Results Page)  	
 
-<p>
-  <strong>Winner:</strong>
-  <%= @match.winner %>
-</p>
+	Four views:- (status is Match status)
+	A. Pairings, when status is 0 for either Host or Player Or when status is 1 for player 
+	B. A page the host will see if status is 1 OR 2
+	C. The Peer review page that the players will see if status is 2.
+	D. The page everyone will see when status is 3.
 
-<p>
-  <strong>Remote:</strong>
-  <%= @match.remote_id %>
-</p>
+	Note:- The change of status from 1 to 2 is coming from League Data Pull (RIOT API)
+
+-->
+<!--
+	This is what the HOST will see when the Match Status is NOT 3
+-->
+<% if (@tournament.hosts.include?(current_user) and @match.winner.nil?) %>
+	<%= form_for([@tournament, @match], method: "put") do |f| %>
+		<ul>
+			<% @match.teams.each do |team| %>
+				<li><label><%= f.radio_button(:winner, team.id) %>
+					<%= team.users.collect{|u| u.user_name}.join(", ") %></label></li>
+		  <% end %>
+		</ul>
+		<%= f.submit("Select winner") %>
+	<% end %>
+<% end %>
+
+
+
+<% unless @match.winner.nil? %>
+	<p>
+		<strong>Winner:</strong>
+		<%= @match.winner.users.collect{|u| u.user_name}.join(", ") %>
+	</p>
+<% end %>
 
-<%= link_to 'Edit', edit_match_path(@match) %> |
-<%= link_to 'Back', matches_path %>