From 42540e7645eaa4abd2bbae767149e07ddb2ab482 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 7 Apr 2014 11:33:12 -0400
Subject: fix indent

---
 app/controllers/matches_controller.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/controllers/matches_controller.rb')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 69ea23b..0704e5d 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -22,8 +22,8 @@ class MatchesController < ApplicationController
 		tournament_matches_path(@tournament)
 	end
 
-	 def get_riot_info
-	if signed_in?
+	def get_riot_info
+		if signed_in?
 
 			pull = "Kaceytron"
 			#current user information
@@ -107,7 +107,7 @@ class MatchesController < ApplicationController
 					purple.merge!("#{place}" => info["games"][0]["stats"])
 				end
 				sleep(1)
-			end					
+			end
 
 			if 100 == recent["games"][0]["stats"]["team"]
 				blue.merge!("#{players[9]}" => recent["games"][0]["stats"])
@@ -118,8 +118,9 @@ class MatchesController < ApplicationController
 			@purp = purple
 			@blue = blue
 
-	end #end if
-  end #end def
+		end #end if
+	end #end def
+
 	# GET /matches/1
 	# GET /matches/1.json
 
-- 
cgit v1.2.3


From 8f06eb768d3f674c04767f020b8bef52b8f3a879 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 7 Apr 2014 11:50:07 -0400
Subject: MstchesController: tidy up comments

---
 app/controllers/matches_controller.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/controllers/matches_controller.rb')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 0704e5d..10c45b0 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -1,12 +1,12 @@
 class MatchesController < ApplicationController
 	before_action :set_tournament, only: [:index, :update]
 
-	# GET /matches
-	# GET /matches.json
 	require 'httparty'
 	require 'json'
 	require 'delayed_job'
 
+	# GET /tournaments/1/matches
+	# GET /tournaments/1/matches.json
 	def index
 		@matches = @tournament.matches
 		# depth of SVG tree
@@ -121,9 +121,6 @@ class MatchesController < ApplicationController
 		end #end if
 	end #end def
 
-	# GET /matches/1
-	# GET /matches/1.json
-
 	def is_match_over
 		response = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{@first}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
 		riot_id = response["#{@first}"]['id']
@@ -144,6 +141,8 @@ class MatchesController < ApplicationController
 	end
 	handle_asynchronously :is_match_over
 
+	# GET /tournaments/1/matches/1
+	# GET /tournaments/1/matches/1.json
 	def show
 		if Tournament.find_by_id(@match.tournament_id).game_id == 1
 			file_blue = "blue.yaml"
@@ -153,6 +152,8 @@ class MatchesController < ApplicationController
 		end
 	end
 
+	# PATCH/PUT /tournaments/1/matches/1
+	# PATCH/PUT /tournaments/1/matches/1.json
 	def update
 		case params[:update_action]
 		when "start"
-- 
cgit v1.2.3


From d6b32cbd1234634740fda22f43c1dd1b31b20d35 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 7 Apr 2014 11:52:21 -0400
Subject: MatchesController: skip peer review if there aren't enough
 players/team

---
 app/controllers/matches_controller.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'app/controllers/matches_controller.rb')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 10c45b0..b6fde0a 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -168,8 +168,6 @@ class MatchesController < ApplicationController
 				end
 			end
 		when "finish"
-			@match.status = 2
-
 			# Individual scores
 			scores = params["scores"]
 			scores.each do |user_name, score|
@@ -193,6 +191,15 @@ class MatchesController < ApplicationController
 				@match.winner.matches.push(@tournament.matches_ordered[cur_match_num/2])
 			end
 
+			# Skip peer evaluation if there aren't enough players per team
+			peer = false
+			@match.teams.each do |team|
+				if team.users.count > 2
+					peer = true
+				end
+			end
+			@match.status = peer ? 2 : 3
+
 			respond_to do |format|
 				if @match.save
 					format.html { redirect_to tournament_match_path(@tournament, @match), notice: 'Peer evaluation started.' }
-- 
cgit v1.2.3