diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-27 23:26:24 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-27 23:26:24 -0400 |
| commit | 1c37ae521e29a5e0869aba52d324ed0cd4a830a6 (patch) | |
| tree | e4488ed3feb5e5dc94a72cd46cff2aeef0dcd1f8 /app/views/tournaments | |
| parent | 6cbf08bb7659dc3265b45d05a66170f1c69ce696 (diff) | |
| parent | 4c572a775a7c28b102b4462af94214148e6df1d2 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/tournaments')
| -rw-r--r-- | app/views/tournaments/show.html.erb | 3 | ||||
| -rw-r--r-- | app/views/tournaments/standings.html.erb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 53389bb..c71d3c6 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -47,8 +47,7 @@ <p> <strong>Sampling method:</strong> - <!-- TODO --> - <%= @tournament.sampling_method %> + <%= @tournament.sampling_method.humanize.capitalize %> </p> <% @tournament.settings.each do |setting| %> 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> |