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

Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

Browse Source 
# Conflicts:
#	Gemfile.lock
This commit is contained in:
Maximilian Grundke
2018-03-08 12:12:06 +01:00
parent 782f9eea73 84bd85703d
commit 77a40c9fc5
7 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/editor.css.scss
View File

@@ -42,13 +42,14 @@ button i.fa-spin {
background-color: #008CBA;
margin-top: 0;
width: 100%;
display: flex;
button {
font-size: 80%;
}
button, .btn-group {
width: 33.33333%;
flex-grow: 1;
}
.btn-group {
@@ -191,4 +192,4 @@ button i.fa-spin {
.enforce-bottom-margin {
margin-bottom: 5px !important;
}
}

3
app/assets/stylesheets/forms.css.scss
View File

@@ -3,7 +3,8 @@
}
.chosen-container {
width: 250px !important;
min-width: 250px !important;
width: 100% !important;
}
.code-field {

7
app/controllers/submissions_controller.rb
View File

@@ -75,6 +75,11 @@ class SubmissionsController < ApplicationController
zio.write(file.content)
end
# zip exercise description
zio.put_next_entry(t('activerecord.models.exercise.one') + '.txt')
zio.write(@submission.exercise.title + "\r\n======================\r\n")
zio.write(@submission.exercise.description)
# zip .co file
zio.put_next_entry(".co")
zio.write(File.read id_file)
@@ -167,7 +172,7 @@ class SubmissionsController < ApplicationController
# if the command is 'client_kill', send it to docker otherwise.
begin
parsed = JSON.parse(data)
if parsed['cmd'] == 'client_kill'
if parsed.class == Hash && parsed['cmd'] == 'client_kill'
Rails.logger.debug("Client exited container.")
@docker_client.kill_container(result[:container])
else

2
app/views/sessions/destroy_through_lti.html.slim
View File

@@ -10,7 +10,7 @@ h2 = t('shared.statistics')
= row(label: '.score') do
p == t('shared.out_of', maximum_value: @submission.exercise.maximum_score, value: @submission.score)
p = progress_bar(@submission.percentage)
= row(label: '.final_submissions', value: @submission.exercise.submissions.final.distinct.count(:user_id, :user_type) - 1)
/= row(label: '.final_submissions', value: @submission.exercise.submissions.final.distinct.count(:user_id, :user_type) - 1)
/= row(label: '.average_score') do
/ p == t('shared.out_of', maximum_value: @submission.exercise.maximum_score, value: @submission.exercise.average_score.round(2))
/ p = progress_bar(@submission.exercise.average_percentage)