🔀 Merge branch 'ladislas/feature/contentkit-move-action-to-exercise'

leka · Nov 14, 2023 · 32e71e0 · 32e71e0
2 parents 9fcc2ec + 8cf77e7
commit 32e71e0
Show file tree

Hide file tree

Showing 10 changed files with 138 additions and 132 deletions.
diff --git a/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-colorBingo.yml b/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-colorBingo.yml
@@ -12,12 +12,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: blue
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: blue
           choices:
             - value: blue
               type: color
@@ -27,12 +27,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: green
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: green
           choices:
             - value: green
               type: color
@@ -44,12 +44,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: red
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: red
           choices:
             - value: red
               type: color
@@ -63,12 +63,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: yellow
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: yellow
           choices:
             - value: yellow
               type: color
@@ -84,12 +84,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: orange
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: orange
           choices:
             - value: orange
               type: color
@@ -107,12 +107,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: yellow
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: yellow
           choices:
             - value: purple
               type: color

diff --git a/...lorer/Resources/GEKNewSystem/activities/activity-listenThenTouchToSelect-mixed-images.yml b/...lorer/Resources/GEKNewSystem/activities/activity-listenThenTouchToSelect-mixed-images.yml
@@ -12,12 +12,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: guitar
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: guitar
           choices:
             - value: image-instrument-guitar-no_background
               type: image
@@ -27,12 +27,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: violin
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: violin
           choices:
             - value: image-instrument-violin-no_background
               type: image
@@ -44,12 +44,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: saxophone
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: saxophone
           choices:
             - value: image-instrument-saxophone-no_background
               type: image
@@ -64,12 +64,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: piano
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: piano
           choices:
             - value: image-instrument-harmonica-no_background
               type: image
@@ -85,12 +85,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: flute
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: flute
           choices:
             - value: image-instrument-violin-no_background
               type: image
@@ -110,12 +110,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: drums
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: drums
           choices:
             - value: image-instrument-drums-no_background
               type: image

diff --git a/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-medley.yml b/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-medley.yml
@@ -12,12 +12,12 @@ sequence:
         category: selection
         interface: listenThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: audio
+            value: violin
         payload:
-          action:
-            type: ipad
-            value:
-              type: audio
-              value: violin
           choices:
             - value: image-instrument-violin-no_background
               type: image
@@ -60,12 +60,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-red
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-red
           choices:
             - value: yellow
               type: color
@@ -85,12 +85,12 @@ sequence:
         category: selection
         interface: robotThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: robot
+          value:
+            type: color
+            value: orange
         payload:
-          action:
-            type: robot
-            value:
-              type: color
-              value: orange
           choices:
             - value: orange
               type: color

diff --git a/...orer/Resources/GEKNewSystem/activities/activity-observeThenTouchToSelect-mixed-colors.yml b/...orer/Resources/GEKNewSystem/activities/activity-observeThenTouchToSelect-mixed-colors.yml
@@ -12,12 +12,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-blue
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-blue
           choices:
             - value: blue
               type: color
@@ -27,12 +27,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-red
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-red
           choices:
             - value: blue
               type: color
@@ -44,12 +44,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-purple
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-purple
           choices:
             - value: purple
               type: color
@@ -64,12 +64,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-yellow
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-yellow
           choices:
             - value: blue
               type: color
@@ -85,12 +85,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-green
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-green
           choices:
             - value: yellow
               type: color
@@ -110,12 +110,12 @@ sequence:
         category: selection
         interface: observeThenTouchToSelect
         gameplay: selectAllRightAnswers
+        action:
+          type: ipad
+          value:
+            type: image
+            value: image-landscape-red
         payload:
-          action:
-            type: ipad
-            value:
-              type: image
-              value: image-landscape-red
           choices:
             - value: yellow
               type: color