summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-28 21:21:47 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-28 21:21:47 -0400
commit8db5113a761d443374a64e5e9fe877fafa3f0a50 (patch)
tree2ee26da4aee9926d44c9fe7faaa3d5705a4a16fc
parentfeffb3b186ad2b73bd9868a1eb24ab20f9c71507 (diff)
Fixed status 2-3 transition and statistic sampling.
-rw-r--r--app/models/match.rb4
-rw-r--r--lib/sampling/manual.html.erb2
-rw-r--r--lib/sampling/manual.rb5
3 files changed, 7 insertions, 4 deletions
diff --git a/app/models/match.rb b/app/models/match.rb
index 219e662..5c3a022 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -7,8 +7,8 @@ class Match < ActiveRecord::Base
def finished?
ok = true
- tournament_stage.scoring_method.stats_needed.each do |stat|
- ok &= statistics.where(match: self, name: stat).nil?
+ tournament_stage.scoring.stats_needed.each do |stat|
+ ok &= !statistics.where(match: self, name: stat).nil?
end
ok
end
diff --git a/lib/sampling/manual.html.erb b/lib/sampling/manual.html.erb
index b783506..187f002 100644
--- a/lib/sampling/manual.html.erb
+++ b/lib/sampling/manual.html.erb
@@ -2,7 +2,7 @@
<input type="hidden" name="update_action" value="finish" >
<% @match.teams.each do |team| %>
<label>
- <input type="radio", name="winner", value="<%= team.id %>" >
+ <input type="radio", name="win", value="<%= team.id %>" >
<%= "Team #{team.id} Won" %>
</label>
<% end %>
diff --git a/lib/sampling/manual.rb b/lib/sampling/manual.rb
index 4e86925..01f6835 100644
--- a/lib/sampling/manual.rb
+++ b/lib/sampling/manual.rb
@@ -44,7 +44,10 @@ module Sampling
end
def handle_user_interaction(user, sampling_params)
- # TODO
+ # => Save sampling_params as statistics
+ sampling_params.select {|name, value| @match.stats_from(self.class).include? name }.each do |name, value|
+ Statistic.create(name: value, user: user, match: @match)
+ end
end
end
end