Description:
merge
Commit status:
[Not Reviewed]
References:
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r832:b5dca9c6565b - - 2 files changed: 4 inserted, 8 deleted

@@ -38,99 +38,96
38 activesupport (= 5.2.3)
38 activesupport (= 5.2.3)
39 arel (>= 9.0)
39 arel (>= 9.0)
40 activerecord-session_store (1.1.3)
40 activerecord-session_store (1.1.3)
41 actionpack (>= 4.0)
41 actionpack (>= 4.0)
42 activerecord (>= 4.0)
42 activerecord (>= 4.0)
43 multi_json (~> 1.11, >= 1.11.2)
43 multi_json (~> 1.11, >= 1.11.2)
44 rack (>= 1.5.2, < 3)
44 rack (>= 1.5.2, < 3)
45 railties (>= 4.0)
45 railties (>= 4.0)
46 activestorage (5.2.3)
46 activestorage (5.2.3)
47 actionpack (= 5.2.3)
47 actionpack (= 5.2.3)
48 activerecord (= 5.2.3)
48 activerecord (= 5.2.3)
49 marcel (~> 0.3.1)
49 marcel (~> 0.3.1)
50 activesupport (5.2.3)
50 activesupport (5.2.3)
51 concurrent-ruby (~> 1.0, >= 1.0.2)
51 concurrent-ruby (~> 1.0, >= 1.0.2)
52 i18n (>= 0.7, < 2)
52 i18n (>= 0.7, < 2)
53 minitest (~> 5.1)
53 minitest (~> 5.1)
54 tzinfo (~> 1.1)
54 tzinfo (~> 1.1)
55 addressable (2.6.0)
55 addressable (2.6.0)
56 public_suffix (>= 2.0.2, < 4.0)
56 public_suffix (>= 2.0.2, < 4.0)
57 ansi (1.5.0)
57 ansi (1.5.0)
58 arel (9.0.0)
58 arel (9.0.0)
59 autoprefixer-rails (9.5.1.1)
59 autoprefixer-rails (9.5.1.1)
60 execjs
60 execjs
61 best_in_place (3.0.3)
61 best_in_place (3.0.3)
62 actionpack (>= 3.2)
62 actionpack (>= 3.2)
63 railties (>= 3.2)
63 railties (>= 3.2)
64 bindex (0.7.0)
64 bindex (0.7.0)
65 bootsnap (1.4.4)
65 bootsnap (1.4.4)
66 msgpack (~> 1.0)
66 msgpack (~> 1.0)
67 bootstrap-datepicker-rails (1.8.0.1)
67 bootstrap-datepicker-rails (1.8.0.1)
68 railties (>= 3.0)
68 railties (>= 3.0)
69 bootstrap-sass (3.4.1)
69 bootstrap-sass (3.4.1)
70 autoprefixer-rails (>= 5.2.1)
70 autoprefixer-rails (>= 5.2.1)
71 sassc (>= 2.0.0)
71 sassc (>= 2.0.0)
72 bootstrap-switch-rails (3.3.4)
72 bootstrap-switch-rails (3.3.4)
73 bootstrap-toggle-rails (2.2.1.0)
73 bootstrap-toggle-rails (2.2.1.0)
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)
101 erubi (1.8.0)
98 erubi (1.8.0)
102 erubis (2.7.0)
99 erubis (2.7.0)
103 execjs (2.7.0)
100 execjs (2.7.0)
104 ffi (1.11.1)
101 ffi (1.11.1)
105 fuzzy-string-match (1.0.1)
102 fuzzy-string-match (1.0.1)
106 RubyInline (>= 3.8.6)
103 RubyInline (>= 3.8.6)
107 globalid (0.4.2)
104 globalid (0.4.2)
108 activesupport (>= 4.2.0)
105 activesupport (>= 4.2.0)
109 haml (5.1.0)
106 haml (5.1.0)
110 temple (>= 0.8.0)
107 temple (>= 0.8.0)
111 tilt
108 tilt
112 haml-rails (1.0.0)
109 haml-rails (1.0.0)
113 actionpack (>= 4.0.1)
110 actionpack (>= 4.0.1)
114 activesupport (>= 4.0.1)
111 activesupport (>= 4.0.1)
115 haml (>= 4.0.6, < 6.0)
112 haml (>= 4.0.6, < 6.0)
116 html2haml (>= 1.0.1)
113 html2haml (>= 1.0.1)
117 railties (>= 4.0.1)
114 railties (>= 4.0.1)
118 html2haml (2.2.0)
115 html2haml (2.2.0)
119 erubis (~> 2.7.0)
116 erubis (~> 2.7.0)
120 haml (>= 4.0, < 6)
117 haml (>= 4.0, < 6)
121 nokogiri (>= 1.6.0)
118 nokogiri (>= 1.6.0)
122 ruby_parser (~> 3.5)
119 ruby_parser (~> 3.5)
123 i18n (1.6.0)
120 i18n (1.6.0)
124 concurrent-ruby (~> 1.0)
121 concurrent-ruby (~> 1.0)
125 in_place_editing (1.2.0)
122 in_place_editing (1.2.0)
126 jbuilder (2.9.1)
123 jbuilder (2.9.1)
127 activesupport (>= 4.2.0)
124 activesupport (>= 4.2.0)
128 jquery-countdown-rails (2.0.2)
125 jquery-countdown-rails (2.0.2)
129 jquery-datatables-rails (3.4.0)
126 jquery-datatables-rails (3.4.0)
130 actionpack (>= 3.1)
127 actionpack (>= 3.1)
131 jquery-rails
128 jquery-rails
132 railties (>= 3.1)
129 railties (>= 3.1)
133 sass-rails
130 sass-rails
134 jquery-rails (4.3.3)
131 jquery-rails (4.3.3)
135 rails-dom-testing (>= 1, < 3)
132 rails-dom-testing (>= 1, < 3)
136 railties (>= 4.2.0)
133 railties (>= 4.2.0)
@@ -254,88 +251,87
254 sprockets (3.7.2)
251 sprockets (3.7.2)
255 concurrent-ruby (~> 1.0)
252 concurrent-ruby (~> 1.0)
256 rack (> 1, < 3)
253 rack (> 1, < 3)
257 sprockets-rails (3.2.1)
254 sprockets-rails (3.2.1)
258 actionpack (>= 4.0)
255 actionpack (>= 4.0)
259 activesupport (>= 4.0)
256 activesupport (>= 4.0)
260 sprockets (>= 3.0.0)
257 sprockets (>= 3.0.0)
261 sqlite3 (1.4.1)
258 sqlite3 (1.4.1)
262 temple (0.8.1)
259 temple (0.8.1)
263 thor (0.20.3)
260 thor (0.20.3)
264 thread_safe (0.3.6)
261 thread_safe (0.3.6)
265 tilt (2.0.9)
262 tilt (2.0.9)
266 tzinfo (1.2.5)
263 tzinfo (1.2.5)
267 thread_safe (~> 0.1)
264 thread_safe (~> 0.1)
268 uglifier (4.1.20)
265 uglifier (4.1.20)
269 execjs (>= 0.3.0, < 3)
266 execjs (>= 0.3.0, < 3)
270 web-console (3.7.0)
267 web-console (3.7.0)
271 actionview (>= 5.0)
268 actionview (>= 5.0)
272 activemodel (>= 5.0)
269 activemodel (>= 5.0)
273 bindex (>= 0.4.0)
270 bindex (>= 0.4.0)
274 railties (>= 5.0)
271 railties (>= 5.0)
275 webdriver (0.1.0)
272 webdriver (0.1.0)
276 websocket-driver (0.7.1)
273 websocket-driver (0.7.1)
277 websocket-extensions (>= 0.1.0)
274 websocket-extensions (>= 0.1.0)
278 websocket-extensions (0.1.4)
275 websocket-extensions (0.1.4)
279 will_paginate (3.0.12)
276 will_paginate (3.0.12)
280 xpath (3.2.0)
277 xpath (3.2.0)
281 nokogiri (~> 1.8)
278 nokogiri (~> 1.8)
282 yaml_db (0.7.0)
279 yaml_db (0.7.0)
283 rails (>= 3.0)
280 rails (>= 3.0)
284 rake (>= 0.8.7)
281 rake (>= 0.8.7)
285
282
286 PLATFORMS
283 PLATFORMS
287 ruby
284 ruby
288
285
289 DEPENDENCIES
286 DEPENDENCIES
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
315 jquery-ui-rails
311 jquery-ui-rails
316 listen (>= 3.0.5, < 3.2)
312 listen (>= 3.0.5, < 3.2)
317 mail
313 mail
318 minitest-reporters
314 minitest-reporters
319 momentjs-rails
315 momentjs-rails
320 mysql2
316 mysql2
321 puma
317 puma
322 rails (~> 5.2)
318 rails (~> 5.2)
323 rails-controller-testing
319 rails-controller-testing
324 rails_bootstrap_sortable
320 rails_bootstrap_sortable
325 rdiscount
321 rdiscount
326 rouge
322 rouge
327 sassc-rails
323 sassc-rails
328 select2-rails
324 select2-rails
329 selenium-webdriver
325 selenium-webdriver
330 simple_form
326 simple_form
331 spring
327 spring
332 spring-watcher-listen (~> 2.0.0)
328 spring-watcher-listen (~> 2.0.0)
333 sqlite3
329 sqlite3
334 uglifier
330 uglifier
335 web-console (>= 3.3.0)
331 web-console (>= 3.3.0)
336 webdriver
332 webdriver
337 will_paginate (~> 3.0.7)
333 will_paginate (~> 3.0.7)
338 yaml_db
334 yaml_db
339
335
340 BUNDLED WITH
336 BUNDLED WITH
341 1.17.2
337 1.17.2
@@ -1,64 +1,64
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', method: 'post'
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', method: 'post'
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', method: 'post'
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', method: 'post'
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'
29
29
30 %h2 Current graders
30 %h2 Current graders
31
31
32 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
32 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
33
33
34 %h2 Stalled graders
34 %h2 Stalled graders
35
35
36 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
36 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
37
37
38 %h2 Terminated graders
38 %h2 Terminated graders
39
39
40 %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
40 %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
41
41
42 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
42 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
43 .col-md-6
43 .col-md-6
44 %h2 Last 20 submissions
44 %h2 Last 20 submissions
45 %table.table.table-striped.table-condensed
45 %table.table.table-striped.table-condensed
46 %thead
46 %thead
47 %th ID
47 %th ID
48 %th User
48 %th User
49 %th Problem
49 %th Problem
50 %th Submitted
50 %th Submitted
51 %th Graded
51 %th Graded
52 %th Result
52 %th Result
53 %tbody
53 %tbody
54 - @submission.each do |sub|
54 - @submission.each do |sub|
55 %tr.inactive
55 %tr.inactive
56 %td= link_to sub.id, submission_path(sub.id)
56 %td= link_to sub.id, submission_path(sub.id)
57 %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
57 %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
58 %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
58 %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
59 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
59 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
60 %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" : " "
61 %td= sub.grader_comment
61 %td= sub.grader_comment
62 %h2 Ungraded submission
62 %h2 Ungraded submission
63 %table.table.table-striped.table-condensed
63 %table.table.table-striped.table-condensed
64 %thead
64 %thead
You need to be logged in to leave comments. Login now