cafe-grader-web

Commit r518:4d5c727a0d13 public

parent | child
Description:
fix displaying bug
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

r518:4d5c727a0d13 - - 2 files changed: 2 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -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.user and sub.problem
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
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -63,10 +63,10
63 - @submission.each do |sub|
63 - @submission.each do |sub|
64 %tr.inactive
64 %tr.inactive
65 %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
65 %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
66 %td= sub.try(:user).try(:full_name)
66 %td= sub.try(:user).try(:full_name)
67 %td= sub.try(:problem).try(:full_name)
67 %td= sub.try(:problem).try(:full_name)
68 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
68 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
69 - %td= "#{time_ago_in_words(sub.graded_at)} ago"
69 + %td= "#{sub.graded_at ? time_ago_in_words(sub.graded_at) : ''} ago"
70 %td= sub.grader_comment
70 %td= sub.grader_comment
71
71
72
72
You need to be logged in to leave comments. Login now