# HG changeset patch # User Nicholas Jillings # Date 1479134739 0 # Node ID 1c8aac0ee5e9e11a6aad892a6eb258c060d766bf # Parent afeda52bcd53e1903cdde6363ebf540dae0f4bfb# Parent 6ff61a4f62a8e39e3f07024e4c2fe37fb51db65b Merge master into vnext diff -r afeda52bcd53 -r 1c8aac0ee5e9 js/core.js --- a/js/core.js Mon Nov 14 14:20:32 2016 +0000 +++ b/js/core.js Mon Nov 14 14:45:39 2016 +0000 @@ -3073,6 +3073,22 @@ this.storeErrorNode(str); return false; }; + this.checkAllCommented = function () { + var str = "You have not commented on all the fragments."; + var cont = true, + boxes = this.commentBoxes.boxes, + numBoxes = boxes.length, + i; + for (i = 0; i < numBoxes; i++) { + if (boxes[i].trackCommentBox.value === "") { + interfaceContext.lightbox.post("Error", str); + console.log(str); + this.storeErrorNode(str); + return false; + } + } + return true; + } this.checkScaleRange = function (min, max) { var page = testState.getCurrentTestPage(); var audioObjects = audioEngineContext.audioObjects; diff -r afeda52bcd53 -r 1c8aac0ee5e9 python/comment_parser.html --- a/python/comment_parser.html Mon Nov 14 14:20:32 2016 +0000 +++ b/python/comment_parser.html Mon Nov 14 14:45:39 2016 +0000 @@ -1,72 +1,78 @@ - - - - - -

WAET Test Results Analysis

Comment Extraction

All of the XMLs in the server 'saves/' directory are automatically parsed and downloaded, extracting only the comments. Simply select the comments you wish to extract below and your desired data format.

- - - -

- - \ No newline at end of file + XMLHttp.send(); + } + + function generateLink(blobfile, fmt) { + var dnlk = window.URL.createObjectURL(blobfile); + var a = document.createElement("a"); + a.hidden = ''; + a.href = dnlk; + a.download = "save" + fmt; + a.textContent = "Save File"; + document.getElementById("download").appendChild(a); + } + + + + + +

WAET Test Results Analysis

Comment Extraction

+ + + +

+ + + diff -r afeda52bcd53 -r 1c8aac0ee5e9 tests/examples/APE_example.xml --- a/tests/examples/APE_example.xml Mon Nov 14 14:20:32 2016 +0000 +++ b/tests/examples/APE_example.xml Mon Nov 14 14:45:39 2016 +0000 @@ -6,7 +6,7 @@ Please enter your name. - + Please select with which activities you have any experience (example checkbox question) diff -r afeda52bcd53 -r 1c8aac0ee5e9 xml/test-schema.xsd --- a/xml/test-schema.xsd Mon Nov 14 14:20:32 2016 +0000 +++ b/xml/test-schema.xsd Mon Nov 14 14:45:39 2016 +0000 @@ -96,7 +96,6 @@ - @@ -296,7 +295,7 @@ - +