cafe-grader-web

Commit r614:20f955456e9b public

parent | child
Description:
fix bug in score report
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r614:20f955456e9b - - 1 file changed: 2 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -31,50 +31,50
31 else
31 else
32 #render template: 'user_admin/user_stat'
32 #render template: 'user_admin/user_stat'
33 render 'current_score'
33 render 'current_score'
34 end
34 end
35 end
35 end
36
36
37 def show_max_score
37 def show_max_score
38 #process parameters
38 #process parameters
39 #problems
39 #problems
40 @problems = []
40 @problems = []
41 params[:problem_id].each do |id|
41 params[:problem_id].each do |id|
42 next unless id.strip != ""
42 next unless id.strip != ""
43 pid = Problem.find_by_id(id.to_i)
43 pid = Problem.find_by_id(id.to_i)
44 @problems << pid if pid
44 @problems << pid if pid
45 end
45 end
46
46
47 #users
47 #users
48 @users = if params[:user] == "all" then
48 @users = if params[:user] == "all" then
49 User.find(:all, :include => [:contests, :contest_stat])
49 User.find(:all, :include => [:contests, :contest_stat])
50 else
50 else
51 User.includes(:contests).includes(:contest_stat).where(enabled: true)
51 User.includes(:contests).includes(:contest_stat).where(enabled: true)
52 end
52 end
53
53
54 #set up range from param
54 #set up range from param
55 - since_id = params.fetch(:min_id, 0).to_i
55 + since_id = params.fetch(:from_id, 0).to_i
56 - until_id = params.fetch(:max_id, 0).to_i
56 + until_id = params.fetch(:to_id, 0).to_i
57
57
58 #calculate the routine
58 #calculate the routine
59 @scorearray = calculate_max_score(@problems, @users,since_id,until_id)
59 @scorearray = calculate_max_score(@problems, @users,since_id,until_id)
60
60
61 #rencer accordingly
61 #rencer accordingly
62 if params[:button] == 'download' then
62 if params[:button] == 'download' then
63 csv = gen_csv_from_scorearray(@scorearray,@problems)
63 csv = gen_csv_from_scorearray(@scorearray,@problems)
64 send_data csv, filename: 'max_score.csv'
64 send_data csv, filename: 'max_score.csv'
65 else
65 else
66 #render template: 'user_admin/user_stat'
66 #render template: 'user_admin/user_stat'
67 render 'max_score'
67 render 'max_score'
68 end
68 end
69
69
70 end
70 end
71
71
72 def score
72 def score
73 if params[:commit] == 'download csv'
73 if params[:commit] == 'download csv'
74 @problems = Problem.all
74 @problems = Problem.all
75 else
75 else
76 @problems = Problem.find_available_problems
76 @problems = Problem.find_available_problems
77 end
77 end
78 @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
78 @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
79 @scorearray = Array.new
79 @scorearray = Array.new
80 @users.each do |u|
80 @users.each do |u|
You need to be logged in to leave comments. Login now