cafe-grader-web

Commit r467:ed3735b8a14e public

parent | child
Description:
fix displaying bug
Commit status:
[Not Reviewed]
References:
algo
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

r467:ed3735b8a14e - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -21,52 +21,52
21 = submit_tag 'Stop all running graders'
21 = submit_tag 'Stop all running graders'
22 .item
22 .item
23 = form_for :clear, :url => {:action => 'clear_all'} do |f|
23 = form_for :clear, :url => {:action => 'clear_all'} do |f|
24 = submit_tag 'Clear all data'
24 = submit_tag 'Clear all data'
25 %br{:style => 'clear:both'}/
25 %br{:style => 'clear:both'}/
26
26
27 %div{style: 'width:500px; float: left;'}
27 %div{style: 'width:500px; float: left;'}
28 - if @last_task
28 - if @last_task
29 Last task:
29 Last task:
30 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
30 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
31
31
32 %br/
32 %br/
33
33
34 - if @last_test_request
34 - if @last_test_request
35 Last test_request:
35 Last test_request:
36 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
36 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
37
37
38 %h2 Current graders
38 %h2 Current graders
39
39
40 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
40 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
41
41
42 %h2 Stalled graders
42 %h2 Stalled graders
43
43
44 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
44 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
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