Skip to content

Commit 5000c20

Browse files
faroitfaroit
authored
Merge pull request #50 from jpauwels/master
Allow multiple Likert scales per stimulus and require playback to start
2 parents aa47f41 + 49fb272 commit 5000c20

21 files changed

+412
-285
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ doc/jsdoc
33
.project
44
dist
55
builds/
6+
results/*
7+
!results/results_will_be_added_here.txt
68

79
#####=== Node ===#####
810

‎configs/LMS_4scale.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ pages:
1818
content: test description
1919
stimuli:
2020
C1: configs/resources/audio/mono_c1.wav
21+
C2: configs/resources/audio/mono_c2.wav
22+
C3: configs/resources/audio/mono_c3.wav
2123
response:
2224
- value: not at all
2325
label: Not at all

‎configs/LSS_multiscale.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# Likert single stimulus page 1 stimulus, two Likert scales with respecitvely 4 and 2 responses
2+
3+
4+
testname: Single Stimulus with multiple Likert scales
5+
testId: lss_multiscale
6+
bufferSize: 2048
7+
stopOnErrors: true
8+
showButtonPreviousPage: true
9+
remoteService: service/write.php
10+
11+
12+
13+
pages:
14+
15+
- type: likert_single_stimulus
16+
id: lss3
17+
name: likert
18+
content: Two out of three stimuli will be randomly selected. In order to select the first two, set randomize to false in the config file.
19+
showWaveform: true
20+
mustPlayback: ended
21+
mustRate: true
22+
randomize: true
23+
maxStimuli: 2
24+
stimuli:
25+
C1: configs/resources/audio/mono_c1.wav
26+
C2: configs/resources/audio/mono_c2.wav
27+
C3: configs/resources/audio/mono_c3.wav
28+
response:
29+
-
30+
- value: not at all
31+
label: Not at all
32+
img: configs/resources/images/star_off.png
33+
imgSelected: configs/resources/images/star_on.png
34+
imgHigherResponseSelected: configs/resources/images/star_on.png
35+
- value: not a lot
36+
label: Not a lot
37+
img: configs/resources/images/star_off.png
38+
imgSelected: configs/resources/images/star_on.png
39+
imgHigherResponseSelected: configs/resources/images/star_on.png
40+
- value: a bit
41+
label: A bit
42+
img: configs/resources/images/star_off.png
43+
imgSelected: configs/resources/images/star_on.png
44+
imgHigherResponseSelected: configs/resources/images/star_on.png
45+
- value: much
46+
label: Much
47+
img: configs/resources/images/star_off.png
48+
imgSelected: configs/resources/images/star_on.png
49+
imgHigherResponseSelected: configs/resources/images/star_on.png
50+
-
51+
- value: not at all
52+
label: Not at all
53+
img: configs/resources/images/star_off.png
54+
imgSelected: configs/resources/images/star_on.png
55+
imgHigherResponseSelected: configs/resources/images/star_on.png
56+
- value: not a lot
57+
label: Not a lot
58+
img: configs/resources/images/star_off.png
59+
imgSelected: configs/resources/images/star_on.png
60+
imgHigherResponseSelected: configs/resources/images/star_on.png
61+
62+
63+
64+
- type: finish
65+
name: Thank you
66+
content: Thank you for attending
67+
showResults: true
68+
writeResults: true

‎configs/mushra_customquestionaire.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pages:
2929
- type: finish
3030
name: Thank you
3131
content: Thank you for attending
32-
popupcontent: Your results were sent. Goodbye and have a nice day
32+
popupContent: Your results were sent. Goodbye and have a nice day
3333
showResults: true
3434
writeResults: true
3535
questionnaire:

‎configs/mushra_noloop.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ pages:
3737
- type: finish
3838
name: Thank you
3939
content: Thank you for attending
40-
popupcontent: Your results were sent. Goodbye and have a nice day
40+
popupContent: Your results were sent. Goodbye and have a nice day
4141
showResults: true
4242
writeResults: true

‎configs/mushra_noloop_nowav.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ pages:
2929
- type: finish
3030
name: Thank you
3131
content: Thank you for attending
32-
popupcontent: Your results were sent. Goodbye and have a nice day
32+
popupContent: Your results were sent. Goodbye and have a nice day
3333
showResults: true
3434
writeResults: true

‎configs/mushra_norandom.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ pages:
4747
- type: finish
4848
name: Thank you
4949
content: Thank you for attending
50-
popupcontent: Your results were sent. Goodbye and have a nice day
50+
popupContent: Your results were sent. Goodbye and have a nice day
5151
showResults: true
5252
writeResults: true

‎configs/mushra_nowav.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ pages:
2929
- type: finish
3030
name: Thank you
3131
content: Thank you for attending
32-
popupcontent: Your results were sent. Goodbye and have a nice day
32+
popupContent: Your results were sent. Goodbye and have a nice day
3333
showResults: true
3434
writeResults: true

‎doc/experimenter.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ A likert multi stimulus page creates a multi-stimulus likert rating.
103103
* **type** must be likert_multi_stimulus.
104104
* **id** Identifier of the page.
105105
* **name** Name of the page (is shown as title)
106+
* **content** Content (HTML) of the page. The content is shown on the upper part of the page.
106107
* **mustRate** If set to true, the participant must rate all stimuli.
107-
* **mustPlayback** If set to true, the participant must fully play back all stimuli.
108-
* **reference** Filepath to the reference stimulus (WAV file).
109-
* **stimuli** A map of stimuli representing three conditions. The key is the name of the condition. The value is the filepath to the stimulus (WAV file).
108+
* **mustPlayback** If set to `ended`, the participant must fully play back all stimuli to the end. If set to `processUpdate`, the participant must start playing back all stimuli before rating becomes possible.
109+
* **stimuli** A map of stimuli which will all be presented on the same page. The key is the name of the condition. The value is the filepath to the stimulus (WAV file).
110110
* **response** A array which represents the Likert scale, where each array element represents a 'likert point'. The array elements are maps with the keys 'value' (value shown in results), 'label' (label of the likert point), 'img' (path to an image of the likert point), 'imgSelected' (image shown if likert point is selected), and 'imgHigherResponseSelected' (image shown when a 'higher' likert point is selected).
111111

112112
#### `likert_single_stimulus` page
@@ -116,9 +116,12 @@ A likert single stimulus page creates a single-stimulus likert rating.
116116
* **type** must be likert_single_stimulus.
117117
* **id** Identifier of the page.
118118
* **name** Name of the page (is shown as title)
119-
* **mustRate** If set to true, the participant must rate all stimuli.
120-
* **reference** Filepath to the reference stimulus (WAV file).
121-
* **stimuli** A map of stimuli representing three conditions. The key is the name of the condition. The value is the filepath to the stimulus (WAV file).
119+
* **content** Content (HTML) of the page. The content is shown on the upper part of the page.
120+
* **showWaveform** If set to true, the waveform of the stimulus is shown.
121+
* **mustRate** If set to true, the participant must rate all stimuli.
122+
* **mustPlayback** If set to `ended`, the participant must fully play back the stimulus to the end. If set to `processUpdate`, the participant must start it before rating becomes possible.
123+
* **stimuli** A map of stimuli, each of which will be presented on a separate page. The key is the name of the condition. The value is the filepath to the stimulus (WAV file).
124+
* **maxStimuli** An upper limit on the amount of stimuli presented to the user.
122125
* **response** An array which represents the Likert scale, where each array element represents a 'likert point'. The array elements are maps with the keys 'value' (value shown in results), 'label' (label of the likert point), 'img' (path to an image of the likert point), 'imgSelected' (image shown if likert point is selected), and 'imgHigherResponseSelected' (image shown when a 'higher' likert point is selected).
123126

124127
#### `finish` page

‎index.html‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
of this source code may result in severe civil and criminal penalties, and
1414
will be prosecuted to the maximum extent possible under law.
1515
-->
16-
<head>
16+
<head>
1717

1818

1919
<meta charset="utf-8">
@@ -130,32 +130,32 @@
130130

131131
<div class="header" id="header"></div>
132132

133-
<div id="container">
133+
<div id="container">
134134

135-
<div id = "page_progressbar"></div>
136-
<h3 class="ui-bar ui-bar-a ui-corner-all" id="page_header"></h3>
137-
<div class="ui-body ui-body-a ui-corner-all" id="page_content">
138-
</div>
139-
<br/>
140-
<div class="ui-body ui-body-a ui-corner-all" id="page_navigation">
141-
</div>
135+
<div id = "page_progressbar"></div>
136+
<h3 class="ui-bar ui-bar-a ui-corner-all" id="page_header"></h3>
137+
<div class="ui-body ui-body-a ui-corner-all" id="page_content">
138+
</div>
139+
<br/>
140+
<div class="ui-body ui-body-a ui-corner-all" id="page_navigation">
141+
</div>
142142

143-
<table align="right" class="logo">
144-
<tr>
145-
<td class="logo" style="vertical-align:top; padding-right:0px;"><small><strong>webMUSHRA
146-
<!-- build:template:dev
147-
Dev
148-
/build -->
149-
<!-- build:template
150-
<%= version %>
151-
/build -->
152-
by</strong></small>
153-
</td>
154-
<td class="logo"><a href="https://www.audiolabs-erlangen.de/"><img src="design/images/alabs_new.png" class="logo"/></a></td>
155-
<td class="logo"><a href="http://www.iis.fraunhofer.de/"><img src="design/images/iis.svg" class="logo" /></a></td>
156-
<td class="logo"><a href="https://www.fau.eu/"><img src="design/images/techfak.svg" class="logo" /></a></td>
157-
</tr>
158-
</table>
143+
<table align="right" class="logo">
144+
<tr>
145+
<td class="logo" style="vertical-align:top; padding-right:0px;"><small><strong>webMUSHRA
146+
<!-- build:template:dev
147+
Dev
148+
/build -->
149+
<!-- build:template
150+
<%= version %>
151+
/build -->
152+
by</strong></small>
153+
</td>
154+
<td class="logo"><a href="https://www.audiolabs-erlangen.de/"><img src="design/images/alabs_new.png" class="logo"/></a></td>
155+
<td class="logo"><a href="http://www.iis.fraunhofer.de/"><img src="design/images/iis.svg" class="logo" /></a></td>
156+
<td class="logo"><a href="https://www.fau.eu/"><img src="design/images/techfak.svg" class="logo" /></a></td>
157+
</tr>
158+
</table>
159159

160160
</div>
161161
<div data-role="popup" data-dismissible="false" data-history="false" data-transition="flip" positionTo="window" id="popupErrors">
@@ -166,9 +166,9 @@ <h3 class="ui-bar ui-bar-a ui-corner-all" id="page_header"></h3>
166166
<div data-role="header" class="ui-corner-top" style="width : 57.5em; background-color: #FFb500;">
167167
<h1 id="popHeader"></h1>
168168
</div>
169-
<div id="popupResultsContent" style="background-color: white;" class="ui-corner-bottom ui-content">
169+
<div id="popupResultsContent" style="background-color: white;" class="ui-corner-bottom ui-content">
170+
</div>
170171
</div>
171-
</div>
172172
<!-- build:js:generic startup.min.js -->
173173
<script src="startup.js"></script>
174174
<!-- /build -->

0 commit comments

Comments
 (0)