diff --git a/app/assets/javascripts/submission_statistics.js b/app/assets/javascripts/submission_statistics.js index 5428061d..ec0d827a 100644 --- a/app/assets/javascripts/submission_statistics.js +++ b/app/assets/javascripts/submission_statistics.js @@ -47,7 +47,7 @@ $(function() { ace.config.set(attribute, ACE_FILES_PATH); }); - var slider = $('#slider>input'); + var slider = $('#submissions-slider>input'); var submissions = $('#data').data('submissions'); var files = $('#data').data('files'); diff --git a/app/assets/stylesheets/statistics.css.scss b/app/assets/stylesheets/statistics.css.scss new file mode 100644 index 00000000..a8d1d81d --- /dev/null +++ b/app/assets/stylesheets/statistics.css.scss @@ -0,0 +1,9 @@ +#submissions-slider { + margin-top: 25px; + margin-bottom: 25px; +} + +#current-file.editor { + height: 400px; +} + diff --git a/app/views/exercises/external_users/statistics.html.slim b/app/views/exercises/external_users/statistics.html.slim index 58a50c43..97c069d4 100644 --- a/app/views/exercises/external_users/statistics.html.slim +++ b/app/views/exercises/external_users/statistics.html.slim @@ -16,9 +16,9 @@ h1 = "#{@exercise} (external user #{@external_user})" .files class=(@exercise.hide_file_tree ? 'hidden col-sm-3' : 'col-sm-3') data-index=index data-entries=FileTree.new(files).to_js_tree - index += 1 div class=(@exercise.hide_file_tree ? 'col-sm-12' : 'col-sm-9') - #current-file.editor style="height: 400px" + #current-file.editor - #slider + #submissions-slider input type='range' orient='horizontal' list='datapoints' min=0 max=submissions.length-1 value=0 datalist#datapoints - index=0 @@ -28,5 +28,18 @@ h1 = "#{@exercise} (external user #{@external_user})" - index += 1 #timeline + .table-responsive + table.table + thead + tr + - ['.time', '.cause', '.score'].each do |title| + th.header = t(title) + tbody + - submissions.each do |submission| + tr data-id=submission.id + td = submission.created_at.strftime("%F %T") + td = submission.cause + td = submission.score + - else p = t('.no_data_available') diff --git a/config/locales/de.yml b/config/locales/de.yml index 56519a72..525b65ae 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -256,6 +256,9 @@ de: external_users: statistics: no_data_available: Keine Daten verfügbar. + time: Zeit + cause: Grund + score: Punktzahl files: roles: main_file: Hauptdatei diff --git a/config/locales/en.yml b/config/locales/en.yml index c7b0aa64..47539bf1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -256,6 +256,9 @@ en: external_users: statistics: no_data_available: No data available. + time: Time + cause: Cause + score: Score files: roles: main_file: Main File