Mercurial > hg > waet-hammond-1
changeset 17:9da74cda0375
Ready to go
line wrap: on
line diff
--- a/new/.git/COMMIT_EDITMSG Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/COMMIT_EDITMSG Wed May 11 13:32:54 2016 +0100 @@ -1,1 +1,1 @@ -Added support for saveFilenamePrefix= querystring , closed #56 +Added allowEarlyExit feature which allows to exit early from a test
--- a/new/.git/logs/HEAD Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/logs/HEAD Wed May 11 13:32:54 2016 +0100 @@ -78,3 +78,14 @@ 6f416ff9b142b8ac27230fc032344bf4ca84c8f8 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro <giuliomoro@yahoo.it> 1462898599 +0100 reset: moving to HEAD~ 156d3d2316cf8d6fffc72327b95daaff29974430 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro <giuliomoro@yahoo.it> 1462898661 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 7042107c78dac12cdcba2229a866bd8ee71582b6 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro <giuliomoro@yahoo.it> 1462899378 +0100 checkout: moving from master to giulio +8e33f51fb451eef9d0d43b7d532446d68590478b 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro <giuliomoro@yahoo.it> 1462901417 +0100 checkout: moving from giulio to master +7042107c78dac12cdcba2229a866bd8ee71582b6 8ae419bed5f803bb9b3f7e729dc64607fe491063 Giulio Moro <giuliomoro@yahoo.it> 1462901423 +0100 commit: allow arbitrary line-breaks in popup +8ae419bed5f803bb9b3f7e729dc64607fe491063 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro <giuliomoro@yahoo.it> 1462901438 +0100 checkout: moving from master to giulio +8e33f51fb451eef9d0d43b7d532446d68590478b 80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 Giulio Moro <giuliomoro@yahoo.it> 1462901460 +0100 commit: Improvement on #44 +80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 8ae419bed5f803bb9b3f7e729dc64607fe491063 Giulio Moro <giuliomoro@yahoo.it> 1462902056 +0100 checkout: moving from giulio to master +8ae419bed5f803bb9b3f7e729dc64607fe491063 8cf0d3864ca114e381c97bbc008f74be35264192 Giulio Moro <giuliomoro@yahoo.it> 1462902252 +0100 commit: Forcing displaying scrollbar in popup when needed. Closed #62 +8cf0d3864ca114e381c97bbc008f74be35264192 80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 Giulio Moro <giuliomoro@yahoo.it> 1462902385 +0100 checkout: moving from master to giulio +80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 64acda7d1a99f2b3f599de8e5f52ab82c26cd044 Giulio Moro <giuliomoro@yahoo.it> 1462902417 +0100 commit: Fixed appearance +64acda7d1a99f2b3f599de8e5f52ab82c26cd044 24d72ac61c59496d824466116608aa96b3257c10 Giulio Moro <giuliomoro@yahoo.it> 1462927815 +0100 commit: Removed hook for 'enter' during survey. replaced with shift+enter +24d72ac61c59496d824466116608aa96b3257c10 b22f843de0968e327fd9fbf2463dc928a0b8a7a7 Giulio Moro <giuliomoro@yahoo.it> 1462927936 +0100 commit: avoids scrollbar with radio or checkbox #63 +b22f843de0968e327fd9fbf2463dc928a0b8a7a7 703aa9a46fa3bf6fbe7ea0e0bd1f0dd9bb6d5525 Giulio Moro <giuliomoro@yahoo.it> 1462963932 +0100 commit: Added allowEarlyExit feature which allows to exit early from a test
--- a/new/.git/logs/refs/heads/giulio Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/logs/refs/heads/giulio Wed May 11 13:32:54 2016 +0100 @@ -22,3 +22,8 @@ ddb1b03a77d924b233edadc836224b150a20595d f98bc6e2841e8eb68878c5c9f28bee7e7291f452 Giulio Moro <giuliomoro@yahoo.it> 1462895164 +0100 commit: fixed returnURL for savefilenameprefix f98bc6e2841e8eb68878c5c9f28bee7e7291f452 bec6f2b297fe5b0265be3101f5a0426ff683d0af Giulio Moro <giuliomoro@yahoo.it> 1462895996 +0100 commit: partially merged in master bec6f2b297fe5b0265be3101f5a0426ff683d0af 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro <giuliomoro@yahoo.it> 1462898231 +0100 commit: Added support for saveFilenamePrefix= #56 +8e33f51fb451eef9d0d43b7d532446d68590478b 80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 Giulio Moro <giuliomoro@yahoo.it> 1462901460 +0100 commit: Improvement on #44 +80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 64acda7d1a99f2b3f599de8e5f52ab82c26cd044 Giulio Moro <giuliomoro@yahoo.it> 1462902417 +0100 commit: Fixed appearance +64acda7d1a99f2b3f599de8e5f52ab82c26cd044 24d72ac61c59496d824466116608aa96b3257c10 Giulio Moro <giuliomoro@yahoo.it> 1462927815 +0100 commit: Removed hook for 'enter' during survey. replaced with shift+enter +24d72ac61c59496d824466116608aa96b3257c10 b22f843de0968e327fd9fbf2463dc928a0b8a7a7 Giulio Moro <giuliomoro@yahoo.it> 1462927936 +0100 commit: avoids scrollbar with radio or checkbox #63 +b22f843de0968e327fd9fbf2463dc928a0b8a7a7 703aa9a46fa3bf6fbe7ea0e0bd1f0dd9bb6d5525 Giulio Moro <giuliomoro@yahoo.it> 1462963932 +0100 commit: Added allowEarlyExit feature which allows to exit early from a test
--- a/new/.git/logs/refs/heads/master Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/logs/refs/heads/master Wed May 11 13:32:54 2016 +0100 @@ -20,3 +20,5 @@ 156d3d2316cf8d6fffc72327b95daaff29974430 6f416ff9b142b8ac27230fc032344bf4ca84c8f8 Giulio Moro <giuliomoro@yahoo.it> 1462898496 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 6f416ff9b142b8ac27230fc032344bf4ca84c8f8 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro <giuliomoro@yahoo.it> 1462898599 +0100 reset: moving to HEAD~ 156d3d2316cf8d6fffc72327b95daaff29974430 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro <giuliomoro@yahoo.it> 1462898661 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 +7042107c78dac12cdcba2229a866bd8ee71582b6 8ae419bed5f803bb9b3f7e729dc64607fe491063 Giulio Moro <giuliomoro@yahoo.it> 1462901423 +0100 commit: allow arbitrary line-breaks in popup +8ae419bed5f803bb9b3f7e729dc64607fe491063 8cf0d3864ca114e381c97bbc008f74be35264192 Giulio Moro <giuliomoro@yahoo.it> 1462902252 +0100 commit: Forcing displaying scrollbar in popup when needed. Closed #62
--- a/new/.git/logs/refs/remotes/origin/giulio Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/logs/refs/remotes/origin/giulio Wed May 11 13:32:54 2016 +0100 @@ -14,3 +14,8 @@ ddb1b03a77d924b233edadc836224b150a20595d f98bc6e2841e8eb68878c5c9f28bee7e7291f452 Giulio Moro <giuliomoro@yahoo.it> 1462895172 +0100 update by push f98bc6e2841e8eb68878c5c9f28bee7e7291f452 bec6f2b297fe5b0265be3101f5a0426ff683d0af Giulio Moro <giuliomoro@yahoo.it> 1462896002 +0100 update by push bec6f2b297fe5b0265be3101f5a0426ff683d0af 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro <giuliomoro@yahoo.it> 1462898239 +0100 update by push +8e33f51fb451eef9d0d43b7d532446d68590478b 80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 Giulio Moro <giuliomoro@yahoo.it> 1462901467 +0100 update by push +80df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 64acda7d1a99f2b3f599de8e5f52ab82c26cd044 Giulio Moro <giuliomoro@yahoo.it> 1462902713 +0100 update by push +64acda7d1a99f2b3f599de8e5f52ab82c26cd044 24d72ac61c59496d824466116608aa96b3257c10 Giulio Moro <giuliomoro@yahoo.it> 1462927824 +0100 update by push +24d72ac61c59496d824466116608aa96b3257c10 b22f843de0968e327fd9fbf2463dc928a0b8a7a7 Giulio Moro <giuliomoro@yahoo.it> 1462927947 +0100 update by push +b22f843de0968e327fd9fbf2463dc928a0b8a7a7 703aa9a46fa3bf6fbe7ea0e0bd1f0dd9bb6d5525 Giulio Moro <giuliomoro@yahoo.it> 1462963939 +0100 update by push
--- a/new/.git/logs/refs/remotes/origin/master Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/logs/refs/remotes/origin/master Wed May 11 13:32:54 2016 +0100 @@ -15,3 +15,5 @@ cf1029f56ea4dd477769e149a788e049d14c5ce7 dfdf68be757c8a5513d466495eee50965100d232 Giulio Moro <giuliomoro@yahoo.it> 1462877515 +0100 update by push dfdf68be757c8a5513d466495eee50965100d232 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro <giuliomoro@yahoo.it> 1462895718 +0100 update by push 156d3d2316cf8d6fffc72327b95daaff29974430 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro <giuliomoro@yahoo.it> 1462899347 +0100 update by push +7042107c78dac12cdcba2229a866bd8ee71582b6 8ae419bed5f803bb9b3f7e729dc64607fe491063 Giulio Moro <giuliomoro@yahoo.it> 1462901427 +0100 update by push +8ae419bed5f803bb9b3f7e729dc64607fe491063 8cf0d3864ca114e381c97bbc008f74be35264192 Giulio Moro <giuliomoro@yahoo.it> 1462902260 +0100 update by push
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/4c/b7b5b25d89f9ecfa1bb53f30ef0a9f3a53f6f4 Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,1 @@ +x+)JMU026a040031Qw s*fXq^eo@$W\5Wsg%W_;<TIVaijQ H黋:ԅ8 ̐mw* 4'4%/,U&?M _)(QUV\XRk]|+rRQoԷsCVd敀T]WK(k)[Pf&\t \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/64/acda7d1a99f2b3f599de8e5f52ab82c26cd044 Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,1 @@ +xAj1 E)ɞBW骇-1tƃq}B< ֵ>FWKsI1{!8+ͤ"f\d dubI`QΑ"e K6w?78`};_[;qOငзbw*y+ K \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/70/3aa9a46fa3bf6fbe7ea0e0bd1f0dd9bb6d5525 Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,2 @@ +xj0{SP (%9k6ݢȤy:6|3Eu z?0Fp.9qb>x.rAMM:5 cXq;1 E>iy[fm +xIeo9֔.*0вLmUoM:e / t.n~] \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/80/df5fd9d3feb7eef1bb7170ed2b0c63691d3f09 Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,3 @@ +xK +1] .ID܉ O[B#)^- TZֹEo"D1G PxrIr!sMn FqnaJă +riSY"_i3& :+)l?ŋz;ۀ "p@4寳9{ӧo`Id)I \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/8a/e419bed5f803bb9b3f7e729dc64607fe491063 Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,1 @@ +xAj0 E) Z$% !dG&Qp ܾag[ҀziU,ܣ`tfBiLLRukgC 0(4E@C n>ʱOׯgY|{쭴ws$DKv, RSiUk*?P6m?viQ3 \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/8c/f0d3864ca114e381c97bbc008f74be35264192 Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,1 @@ +xKj!E3v2 4jY~ @ e~]"%dv. 'Ҿ 9#<RVa\y&g,Ȟu?M pӚ-_\A#]Zin2*'^?FY 7 cw~RR^G'XR9z?<Z Ptg 4Ą L% Z \ No newline at end of file
--- a/new/.git/refs/heads/giulio Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/refs/heads/giulio Wed May 11 13:32:54 2016 +0100 @@ -1,1 +1,1 @@ -8e33f51fb451eef9d0d43b7d532446d68590478b +703aa9a46fa3bf6fbe7ea0e0bd1f0dd9bb6d5525
--- a/new/.git/refs/heads/master Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/refs/heads/master Wed May 11 13:32:54 2016 +0100 @@ -1,1 +1,1 @@ -7042107c78dac12cdcba2229a866bd8ee71582b6 +8cf0d3864ca114e381c97bbc008f74be35264192
--- a/new/.git/refs/remotes/origin/giulio Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/refs/remotes/origin/giulio Wed May 11 13:32:54 2016 +0100 @@ -1,1 +1,1 @@ -8e33f51fb451eef9d0d43b7d532446d68590478b +703aa9a46fa3bf6fbe7ea0e0bd1f0dd9bb6d5525
--- a/new/.git/refs/remotes/origin/master Tue May 10 18:20:05 2016 +0100 +++ b/new/.git/refs/remotes/origin/master Wed May 11 13:32:54 2016 +0100 @@ -1,1 +1,1 @@ -7042107c78dac12cdcba2229a866bd8ee71582b6 +8cf0d3864ca114e381c97bbc008f74be35264192
--- a/new/css/core.css Tue May 10 18:20:05 2016 +0100 +++ b/new/css/core.css Wed May 11 13:32:54 2016 +0100 @@ -42,12 +42,13 @@ border-radius: 10px; box-shadow: 0px 0px 50px #000; z-index: 10; - position: fixed; + position: fixed; } div#popupContent { margin-top: 20px; margin-bottom: 35px; + overflow: auto; } div#popupTitleHolder { @@ -56,7 +57,11 @@ max-height: 250px; overflow: auto; margin-bottom: 5px; - text-align: center; + padding: 8px; +} + +#popupTitle { + white-space: pre-line; } div#popupResponse { @@ -67,6 +72,16 @@ position: relative; } +div#earlyExitBox{ + z-index: 100; + float: left; + padding: 20px; + border: 1px solid black; + position: absolute; + background: wheat; + bottom: 20px; +} + button.popupButton { /* Button for popup window */ @@ -203,4 +218,15 @@ width: 8px; padding: 0 5px; height: 290px; -} \ No newline at end of file +} + +::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; +} + +::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0,0,0,.5); + -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5); +}
--- a/new/embedded_player.php Tue May 10 18:20:05 2016 +0100 +++ b/new/embedded_player.php Wed May 11 13:32:54 2016 +0100 @@ -4,12 +4,13 @@ } else { error('no video ID specified'); } -if(isset($_GET['returnUrl'])){ - $returnUrl = $_GET['returnUrl']; -} else { -} +if(isset($_GET['returnURL'])){ + $returnUrl = $_GET['returnURL']; +} +unset($_GET['v']); // delete edit parameter; +$qs = http_build_query($_GET); +?> -?> <html> <head></head> <body style="text-align: center"> @@ -18,7 +19,9 @@ <div style="text-align: left; margin: auto; margin-top: 10px; width: 80%; min-width: 500px; max-width: 800px;"> Watch the video above to learn more about the characteristics of the sounds produced by the Hammond organ. This will serve as a training for the rest of the listening test. -Once you are done watching the video, click <a href="<?php echo $returnUrl?>">here</a> to continue with the test. +<br /> +<br /> +Once you are done watching the video, click <a href="<?php echo 'test.html?url=hammond/tests/training.xml&'.$qs ?>">here</a> to continue with the training. </div> </body> -</html> \ No newline at end of file +</html>
--- a/new/hammond/tests/ABX.xml Tue May 10 18:20:05 2016 +0100 +++ b/new/hammond/tests/ABX.xml Wed May 11 13:32:54 2016 +0100 @@ -3,22 +3,19 @@ <setup interface="ABX" projectReturn="save.php" randomiseOrder="true" sampleRate="44100"> <survey location="before"> <surveyentry type="statement" id="introduction" mandatory="true"> - <statement>In this test you will have to identify which of two sounds (A and B) matches the reference sound (X)</statement> + <statement>In this test you will have to identify which of two sounds (A and B) matches the reference sound (X). + + Press the "listen" button to listen to each sample. Once you pick your answer, click on the "A" or "B" red box and the box will turn green. Then you can click 'submit' to submit your answer.</statement> </surveyentry> </survey> - <survey location="after"> - <surveyentry type="radio" id="rating"> - <statement>Self assessment: + <survey location="after"> + <surveyentry type="statement" id="suggestion"> + <statement>This section is completed. - how much were you able to tell the difference between the sounds in this section? - </statement> - <option name="notatall">Not at all</option> - <option name="partly">Little</option> - <option name="half">Half of the times</option> - <option name="alot">A lot</option> - <option name="entirely">Entirely</option> - </surveyentry> - </survey> + In the next page, feel free to go back to the training before proceeding to the AB tests. + </statement> + </surveyentry> + </survey> <metric> <metricenable>testTimer</metricenable> <metricenable>elementTimer</metricenable> @@ -547,4 +544,4 @@ <audioelement url="./samples/E41-Line out-number0081-velocity028-pressed.wav" id="track-319" originalId="1837" /> <audioelement url="./samples/E41-Line out-number0246-velocity106-struck.wav" id="track-320" originalId="2002" /> </page> -</waet> \ No newline at end of file +</waet>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/hammond/tests/post_survey.xml Wed May 11 13:32:54 2016 +0100 @@ -0,0 +1,26 @@ +<?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' loudness="-23" sampleRate="44100"> + <survey location="before"> + <surveyentry type="question" id="comments" mandatory="true" boxsize="huge"> + <statement>Do you have any comments on this listening test?</statement> + </surveyentry> + </survey> + <survey location="after"> + <surveyentry type="question" id="email"> + <statement>If you want to be contacted again in the future for further studies on the Hammond organ, please leave your email address below, otherwise leave the box empty and click "next". </statement> + </surveyentry> + </survey> + <metric> </metric> + <interface> + </interface> + </setup> + <page id="test-0" hostURL="" hidden="true"> + <interface> + </interface> + <audioelement url="media/example/1.wav" id="track-1"/> + </page> +</waet> +
--- a/new/hammond/tests/pre_survey.xml Tue May 10 18:20:05 2016 +0100 +++ b/new/hammond/tests/pre_survey.xml Wed May 11 13:32:54 2016 +0100 @@ -6,46 +6,68 @@ <survey location="before"> <surveyentry type="statement" id="welcome" mandatory="true"> <statement> - We would like to invite you to be part of this research project, if you would like to. You should only agree to take part if you want to, it is entirely up to you. If you choose not to take part there will not be any disadvantages for you and you will hear no more about it. - Please read the following information carefully before you decide to take part; this will tell you why the research is being done and what you will be asked to do if you take part. Please ask if there is anything that is not clear or if you would like more information. -If you decide to take part you will be asked to sign the attached form to say that you agree. + In this listening test you will be asked to classify a set of recordings of notes played on a Hammond organ. The test is open to everyone, regardless of their background and musical knowledge. + A brief training will be provided which will help you familiarize with the audio material presented. + You will be required to use a set of headphones and you will have to enter the model of headphones used. + + You should only agree to take part in this research project only if you want to and it is entirely up to you. If you choose not to take part there will not be any disadvantages for you and you will hear no more about it. You are still free to withdraw at any time and without giving a reason. - In this listening test you will be asked to classify a set of recordings of notes played on a Hammond organ. The test is open to everyone, regardless of their background and musical knowledge. A brief training will be provided which will help you familiarize with the audio material presented. If you are undertaking this test on your own computer, you will be required to use a set of headphones and you will have to enter the model of headphones used. - This listening test was approved by the Queen Mary University of London ethics committee, with approval code QMREC1691a. If you have any questions or concerns about the manner in which the study was conducted please, in the first instance, contact the researcher responsible for the study at g.moro[at]qmul.ac.uk . If this is unsuccessful, or not appropriate, please contact the Secretary at the Queen Mary Ethics of Research Committee, research-ethics[at]qmul.ac.uk + This listening test was approved by the Queen Mary University of London ethics committee, with approval code QMREC1691a. If you have any questions or concerns about the manner in which the study was conducted please, in the first instance, contact the researcher responsible for the study at g.moro@qmul.ac.uk . If this is unsuccessful, or not appropriate, please contact the Secretary at the Queen Mary Ethics of Research Committee, research-ethics@qmul.ac.uk </statement> </surveyentry> - <surveyentry type="question" id="sessionId" mandatory="true"> + <surveyentry type="question" id="headphones" mandatory="true"> + <statement>To undertake this study you will need to wear headphones and be in a quiet environment. Please indicate here the brand/model of headphones you will be using. + </statement> + </surveyentry> + <surveyentry type="question" id="sessionId" mandatory="true" > <statement>What is your name?</statement> </surveyentry> - <surveyentry type="checkbox" id="gender" mandatory="true"> + <surveyentry type="question" id="gender" mandatory="true"> <statement>What is your gender?</statement> - <option name="mus">__MUSICIAN__</option> </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 type="question" id="musicalInstruments" mandatory="true" boxsize="huge"> + <statement>Do you play any musical instruments? If yes, please list them and indicate your level of expertise with each of them. Also, please indicate which one is your main instrument.</statement> + </surveyentry> + <surveyentry type="question" id="playedHammond" mandatory="true" boxsize="huge"> + <statement>Have you ever played a tonewheel Hammond organ? If yes, please specify which model(s) and for how long you played it.</statement> + </surveyentry> + <surveyentry type="question" id="playedEmulator" mandatory="true" boxsize="huge"> + <statement>Have you ever played an emulator of a Hammond organ? If yes, please specify which model(s) and for how long you played it. + </statement> + </surveyentry> + <surveyentry type="radio" id="familiarSound" mandatory="true" boxsize="huge"> + <statement>Please rate your familiarity with the SOUND of the Hammond organ. + + For instance: "not familiar" means that you have no idea what a Hammond organ sounds like; "very familiar" means you know the difference between different drawbars, chorus and Leslie settings + </statement> + <option name="1">1 (Not familiar)</option> + <option name="2">2</option> + <option name="3">3</option> + <option name="4">4</option> + <option name="5">5 (very familiar)</option> + </surveyentry> + <surveyentry type="radio" id="familiarWorking" mandatory="true"> + <statement>Please rate your familiarity with the WORKING PRINCIPLE of the Hammond organ + + For instance, "not familiar" means that you know nothing about the working principe of the Hammond organ; "very familiar" means that you are familiar with concepts such as tonewheel generator, key-click, scanner-vibrato, leakage, foldback.</statement> + <option name="1">1 (Not familiar)</option> + <option name="2">2</option> + <option name="3">3</option> + <option name="4">4</option> + <option name="5">5 (very familiar)</option> </surveyentry> + <surveyentry type="question" id="hearing" mandatory="true"> + <statement>Do you have any hearing disabilities?</statement> + </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> + <interface> + </interface> </setup> <page id="test-0" hostURL="" hidden="true"> - <interface> - <title>Pre-test survey</title> - </interface> + <interface> + </interface> <audioelement url="media/example/1.wav" id="track-1"/> </page> </waet>
--- a/new/hammond/tests/training.xml Tue May 10 18:20:05 2016 +0100 +++ b/new/hammond/tests/training.xml Wed May 11 13:32:54 2016 +0100 @@ -3,14 +3,14 @@ <setup interface="AB" projectReturn="save.php" randomiseOrder="false" loudness="-23" sampleRate="44100"> <survey location="before"> <surveyentry type="statement" id="sessionId" mandatory="true"> - <statement>In this section you will be able to listen to a set of examples which will help you become familiar with the sound of the Hammond organ. + <statement>In this section you will to listen to a set of examples which will help you become familiar with the sound of the Hammond organ. For the scope of this listening test, we are only interested in the attack part of the note, therefore all the recordings you are going to hear are faded out after the attack transient.</statement> </surveyentry> </survey> <survey location="after"> <surveyentry type="statement" id="return" mandatory="true"> - <statement>Now that you have completed the training, you are ready to start the listening test.</statement> + <statement>Now that you have completed the training, you are ready to start the listening test. You can come back to this training later during the test.</statement> </surveyentry> </survey> <metric> @@ -123,6 +123,7 @@ We will ask you to choose which of two samples better matches a given type of touch. + Press the "listen" button to listen to each sample. Once you pick your answer, click on the "A" or "B" red box and the box will turn green. Then you can click 'submit' to submit your answer. </statement> </surveyentry> <surveyentry type="statement" id="intro3" mandatory="true">
--- a/new/js/core.js Tue May 10 18:20:05 2016 +0100 +++ b/new/js/core.js Wed May 11 13:32:54 2016 +0100 @@ -147,6 +147,7 @@ var search = window.location.search.split('?')[1]; // Now split the requests into pairs var searchQueries = search.split('&'); + var allowEarlyExit = false; for (var i in searchQueries) { @@ -164,12 +165,22 @@ case "saveFilenamePrefix": gSaveFilenamePrefix = value; break; + case "allowEarlyExit": + allowEarlyExit = (value === 'true'); + break; } } loadProjectSpec(url); window.onbeforeunload = function() { return "Please only leave this page once you have completed the tests. Are you sure you have completed all testing?"; }; + if(allowEarlyExit === true){ + window.onbeforeunload = undefined; + var msg = document.createElement('div'); + msg.innerHTML = 'You can exit the training and go back to the test at any time by clicking <a href="'+gReturnURL+'">here</a>.'; + msg.id = 'earlyExitBox'; + document.getElementsByTagName('body')[0].appendChild(msg); + } } }; @@ -618,7 +629,7 @@ this.node = null; this.store = null; $(window).keypress(function(e){ - if (e.keyCode == 13 && popup.popup.style.visibility == 'visible') + if (e.keyCode == 13 && e.shiftKey === true && popup.popup.style.visibility == 'visible') { console.log(e); popup.buttonProceed.onclick(); @@ -732,8 +743,6 @@ index++; } this.popupResponse.style.textAlign=""; - var leftP = 50-(((max_w/$('#popupContent').width())/2)*100); - this.popupResponse.style.left=leftP+"%"; } else if (node.specification.type == 'radio') { if (node.response == undefined) { node.response = {name: "", text: ""}; @@ -761,8 +770,6 @@ max_w = w; } this.popupResponse.style.textAlign=""; - var leftP = 50-(((max_w/$('#popupContent').width())/2)*100); - this.popupResponse.style.left=leftP+"%"; } else if (node.specification.type == 'number') { var input = document.createElement('input'); input.type = 'textarea';
--- a/new/test_base.php Tue May 10 18:20:05 2016 +0100 +++ b/new/test_base.php Wed May 11 13:32:54 2016 +0100 @@ -59,7 +59,7 @@ $queryString = http_build_query($queryStringParsed); $absoluteUrlNextPlusOne = $absoluteUrlSplit[0]."?".$queryString; } - $defaultTestEntry = Array('url' => null, 'string' => null, 'class' => 'disabled', 'a' => false, 'editable' => false, 'alwaysAccessible' => false, 'returnUrl' => '', 'saveFilenamePrefix' => ''); + $defaultTestEntry = Array('url' => null, 'string' => null, 'class' => 'disabled', 'a' => false, 'editable' => false, 'alwaysAccessible' => false, 'returnUrl' => '', 'saveFilenamePrefix' => '', 'allowEarlyExit' => 'false'); require_once('test_list.php'); //this returns $tests @@ -88,7 +88,11 @@ // if we are going to run a new test, return to the same page with next:=next+1 $tests[$n]['returnUrl'] = urlencode($absoluteUrlNextPlusOne); } - if($tests[$n]['alwaysAccessible'] === true){ + if($n < $next){ + if($tests[$n]['alwaysAccessible'] === true){ + $tests[$n]['allowEarlyExit'] = 'true'; + } + }if($tests[$n]['alwaysAccessible'] === true){ $tests[$n]['class'] .= ' alwaysAccessible'; } } @@ -116,7 +120,7 @@ } .alwaysAccessible.done a{ /*color: fa5858;*/ - background: rgba(255,200,200, 150); + background: rgb(255, 249, 54); } .disabled{ color: grey; @@ -129,6 +133,9 @@ padding-top: 5px; } +h1{ + text-align: center; +} </style> <script src="js/jquery-2.1.4.js"></script> <script> @@ -139,7 +146,7 @@ var elements; $(document).ready(function(){ lis = $('ul'); - elements = $('li.done:not(.editable):not(.alwaysAccessible)', lis); + elements = $('li.done:not(.editable):not(.alwaysAccessible) a', lis); for(var n = 0; n < elements.length; n++){ elements[n].onclick = confirmEditing; } @@ -153,7 +160,7 @@ </script> </head> <body> - +<h1>Hammond organ listening test</h1> <ul class = "tests-list"> <?php foreach($tests as $n => $test) : ?> <li class="test-element <?php echo $test['class'] ?>"> @@ -165,7 +172,7 @@ // id= keeps track of the user and of the sorting of the tests in this page // next= keeps track of the first test not yet undertaken - echo '<a href="'.$test['url'].'&saveFilenamePrefix='.$test['saveFilenamePrefix'].'&returnURL='.$test['returnUrl'].'">'.($n+1).' - '.$test['string'].'</a>'; + echo '<a href="'.$test['url'].'&allowEarlyExit='.$test['allowEarlyExit'].'&saveFilenamePrefix='.$test['saveFilenamePrefix'].'&returnURL='.$test['returnUrl'].'">'.($n+1).' - '.$test['string'].'</a>'; } else { echo ($n+1).' - '.$test['string']; }
--- a/new/test_list.php Tue May 10 18:20:05 2016 +0100 +++ b/new/test_list.php Wed May 11 13:32:54 2016 +0100 @@ -6,12 +6,15 @@ $baseUrl = 'test.html?url=hammond/tests'.$lang.'/'; $preSurvey = $defaultTestEntry; $preSurvey['url'] = $baseUrl.'pre_survey.xml'; - //$preSurvey['url'] = "survey.php?"; - $preSurvey['string'] = 'Survey'; + $preSurvey['string'] = 'Preliminary survey'; + $postSurvey = $defaultTestEntry; + $postSurvey['url'] = $baseUrl.'post_survey.xml'; + $postSurvey['string'] = 'Post survey(optional)'; + $trainingVideo = $defaultTestEntry; $trainingVideo['url'] = 'embedded_player.php?v=kcRtyvQxbgU'; - $trainingVideo['string'] = 'Training video'; + $trainingVideo['string'] = 'Training'; $trainingVideo['alwaysAccessible'] = true; $trainingSamples = $defaultTestEntry; @@ -38,5 +41,5 @@ $seed = hexdec(substr($id, -8)); //shuffling only the order of the ABtests fisherYatesShuffle($abTests, $seed); - $tests = array_merge(Array($preSurvey), Array($trainingVideo), Array($trainingSamples), Array($abxTest), $abTests); + $tests = array_merge(Array($preSurvey), Array($trainingVideo), /*Array($trainingSamples),*/ Array($abxTest), $abTests, Array($postSurvey));