diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -120,7 +120,7 @@ def user_stat @problems = Problem.find_available_problems - @users = User.find(:all) + @users = User.find(:all, :include => [:contests, :contest_stat]) @scorearray = Array.new @users.each do |u| ustat = Array.new diff --git a/app/views/user_admin/user_stat.rhtml b/app/views/user_admin/user_stat.rhtml --- a/app/views/user_admin/user_stat.rhtml +++ b/app/views/user_admin/user_stat.rhtml @@ -5,6 +5,8 @@ User Name Activated? + Logged in + Contest(s) <% @problems.each do |p| %> <%= p.name %> <% end %> @@ -21,6 +23,12 @@ <%= sc[i].login %> <%= sc[i].full_name %> <%= sc[i].activated %> + + <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %> + + + <%= sc[i].contests.collect {|c| c.name}.join(', ') %> + <% else %> <%= sc[i][0] %> <% total += sc[i][0] %>