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
Author
-
r461:43d522bf3ca9 - - 2 files changed: 23 inserted, 1 deleted
| @@ -29,12 +29,13 | |||||
|
|
29 | @terminated_processes = GraderProcess.find_terminated_graders |
|
29 | @terminated_processes = GraderProcess.find_terminated_graders |
|
|
30 |
|
30 | ||
|
|
31 | @last_task = Task.find(:first, |
|
31 | @last_task = Task.find(:first, |
|
|
32 | :order => 'created_at DESC') |
|
32 | :order => 'created_at DESC') |
|
|
33 | @last_test_request = TestRequest.find(:first, |
|
33 | @last_test_request = TestRequest.find(:first, |
|
|
34 | :order => 'created_at DESC') |
|
34 | :order => 'created_at DESC') |
|
|
|
35 | + @submission = Submission.order("id desc").limit(20) | ||
|
|
35 | end |
|
36 | end |
|
|
36 |
|
37 | ||
|
|
37 | def clear |
|
38 | def clear |
|
|
38 | grader_proc = GraderProcess.find(params[:id]) |
|
39 | grader_proc = GraderProcess.find(params[:id]) |
|
|
39 | grader_proc.destroy if grader_proc!=nil |
|
40 | grader_proc.destroy if grader_proc!=nil |
|
|
40 | redirect_to :action => 'list' |
|
41 | redirect_to :action => 'list' |
| @@ -21,23 +21,23 | |||||
|
|
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 | - if @last_task |
|
28 | - if @last_task |
|
|
28 | Last task: |
|
29 | Last task: |
|
|
29 | = 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' |
|
|
30 |
|
31 | ||
|
|
31 | %br/ |
|
32 | %br/ |
|
|
32 |
|
33 | ||
|
|
33 | - if @last_test_request |
|
34 | - if @last_test_request |
|
|
34 | Last test_request: |
|
35 | Last test_request: |
|
|
35 | = 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' |
|
|
36 |
|
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 | ||
| @@ -46,6 +46,27 | |||||
|
|
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{} | ||
|
|
|
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 | ||
|
|
|
71 | + | ||
|
|
|
72 | + | ||
You need to be logged in to leave comments.
Login now