Description:
add last 20 submissions status
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r461:43d522bf3ca9 - - 2 files changed: 43 inserted, 21 deleted
@@ -32,6 +32,7 | |||
|
32 | 32 | :order => 'created_at DESC') |
|
33 | 33 | @last_test_request = TestRequest.find(:first, |
|
34 | 34 | :order => 'created_at DESC') |
|
35 | + @submission = Submission.order("id desc").limit(20) | |
|
35 | 36 | end |
|
36 | 37 | |
|
37 | 38 | def clear |
@@ -24,28 +24,49 | |||
|
24 | 24 | = submit_tag 'Clear all data' |
|
25 | 25 | %br{:style => 'clear:both'}/ |
|
26 | 26 | |
|
27 | - - if @last_task | |
|
28 |
- |
|
|
29 | - = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task' | |
|
27 | + %div{style: 'width:500px; float: left;'} | |
|
28 | + - if @last_task | |
|
29 | + Last task: | |
|
30 | + = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task' | |
|
31 | + | |
|
32 | + %br/ | |
|
33 | + | |
|
34 | + - if @last_test_request | |
|
35 | + Last test_request: | |
|
36 | + = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest' | |
|
37 | + | |
|
38 | + %h2 Current graders | |
|
39 | + | |
|
40 | + = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes} | |
|
41 | + | |
|
42 | + %h2 Stalled graders | |
|
43 | + | |
|
44 | + = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes} | |
|
45 | + | |
|
46 | + %h2 Terminated graders | |
|
30 | 47 | |
|
31 | - %br/ | |
|
48 | + = form_for :clear, :url => {:action => 'clear_terminated'} do |f| | |
|
49 | + = submit_tag 'Clear data for terminated graders' | |
|
32 | 50 | |
|
33 | - - if @last_test_request | |
|
34 | - Last test_request: | |
|
35 | - = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest' | |
|
51 | + = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes} | |
|
52 | + %div{} | |
|
53 | + %h2 Last 20 submissions | |
|
54 | + %table.graders | |
|
55 | + %thead | |
|
56 | + %th ID | |
|
57 | + %th User | |
|
58 | + %th Problem | |
|
59 | + %th Submitted | |
|
60 | + %th Graded | |
|
61 | + %th Result | |
|
62 | + %tbody | |
|
63 | + - @submission.each do |sub| | |
|
64 | + %tr.inactive | |
|
65 | + %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id | |
|
66 | + %td= sub.try(:user).try(:full_name) | |
|
67 | + %td= sub.try(:problem).try(:full_name) | |
|
68 | + %td= "#{time_ago_in_words(sub.submitted_at)} ago" | |
|
69 | + %td= "#{time_ago_in_words(sub.graded_at)} ago" | |
|
70 | + %td= sub.grader_comment | |
|
36 | 71 | |
|
37 | 72 | |
|
38 | - %h2 Current graders | |
|
39 | - | |
|
40 | - = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes} | |
|
41 | - | |
|
42 | - %h2 Stalled graders | |
|
43 | - | |
|
44 | - = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes} | |
|
45 | - | |
|
46 | - %h2 Terminated graders | |
|
47 | - | |
|
48 | - = form_for :clear, :url => {:action => 'clear_terminated'} do |f| | |
|
49 | - = submit_tag 'Clear data for terminated graders' | |
|
50 | - | |
|
51 | - = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes} |
You need to be logged in to leave comments.
Login now