Description:
fix bug for "stuck" and add authorization
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r464:310e993b7826 - - 1 file changed: 2 inserted, 1 deleted
| @@ -1,27 +1,27 | |||||
|
|
1 | class ReportController < ApplicationController |
|
1 | class ReportController < ApplicationController |
|
|
2 |
|
2 | ||
|
|
3 | - before_filter :admin_authorization, only: [:login_stat,:submission_stat] |
|
3 | + before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck] |
|
|
4 | before_filter(only: [:problem_hof]) { |c| |
|
4 | before_filter(only: [:problem_hof]) { |c| |
|
|
5 | return false unless authenticate |
|
5 | return false unless authenticate |
|
|
6 |
|
6 | ||
|
|
7 | if GraderConfiguration["right.user_view_submission"] |
|
7 | if GraderConfiguration["right.user_view_submission"] |
|
|
8 | return true; |
|
8 | return true; |
|
|
9 | end |
|
9 | end |
|
|
10 |
|
10 | ||
|
|
11 | admin_authorization |
|
11 | admin_authorization |
|
|
12 | } |
|
12 | } |
|
|
13 |
|
13 | ||
|
|
14 | def login_stat |
|
14 | def login_stat |
|
|
15 | @logins = Array.new |
|
15 | @logins = Array.new |
|
|
16 |
|
16 | ||
|
|
17 | date_and_time = '%Y-%m-%d %H:%M' |
|
17 | date_and_time = '%Y-%m-%d %H:%M' |
|
|
18 | begin |
|
18 | begin |
|
|
19 | md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
19 | md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
|
20 | @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) |
|
20 | @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) |
|
|
21 | rescue |
|
21 | rescue |
|
|
22 | @since_time = DateTime.new(1000,1,1) |
|
22 | @since_time = DateTime.new(1000,1,1) |
|
|
23 | end |
|
23 | end |
|
|
24 | begin |
|
24 | begin |
|
|
25 | md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
25 | md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
|
26 | @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) |
|
26 | @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) |
|
|
27 | rescue |
|
27 | rescue |
| @@ -175,42 +175,43 | |||||
|
|
175 | if @best[:length][:value] >= prop[:length][:value] |
|
175 | if @best[:length][:value] >= prop[:length][:value] |
|
|
176 | @best[:length] = prop[:length] |
|
176 | @best[:length] = prop[:length] |
|
|
177 | @best[:length][:lang] = lang |
|
177 | @best[:length][:lang] = lang |
|
|
178 | end |
|
178 | end |
|
|
179 | if @best[:first][:value] >= prop[:first][:value] |
|
179 | if @best[:first][:value] >= prop[:first][:value] |
|
|
180 | @best[:first] = prop[:first] |
|
180 | @best[:first] = prop[:first] |
|
|
181 | @best[:first][:lang] = lang |
|
181 | @best[:first][:lang] = lang |
|
|
182 | end |
|
182 | end |
|
|
183 | end |
|
183 | end |
|
|
184 | end |
|
184 | end |
|
|
185 |
|
185 | ||
|
|
186 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
186 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
|
187 | @summary[:attempt] = user.count |
|
187 | @summary[:attempt] = user.count |
|
|
188 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
188 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
|
189 | end |
|
189 | end |
|
|
190 |
|
190 | ||
|
|
191 | def stuck #report struggling user,problem |
|
191 | def stuck #report struggling user,problem |
|
|
192 | # init |
|
192 | # init |
|
|
193 | user,problem = nil |
|
193 | user,problem = nil |
|
|
194 | solve = true |
|
194 | solve = true |
|
|
195 | tries = 0 |
|
195 | tries = 0 |
|
|
196 | @struggle = Array.new |
|
196 | @struggle = Array.new |
|
|
197 | record = {} |
|
197 | record = {} |
|
|
198 | Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub| |
|
198 | Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub| |
|
|
|
199 | + next unless sub.problem and sub.user | ||
|
|
199 | if user != sub.user_id or problem != sub.problem_id |
|
200 | if user != sub.user_id or problem != sub.problem_id |
|
|
200 | @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve |
|
201 | @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve |
|
|
201 | record = {user: sub.user, problem: sub.problem} |
|
202 | record = {user: sub.user, problem: sub.problem} |
|
|
202 | user,problem = sub.user_id, sub.problem_id |
|
203 | user,problem = sub.user_id, sub.problem_id |
|
|
203 | solve = false |
|
204 | solve = false |
|
|
204 | tries = 0 |
|
205 | tries = 0 |
|
|
205 | end |
|
206 | end |
|
|
206 | if sub.points >= sub.problem.full_score |
|
207 | if sub.points >= sub.problem.full_score |
|
|
207 | solve = true |
|
208 | solve = true |
|
|
208 | else |
|
209 | else |
|
|
209 | tries += 1 |
|
210 | tries += 1 |
|
|
210 | end |
|
211 | end |
|
|
211 | end |
|
212 | end |
|
|
212 | @struggle.sort!{|a,b| b[:tries] <=> a[:tries] } |
|
213 | @struggle.sort!{|a,b| b[:tries] <=> a[:tries] } |
|
|
213 | @struggle = @struggle[0..50] |
|
214 | @struggle = @struggle[0..50] |
|
|
214 | end |
|
215 | end |
|
|
215 |
|
216 | ||
|
|
216 | end |
|
217 | end |
You need to be logged in to leave comments.
Login now