# HG changeset patch # User Nicholas Jillings # Date 1479134997 0 # Node ID 8188efa9415d7ea3871f98a6974ad9aaac494930 # Parent 2577d983f291f65595c24e76f2ac75e55f0a9a27# Parent 1c8aac0ee5e9e11a6aad892a6eb258c060d766bf Merge branch 'vnext' into Dev_main # Conflicts: # css/core.css # interfaces/ape.js # js/specification.js # tests/examples/APE_example.xml # tests/examples/mushra_example.xml diff -r 2577d983f291 -r 8188efa9415d interfaces/ape.js --- a/interfaces/ape.js Mon Nov 14 14:23:41 2016 +0000 +++ b/interfaces/ape.js Mon Nov 14 14:49:57 2016 +0000 @@ -277,7 +277,6 @@ if (audioHolderObject.label == "default" || audioHolderObject.label == "") { audioHolderObject.label = "number"; } - // Set the page title if (typeof audioHolderObject.title == "string" && audioHolderObject.title.length > 0) { document.getElementById("test-title").textContent = audioHolderObject.title diff -r 2577d983f291 -r 8188efa9415d js/core.js --- a/js/core.js Mon Nov 14 14:23:41 2016 +0000 +++ b/js/core.js Mon Nov 14 14:49:57 2016 +0000 @@ -3199,6 +3199,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 2577d983f291 -r 8188efa9415d python/comment_parser.html --- a/python/comment_parser.html Mon Nov 14 14:23:41 2016 +0000 +++ b/python/comment_parser.html Mon Nov 14 14:49:57 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

+

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.

+
+
+ + + +
+ + + diff -r 2577d983f291 -r 8188efa9415d xml/test-schema.xsd --- a/xml/test-schema.xsd Mon Nov 14 14:23:41 2016 +0000 +++ b/xml/test-schema.xsd Mon Nov 14 14:49:57 2016 +0000 @@ -96,7 +96,6 @@ - @@ -471,7 +470,7 @@ - +