# HG changeset patch # User Nattee Niparnan # Date 2015-02-05 17:45:21 # Node ID a0c51d75908c90b9d040f1889941b0a4d69bccbf # Parent 7cf62e1e74ba8a57c8843016af594fdc57984d2d remove junk from ealier merge 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 @@ -153,34 +153,6 @@ end def user_stat_max - @problems = Problem.find_available_problems - @users = User.find(:all, :include => [:contests, :contest_stat]) - @scorearray = Array.new - #set up range from param - since_id = params.fetch(:since_id, 0).to_i - until_id = params.fetch(:until_id, 0).to_i - @users.each do |u| - ustat = Array.new - ustat[0] = u - @problems.each do |p| - max_points = 0 - Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| - max_points = sub.points if sub and sub.points and (sub.points > max_points) - end - ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] - end - @scorearray << ustat - end - - if params[:commit] == 'download csv' then - csv = gen_csv_from_scorearray(@scorearray,@problems) - send_data csv, filename: 'last_score.csv' - else - render template: 'user_admin/user_stat' - end - end - - def user_stat_max if params[:commit] == 'download csv' @problems = Problem.all else