diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-28 19:39:36 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-28 19:39:36 -0400 |
commit | 87530c5bca7062ed18badf98bcb4b63529607ecd (patch) | |
tree | 29f2da66af99fbf05726ae9f4fa4bd78d910a763 /lib/sampling | |
parent | 3a4412f08bed438ebf14f6cdfa5bb6eb4d239138 (diff) | |
parent | 8dade78c49ad03085166c41d8b334a6ade3a287e (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'lib/sampling')
-rw-r--r-- | lib/sampling/manual.html.erb | 12 | ||||
-rw-r--r-- | lib/sampling/manual.rb | 7 | ||||
-rw-r--r-- | lib/sampling/peer_review.html.erb | 2 | ||||
-rw-r--r-- | lib/sampling/peer_review.rb | 10 |
4 files changed, 21 insertions, 10 deletions
diff --git a/lib/sampling/manual.html.erb b/lib/sampling/manual.html.erb index cf873b4..7b71c29 100644 --- a/lib/sampling/manual.html.erb +++ b/lib/sampling/manual.html.erb @@ -1 +1,11 @@ -<!-- TODO --> +<% if @tournament.hosts.include? @current_user %> + <input type="hidden" name="update_action" value="finish" > + <% @match.teams.each do |team| %> + <input type="radio", name="winner", value="<%= team.id %>" > + <%= "Team #{team.id} Won" %> + <% end %> + <br> + <input type="submit", value="Finish match" > +<% else %> + <p>The match is running; the host has yet to post the scores of the match.</p> +<% end %>
\ No newline at end of file diff --git a/lib/sampling/manual.rb b/lib/sampling/manual.rb index a190bd2..4e86925 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 @@ -31,15 +31,16 @@ module Sampling end def render_user_interaction(user) + @tournament = @match.tournament_stage.tournament @current_user = user @users = @match.users @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 + return erb.result(binding).html_safe end def handle_user_interaction(user, sampling_params) diff --git a/lib/sampling/peer_review.html.erb b/lib/sampling/peer_review.html.erb index e744936..a0b9c4d 100644 --- a/lib/sampling/peer_review.html.erb +++ b/lib/sampling/peer_review.html.erb @@ -18,7 +18,7 @@ <%# TODO: display more statistics %> </li><% end %> </ol> - <%= submit_tag("Submit peer evaluation", :onsubmit => "score_peers()") %> + <input type="submit" value="Submit peer evaluation", onsubmit="score_peers()") > <% else %> <p>Still waiting for peer feedback from the following users: <ul><% @feedbacks_missing.each do |user| %> diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb index 4577542..1aabe34 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,10 +36,10 @@ 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 + return erb.result(binding).html_safe end def handle_user_interaction(reviewing_user, params) @@ -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 |