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: 43 inserted, 21 deleted
| @@ -23,24 +23,25 | |||||
|
|
23 | end |
|
23 | end |
|
|
24 |
|
24 | ||
|
|
25 | def list |
|
25 | def list |
|
|
26 | @grader_processes = GraderProcess.find_running_graders |
|
26 | @grader_processes = GraderProcess.find_running_graders |
|
|
27 | @stalled_processes = GraderProcess.find_stalled_process |
|
27 | @stalled_processes = GraderProcess.find_stalled_process |
|
|
28 |
|
28 | ||
|
|
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' |
|
|
41 | end |
|
42 | end |
|
|
42 |
|
43 | ||
|
|
43 | def clear_terminated |
|
44 | def clear_terminated |
|
|
44 | GraderProcess.find_terminated_graders.each do |p| |
|
45 | GraderProcess.find_terminated_graders.each do |p| |
|
|
45 | p.destroy |
|
46 | p.destroy |
|
|
46 | end |
|
47 | end |
| @@ -15,37 +15,58 | |||||
|
|
15 | = submit_tag 'Start graders in grading env' |
|
15 | = submit_tag 'Start graders in grading env' |
|
|
16 | .item |
|
16 | .item |
|
|
17 | = form_for :clear, :url => {:action => 'start_exam'} do |f| |
|
17 | = form_for :clear, :url => {:action => 'start_exam'} do |f| |
|
|
18 | = submit_tag 'Start graders in exam env' |
|
18 | = submit_tag 'Start graders in exam env' |
|
|
19 | .item |
|
19 | .item |
|
|
20 | = form_for :clear, :url => {:action => 'stop_all'} do |f| |
|
20 | = form_for :clear, :url => {:action => 'stop_all'} do |f| |
|
|
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 | - - if @last_task |
|
27 | + %div{style: 'width:500px; float: left;'} |
|
|
28 |
- |
|
28 | + - if @last_task |
|
|
29 | - = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => '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 |
|
51 | + = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes} |
|
|
34 | - Last test_request: |
|
52 | + %div{} |
|
|
35 | - = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest' |
|
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