cafe-grader-web

Commit r499:1da8597120e1 public

parent | child
Description:
fix download score in user_stat not working
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r499:1da8597120e1 - - 1 file changed: 6 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -129,48 +129,54
129 redirect_to :action => 'list'
129 redirect_to :action => 'list'
130 end
130 end
131
131
132 def user_stat
132 def user_stat
133 if params[:commit] == 'download csv'
133 if params[:commit] == 'download csv'
134 @problems = Problem.all
134 @problems = Problem.all
135 else
135 else
136 @problems = Problem.find_available_problems
136 @problems = Problem.find_available_problems
137 end
137 end
138 @users = User.find(:all, :include => [:contests, :contest_stat])
138 @users = User.find(:all, :include => [:contests, :contest_stat])
139 @scorearray = Array.new
139 @scorearray = Array.new
140 @users.each do |u|
140 @users.each do |u|
141 ustat = Array.new
141 ustat = Array.new
142 ustat[0] = u
142 ustat[0] = u
143 @problems.each do |p|
143 @problems.each do |p|
144 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
144 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
145 if (sub!=nil) and (sub.points!=nil)
145 if (sub!=nil) and (sub.points!=nil)
146 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
146 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
147 else
147 else
148 ustat << [0,false]
148 ustat << [0,false]
149 end
149 end
150 end
150 end
151 @scorearray << ustat
151 @scorearray << ustat
152 end
152 end
153 + if params[:commit] == 'download csv' then
154 + csv = gen_csv_from_scorearray(@scorearray,@problems)
155 + send_data csv, filename: 'last_score.csv'
156 + else
157 + render template: 'user_admin/user_stat'
158 + end
153 end
159 end
154
160
155 def user_stat_max
161 def user_stat_max
156 if params[:commit] == 'download csv'
162 if params[:commit] == 'download csv'
157 @problems = Problem.all
163 @problems = Problem.all
158 else
164 else
159 @problems = Problem.find_available_problems
165 @problems = Problem.find_available_problems
160 end
166 end
161 @users = User.find(:all, :include => [:contests, :contest_stat])
167 @users = User.find(:all, :include => [:contests, :contest_stat])
162 @scorearray = Array.new
168 @scorearray = Array.new
163 #set up range from param
169 #set up range from param
164 since_id = params.fetch(:since_id, 0).to_i
170 since_id = params.fetch(:since_id, 0).to_i
165 until_id = params.fetch(:until_id, 0).to_i
171 until_id = params.fetch(:until_id, 0).to_i
166 @users.each do |u|
172 @users.each do |u|
167 ustat = Array.new
173 ustat = Array.new
168 ustat[0] = u
174 ustat[0] = u
169 @problems.each do |p|
175 @problems.each do |p|
170 max_points = 0
176 max_points = 0
171 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
177 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
172 max_points = sub.points if sub and sub.points and (sub.points > max_points)
178 max_points = sub.points if sub and sub.points and (sub.points > max_points)
173 end
179 end
174 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
180 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
175 end
181 end
176 @scorearray << ustat
182 @scorearray << ustat
You need to be logged in to leave comments. Login now