cafe-grader-web

Commit r464:310e993b7826 public

parent | child
Description:
fix bug for "stuck" and add authorization
Commit status:
[Not Reviewed]
References:
algo
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

r464:310e993b7826 - - 1 file changed: 2 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,9 +1,9
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
@@ -193,12 +193,13
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
You need to be logged in to leave comments. Login now