🔀 Merge branch 'ladislas/feature/contentkit-interface-rename-to-verbs'

leka · Nov 14, 2023 · 9fa4be8 · 9fa4be8
2 parents 32e71e0 + 9df29aa
commit 9fa4be8
Show file tree

Hide file tree

Showing 58 changed files with 318 additions and 404 deletions.
diff --git a/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-colorBingo.yml b/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-colorBingo.yml
@@ -9,9 +9,8 @@ image: activity_color_recognition_1
 sequence:
   - exercises:
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:
@@ -24,9 +23,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:
@@ -41,9 +39,8 @@ sequence:
               type: color
 
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:
@@ -60,9 +57,8 @@ sequence:
               type: color
 
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:
@@ -81,9 +77,8 @@ sequence:
               type: color
 
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:
@@ -104,9 +99,8 @@ sequence:
               type: color
 
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:

diff --git a/...dDrop-one_zone-one_right_answer-image.yml → ...Zones-one_zone-one_right_answer-image.yml b/...dDrop-one_zone-one_right_answer-image.yml → ...Zones-one_zone-one_right_answer-image.yml
@@ -9,9 +9,8 @@ image: activity_image_recognition_1
 sequence:
   - exercises:
       - instructions: Place le bon instrument dans le panier
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: basket
@@ -24,9 +23,8 @@ sequence:
               type: image
 
       - instructions: Place le bon instrument dans le panier
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: basket
@@ -41,9 +39,8 @@ sequence:
               dropZone: zoneA
 
       - instructions: Place le bon instrument dans le panier
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: basket

diff --git a/...o_zones-multiple_right_answers-images.yml → ...o_zones-multiple_right_answers-images.yml b/...o_zones-multiple_right_answers-images.yml → ...o_zones-multiple_right_answers-images.yml
@@ -9,9 +9,8 @@ image: activity_image_recognition_1
 sequence:
   - exercises:
       - instructions: Place les instruments dans les bonnes familles d'instruments
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: image-placeholder-instruments_wind
@@ -31,9 +30,8 @@ sequence:
               dropZone: zoneA
 
       - instructions: Place les instruments dans les bonnes familles d'instruments
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: image-placeholder-instruments_wind
@@ -53,9 +51,8 @@ sequence:
               dropZone: zoneA
 
       - instructions: Place les instruments dans les bonnes familles d'instruments
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: image-placeholder-instruments_wind

diff --git a/...lorer/Resources/GEKNewSystem/activities/activity-listenThenTouchToSelect-mixed-images.yml b/...lorer/Resources/GEKNewSystem/activities/activity-listenThenTouchToSelect-mixed-images.yml
@@ -9,9 +9,8 @@ image: activity_image_recognition_1
 sequence:
   - exercises:
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -24,9 +23,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -41,9 +39,8 @@ sequence:
               type: image
 
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -61,9 +58,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -82,9 +78,8 @@ sequence:
               type: image
 
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -107,9 +102,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:

diff --git a/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-medley.yml b/Apps/LekaActivityUIExplorer/Resources/GEKNewSystem/activities/activity-medley.yml
@@ -9,9 +9,8 @@ image: activity_color_recognition_1
 sequence:
   - exercises:
       - instructions: Écoute le son puis touche le bon instrument
-        category: selection
         interface: listenThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -26,9 +25,8 @@ sequence:
               type: image
 
       - instructions: Touche le bleu
-        category: selection
         interface: touchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         payload:
           choices:
             - value: blue
@@ -42,9 +40,8 @@ sequence:
               type: color
 
       - instructions: Touche le rond rouge et le rond jaune
-        category: selection
         interface: touchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         payload:
           choices:
             - value: red
@@ -57,9 +54,8 @@ sequence:
               type: color
 
       - instructions: Regarde l'image puis touche la bonne réponse
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -82,9 +78,8 @@ sequence:
               type: color
 
       - instructions: Touche la couleur de Leka
-        category: selection
         interface: robotThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: robot
           value:
@@ -105,9 +100,8 @@ sequence:
               type: color
 
       - instructions: Place le bon instrument dans le panier
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: basket
@@ -126,9 +120,8 @@ sequence:
               type: image
 
       - instructions: Place les instruments dans les bonnes familles d'instruments
-        category: dragAndDrop
-        interface: dragAndDrop
-        gameplay: selectAllRightAnswers
+        interface: dragAndDropIntoZones
+        gameplay: findTheRightAnswers
         payload:
           dropZoneA:
             value: image-placeholder-instruments_wind

diff --git a/...orer/Resources/GEKNewSystem/activities/activity-observeThenTouchToSelect-mixed-colors.yml b/...orer/Resources/GEKNewSystem/activities/activity-observeThenTouchToSelect-mixed-colors.yml
@@ -9,9 +9,8 @@ image: activity_image_recognition_1
 sequence:
   - exercises:
       - instructions: Regarde l'image puis touche la bonne réponse
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -24,9 +23,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Regarde l'image puis touche la bonne réponse
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -41,9 +39,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Regarde l'image puis touche les bonnes réponses
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -61,9 +58,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Regarde l'image puis touche la bonne réponse
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -82,9 +78,8 @@ sequence:
               type: color
 
       - instructions: Regarde l'image puis touche les bonnes réponses
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value:
@@ -107,9 +102,8 @@ sequence:
               isRightAnswer: true
 
       - instructions: Regarde l'image puis touche la bonne réponse
-        category: selection
         interface: observeThenTouchToSelect
-        gameplay: selectAllRightAnswers
+        gameplay: findTheRightAnswers
         action:
           type: ipad
           value: