Misc fixes. (This commit is from Luke on Andrew's box)

3 files changed, 8 insertions, 8 deletions

diff --git a/lib/sampling/manual.rb b/lib/sampling/manual.rb
index a190bd2..cfecd8f 100644
--- a/lib/sampling/manual.rb
+++ b/lib/sampling/manual.rb
@@ -4,7 +4,7 @@ module Sampling
 			return true
 		end
 
-		def can_get?(setting_name)
+		def self.can_get?(setting_name)
 			return 1
 		end
 
@@ -36,7 +36,7 @@ module Sampling
 			@stats = @match.stats_from(self.class)
 
 			require 'erb'
-			erb_filename = File.join(__FILE__.sub(/\.rb$/, '.svg.erb'))
+			erb_filename = File.join(__FILE__.sub(/\.rb$/, '.html.erb'))
 			erb = ERB.new(File.read(erb_filename))
 			erb.filename = erb_filename
 			return erb.result.html_safe
diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb
index 4577542..e86595f 100644
--- a/lib/sampling/peer_review.rb
+++ b/lib/sampling/peer_review.rb
@@ -5,7 +5,7 @@ module Sampling
 		end
 
 		def self.can_get?(setting_name)
-			return setting_name.start_with?("feedback_from_")
+			return setting_name.start_with?("feedback_from_") ? 2 : 0
 		end
 
 		def self.uses_remote?
@@ -36,7 +36,7 @@ module Sampling
 			@feedbacks_missing = get_feedbacks_missing(match)
 
 			require 'erb'
-			erb_filename = File.join(__FILE__.sub(/\.rb$/, '.svg.erb'))
+			erb_filename = File.join(__FILE__.sub(/\.rb$/, '.html.erb'))
 			erb = ERB.new(File.read(erb_filename))
 			erb.filename = erb_filename
 			return erb.result.html_safe
@@ -74,14 +74,14 @@ module Sampling
 
 		def self.get_feedbacks_missing(match)
 			require 'set'
-			ret = Set.new()
+			ret = Set.new
 
 			feedback = get_feedbacks(match)
 			users = get_users(match)
 
 			feedback.each do |feedback|
 				(users - feedback.keys).each do |user|
-					ret.push(user)
+					ret.add(user)
 				end
 			end
 
diff --git a/lib/scoring/winner_takes_all.rb b/lib/scoring/winner_takes_all.rb
index bf95781..57ddae6 100644
--- a/lib/scoring/winner_takes_all.rb
+++ b/lib/scoring/winner_takes_all.rb
@@ -1,13 +1,13 @@
 module Scoring
 	module WinnerTakesAll
 		def self.stats_needed
-			return []
+			return ["win"]
 		end
 
 		def self.score(match, interface)
 			scores = {}
 			match.players.each do |player|
-				scores[player.user_name] = score_user(match.win?(player))
+				scores[player.user_name] = score_user(player.statistics.where(:match => match, :name => "win").value)
 			end
 			scores
 		end