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

6 files changed, 66 insertions, 9 deletions

diff --git a/app/models/game.rb b/app/models/game.rb
index a181c26..ec865d8 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -1,2 +1,3 @@
 class Game < ActiveRecord::Base
+	has_many :settings, class_name: "GameSetting" 
 end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 22711b1..e408cfe 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -25,7 +25,7 @@ class Tournament < ActiveRecord::Base
 		end
 	end
 
-	def setup()
+	def setup
 		num_teams = (self.players.count/self.min_players_per_team).floor
 		num_matches = num_teams - 1
 		for i in 1..num_matches
@@ -33,8 +33,11 @@ class Tournament < ActiveRecord::Base
 		end
 		match_num = 0
 		team_num = 0
+		#for each grouping of min_players_per_team
 		self.players.each_slice(min_players_per_team) do |players|
+			#create a new team in the current match
 			self.matches[match_num].teams.push(Team.create(users: players))
+			#if the match is full, move to the next match, otherwise move to the next team
 			if (team_num != 0 and team_num % max_teams_per_match == 0)
 				match_num += 1
 				team_num = 0
diff --git a/app/models/user.rb b/app/models/user.rb
index d1698bd..64dd7ed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,10 +14,14 @@ class User < ActiveRecord::Base
 	end
 
 	def can?(action)
+		return true
 		case action
 		when :create_tournament
+			return true
 		when :edit_tournament
+			return true
 		when :join_tournament
+			return true
 		when :delete_tournament
 
 		when :create_game
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 %>