diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 23:15:31 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 23:15:31 -0400 |
| commit | b35fa4b6f79d13d46eab4c9ba9e631eeb20ba73b (patch) | |
| tree | fd0e0cc49139e009df042c66442993b814d0f9c4 | |
| parent | d4e4e9281ac707130281eff3beb4bd100dd07809 (diff) | |
replaced getStatistic with focused where
| -rw-r--r-- | app/models/match.rb | 9 | ||||
| -rw-r--r-- | app/views/tournaments/standings.html.erb | 4 | ||||
| -rw-r--r-- | lib/seeding/fair_ranked_seeding.rb | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/models/match.rb b/app/models/match.rb index 9045d67..e817b71 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -6,7 +6,14 @@ class Match < ActiveRecord::Base belongs_to :winner, class_name: "Team" def setup() - + end + + def finished? + ok = true + tournament_stage.scoring_method.stats_needed.each do |stat| + ok &= statistics.where(match: self, name: stat).nil? + end + ok end def is_match_over(match, firstPlayer) diff --git a/app/views/tournaments/standings.html.erb b/app/views/tournaments/standings.html.erb index b8739de..a04e132 100644 --- a/app/views/tournaments/standings.html.erb +++ b/app/views/tournaments/standings.html.erb @@ -1,7 +1,7 @@ -<% playerscores = @tournament.players.collect {|player| player => @tournament.statistics.getStatistic(player.matches.last, player, :score) } %> +<% playerscores = @tournament.players.collect {|player| player => @tournament.statistics.where(match: player.matches.last, user: player, name: :score) } %> <% teams = tournament_stage.matches.collect { |match| match.teams.collect { |team| team.id => team.players.collect -{ |player| player.user_name => @tournament.statistics.getStatistic(player.matches.last, player, :score } } } %> +{ |player| player.user_name => @tournament.statistics.where(match: player.matches.last, user: player, name: :score } } } %> <table> <tr> diff --git a/lib/seeding/fair_ranked_seeding.rb b/lib/seeding/fair_ranked_seeding.rb index 6bc62ca..870ebdd 100644 --- a/lib/seeding/fair_ranked_seeding.rb +++ b/lib/seeding/fair_ranked_seeding.rb @@ -33,7 +33,7 @@ module Seeding end def self.previous_score(player, tournament) - score = tournament.statistics.getStatistic(player.matches.last, player, :score) + score = tournament.statistics.where(match: player.matches.last, user: player, name: :score) if score.nil? return 0 end |