psanchezp

Revert groups

...@@ -11,13 +11,8 @@ class ApplicationController < HeimdallEngine::ApplicationController ...@@ -11,13 +11,8 @@ class ApplicationController < HeimdallEngine::ApplicationController
11 private 11 private
12 12
13 def leaderboard 13 def leaderboard
14 - @leaders = Group.for(current_user.id).inject({}) do |h, group| 14 + @leaders = Bet.joins(:user).group('users.name').sum(:points)
15 - h[group.name] = { 15 + .sort_by { |k,v| v }.take(5)
16 - pool: group.pool_name,
17 - leaderboard: Bet.for_pool(group.pool_id).board.take(5)
18 - }
19 - h
20 - end
21 end 16 end
22 17
23 def check_matches 18 def check_matches
...@@ -33,7 +28,7 @@ class ApplicationController < HeimdallEngine::ApplicationController ...@@ -33,7 +28,7 @@ class ApplicationController < HeimdallEngine::ApplicationController
33 def check_results 28 def check_results
34 return [] unless current_user 29 return [] unless current_user
35 current_user.bets.joins(:match).order('matches.date desc') 30 current_user.bets.joins(:match).order('matches.date desc')
36 - .where.not(points: nil) 31 + .where.not(result: nil)
37 .limit(5) 32 .limit(5)
38 end 33 end
39 end 34 end
......