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

Merge pull request #45 from openHPI/flowr

Browse Source 
Flowr
This commit is contained in:
rteusner
2016-03-02 17:31:39 +01:00
parent fb9e8c48a0 9d6c746e48
commit 0b349489b4
1 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ $(function() {
var ENTER_KEY_CODE = 13; var ENTER_KEY_CODE = 13;
var flowrOutputBuffer = "";
var flowrResultHtml = '<div class="panel panel-default"><div id="{{headingId}}" role="tab" class="panel-heading"><h4 class="panel-title"><a data-toggle="collapse" data-parent="#flowrHint" href="#{{collapseId}}" aria-expanded="true" aria-controls="{{collapseId}}"></a></h4></div><div id="{{collapseId}}" role="tabpanel" aria-labelledby="{{headingId}}" class="panel-collapse collapse"><div class="panel-body"></div></div></div>' var flowrResultHtml = '<div class="panel panel-default"><div id="{{headingId}}" role="tab" class="panel-heading"><h4 class="panel-title"><a data-toggle="collapse" data-parent="#flowrHint" href="#{{collapseId}}" aria-expanded="true" aria-controls="{{collapseId}}"></a></h4></div><div id="{{collapseId}}" role="tabpanel" aria-labelledby="{{headingId}}" class="panel-collapse collapse"><div class="panel-body"></div></div></div>'
var ajax = function(options) { var ajax = function(options) {
@ -329,47 +330,37 @@ $(function() {
showTab(2); showTab(2);
}; };
var stderrOutput = '';
// activate flowr only for half of the audience // activate flowr only for half of the audience
var isFlowrEnabled = parseInt($('#editor').data('user-id'))%2 == 0; var isFlowrEnabled = true;//parseInt($('#editor').data('user-id'))%2 == 0;
var handleStderrOutputForFlowr = function(event) { var handleStderrOutputForFlowr = function() {
if (!isFlowrEnabled) return if (!isFlowrEnabled) return
var json = JSON.parse(event.data);
if (json.stderr) {
stderrOutput += json.stderr;
} else if (json.code) {
if (stderrOutput == '') {
return;
}
var flowrUrl = $('#flowrHint').data('url'); var flowrUrl = $('#flowrHint').data('url');
var flowrHintBody = $('#flowrHint .panel-body'); var flowrHintBody = $('#flowrHint .panel-body');
var queryParameters = { var queryParameters = {
query: stderrOutput query: flowrOutputBuffer
} }
flowrHintBody.empty(); flowrHintBody.empty();
jQuery.getJSON(flowrUrl, queryParameters, function(data) { jQuery.getJSON(flowrUrl, queryParameters, function(data) {
for (var question in data.queryResults) { jQuery.each(data.queryResults, function(index, question) {
var collapsibleTileHtml = flowrResultHtml.replace(/{{collapseId}}/g, 'collapse-' + question).replace(/{{headingId}}/g, 'heading-' + question); var collapsibleTileHtml = flowrResultHtml.replace(/{{collapseId}}/g, 'collapse-' + question).replace(/{{headingId}}/g, 'heading-' + question);
var resultTile = $(collapsibleTileHtml); var resultTile = $(collapsibleTileHtml);
resultTile.find('h4 > a').text(data.queryResults[question].title + ' | Found via ' + data.queryResults[question].source); resultTile.find('h4 > a').text(question.title + ' | Found via ' + question.source);
resultTile.find('.panel-body').html(data.queryResults[question].body); resultTile.find('.panel-body').html(question.body);
resultTile.find('.panel-body').append('<a href="' + data.queryResults[question].url + '" class="btn btn-primary btn-block">Open this question</a>'); resultTile.find('.panel-body').append('<a href="' + question.url + '" class="btn btn-primary btn-block">Open this question</a>');
flowrHintBody.append(resultTile); flowrHintBody.append(resultTile);
} });
if (data.queryResults.length !== 0) { if (data.queryResults.length !== 0) {
$('#flowrHint').fadeIn(); $('#flowrHint').fadeIn();
} }
}) })
stderrOutput = ''; flowrOutputBuffer = '';
}
}; };
var handleTestResponse = function(response) { var handleTestResponse = function(response) {
@ -754,6 +745,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;
//}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);
@ -1190,6 +1182,7 @@ $(function() {
break; break;
case 'exit': case 'exit':
killWebsocketAndContainer(); killWebsocketAndContainer();
handleStderrOutputForFlowr();
break; break;
case 'timeout': 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. // just show the timeout message here. Another exit command is sent by the rails backend when the socket to the docker container closes.