Merge pull request 'final study push (hopefully)' (#13) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #13
This commit is contained in:
commit
f548c60157
@ -204,7 +204,7 @@ def startpage():
|
||||
print("order: ",order)
|
||||
#TODO random is not implemented here
|
||||
session["block_order"][name] = order
|
||||
case "empty":
|
||||
case "empty":
|
||||
order = list(config[name]["stimuli"]["list"]) # order = list of simuli keys
|
||||
print("order: ",order)
|
||||
session["block_order"][name] = order
|
||||
|
@ -12,24 +12,19 @@
|
||||
<div class="container">
|
||||
<h2>SLAEFORMS Gebärdensprachavatar Studie</h2>
|
||||
|
||||
<video controls>
|
||||
<source src="{{ url_for('static', filename='videos/platzhalter-video.mp4') }}" type="video/mp4">
|
||||
</video>
|
||||
<div class="spacer" aria-hidden="true" style="height:20px"></div>
|
||||
<div class="spacer" aria-hidden="true" style="height:20px"></div>
|
||||
<div class="textblock">
|
||||
|
||||
<p style="font-size: 22px;">
|
||||
Bei allen Aufgaben in dieser Studie gibt es ein Erklärvideo, in dem die Aufgabe und die Antwortmöglichkeiten in Gebärdensprache erklärt werden.
|
||||
Falls Sie Fragen haben oder eine Aufgabe nicht verstehen, können Sie den "Gebärdensprach"-Button auf der rechten Seite des Bildschirms klicken, um das Video und den Erklärtext zu sehen.
|
||||
Bei allen Aufgaben in dieser Studie gibt es Texte, in denen die Aufgaben und die Antwortmöglichkeiten erklärt werden.
|
||||
Falls Sie Fragen haben oder eine Aufgabe nicht verstehen, können Sie den "Info"-Button auf der rechten Seite des Bildschirms klicken, um den Erklärtext zu sehen.
|
||||
Sie können den Button nochmal anklicken, um wieder zur Aufgabe zurückzukommen.
|
||||
</p>
|
||||
<div style="margin: auto; display: block; max-width: 90px;">
|
||||
<button style="margin: auto; max-width: 90px;"><img class="infoButtonIcon" id="buttonInfoIcon"
|
||||
src="{{ url_for('static', filename='icons/sl-icon.png')}}" alt="sign-language-icon"></button>
|
||||
src="{{ url_for('static', filename='icons/info-icon.png')}}" alt="info-icon"></button>
|
||||
</div>
|
||||
<p style="font-size: 22px; text-align: center;">
|
||||
Der Gebärdensprach-Button.
|
||||
Das ist der Info-Button.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
@ -12,10 +12,6 @@
|
||||
<div class="container">
|
||||
<h2>SLAEFORMS Gebärdensprachavatar Studie</h2>
|
||||
|
||||
<video controls>
|
||||
<source src="{{ url_for('static', filename='videos/platzhalter-video.mp4') }}" type="video/mp4">
|
||||
</video>
|
||||
<div class="spacer" aria-hidden="true" style="height:20px"></div>
|
||||
<div class="textblock">
|
||||
|
||||
{% include "p1infos.html" %}
|
||||
|
@ -12,10 +12,6 @@
|
||||
<div class="container">
|
||||
<h2>SLAEFORMS Gebärdensprachavatar Studie</h2>
|
||||
|
||||
<video controls>
|
||||
<source src="{{ url_for('static', filename='videos/platzhalter-video.mp4') }}" type="video/mp4">
|
||||
</video>
|
||||
<div class="spacer" aria-hidden="true" style="height:20px"></div>
|
||||
<div class="textblock">
|
||||
|
||||
{% include "p2infos.html" %}
|
||||
|
@ -12,10 +12,6 @@
|
||||
<div class="container">
|
||||
<h2>SLAEFORMS Gebärdensprachavatar Studie</h2>
|
||||
|
||||
<video controls>
|
||||
<source src="{{ url_for('static', filename='videos/platzhalter-video.mp4') }}" type="video/mp4">
|
||||
</video>
|
||||
<div class="spacer" aria-hidden="true" style="height:20px"></div>
|
||||
<div class="textblock">
|
||||
|
||||
{% include "p3infos.html" %}
|
||||
|
@ -13,6 +13,13 @@
|
||||
allowfullscreen></iframe>
|
||||
</div>
|
||||
|
||||
{% elif (embed == "vimeo") %}
|
||||
<div class="iframe-container">
|
||||
|
||||
<iframe title="vimeo-player" class="center" src="{{ video_url }}" frameborder="0" allowfullscreen></iframe>
|
||||
|
||||
</div>
|
||||
|
||||
{% elif (embed == "no") %}
|
||||
|
||||
<video controls>
|
||||
@ -42,8 +49,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="dv_half">
|
||||
<div class="iframe-container">
|
||||
<iframe class="center" src="{{ video_url2 }}" title="YouTube video player" frameborder="0"
|
||||
@ -53,6 +58,25 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% elif (embed == "vimeo") %}
|
||||
<div class="double_video_container">
|
||||
|
||||
<div class="dv_half">
|
||||
<div class="iframe-container">
|
||||
<iframe title="vimeo-player" class="center" src="{{ video_url1 }}" frameborder="0" allowfullscreen></iframe>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dv_half">
|
||||
<div class="iframe-container">
|
||||
<iframe title="vimeo-player" class="center" src="{{ video_url2 }}" frameborder="0" allowfullscreen></iframe>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
{% elif (embed == "no") %}
|
||||
<div class="double_video_container">
|
||||
<div class="dv_half">
|
||||
@ -118,12 +142,14 @@ step={{question["step"]}}
|
||||
|
||||
{% if (infovideo) %}
|
||||
<dialog>
|
||||
|
||||
|
||||
<button class="dialogBtn" autofocus><img class="infoButtonIcon" id="buttonClose"
|
||||
src="{{ url_for('static', filename='icons/x-icon.png')}}" alt="Delete Icon"></button>
|
||||
{% if ("videourl" in infovideo) %}
|
||||
<video controls>
|
||||
<source src="{{ url_for('static', filename=infovideo['videourl']) }}" type="video/mp4">
|
||||
</video>
|
||||
{% endif %}
|
||||
<div class="dialogTextContainer">
|
||||
{% if ("infotext" in infovideo) %}
|
||||
<p>{{ infovideo["infotext"] }}</p>
|
||||
@ -134,7 +160,7 @@ step={{question["step"]}}
|
||||
</div>
|
||||
</dialog>
|
||||
<button class="dialogBtn"><img class="infoButtonIcon" id="buttonInfoIcon"
|
||||
src="{{ url_for('static', filename='icons/sl-icon.png')}}" alt="Info Icon"></button>
|
||||
src="{{ url_for('static', filename='icons/info-icon.png')}}" alt="Info Icon"></button>
|
||||
<script src="{{ url_for('static', filename='infoDialogScript.js')}}"></script>
|
||||
{% endif %}
|
||||
|
||||
@ -157,7 +183,7 @@ step={{question["step"]}}
|
||||
<div class="spacer" aria-hidden="true" style="height:30px"></div>
|
||||
|
||||
<div class="questioncontainer">
|
||||
<h3 style="margin: auto;">{{ questions[question]['text']}}</h3>
|
||||
<h3 style="margin: auto;">{{ questions[question]['text']}}</h3>
|
||||
</div>
|
||||
<div class="spacer" aria-hidden="true" style="height:60px"></div>
|
||||
|
||||
@ -165,7 +191,7 @@ step={{question["step"]}}
|
||||
{% elif (questions[question]["type"] == "likert") %}
|
||||
<div class="likertcontainer">
|
||||
<div class="questioncontainer">
|
||||
<h3>{{ questions[question]['text']}}</h3>
|
||||
<h3>{{ questions[question]['text']}}</h3>
|
||||
</div>
|
||||
<div class="likert" style="--likert-rows: {{ questions[question]['points']|length() }}">
|
||||
{% for point in questions[question]["points"] %}
|
||||
@ -184,7 +210,7 @@ step={{question["step"]}}
|
||||
{% elif (questions[question]["type"] == "likert-basic") %}
|
||||
|
||||
<div class="questioncontainer">
|
||||
<h3>{{ questions[question]['text']}}</h3>
|
||||
<h3>{{ questions[question]['text']}}</h3>
|
||||
</div>
|
||||
|
||||
<div class="normal-likert-container">
|
||||
@ -263,7 +289,7 @@ step={{question["step"]}}
|
||||
{% elif (questions[question]["type"] == "multiplechoice") %}
|
||||
<div class="compressWidth">
|
||||
<p>
|
||||
<div>
|
||||
<div>
|
||||
{{ questions[question]['text']}}
|
||||
|
||||
{% for point in questions[question]["points"] %}
|
||||
@ -274,7 +300,7 @@ step={{question["step"]}}
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
<div class="spacer" aria-hidden="true" style="height:30px"></div>
|
||||
|
||||
@ -321,13 +347,13 @@ step={{question["step"]}}
|
||||
<div class="spacer" aria-hidden="true" style="height:30px"></div>
|
||||
<div class="button-container">
|
||||
|
||||
{% if ("lastquestion" in stimlui) %}
|
||||
<button id="submitbutton" type="submit">Studie Beenden</button>
|
||||
<!-- TODO maybe I want to use this instead: <button id="submitbutton" type="submit">Submit</button> /// <input class="inputs" id="submitbutton" type="submit" value="submit" />-->
|
||||
{% else %}
|
||||
<button id="submitbutton" type="submit">Weiter</button>
|
||||
<!-- TODO maybe I want to use this instead: <button id="submitbutton" type="submit">Submit</button> /// <input class="inputs" id="submitbutton" type="submit" value="submit" />-->
|
||||
{% endif %}
|
||||
{% if ("lastquestion" in stimlui) %}
|
||||
<button id="submitbutton" type="submit">Studie Beenden</button>
|
||||
<!-- TODO maybe I want to use this instead: <button id="submitbutton" type="submit">Submit</button> /// <input class="inputs" id="submitbutton" type="submit" value="submit" />-->
|
||||
{% else %}
|
||||
<button id="submitbutton" type="submit">Weiter</button>
|
||||
<!-- TODO maybe I want to use this instead: <button id="submitbutton" type="submit">Submit</button> /// <input class="inputs" id="submitbutton" type="submit" value="submit" />-->
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
</form>
|
||||
@ -336,10 +362,10 @@ step={{question["step"]}}
|
||||
</body>
|
||||
<footer>
|
||||
<div class="container" style="font-size: 19px;">
|
||||
<a href="{{ url_for('startpage') }}" target="_blank">Startseite</a>
|
||||
<a href="{{ url_for('impressum') }}" target="_blank">Impressum</a>
|
||||
<a href="{{ url_for('datenschutz') }}" target="_blank">Datenschutz</a>
|
||||
<a href="{{ url_for('startpage') }}" target="_blank">Startseite</a>
|
||||
<a href="{{ url_for('impressum') }}" target="_blank">Impressum</a>
|
||||
<a href="{{ url_for('datenschutz') }}" target="_blank">Datenschutz</a>
|
||||
</div>
|
||||
</footer>
|
||||
</footer>
|
||||
|
||||
</html>
|
@ -12,11 +12,6 @@
|
||||
<div class="container" style="height: 100%; font-size: 22px;">
|
||||
<h2>SLAEFORMS Gebärdensprachavatar Studie</h2>
|
||||
|
||||
<video controls>
|
||||
<source src="{{ url_for('static', filename='videos/platzhalter-video.mp4') }}" type="video/mp4">
|
||||
</video>
|
||||
<div class="spacer" aria-hidden="true" style="height:20px"></div>
|
||||
|
||||
<div class="textblock">
|
||||
<p>
|
||||
Hallo und willkommen zu dieser Studie, danke für Ihre Teilnahme.
|
||||
@ -51,8 +46,7 @@
|
||||
Das Laden der Seiten kann manchmal einige Sekunden dauern. Falls es zu einem Fehler kommen sollte und ein Video nicht geladen wird, versuchen Sie bitte die Seite neu zu laden.
|
||||
</p>
|
||||
<p>
|
||||
Für jeden Teil der Studie gibt es ein Video, das die Fragestellung und die Antwortmöglichkeiten in
|
||||
Gebärdensprache erklärt. Falls Sie das Video während der Studie nochmal sehen möchten, können Sie es
|
||||
Für jeden Teil der Studie gibt es einen Text, der die Fragestellung und die Antwortmöglichkeiten erklärt. Falls Sie den Text während der Studie nochmal sehen möchten, können Sie es
|
||||
über den „Info“-Knopf auf der rechten Seite aufrufen.
|
||||
</p>
|
||||
<p>
|
||||
|
1080
slaeforms/userstudy1-vimeo.json
Normal file
1080
slaeforms/userstudy1-vimeo.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,13 +7,10 @@
|
||||
"type": "TaskTemplate",
|
||||
"template": "standard_template.html",
|
||||
"stimuli": {
|
||||
"type": "single_video",
|
||||
"order": "",
|
||||
"type": "empty",
|
||||
"list": {
|
||||
"video_1": "platzhalter-video.mp4"
|
||||
},
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
"empty_stimulus": ""
|
||||
|
||||
}
|
||||
},
|
||||
"questions": {
|
||||
@ -226,7 +223,6 @@
|
||||
}
|
||||
},
|
||||
"infovideo": {
|
||||
"videourl": "videos/platzhalter-video.mp4",
|
||||
"htmlblock": "dqinfos.html",
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
@ -296,9 +292,9 @@
|
||||
"type": "single_video",
|
||||
"order": "random",
|
||||
"list": {
|
||||
"video_1": "0009-inflected.mp4",
|
||||
"video_2": "0009-mocap.mp4",
|
||||
"video_3": "0009-simple.mp4"
|
||||
"video_1": "0044-inflected.mp4",
|
||||
"video_2": "0044-mocap.mp4",
|
||||
"video_3": "0044-simple.mp4"
|
||||
},
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
@ -433,7 +429,6 @@
|
||||
}
|
||||
},
|
||||
"infovideo": {
|
||||
"videourl": "videos/platzhalter-video.mp4",
|
||||
"htmlblock": "p1infos.html",
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
@ -623,7 +618,6 @@
|
||||
}
|
||||
},
|
||||
"infovideo": {
|
||||
"videourl": "videos/platzhalter-video.mp4",
|
||||
"htmlblock": "p1infos.html",
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
@ -809,7 +803,6 @@
|
||||
}
|
||||
},
|
||||
"infovideo": {
|
||||
"videourl": "videos/platzhalter-video.mp4",
|
||||
"htmlblock": "p2infos.html",
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
@ -1001,7 +994,6 @@
|
||||
}
|
||||
},
|
||||
"infovideo": {
|
||||
"videourl": "videos/platzhalter-video.mp4",
|
||||
"htmlblock": "p3infos.html",
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
@ -1043,13 +1035,9 @@
|
||||
"type": "TaskTemplate",
|
||||
"template": "standard_template.html",
|
||||
"stimuli": {
|
||||
"type": "single_video",
|
||||
"order": "random",
|
||||
"type": "empty",
|
||||
"list": {
|
||||
"video_1": "platzhalter-video.mp4"
|
||||
},
|
||||
"configuration": {
|
||||
"embed": "no"
|
||||
"empty_stimulus": ""
|
||||
},
|
||||
"lastquestion": "true"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user