Description:
- change user_admin default action from list to index
- remove duplicate button in grader control
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r588:8bdb0ec71018 - - 4 files changed: 21 inserted, 23 deleted
| @@ -30,12 +30,13 | |||||
|
|
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 | @submission = Submission.order("id desc").limit(20) |
|
|
|
36 | + @backlog_submission = Submission.where('graded_at is null') | ||
|
|
36 | end |
|
37 | end |
|
|
37 |
|
38 | ||
|
|
38 | def clear |
|
39 | def clear |
|
|
39 | grader_proc = GraderProcess.find(params[:id]) |
|
40 | grader_proc = GraderProcess.find(params[:id]) |
|
|
40 | grader_proc.destroy if grader_proc!=nil |
|
41 | grader_proc.destroy if grader_proc!=nil |
|
|
41 | redirect_to :action => 'list' |
|
42 | redirect_to :action => 'list' |
| @@ -13,17 +13,12 | |||||
|
|
13 | :manage_contest, |
|
13 | :manage_contest, |
|
|
14 | :bulk_mail |
|
14 | :bulk_mail |
|
|
15 | ], |
|
15 | ], |
|
|
16 | :redirect_to => { :action => :list } |
|
16 | :redirect_to => { :action => :list } |
|
|
17 |
|
17 | ||
|
|
18 | def index |
|
18 | def index |
|
|
19 | - list |
|
||
|
|
20 | - render :action => 'list' |
|
||
|
|
21 | - end |
|
||
|
|
22 | - |
|
||
|
|
23 | - def list |
|
||
|
|
24 | @user_count = User.count |
|
19 | @user_count = User.count |
|
|
25 | if params[:page] == 'all' |
|
20 | if params[:page] == 'all' |
|
|
26 | @users = User.all |
|
21 | @users = User.all |
|
|
27 | @paginated = false |
|
22 | @paginated = false |
|
|
28 | else |
|
23 | else |
|
|
29 | @users = User.paginate :page => params[:page] |
|
24 | @users = User.paginate :page => params[:page] |
| @@ -1,9 +1,10 | |||||
|
|
1 | # Methods added to this helper will be available to all templates in the application. |
|
1 | # Methods added to this helper will be available to all templates in the application. |
|
|
2 | module ApplicationHelper |
|
2 | module ApplicationHelper |
|
|
3 |
|
3 | ||
|
|
|
4 | + #new bootstrap header | ||
|
|
4 | def navbar_user_header |
|
5 | def navbar_user_header |
|
|
5 | left_menu = '' |
|
6 | left_menu = '' |
|
|
6 | right_menu = '' |
|
7 | right_menu = '' |
|
|
7 | user = User.find(session[:user_id]) |
|
8 | user = User.find(session[:user_id]) |
|
|
8 |
|
9 | ||
|
|
9 | if (user!=nil) and (GraderConfiguration.show_tasks_to?(user)) |
|
10 | if (user!=nil) and (GraderConfiguration.show_tasks_to?(user)) |
| @@ -12,29 +12,12 | |||||
|
|
12 | .panel-body |
|
12 | .panel-body |
|
|
13 | =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default', method: 'post' |
|
13 | =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default', method: 'post' |
|
|
14 | =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post' |
|
14 | =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post' |
|
|
15 | =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post' |
|
15 | =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post' |
|
|
16 | =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post' |
|
16 | =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post' |
|
|
17 |
|
17 | ||
|
|
18 | - .submitbox |
|
||
|
|
19 | - .item |
|
||
|
|
20 | - Grader control: |
|
||
|
|
21 | - .item |
|
||
|
|
22 | - = form_for :clear, :url => {:action => 'start_grading'} do |f| |
|
||
|
|
23 | - = submit_tag 'Start graders in grading env' |
|
||
|
|
24 | - .item |
|
||
|
|
25 | - = form_for :clear, :url => {:action => 'start_exam'} do |f| |
|
||
|
|
26 | - = submit_tag 'Start graders in exam env' |
|
||
|
|
27 | - .item |
|
||
|
|
28 | - = form_for :clear, :url => {:action => 'stop_all'} do |f| |
|
||
|
|
29 | - = submit_tag 'Stop all running graders' |
|
||
|
|
30 | - .item |
|
||
|
|
31 | - = form_for :clear, :url => {:action => 'clear_all'} do |f| |
|
||
|
|
32 | - = submit_tag 'Clear all data' |
|
||
|
|
33 | - %br{:style => 'clear:both'}/ |
|
||
|
|
34 | - |
|
||
|
|
35 | .row |
|
18 | .row |
|
|
36 | .col-md-6 |
|
19 | .col-md-6 |
|
|
37 | - if @last_task |
|
20 | - if @last_task |
|
|
38 | Last task: |
|
21 | Last task: |
|
|
39 | = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task' |
|
22 | = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task' |
|
|
40 |
|
23 | ||
| @@ -64,18 +47,36 | |||||
|
|
64 | %th ID |
|
47 | %th ID |
|
|
65 | %th User |
|
48 | %th User |
|
|
66 | %th Problem |
|
49 | %th Problem |
|
|
67 | %th Submitted |
|
50 | %th Submitted |
|
|
68 | %th Graded |
|
51 | %th Graded |
|
|
69 | %th Result |
|
52 | %th Result |
|
|
70 | - %th |
|
||
|
|
71 | %tbody |
|
53 | %tbody |
|
|
72 | - @submission.each do |sub| |
|
54 | - @submission.each do |sub| |
|
|
73 | %tr.inactive |
|
55 | %tr.inactive |
|
|
74 | %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id |
|
56 | %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id |
|
|
75 | %td= sub.try(:user).try(:full_name) |
|
57 | %td= sub.try(:user).try(:full_name) |
|
|
76 | %td= sub.try(:problem).try(:full_name) |
|
58 | %td= sub.try(:problem).try(:full_name) |
|
|
77 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
59 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
|
78 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
60 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
|
79 | %td= sub.grader_comment |
|
61 | %td= sub.grader_comment |
|
|
|
62 | + %h2 Ungraded submission | ||
|
|
|
63 | + %table.table.table-striped.table-condensed | ||
|
|
|
64 | + %thead | ||
|
|
|
65 | + %th ID | ||
|
|
|
66 | + %th User | ||
|
|
|
67 | + %th Problem | ||
|
|
|
68 | + %th Submitted | ||
|
|
|
69 | + %th Graded | ||
|
|
|
70 | + %th Result | ||
|
|
|
71 | + %tbody | ||
|
|
|
72 | + - @backlog_submission.each do |sub| | ||
|
|
|
73 | + %tr.inactive | ||
|
|
|
74 | + %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id | ||
|
|
|
75 | + %td= sub.try(:user).try(:full_name) | ||
|
|
|
76 | + %td= sub.try(:problem).try(:full_name) | ||
|
|
|
77 | + %td= "#{time_ago_in_words(sub.submitted_at)} ago" | ||
|
|
|
78 | + %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " | ||
|
|
|
79 | + %td= sub.grader_comment | ||
|
|
80 |
|
80 | ||
|
|
81 |
|
81 | ||
|
|
|
82 | + | ||
You need to be logged in to leave comments.
Login now