Merge branch 'master' into fix-additional-line

app/assets/javascripts/editor.js.erb

@@ -421,7 +421,7 @@ $(function() {
       session.setUseWrapMode(true);
 
       var file_id =  $(element).data('id');
-      setAnnotations(editor, file_id);
+      //setAnnotations(editor, file_id);
 
       session.on('annotationRemoval', handleAnnotationRemoval);
       session.on('annotationChange', handleAnnotationChange);
@@ -1120,7 +1120,10 @@ $(function() {
   };
 
   var initWebsocketConnection = function(url) {
-      websocket = new WebSocket('wss://' + window.location.hostname + ':' + window.location.port + url);
+      //TODO: get the protocol from config file dependent on environment. (dev: ws, prod: wss)
+      //causes: Puma::HttpParserError: Invalid HTTP format, parsing fails.
+      //TODO: make sure that this gets cached.
+      websocket = new WebSocket('<%= DockerClient.config['ws_client_protocol'] %>' + window.location.hostname + ':' + window.location.port + url);
       websocket.onopen = function(evt) { resetOutputTab(); }; // todo show some kind of indicator for established connection
       websocket.onclose = function(evt) { /* expected at some point */ };
       websocket.onmessage = function(evt) { parseCanvasMessage(evt.data, true); };

app/assets/javascripts/submission_statistics.js

@@ -0,0 +1,96 @@
+$(function() {
+
+  var ACE_FILES_PATH = '/assets/ace/';
+  var THEME = 'ace/theme/textmate';
+
+  var currentSubmission = 0;
+  var active_file = undefined;
+  var fileTrees = []
+  var editor = undefined;
+  var fileTypeById = {}
+
+  var showActiveFile = function() {
+    var session = editor.getSession();
+    var fileType = fileTypeById[active_file.file_type_id]
+    session.setMode(fileType.editor_mode);
+    session.setTabSize(fileType.indent_size);
+    session.setValue(active_file.content);
+    session.setUseSoftTabs(true);
+    session.setUseWrapMode(true);
+
+    showFileTree(currentSubmission);
+    filetree = $(fileTrees[currentSubmission])
+    filetree.jstree("deselect_all");
+    filetree.jstree().select_node(active_file.file_id);
+  };
+
+  var initializeFileTree = function() {
+    $('.files').each(function(index, element) {
+      fileTree = $(element).jstree($(element).data('entries'));
+      fileTree.on('click', 'li.jstree-leaf', function() {
+        var id = parseInt($(this).attr('id'))
+        _.each(files[currentSubmission], function(file) {
+          if (file.file_id === id) {
+            active_file = file;
+          }
+        });
+        showActiveFile();
+      });
+      fileTrees.push(fileTree);
+    });
+  };
+
+  var showFileTree = function(index) {
+    $('.files').hide();
+    $(fileTrees[index].context).show();
+  }
+
+  if ($.isController('exercises') && $('#timeline').isPresent()) {
+
+    _.each(['modePath', 'themePath', 'workerPath'], function(attribute) {
+      ace.config.set(attribute, ACE_FILES_PATH);
+    });
+
+    var slider = $('#submissions-slider>input');
+    var submissions = $('#data').data('submissions');
+    var files = $('#data').data('files');
+    var filetypes = $('#data').data('file-types');
+
+    editor = ace.edit('current-file');
+    editor.setShowPrintMargin(false);
+    editor.setTheme(THEME);
+    editor.$blockScrolling = Infinity;
+    editor.setReadOnly(true);
+
+    _.each(filetypes, function (filetype) {
+      filetype = JSON.parse(filetype);
+      fileTypeById[filetype.id] = filetype;
+    });
+
+    $('tr[data-id]>.clickable').each(function(index, element) {
+      element = $(element);
+      element.click(function() {
+        slider.val(index);
+        slider.change()
+      });
+    });
+
+    slider.on('change', function(event) {
+      currentSubmission = slider.val();
+      var currentFiles = files[currentSubmission];
+      var fileIndex = 0;
+      _.each(currentFiles, function(file, index) {
+        if (file.name === active_file.name) {
+          fileIndex = index;
+        }
+      })
+      active_file = currentFiles[fileIndex];
+      showActiveFile();
+    });
+
+    active_file = files[0][0]
+    initializeFileTree();
+    showActiveFile();
+  }
+
+});