Merge branch 'develop' into numericChallengeIds

Program-AR · Nov 7, 2023 · 0476721 · 0476721
2 parents f39807e + 2b47d18
commit 0476721
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 70 deletions.
diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js
@@ -780,12 +780,6 @@ export default Service.extend({
       }`,
     });
 
-    this.crearBloqueAccion('IrseEnYacare', 'goInAlligator', {
-      icono: 'icono.yacare.png',
-      comportamiento: 'IrseEnYacare',
-      argumentos: `{}`,
-    });
-
     this.crearBloqueAccion('Escapar', 'escape', {
       icono: 'icono.escapar.png',
       comportamiento: 'Escapar',
@@ -841,6 +835,12 @@ export default Service.extend({
         etiqueta: "Tacho",
       }`,
     });
+
+    this.crearBloqueAccion('IrseEnYacare', 'goInAlligator', {
+      icono: 'icono.yacare.png',
+      comportamiento: 'IrseEnYacare',
+      argumentos: `{}`,
+    });
 
     this.crearBloqueAccion('TomarLata', 'takeCan', {
       icono: 'icono.lata.png',

diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js
@@ -3224,4 +3224,15 @@ export const desafios = [
       'ParaLaDerecha', 'ParaLaIzquierda', 'ParaArriba', 'ParaAbajo', 'MoverA',
       'RecogerTrofeo', 'Numero', 'OpAritmetica']
   },
+  {
+    id: 1135,
+    nombre: 'PaleteandoConParametros',
+    escena: 'PaleteandoConParametros',
+    bloques: ['Procedimiento', 'RepetirVacio', 'Repetir', 'Si', 'SiNo', 'Hasta',
+      'TocandoPingPong', 'RebotarPingPong',
+      'MoverACasillaAbajo', 'MoverACasillaArriba', 'MoverACasillaIzquierda', 'MoverACasillaDerecha',
+      'Numero', 'OpComparacion', 'OpAritmetica',
+      'ParaLaDerecha', 'ParaLaIzquierda', 'ParaArriba', 'ParaAbajo'
+    ]
+  },
 ];
diff --git a/app/utils/staticData/grupos.js b/app/utils/staticData/grupos.js
@@ -309,6 +309,7 @@ export const grupos = [
       1132,
       1133,
       1134,
+      1135
     ]
   }
 ];
diff --git a/package.json b/package.json
@@ -26,7 +26,8 @@
     "Nahuel Palumbo <nahuel.palumbo@gmail.com> (https://github.com/PalumboN)",
     "Diana López Alvas <dlopezalvas@gmail.com> (https://github.com/dlopezalvas)",
     "Tomás Floxo Lodeiro <tomasfloxolodeiro@gmail.com> (https://github.com/tfloxolodeiro)",
-    "Ezequiel Pereyra <pereyra.ezequielh@gmail.com> (https://github.com/ezequielPereyra)"
+    "Ezequiel Pereyra <pereyra.ezequielh@gmail.com> (https://github.com/ezequielPereyra)",
+    "Daniel Ferro <danieloscarferro@gmail.com> (https://github.com/danielferro69)"
   ],
   "private": true,
   "directories": {

diff --git a/tests/integration/desafios/LimpiandoElHumedal-test.js b/tests/integration/desafios/LimpiandoElHumedal-test.js
diff --git a/tests/integration/desafios/PaleteandoConParametros-test.js b/tests/integration/desafios/PaleteandoConParametros-test.js
diff --git a/tests/integration/desafios/libroPrimaria/Duba-AlternativaCondicional-test.js b/tests/integration/desafios/libroPrimaria/Duba-AlternativaCondicional-test.js
@@ -33,7 +33,11 @@ moduloActividad("Duba - Alternativa condicional", () => {
     <block type="al_empezar_a_ejecutar" deletable="false" movable="false" editable="false" x="300" y="15">
       <statement name="program">
         <shadow type="required_statement"></shadow>
-        <block type="MoverACasillaDerecha"></block>
+        <block type="MoverACasillaDerecha">
+          <next>
+            <block type="MoverACasillaIzquierda"></block>
+          </next>
+        </block>
       </statement>
     </block>
   </xml>`
-Original file line number
+Diff line change
@@ Expand Up / @@ -309,6 +309,7 @@ export const grupos = [ @@
 ,
 ,
 ,
         ]
       }
     ];