Merge branch 'master' of github.com:LukeShu/leaguer

3 files changed, 57 insertions, 8 deletions

diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index d4ddb0e..219507d 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -18,6 +18,7 @@
         <td><%= match.id%></td>
         <td><%= match.name %></td>
         <td><%= link_to "Show", tournament_match_path(@tournament, match) %>
+        <td><%= submit_tag("Start Match") %>
       </tr>
     <% end %>
   </tbody>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 4973dc3..6fb4042 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -38,11 +38,40 @@
 					<%= team.users.collect{|u| u.user_name}.join(", ") %></label></li>
 		  <% end %>
 		</ul>
-		<%= f.submit("Select winner") %>
+		<%= f.submit("Select Winner") %>
 	<% end %>
 <% end %>
 
+<!--
+	This is what the Players and the Hosts of the tournament will view when the Match Status is 0
+-->
+<% if (@match.status==0) %>
+	<% if (@tournament.players.include?(current_user) || @tournament.hosts.include?(current_user)) %>
+			<% @match.teams.each do |team| %>
+				<ul>
+					<% team.users.collect{|u| u.user_name}.each do |k| %>
+						<li><label><%= k %></label></li>
+					<% end %>
+				</ul>
+		  	<% end %>
+	<% end %>
+<% end %>
 
+<!--
+	Players see the Peer Review Page
+	Host see the Game Status
+-->
+<% if (@match.status==0) %>
+	<% if (@tournament.players.include?(current_user) %>
+		<% @match.teams.each do |team| %>
+			<ul>
+				<% team.users.collect{|u| u.user_name}.each do |k| %>
+					<li><label><%= k %></label></li>
+				<% end %>
+			</ul>
+		 <% end %>	
+	<% end %>
+<% end %>
 
 <% unless @match.winner.nil? %>
 	<p>
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 8a704b5..3661077 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -2,18 +2,37 @@
   <%= render "common/error_messages", :target => @tournament %>
   <%= f.hidden_field(:game_id) %>
 
-  <% @chosen = Game.find_by(params[:game]) %>
+  <% @game = Game.find_by(params[:game]) %>
   <% @tournament.attributes.each do |name, value| %>
     <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "status") or (name == "set_rounds") %>
       <% next %>
     <% end %>
     <p>
-        <%= f.label name %><br>
-        <% if !@chosen.attributes[name].nil? %>
-          <%= f.text_field(name, :value => @chosen.attributes[name] ) %>
-        <% else %>
-          <%= f.text_field name %>
-        <% end  %>
+      <%= f.label name %><br>
+      <% if !@game.attributes[name].nil? %>
+        <%= f.text_field(name, :value => @game.attributes[name] ) %>
+      <% else %>
+        <%= f.text_field name %>
+      <% end  %>
+    </p>
+  <% end %>
+
+  <% @settings = GameSetting.find_by(params[:game_id]) %>
+  <% unless @settings  %>
+  	<br>
+	<br>
+	<br>
+	<br>
+	<br>
+	<br>
+	<br>
+	<br>
+  <% end %>
+  <% @settings.each do |setting| %>
+    <p>
+      <%= f.label setting.name %><br>
+      <% #eventually display by non-generic input method  %>
+      <%= f.select :setting options_from_collection_for_select([setting.description, ""].append setting.type_opt.split(',')) %>
     </p>
   <% end %>