Feature/break actions

backend/experiment/actions/__init__.py

@@ -1,15 +1,13 @@
+from .consent import Consent
 from .explainer import Explainer, Step
 from .form import *
 from .final import Final
-from .score import Score
-from .song_sync import SongSync
-from .consent import Consent
+from .html import HTML
+from .info import Info
 from .playback import Playback
 from .playlist import Playlist
-from .start_session import StartSession
-from .trial import Trial
-from .info import Info
-from .plink import Plink
 from .redirect import Redirect
-from .html import HTML
+from .score import Score
+from .start_session import StartSession
 from .toontjehoger import ToontjeHoger
+from .trial import Trial

backend/experiment/actions/form.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
-from .styles import STYLE_NEUTRAL
+from .styles import STYLE_NEUTRAL, STYLE_BOOLEAN_NEGATIVE_FIRST
 from .base_action import BaseAction
 
 class Question(BaseAction):
@@ -64,10 +64,11 @@ class BooleanQuestion(Question):
     def __init__(self, choices=None, **kwargs):
         super().__init__(**kwargs)
         self.choices = choices or {
-            'yes': _('Yes'),
-            'no': _('No')
+            'no': _('No'),
+            'yes': _('Yes')
         }
         self.view = 'BUTTON_ARRAY'
+        self.style = STYLE_BOOLEAN_NEGATIVE_FIRST
 
 class ChoiceQuestion(Question):
     def __init__(self, choices, min_values=1, **kwargs):

backend/experiment/actions/score.py

@@ -13,7 +13,7 @@ class Score(BaseAction):  # pylint: disable=too-few-public-methods
 
     ID = 'SCORE'
 
-    def __init__(self, session, title=None, score_message=None, config=None, icon=None, timer=None, feedback=None):
+    def __init__(self, session, title=None, score=None, score_message=None, config=None, icon=None, timer=None, feedback=None):
         """ Score presents feedback to a participant after a Trial
         - session: a Session object
         - title: the title of the score page
@@ -27,7 +27,7 @@ def __init__(self, session, title=None, score_message=None, config=None, icon=No
         """
         self.session = session
         self.title = title
-        self.score = session.last_score()
+        self.score = score or session.last_score()
         self.score_message = score_message or self.default_score_message
         self.feedback = feedback
         self.config = {

backend/experiment/actions/trial.py

@@ -27,9 +27,7 @@ def __init__(self, playback=None, html=None, feedback_form=None, title='', confi
             - response_time: how long to wait until stopping the player / proceeding to the next view
             - auto_advance: proceed to next view after player has stopped
             - listen_first: whether participant can submit before end of sound
-            - time_pass_break: when time has passed, submit the result immediately; skipping any subsequent actions (e.g. a certainty question)
-                - Can not be combined with listen_first (True)
-                - Can not be combined with auto_advance (False)
+            - break_round_on: result values upon which consecutive rounds in the current next_round array will be skipped
             - continue_label: if there is no form, how to label a button to proceed to next view
         - style: style class to add to elements in form and playback
             - neutral: first element is blue, second is yellow, third is teal

backend/experiment/actions/wrappers.py

@@ -1,11 +1,15 @@
+import random
+
 from django.utils.translation import gettext as _
 
-from .form import ChoiceQuestion, Form
+from .form import BooleanQuestion, ChoiceQuestion, Form
 from .playback import Playback
 from .trial import Trial
 
 from result.utils import prepare_result
 
+from experiment.actions.styles import STYLE_BOOLEAN_NEGATIVE_FIRST
+
 
 def two_alternative_forced(session, section, choices, expected_response=None, style={}, comment='', scoring_rule=None, title='', config=None):
     """
@@ -37,3 +41,63 @@ def two_alternative_forced(session, section, choices, expected_response=None, st
     feedback_form = Form([question])
     trial = Trial(playback=playback, feedback_form=feedback_form, title=title, config=config)
     return trial
+
+def song_sync(session, section, title, response_time=15):
+    trial_config = {
+        'response_time': response_time,
+        'auto_advance': True
+    }
+    recognize = Trial(
+        feedback_form=Form([BooleanQuestion(
+            key='recognize',
+            result_id=prepare_result('recognize', session, section=section, scoring_rule='SONG_SYNC_RECOGNITION'),
+            submits=True
+        )]),
+        playback=Playback([section], 'AUTOPLAY', play_config={
+            'ready_time': 3,
+            'show_animation': True
+        },
+        preload_message=_('Get ready!'),
+        instruction=_('Do you recognize the song?'),
+        ),
+        config={**trial_config, 'break_round_on': {'EQUALS': ['TIMEOUT', 'no']}},
+        title=title
+    )
+    silence_time = 4
+    silence = Trial(
+        playback=Playback([section], 'AUTOPLAY',
+                          instruction=_('Keep imagining the music'),
+                          play_config={
+                            'mute': True,
+                            'ready_time': 0,
+                            'show_animation': True,
+        }),
+        config={
+            'response_time': silence_time,
+            'auto_advance': True,
+            'show_continue_button': False
+        },
+        title=title
+    )
+    continuation_correctness = random.randint(0, 1) == 1
+    correct_place = Trial(
+        feedback_form=Form([BooleanQuestion(
+            key='correct_place',
+            submits=True,
+            result_id=prepare_result('correct_place',
+                                     session,
+                                     section=section,
+                                     scoring_rule='SONG_SYNC_CONTINUATION',
+                                     expected_response='yes' if continuation_correctness else 'no')
+        )]),
+        playback=Playback([section], 'AUTOPLAY',
+                        instruction=_('Did the track come back in the right place?'),
+                        play_config={
+            'ready_time': 0,
+            'playhead': silence_time + (random.randint(100, 150) / 10 if not continuation_correctness else 0),
+            'show_animation': True
+        }),
+        config=trial_config,
+        title=title
+    )
+    return [recognize, silence, correct_place]

backend/experiment/rules/__init__.py

@@ -8,6 +8,7 @@
 from .h_bat import HBat
 from .h_bat_bfit import HBatBFIT
 from .hbat_bst import BST
+from .hooked import Hooked
 from .huang_2022 import Huang2022
 from .kuiper_2020 import Kuiper2020
 from .listening_conditions import ListeningConditions
@@ -41,6 +42,7 @@
     HBat.ID: HBat,
     HBatBFIT.ID: HBatBFIT,
     BST.ID: BST,
+    Hooked.ID: Hooked,
     MatchingPairs.ID: MatchingPairs,
     MatchingPairsICMPC.ID: MatchingPairsICMPC,
     MusicalPreferences.ID: MusicalPreferences,