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

4 files changed, 26 insertions, 9 deletions

diff --git a/app/controllers/brackets_controller.rb b/app/controllers/brackets_controller.rb
index b91a2c4..e202c96 100644
--- a/app/controllers/brackets_controller.rb
+++ b/app/controllers/brackets_controller.rb
@@ -11,6 +11,7 @@ class BracketsController < ApplicationController
 	# GET /brackets/1
 	# GET /brackets/1.json
 	def show
+		@results = (@tournament.status == 4)? @bracket.calcResult : nil;
 		@matches = @tournament.stages.order(:id).first.matches_ordered
 		@numTeams = @tournament.min_teams_per_match
 		@logBase = @numTeams
diff --git a/app/models/bracket.rb b/app/models/bracket.rb
index fc3e10e..48414c3 100644
--- a/app/models/bracket.rb
+++ b/app/models/bracket.rb
@@ -20,4 +20,13 @@ class Bracket < ActiveRecord::Base
 		end 
 		return true
 	end
+
+
+	def calcResults
+		results = Array.new
+		(0..bracket_matches.count-1).each do |i|
+				results.push(bracket_matches.order(:match_id)[i].predicted_winner == tournament.stages.order(:id).first.matches.order(:id).winner)
+		end 
+		return results
+	end
 end
diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb
index a3eb000..24b19fe 100644
--- a/app/views/brackets/show.html.erb
+++ b/app/views/brackets/show.html.erb
@@ -1,7 +1,8 @@
 <h2><%= @bracket.name %></h2>
 
-<h4> Make your prediction for the tournament by clicking on the teams you think will win </h4>
-
+<% if !@results %>
+  <h4> Make your prediction for the tournament by clicking on the teams you think will win </h4>
+<% end %>
 
 <svg id="prediction-svg" version="1.1" baseProfile="full"
 	xmlns="http://www.w3.org/2000/svg"
@@ -71,7 +72,7 @@
 	while t <= @numTeams %>
 	    <rect width="<%= rw-5 %>%" height="<%= rh*Float(30)/(@matchHeight) %>%" x="<%= rx + 2.5 %>%" y="<%= ry + (Float(t-1)/@numTeams)*rh + 1 %>%" fill="white" />
 	    <text id="svg-match-<%= i %>-team-<%= t-1 %>" x="<%= rx + rw/4 %>%" y="<%= ry + (Float(t-1)/@numTeams + Float(33)/(@matchHeight))*rh %>%" font-size="150%" 
-        <% if @matches[i].teams[t-1] %>
+        <% if @matches[i].teams[t-1] && !@results %>
           onclick="chooseWinner(<%= @matches[i].id%>, <%= @matches[i].teams[t-1].id %>)"
           <% end %>
           >
@@ -97,12 +98,13 @@
   <% end %>
 </SVG>
 
-<%= form_tag(tournament_bracket_path(@tournament, @bracket), method: 'put') do %>
-  <input type="hidden" name="update_action" value="predict">
-  <% for i in 1..@matches.length %>
-    <%= hidden_field_tag("bracket[matches][#{@matches[i].id.to_s}]", value = nil) %>
+<% if !@results %>
+  <%= form_tag(tournament_bracket_path(@tournament, @bracket), method: 'put') do %>
+    <input type="hidden" name="update_action" value="predict">
+    <% for i in 1..@matches.length %>
+      <%= hidden_field_tag("bracket[matches][#{@matches[i].id.to_s}]", value = nil) %>
+    <% end %>
+    <%= submit_tag("Submit Prediction", disabled: true, id: "bracket-submit") %>
   <% end %>
-  <%= submit_tag("Submit Prediction", disabled: true, id: "bracket-submit") %>
 <% end %>
-
 <%= link_to 'Back', tournaments_path %>
diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
index f4d02ec..c0237b1 100644
--- a/app/views/common/_show_tournament.html.erb
+++ b/app/views/common/_show_tournament.html.erb
@@ -38,6 +38,11 @@
 				<%= form_tag(tournament_brackets_path(target), method: "post") do %>
 					<%= submit_tag("Make Bracket") %>
 				<% end %>
+			<% elsif @user_bracket && target.status == 4 %>
+				<%= form_tag(tournament_bracket_path(@tournament, @bracket), method: 'put') do %>
+  					<input type="hidden" name="update_action" value="results">
+  					<%= submit_tag("Bracket Results") %>
+				<% end %>
 			<% end %>
 		<% end %>
 	</div>