# HG changeset patch
# User Giulio Moro <giuliomoro@yahoo.it>
# Date 1461289401 -3600
# Node ID d537911d9b2554b3fc7bcfc22b98cb323d7ba4da
# Parent  cd880011e9ea729e04962b0d04b2ffc52b1d8e99
Updates

diff -r cd880011e9ea -r d537911d9b25 hammond/post_survey.xml
--- a/hammond/post_survey.xml	Fri Apr 22 02:42:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-	<setup interface="AB" projectReturn="save.php" randomiseOrder='true' testPages="2" loudness="-23" sampleRate="44100">
-        <survey location="after">
-            <surveyentry type="question" id="location" mandatory="true" boxsize="large">
-                <statement>Please enter your location. (example mandatory text question)</statement>
-            </surveyentry>
-            <surveyentry type="number" id="age" min="0">
-                <statement>Please enter your age (example non-mandatory number question)</statement>
-            </surveyentry>
-            <surveyentry type="radio" id="rating">
-                <statement>Please rate this interface (example radio button question)</statement>
-                <option name="bad">Bad</option>
-                <option name="poor">Poor</option>
-                <option name="good">Good</option>
-                <option name="great">Great</option>
-            </surveyentry>
-            <surveyentry type="statement" id="done">
-                <statement>Thank you for taking this listening test. May God be with you.</statement>
-            </surveyentry>
-        </survey>
-		<metric>
-			<metricenable>testTimer</metricenable>
-			<metricenable>elementTimer</metricenable>
-			<metricenable>elementInitialPosition</metricenable>
-			<metricenable>elementTracker</metricenable>
-			<metricenable>elementFlagListenedTo</metricenable>
-			<metricenable>elementFlagMoved</metricenable>
-			<metricenable>elementListenTracker</metricenable>
-		</metric>
-		<interface>
-			<interfaceoption type="show" name='playhead'/>
-			<interfaceoption type="show" name="page-count"/>
-            <interfaceoption type="show" name='volume'/>
-            <!--interfaceoption type="submit" name="post-submit-dialog">
-                <a href="javascript:document.referrer">Click here to continue with the next test</a>
-            </interfaceoption-->
-		</interface>
-	</setup>
-    
-    <page id="test-0" hostURL="example_eval/" showElementComments="false" hidden="true">
-        <commentboxprefix>Comment on fragment</commentboxprefix>
-        <interface>
-            <title>Post-test survey</title>
-        </interface>
-        <audioelement url="1.wav" id="dummy"/>
-    </page>
-
-</waet>
\ No newline at end of file
diff -r cd880011e9ea -r d537911d9b25 hammond/pre_survey.xml
--- a/hammond/pre_survey.xml	Fri Apr 22 02:42:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<waet
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-
-    <setup interface="AB" projectReturn="save.php" randomiseOrder='true' testPages="1" loudness="-23" sampleRate="44100"> 
-        <survey location="before"> 
-            <surveyentry type="question" id="sessionId" mandatory="true"> 
-                <statement>__PLEASE_ENTER_YOUR_NAME__</statement> 
-            </surveyentry> 
-            <surveyentry type="checkbox" id="checkboxtest" mandatory="true"> 
-                <statement>__CHECKBOX_ACTIVITIES__</statement> 
-                <option name="musician">__MUSICIAN__</option> 
-                <option name="soundengineer">__SOUNDENGINEER__</option> 
-                <option name="developer">__DEVELOPER__</option> 
-                <option name="hwdesigner">__HWDESIGNER__</option> 
-                <option name="researcher">__RESEARCHER__</option> 
-            </surveyentry> 
-        </survey> 
-        <metric> </metric> 
-        <interface> 
-            <interfaceoption type="check" name="fragmentMoved"/> 
-            <interfaceoption type="check" name="scalerange" min="25" max="75"/> 
-            <interfaceoption type="check" name="fragmentPlayed" /> 
-            <interfaceoption type="show" name='playhead'/> 
-            <interfaceoption type="show" name="page-count"/> 
-            <interfaceoption type="show" name='volume'/> 
-            <!--interfaceoption type="submit" name="post-submit-dialog"> <a href="javascript:document.referrer">Click here to continue with the next test</a> </interfaceoption--> 
-        </interface> 
-    </setup> 
-    <page id="test-0" hostURL="example_eval/" hidden="true"> 
-        <interface> 
-            <title>Pre-test survey</title> 
-        </interface> 
-        <audioelement url="1.wav" id="track-1"/> 
-    </page> 
-</waet>
-
diff -r cd880011e9ea -r d537911d9b25 hammond/tests/training.xml
--- a/hammond/tests/training.xml	Fri Apr 22 02:42:50 2016 +0100
+++ b/hammond/tests/training.xml	Fri Apr 22 02:43:21 2016 +0100
@@ -39,7 +39,8 @@
         <audioelement url="./samples/C25-Line out-number0236-velocity110-struck.wav" id="track-8" originalId="1248" label="Struck-fast" inactive="true"/>
         <survey location="before">
             <surveyentry type="statement" id="ascsadc" mandatory="true">
-                <statement>Listen carefully to the differences between different types of touch on the same key. You can listen to each sample multiple times.</statement>
+                <statement>Listen carefully to the differences between different types of touch on the same key.
+                    You can listen to each sample multiple times.</statement>
             </surveyentry>
         </survey>
     </page>
@@ -74,7 +75,9 @@
                 </statement>
             </surveyentry>
             <surveyentry type="statement" id="intro2" mandatory="true">
-                <statement>Press the "listen" button to listen to each sample.\n Once you pick your answer, click on the "A" or "B" red box accordingly and the box will turn green. At this point click 'submit' to submit your answer. In case you do not know which one to pick, just click submit without selecting any answer.
+                <statement>Press the "listen" button to listen to each sample. Once you pick your answer, click on the "A" or "B" red box accordingly and the box will turn green.
+                    Then you can click 'submit' to submit your answer.
+                    In case you do not know which answer to pick, just click submit without selecting any answer.
                 </statement>
             </surveyentry>
             <surveyentry type="statement" id="intro3" mandatory="true">
@@ -84,7 +87,7 @@
         </survey>
         <survey location="after">
             <surveyentry type="statement" id="intro4" mandatory="true">
-                <statement>The correct answer to this question was "B".
+                <statement>The correct answer to this last question was "B".
                 </statement>
             </surveyentry>
         </survey>