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 | 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

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

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -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.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
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
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -45,28 +45,28
45
45
46 %h2 Terminated graders
46 %h2 Terminated graders
47
47
48 = form_for :clear, :url => {:action => 'clear_terminated'} do |f|
48 = form_for :clear, :url => {:action => 'clear_terminated'} do |f|
49 = submit_tag 'Clear data for terminated graders'
49 = submit_tag 'Clear data for terminated graders'
50
50
51 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
51 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
52 %div{}
52 %div{}
53 %h2 Last 20 submissions
53 %h2 Last 20 submissions
54 %table.graders
54 %table.graders
55 %thead
55 %thead
56 %th ID
56 %th ID
57 %th User
57 %th User
58 %th Problem
58 %th Problem
59 %th Submitted
59 %th Submitted
60 %th Graded
60 %th Graded
61 %th Result
61 %th Result
62 %tbody
62 %tbody
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