Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r832:b5dca9c6565b - - 2 files changed: 4 inserted, 8 deleted
@@ -74,27 +74,24 | |||||
|
74 | bootstrap3-datetimepicker-rails (4.17.47) |
|
74 | bootstrap3-datetimepicker-rails (4.17.47) |
|
75 | momentjs-rails (>= 2.8.1) |
|
75 | momentjs-rails (>= 2.8.1) |
|
76 | builder (3.2.3) |
|
76 | builder (3.2.3) |
|
77 | byebug (11.0.1) |
|
77 | byebug (11.0.1) |
|
78 | capybara (3.25.0) |
|
78 | capybara (3.25.0) |
|
79 | addressable |
|
79 | addressable |
|
80 | mini_mime (>= 0.1.3) |
|
80 | mini_mime (>= 0.1.3) |
|
81 | nokogiri (~> 1.8) |
|
81 | nokogiri (~> 1.8) |
|
82 | rack (>= 1.6.0) |
|
82 | rack (>= 1.6.0) |
|
83 | rack-test (>= 0.6.3) |
|
83 | rack-test (>= 0.6.3) |
|
84 | regexp_parser (~> 1.5) |
|
84 | regexp_parser (~> 1.5) |
|
85 | xpath (~> 3.2) |
|
85 | xpath (~> 3.2) |
|
86 | - capybara-console (0.0.4) |
|
||
|
87 | - capybara |
|
||
|
88 | - rails (>= 3.0) |
|
||
|
89 | childprocess (1.0.1) |
|
86 | childprocess (1.0.1) |
|
90 | rake (< 13.0) |
|
87 | rake (< 13.0) |
|
91 | coffee-rails (4.2.2) |
|
88 | coffee-rails (4.2.2) |
|
92 | coffee-script (>= 2.2.0) |
|
89 | coffee-script (>= 2.2.0) |
|
93 | railties (>= 4.0.0) |
|
90 | railties (>= 4.0.0) |
|
94 | coffee-script (2.4.1) |
|
91 | coffee-script (2.4.1) |
|
95 | coffee-script-source |
|
92 | coffee-script-source |
|
96 | execjs |
|
93 | execjs |
|
97 | coffee-script-source (1.12.2) |
|
94 | coffee-script-source (1.12.2) |
|
98 | concurrent-ruby (1.1.5) |
|
95 | concurrent-ruby (1.1.5) |
|
99 | crass (1.0.4) |
|
96 | crass (1.0.4) |
|
100 | dynamic_form (1.1.4) |
|
97 | dynamic_form (1.1.4) |
@@ -290,25 +287,24 | |||||
|
290 | ace-rails-ap |
|
287 | ace-rails-ap |
|
291 | activerecord-session_store |
|
288 | activerecord-session_store |
|
292 | autoprefixer-rails |
|
289 | autoprefixer-rails |
|
293 | best_in_place (~> 3.0.1) |
|
290 | best_in_place (~> 3.0.1) |
|
294 | bootsnap (>= 1.1.0) |
|
291 | bootsnap (>= 1.1.0) |
|
295 | bootstrap-datepicker-rails |
|
292 | bootstrap-datepicker-rails |
|
296 | bootstrap-sass (~> 3.4.1) |
|
293 | bootstrap-sass (~> 3.4.1) |
|
297 | bootstrap-switch-rails |
|
294 | bootstrap-switch-rails |
|
298 | bootstrap-toggle-rails |
|
295 | bootstrap-toggle-rails |
|
299 | bootstrap3-datetimepicker-rails |
|
296 | bootstrap3-datetimepicker-rails |
|
300 | byebug |
|
297 | byebug |
|
301 | capybara (>= 2.15) |
|
298 | capybara (>= 2.15) |
|
302 | - capybara-console |
|
||
|
303 | coffee-rails |
|
299 | coffee-rails |
|
304 | dynamic_form |
|
300 | dynamic_form |
|
305 | fuzzy-string-match |
|
301 | fuzzy-string-match |
|
306 | haml |
|
302 | haml |
|
307 | haml-rails |
|
303 | haml-rails |
|
308 | in_place_editing |
|
304 | in_place_editing |
|
309 | jbuilder (~> 2.5) |
|
305 | jbuilder (~> 2.5) |
|
310 | jquery-countdown-rails |
|
306 | jquery-countdown-rails |
|
311 | jquery-datatables-rails |
|
307 | jquery-datatables-rails |
|
312 | jquery-rails |
|
308 | jquery-rails |
|
313 | jquery-tablesorter |
|
309 | jquery-tablesorter |
|
314 | jquery-timepicker-addon-rails |
|
310 | jquery-timepicker-addon-rails |
@@ -1,28 +1,28 | |||||
|
1 | - content_for :head do |
|
1 | - content_for :head do |
|
2 | <meta http-equiv ="refresh" content="60"/> |
|
2 | <meta http-equiv ="refresh" content="60"/> |
|
3 |
|
3 | ||
|
4 | %h1 Grader information |
|
4 | %h1 Grader information |
|
5 |
|
5 | ||
|
6 | %p |
|
6 | %p |
|
7 | = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info' |
|
7 | = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info' |
|
8 |
|
8 | ||
|
9 | .panel.panel-primary |
|
9 | .panel.panel-primary |
|
10 | .panel-heading |
|
10 | .panel-heading |
|
11 | Grader control: |
|
11 | Grader control: |
|
12 | .panel-body |
|
12 | .panel-body |
|
13 |
- =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default' |
|
13 | + =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default' |
|
14 |
- =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default' |
|
14 | + =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default' |
|
15 |
- =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default' |
|
15 | + =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default' |
|
16 |
- =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default' |
|
16 | + =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default' |
|
17 |
|
17 | ||
|
18 | .row |
|
18 | .row |
|
19 | .col-md-6 |
|
19 | .col-md-6 |
|
20 | - if @last_task |
|
20 | - if @last_task |
|
21 | Last task: |
|
21 | Last task: |
|
22 | = 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' |
|
23 |
|
23 | ||
|
24 | %br/ |
|
24 | %br/ |
|
25 |
|
25 | ||
|
26 | - if @last_test_request |
|
26 | - if @last_test_request |
|
27 | Last test_request: |
|
27 | Last test_request: |
|
28 | = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest' |
|
28 | = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest' |
You need to be logged in to leave comments.
Login now