# HG changeset patch # User Nicholas Jillings # Date 1501514147 -3600 # Node ID a1e294297380c7e2b99b88e3ce47725b42c712e5 # Parent 281393b64a1350f41307af1b562202f80d8f4bea #222 WIP diff -r 281393b64a13 -r a1e294297380 test_create.html --- a/test_create.html Fri Jul 21 14:48:37 2017 +0100 +++ b/test_create.html Mon Jul 31 16:15:47 2017 +0100 @@ -12,13 +12,14 @@ - WAET 1.2.1 Test Creator + WAET 1.2.2 Test Creator
-

Web Audio Evaluation Tool - Test Creator

+

Web Audio Evaluation Tool

+

Test Creator v1.2.2

@@ -53,7 +54,7 @@
Exit URL: - +
Randomise Page Order: @@ -61,15 +62,15 @@
Page Pool Size: - +
Loudness Normalisation (LUFS): - +
Fixed Sampling Rate: - +
Pre-Test audio calibration: @@ -77,15 +78,15 @@
Global Cross-fade time: - +
Global Fragment Pre-Silence: - +
Global Fragment Post-Silence: - +
Play audio one-at-a-time: @@ -93,11 +94,11 @@
Minimum number of fragment plays - +
Maximum number of fragment plays - +
@@ -468,7 +469,7 @@
Repeat Page N-times: - +
Loop audio: @@ -480,7 +481,7 @@
Loudness (page): - +
Label type: @@ -499,7 +500,7 @@
Fragment pool size: - +
Always include page: @@ -511,11 +512,11 @@
Fragment pre-silence: - +
Fragment post-silence: - +
Cannot interupt audio: @@ -527,11 +528,11 @@
Minimum number of fragment plays - +
Maximum number of fragment plays - +
@@ -999,7 +1000,7 @@
Loudness: - +
Always include fragment: @@ -1044,13 +1045,13 @@
- Test Creator + Test Creator v1.2.2 Create New Test
- Welcome to the WAET test creator tool. This will allow you to create a new test from scratch to suit your testing needs. If you wish to update a test file, please drag and drop the XML document into the area below for processing, otherwise press 'Next' to start a new test. This tool generates files for the WAET 1.2.1 version. + Welcome to the WAET test creator tool. This will allow you to create a new test from scratch to suit your testing needs. If you wish to update a test file, please drag and drop the XML document into the area below for processing, otherwise press 'Next' to start a new test. This tool generates files for the WAET 1.2.2 version.
diff -r 281393b64a13 -r a1e294297380 test_create/style.css --- a/test_create/style.css Fri Jul 21 14:48:37 2017 +0100 +++ b/test_create/style.css Mon Jul 31 16:15:47 2017 +0100 @@ -74,10 +74,10 @@ width: 80%; } .node > h1, -h2, -h3, -h4, -h5 { +.node > h2, +.node > h3, +.node > h4, +.node > h5 { text-align: center; } .attribute { diff -r 281393b64a13 -r a1e294297380 test_create/test_core.js --- a/test_create/test_core.js Fri Jul 21 14:48:37 2017 +0100 +++ b/test_create/test_core.js Mon Jul 31 16:15:47 2017 +0100 @@ -240,6 +240,15 @@ $s.configure = function () {} $s.$watch("selectedTestPrototype", $s.configure); + + $s.placeholder = function (name) { + var spec = $s.schema.querySelector("attribute[name=\"" + name + "\"]") || $w.specification.schema.querySelector("attribute[name=\"" + name + "\"]"); + var attr = spec.getAttribute("default"); + if (attr === undefined) { + return ""; + } + return attr; + } }]); AngularInterface.controller("survey", ['$scope', '$element', '$window', function ($s, $e, $w) { @@ -413,6 +422,8 @@ $s.configure(); }]); AngularInterface.controller("page", ['$scope', '$element', '$window', function ($s, $e, $w) { + $s.schema = $w.specification.schema.querySelector("element[name=\"page\"]"); + $s.page.label = "default"; $s.addInterface = function () { $s.page.addInterface(); }; @@ -450,4 +461,13 @@ } $s.page.audioElements.splice(index, 1); }; + + $s.placeholder = function (name) { + var spec = $s.schema.querySelector("attribute[name=\"" + name + "\"]") || $w.specification.schema.querySelector("attribute[name=\"" + name + "\"]"); + var attr = spec.getAttribute("default"); + if (attr === undefined) { + return ""; + } + return attr; + } }]); diff -r 281393b64a13 -r a1e294297380 xml/test-schema.xsd --- a/xml/test-schema.xsd Fri Jul 21 14:48:37 2017 +0100 +++ b/xml/test-schema.xsd Mon Jul 31 16:15:47 2017 +0100 @@ -12,14 +12,14 @@ - + - +