Merge branch 'master' into score-websocket

Conflicts:
	app/assets/javascripts/editor.js.erb

app/assets/javascripts/editor.js.erb

@@ -19,6 +19,10 @@ $(function() {
   var SERVER_SEND_EVENT = 2;
 
   var editors = [];
+  var editor_for_file = new Map();
+  var regex_for_language = new Map();
+  var tracepositions_regex;
+
   var active_file = undefined;
   var active_frame = undefined;
   var running = false;
@@ -176,7 +180,10 @@ $(function() {
   var downloadCode = function(event) {
     event.preventDefault();
     createSubmission(this, null,function(response) {
-      var url = response.download_url.replace(FILENAME_URL_PLACEHOLDER, active_file.filename);
+      var url = response.download_url;
+
+      // to download just a single file, use the following url
+      //var url = response.download_file_url.replace(FILENAME_URL_PLACEHOLDER, active_file.filename);
       window.location = url;
     });
   };
@@ -415,12 +422,18 @@ $(function() {
       editor.setTheme(THEME);
       editor.commands.bindKey("ctrl+alt+0", null);
       editors.push(editor);
+      editor_for_file.set($(element).parent().data('filename'), editor);
       var session = editor.getSession();
       session.setMode($(element).data('mode'));
       session.setTabSize($(element).data('indent-size'));
       session.setUseSoftTabs(true);
       session.setUseWrapMode(true);
 
+      // set regex for parsing error traces based on the mode of the main file.
+      if( $(element).parent().data('role') == "main_file"){
+        tracepositions_regex = regex_for_language.get($(element).data('mode'));
+      }
+
       var file_id =  $(element).data('id');
 
       /*
@@ -468,6 +481,12 @@ $(function() {
     $('#request-for-comments').on('click', requestComments);
   };
 
+
+  var initializeRegexes = function(){
+    regex_for_language.set("ace/mode/python", /File "(.+?)", line (\d+)/g);
+    regex_for_language.set("ace/mode/java", /(.*\.java):(\d+):/g);
+  }
+
   var initializeTooltips = function() {
     $('[data-tooltip]').tooltip();
   };
@@ -602,8 +621,6 @@ $(function() {
       element.addClass('text-success').append(output.stdout);
       flowrOutputBuffer += output.stdout;
       QaApiOutputBuffer.stdout += output.stdout;
-
-
       //}else{
       //  element.addClass('text-success');
       //  element.data('content_buffer' , element.data('content_buffer') + output.stdout);
@@ -892,7 +909,9 @@ $(function() {
   }
 
   var showWorkspaceTab = function(event) {
-    event.preventDefault();
+    if(event){
+      event.preventDefault();
+    }
     showTab(0);
   };
 
@@ -1053,6 +1072,7 @@ $(function() {
             killWebsocketAndContainer();
             handleQaApiOutput();
             handleStderrOutputForFlowr();
+            augmentStacktraceInOutput();
             break;
         case 'timeout':
             // just show the timeout message here. Another exit command is sent by the rails backend when the socket to the docker container closes.
@@ -1064,6 +1084,41 @@ $(function() {
       }
   };
 
+
+  var jumpToSourceLine = function(event){
+    var file = $(event.target).data('file');
+    var line = $(event.target).data('line');
+
+    showWorkspaceTab(null);
+    // set active file ?!?!
+
+    var frame = $('div.frame[data-filename="' + file + '"]');
+    showFrame(frame);
+
+    var editor = editor_for_file.get(file);
+    editor.gotoLine(line, 0);
+
+  };
+
+  var augmentStacktraceInOutput = function() {
+    if(tracepositions_regex){
+      var element = $('#output>pre');
+      var text = element.text();
+      element.on( "click", "a", jumpToSourceLine);
+
+      var matches;
+
+      while(matches = tracepositions_regex.exec(text)){
+        var frame = $('div.frame[data-filename="' + matches[1] + '"]')
+
+        if(frame.length > 0){
+          element.html(text.replace(matches[0], "<a href='#' data-file='" +  matches[1] + "' data-line='" + matches[2] + "'>" + matches[0] + "</a>"));
+        }
+      }
+    }
+
+  };
+
   var renderWebsocketOutput = function(msg){
     var element = findOrCreateRenderElement(0);
     element.append(msg.data);
@@ -1177,25 +1232,25 @@ $(function() {
     var file_id = $('.editor').data('id')
     var question = $('#question').val();
 
-    $.ajax({
-      method: 'POST',
-      url: '/request_for_comments',
-      data: {
-        request_for_comment: {
-          exercise_id: exercise_id,
-          file_id: file_id,
-          question: question,
-          "requested_at(1i)": 2015, // these are the timestamp values that the request handler demands
-          "requested_at(2i)":3, // they could be random here, because the timestamp is updated on serverside anyway
-          "requested_at(3i)":27,
-          "requested_at(4i)":17,
-          "requested_at(5i)":06
+    var createRequestForComments = function(submission) {
+      $.ajax({
+        method: 'POST',
+        url: '/request_for_comments',
+        data: {
+          request_for_comment: {
+            exercise_id: exercise_id,
+            file_id: file_id,
+            submission_id: submission.id,
+            question: question
+          }
         }
-      }
-    }).done(function() {
-      hideSpinner();
-      $.flash.success({ text: $('#askForCommentsButton').data('message-success') })
-    }).error(ajaxError);
+      }).done(function() {
+        hideSpinner();
+        $.flash.success({ text: $('#askForCommentsButton').data('message-success') });
+      }).error(ajaxError);
+    }
+
+    createSubmission($('.requestCommentsButton'), null, createRequestForComments);
 
     $('#comment-modal').modal('hide');
     var button = $('.requestCommentsButton');
@@ -1224,6 +1279,7 @@ $(function() {
 
   if ($('#editor').isPresent()) {
       if (isBrowserSupported()) {
+          initializeRegexes();
           initializeCodePilot();
           $('.score, #development-environment').show();
           configureEditors();

app/assets/javascripts/exercises.js

@@ -12,6 +12,9 @@ $(function() {
     $('#files li:last select[name*="file_type_id"]').val(getSelectedExecutionEnvironment().file_type_id);
     $('#files li:last select').chosen(window.CodeOcean.CHOSEN_OPTIONS);
     $('body, html').scrollTo('#add-file');
+    // if we collapse the file forms by default, we need to click on the new element in order to open it.
+    // however, this crashes for more files (if we add several ones by clicking the add button more often), since the elements are probably not correctly added to the files list.
+    //$('#files li:last>div:first>a>div').click();
   };
 
   var ajaxError = function() {
@@ -148,6 +151,22 @@ $(function() {
     });
   };
 
+  var updateFileTemplates = function(fileType) {
+      var jqxhr = $.ajax({
+          url: '/file_templates/by_file_type/' + fileType + '.json',
+          dataType: 'json'
+      });
+      jqxhr.done(function(response) {
+          var noTemplateLabel = $('#noTemplateLabel').data('text');
+          var options = "<option value>" + noTemplateLabel + "</option>";
+          for (var i = 0; i < response.length; i++) {
+              options += "<option value='" + response[i].id + "'>" + response[i].name + "</option>"
+          }
+          $("#code_ocean_file_file_template_id").find('option').remove().end().append($(options));
+      });
+      jqxhr.fail(ajaxError);
+  }
+
   if ($.isController('exercises')) {
     if ($('table').isPresent()) {
       enableBatchUpdate();
@@ -162,6 +181,10 @@ $(function() {
       inferFileAttributes();
       observeFileRoleChanges();
       overrideTextareaTabBehavior();
+    } else if ($('#files.jstree').isPresent()) {
+        var fileTypeSelect = $('#code_ocean_file_file_type_id');
+        fileTypeSelect.on("change", function() {updateFileTemplates(fileTypeSelect.val())});
+        updateFileTemplates(fileTypeSelect.val());
     }
     toggleCodeHeight();
     if (window.hljs) {

app/assets/javascripts/file_templates.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/