htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into teams-remove

Browse Source
This commit is contained in:
Ralf Teusner
2016-07-06 16:24:24 +02:00
parent 4bb8c79150 4651c87491
commit 51b435251f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/editor.js.erb
View File

@ -587,7 +587,7 @@ $(function() {
} else if (output.stdout) { } else if (output.stdout) {
//if (output_mode_is_streaming){ //if (output_mode_is_streaming){
element.addClass('text-success').append(output.stdout); element.addClass('text-success').append(output.stdout);
flowrOutputBuffer += output.stdout; // flowrOutputBuffer += output.stdout;
//}else{ //}else{
// element.addClass('text-success'); // element.addClass('text-success');
// element.data('content_buffer' , element.data('content_buffer') + output.stdout); // element.data('content_buffer' , element.data('content_buffer') + output.stdout);

4
app/views/exercises/external_users/statistics.html.slim
View File

@ -50,9 +50,9 @@ h1 = "#{@exercise} (external user #{@external_user})"
td td
-submission.testruns.each do |run| -submission.testruns.each do |run|
- if run.passed - if run.passed
.unit-test-result.positive-result .unit-test-result.positive-result title=run.output
- else - else
.unit-test-result.negative-result .unit-test-result.negative-result title=run.output
td = Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0 td = Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0
-working_times_until.push((Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0)) -working_times_until.push((Time.at(deltas[1..index].inject(:+)).utc.strftime("%H:%M:%S") if index > 0))
p = t('.addendum') p = t('.addendum')