From a701a0d6b45bc4d8c43f1ced47cb6aaa9e246ee9 Mon Sep 17 00:00:00 2001 From: Daniel Ferro Date: Tue, 17 Oct 2023 10:20:01 -0300 Subject: [PATCH 1/7] surfing --- app/services/blocks-gallery.js | 37 +++++++++++++++++++++++++++++++ app/utils/staticData/desafios.js | 8 ++++++- public/iconos/icono.yacare.png | Bin 0 -> 453 bytes translations/blocks/en-us.yaml | 4 ++++ translations/blocks/es-ar.yaml | 4 ++++ translations/blocks/pt-br.yaml | 4 ++++ 6 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 public/iconos/icono.yacare.png diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 3c034a4bb..a63273c33 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -754,6 +754,43 @@ export default Service.extend({ }`, }); + this.crearBloqueAccion('Colocar', 'putIntoTheTrash', { + icono: 'icono.tacho.png', + comportamiento: 'Soltar', + argumentos: `{ + idTransicion: "colocar", + etiqueta: "Tacho", + }`, + }); + + this.crearBloqueAccion('IrseEnYacare', 'goInAlligator', { + icono: 'icono.yacare.png', + comportamiento: 'Irse', + argumentos: `{ + irseCon: "yacare", + nombreAnimacion: "surfear" + }`, + }); + + this.crearBloqueAccion('TomarLata', 'takeCan', { + icono: 'icono.lata.png', + comportamiento: 'Sostener', + argumentos: `{ + etiqueta: "Lata", + nombreAnimacion: "recoger" + }`, + }); + + this.crearBloqueAccion('TomarPapel', 'takePaper', { + id: 'TomarPapel', + icono: 'icono.papel.png', + comportamiento: 'Sostener', + argumentos: `{ + etiqueta: "Papel", + nombreAnimacion: "recoger" + }`, + }); + this.crearBloqueAccion('AvanzarMono', 'moveRight', { icono: 'icono.derecha.png', comportamiento: 'MoverACasillaDerecha', diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js index deca6a3d1..6688aa322 100644 --- a/app/utils/staticData/desafios.js +++ b/app/utils/staticData/desafios.js @@ -207,7 +207,13 @@ export const desafios = [ conditionalRepetition: true, } }, - { +{ + id: 'nuevo12', + nombre: 'LimpiandoElHumedal', + escena: 'LimpiandoElHumedal', + bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'TomarLata', 'TomarPapel', 'Colocar', 'IrseEnYacare', 'Repetir', 'Procedimiento'], + }, + { id: "nuevo22", nombre: 'CapyBuscaAGuyra', escena: `new EscenaCapySolo("\ diff --git a/public/iconos/icono.yacare.png b/public/iconos/icono.yacare.png new file mode 100644 index 0000000000000000000000000000000000000000..c4de2515d017d7b4deb5a2dd4864b0b59515ba73 GIT binary patch literal 453 zcmV;$0XqJPP)J0uW;ve%7BK@{>X|?U z3k!KlxVyVY4AghVHfs=>PfmfJ`VatqP49nVnGJJdkatK2` z3mZcKpAaKh420i4|7QR)80Jk78)Rku_b>k$L}eHmp5Fe?@blY$24;vu3Nm^*L9Su= z^@D-o{mXw0T)d15K>7ENuKxpRE(EH{X9P0-g9OCo85!8Q7zqaQk@deBj;#C5kkG{O z;mNIk0$|U{X)=K|Yx5d17%Hj}6pdnT+&+p1H;Ytf(-A!er9;A!h_cZkD)Z<{ty5EQy!EzBpi+4 Date: Tue, 17 Oct 2023 10:32:30 -0300 Subject: [PATCH 2/7] adding tests --- .../desafios/LimpiandoElHumedal-test.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/integration/desafios/LimpiandoElHumedal-test.js diff --git a/tests/integration/desafios/LimpiandoElHumedal-test.js b/tests/integration/desafios/LimpiandoElHumedal-test.js new file mode 100644 index 000000000..14ed58003 --- /dev/null +++ b/tests/integration/desafios/LimpiandoElHumedal-test.js @@ -0,0 +1,23 @@ +import { moduloActividad, actividadTest } from '../../helpers/actividadTest'; + +const nombre = 'LimpiandoElHumedal'; + +moduloActividad(nombre, () => { + + actividadTest(nombre, { + solucion: '33AgarrarPapel4334agarrarLata33', + }); + + actividadTest(nombre, { + descripcionAdicional: 'Da error al querer irse sin limpiar el humedal', + solucion:'', + errorEsperado: 'Para irse hace falta un transporte' + }); + + actividadTest(nombre, { + descripcionAdicional: 'Da error al tirar en el tacho cuando no tengo nada', + solucion: '', + errorEsperado: 'No tengo nada en la mano' + }); + +}); \ No newline at end of file From 98a5a96605ab6eeb8da32ed984af6b3b64b538b2 Mon Sep 17 00:00:00 2001 From: Daniel Ferro Date: Tue, 17 Oct 2023 10:41:23 -0300 Subject: [PATCH 3/7] ordenando y traduciendo --- app/utils/staticData/desafios.js | 36 ++++++++++++++++---------------- translations/en-us.yaml | 12 +++++++---- translations/es-ar.yaml | 4 ++++ translations/pt-br.yaml | 4 ++++ 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js index 6688aa322..20905efbc 100644 --- a/app/utils/staticData/desafios.js +++ b/app/utils/staticData/desafios.js @@ -207,24 +207,6 @@ export const desafios = [ conditionalRepetition: true, } }, -{ - id: 'nuevo12', - nombre: 'LimpiandoElHumedal', - escena: 'LimpiandoElHumedal', - bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'TomarLata', 'TomarPapel', 'Colocar', 'IrseEnYacare', 'Repetir', 'Procedimiento'], - }, - { - id: "nuevo22", - nombre: 'CapyBuscaAGuyra', - escena: `new EscenaCapySolo("\ - [*,*,*,*,*],\ - ", { coleccion: ["G", "A"] })`, - bloques: ['Repetir', 'Si', 'SiNo', 'Hasta', 'Procedimiento', - 'VolverAlBordeIzquierdo', 'MoverACasillaDerecha', 'TocandoGuyra','SubirPajarito'], - expectations: { - conditionalRepetition: true, - } - }, { id: 23, nombre: 'FutbolRobots', @@ -2840,6 +2822,12 @@ export const desafios = [ escena: 'InstalandoJuegosYvoty', bloques: ['PasarASiguienteComputadora', 'PrenderComputadora', 'ApagarComputadora', 'EscribirC', 'EscribirB', 'EscribirA', 'InstalarJuego', 'Repetir', 'Procedimiento'], }, + { + id: 'nuevo12', + nombre: 'LimpiandoElHumedal', + escena: 'LimpiandoElHumedal', + bloques: ['MoverACasillaDerecha', 'MoverACasillaIzquierda', 'MoverACasillaArriba', 'MoverACasillaAbajo', 'TomarLata', 'TomarPapel', 'Colocar', 'IrseEnYacare', 'Repetir', 'Procedimiento'], + }, { id: 'nuevo13', nombre: 'PateandoAVeces', @@ -2944,6 +2932,18 @@ export const desafios = [ conditionalRepetition: true, } }, + { + id: "nuevo22", + nombre: 'CapyBuscaAGuyra', + escena: `new EscenaCapySolo("\ + [*,*,*,*,*],\ + ", { coleccion: ["G", "A"] })`, + bloques: ['Repetir', 'Si', 'SiNo', 'Hasta', 'Procedimiento', + 'VolverAlBordeIzquierdo', 'MoverACasillaDerecha', 'TocandoGuyra','SubirPajarito'], + expectations: { + conditionalRepetition: true, + } + }, { id: 'nuevo23', nombre: 'FutbolAlSur', diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 911387f9c..ec56572d8 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -121,10 +121,6 @@ model: description: | The mouse is hungrier than ever! Guide him along the maze so that he can eat all pieces of cheese. Clue: before starting, push the “Run” button several times to learn how the scenario changes. clue: 'It is important to consider if the block’s condition called "Repeat until" is met at any given time. Otherwise, the program might never end!' - 'nuevo22': - title: Capy looks for Guyrá - description: Help Capy to find Guyrá - clue: '' '22': title: Detective Chaparro description: 'The detective should discover the guilty of a crime. Starting by the first on the left, interrogate each one of the suspects until you find the guilty party!' @@ -694,6 +690,10 @@ model: description: | Yvoty needs to install a game in 3 different computers to have fun with his friends. The steps to install the game in each computer are: powering the computer on, writing the password ("ABC"), installing the game, and finally powering the computer off. Clue: make the most of the fact that you have to do the same work in each computer. clue: '' + 'nuevo12': + title: cleaning the wetland + description: 'Capy needs to clean the wetland to go surfing. To achieve this, Capy needs to carry 3 cans and 3 papers to the trash, but Capy cannot throw more than one at a time.' + clue: '' 'nuevo16': title: Three telescopes description: | @@ -714,6 +714,10 @@ model: description: | Super Yvoty should wake up all the fireflies, but opposite to the previous challenge, there are cells without any firefly here. Could you use the same procedure you used in Super Tito 1? clue: The "Repeat until" block will repeat a sequence of actions until one condition is met. This is called "Conditional repetition". + 'nuevo22': + title: Capy looks for Guyrá + description: Help Capy to find Guyrá + clue: '' 'nuevo24': title: Powering all computers on description: | diff --git a/translations/es-ar.yaml b/translations/es-ar.yaml index 5fa9c01cb..a61087e1c 100644 --- a/translations/es-ar.yaml +++ b/translations/es-ar.yaml @@ -700,6 +700,10 @@ model: description: | Yvoty va a instalar un juego en tres computadoras para que ella y sus amigas tengan todo listo para divertirse esta noche. Los pasos para instalarlo son: encender la computadora, escribir la contraseña ("ABC"), instalar el juego y apagar la máquina. Ayudala a completar la instalación de las tres compus. clue: '¿Hay algo que se repita? Seguramente te diste cuenta que en cada computadora hay que hacer exactamente el mismo trabajo. ¿Cómo podría ayudarte tener en cuenta eso?' + 'nuevo12': + title: Limpiando el humedal + description: 'Capy necesita limpiar el humedal antes de ir a surfear. Para lograrlo, Capy necesita agarrar 3 latas y 3 papeles y llevarlos hasta el tacho, pero no puede tirar más de uno a la vez.' + clue: '' 'nuevo13': title: Chuy y la pelota indecisa description: | diff --git a/translations/pt-br.yaml b/translations/pt-br.yaml index fa5656dcd..2b5c448c9 100644 --- a/translations/pt-br.yaml +++ b/translations/pt-br.yaml @@ -680,6 +680,10 @@ model: description: | Yvoty tiene que instalar un juego en 3 compus para divertirse con sus amigos. Los pasos para instalarlo en cada una son: encenderla, escribir la contraseña ("ABC"), instalar el juego y apagar la máquina. Pista: aprovechá que en cada compu hay que hacer el mismo trabajo. clue: '' + 'nuevo12': + title: Limpando o pantanal + description: 'Capy precisa limpar o pântano antes de surfar. Para conseguir isso, Capy precisa pegar 3 latas e 3 pedaços de papel e levá-los para o lixo, mas não pode jogar mais de um de cada vez.' + clue: '' 'nuevo16': title: Tres telescopios description: | From ac3d469da72b4a3c6a9146b7ccc4e91dbc3fed89 Mon Sep 17 00:00:00 2001 From: Daniel Ferro Date: Tue, 17 Oct 2023 11:07:41 -0300 Subject: [PATCH 4/7] fixing Tests --- tests/integration/desafios/LimpiandoElHumedal-test.js | 8 ++++---- translations/en-us.yaml | 2 +- translations/es-ar.yaml | 2 +- translations/pt-br.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/integration/desafios/LimpiandoElHumedal-test.js b/tests/integration/desafios/LimpiandoElHumedal-test.js index 14ed58003..da9c24e68 100644 --- a/tests/integration/desafios/LimpiandoElHumedal-test.js +++ b/tests/integration/desafios/LimpiandoElHumedal-test.js @@ -9,15 +9,15 @@ moduloActividad(nombre, () => { }); actividadTest(nombre, { - descripcionAdicional: 'Da error al querer irse sin limpiar el humedal', + descripcionAdicional: 'Da error al tirar en el tacho cuando no tengo nada', solucion:'', - errorEsperado: 'Para irse hace falta un transporte' + errorEsperado: 'No tengo nada en la mano' }); actividadTest(nombre, { - descripcionAdicional: 'Da error al tirar en el tacho cuando no tengo nada', + descripcionAdicional: ' Da error al querer irse sin limpiar el humedal', solucion: '', - errorEsperado: 'No tengo nada en la mano' + errorEsperado: 'Para irse hace falta un transporte' }); }); \ No newline at end of file diff --git a/translations/en-us.yaml b/translations/en-us.yaml index ec56572d8..c7cb79eb6 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -692,7 +692,7 @@ model: clue: '' 'nuevo12': title: cleaning the wetland - description: 'Capy needs to clean the wetland to go surfing. To achieve this, Capy needs to carry 3 cans and 3 papers to the trash, but Capy cannot throw more than one at a time.' + description: 'Capy needs to clean the wetland to go surfing. To achieve this, Capy needs to carry 3 cans and 3 papers to the trash, but Capy cannot throw more than one at a time. Then, Capy gets on the alligator and finally goes surfing!' clue: '' 'nuevo16': title: Three telescopes diff --git a/translations/es-ar.yaml b/translations/es-ar.yaml index a61087e1c..4e7289d94 100644 --- a/translations/es-ar.yaml +++ b/translations/es-ar.yaml @@ -702,7 +702,7 @@ model: clue: '¿Hay algo que se repita? Seguramente te diste cuenta que en cada computadora hay que hacer exactamente el mismo trabajo. ¿Cómo podría ayudarte tener en cuenta eso?' 'nuevo12': title: Limpiando el humedal - description: 'Capy necesita limpiar el humedal antes de ir a surfear. Para lograrlo, Capy necesita agarrar 3 latas y 3 papeles y llevarlos hasta el tacho, pero no puede tirar más de uno a la vez.' + description: 'Capy necesita limpiar el humedal antes de ir a surfear. Para lograrlo, Capy necesita agarrar 3 latas y 3 papeles y llevarlos hasta el tacho, pero no puede tirar más de uno a la vez. Luego, se sube al yacaré y se va a surfear!' clue: '' 'nuevo13': title: Chuy y la pelota indecisa diff --git a/translations/pt-br.yaml b/translations/pt-br.yaml index 2b5c448c9..0ac168fc6 100644 --- a/translations/pt-br.yaml +++ b/translations/pt-br.yaml @@ -682,7 +682,7 @@ model: clue: '' 'nuevo12': title: Limpando o pantanal - description: 'Capy precisa limpar o pântano antes de surfar. Para conseguir isso, Capy precisa pegar 3 latas e 3 pedaços de papel e levá-los para o lixo, mas não pode jogar mais de um de cada vez.' + description: 'Capy precisa limpar o pântano antes de surfar. Para conseguir isso, Capy precisa pegar 3 latas e 3 pedaços de papel e levá-los para o lixo, mas não pode jogar mais de um de cada vez. Aí ele sobe no jacaré e finalmente a surfar!' clue: '' 'nuevo16': title: Tres telescopios From 26c2b5238f469944544c2fec242b085dc97e55b3 Mon Sep 17 00:00:00 2001 From: Daniel Ferro Date: Tue, 17 Oct 2023 11:20:49 -0300 Subject: [PATCH 5/7] exercises 1.4.11 --- package-lock.json | 6 +++--- package.json | 2 +- public/pilas.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d983625c1..b70be9595 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33036,9 +33036,9 @@ } }, "pilas-bloques-exercises": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/pilas-bloques-exercises/-/pilas-bloques-exercises-1.4.7.tgz", - "integrity": "sha512-TLT5YBblR0MlNYCI+EyAwYo3fTalFFze96aVCjnaQY3nOage837InrUniZsjx071WgIBKHbG6G6x/caB3dqlKg==", + "version": "1.4.11", + "resolved": "https://registry.npmjs.org/pilas-bloques-exercises/-/pilas-bloques-exercises-1.4.11.tgz", + "integrity": "sha512-YNsRAg2D8UIJeYhUIvUShDlBOwPtUhF6Qweh3nAvkbt7W2SzWXZGs2HFWHUtri/JYPaEiX9RCy2rbxoRxaKCDA==", "requires": { "pilasweb": "^0.5.0" } diff --git a/package.json b/package.json index 7c28fb9bf..89ca552b4 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "creador-de-desafios-pilasbloques": "^1.0.1", "mulang": "^6.0.5", "pilas-bloques-ember-intl": "^1.1.2", - "pilas-bloques-exercises": "1.4.7", + "pilas-bloques-exercises": "1.4.11", "pilasweb": "^0.5.0", "proceds-blockly": "^1.1.0", "ramda": "^0.28.0", diff --git a/public/pilas.html b/public/pilas.html index b372bdfb7..8770ee061 100644 --- a/public/pilas.html +++ b/public/pilas.html @@ -22,7 +22,7 @@ - + From d01dd92c49528237fbff44bdc1a3534ced5986c7 Mon Sep 17 00:00:00 2001 From: Daniel Ferro <91342656+danielferro69@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:19:25 -0300 Subject: [PATCH 6/7] Update translations/en-us.yaml Co-authored-by: Tomas Floxo <37090248+tfloxolodeiro@users.noreply.github.com> --- translations/en-us.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/en-us.yaml b/translations/en-us.yaml index c7cb79eb6..4f7bdb467 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -691,7 +691,7 @@ model: Yvoty needs to install a game in 3 different computers to have fun with his friends. The steps to install the game in each computer are: powering the computer on, writing the password ("ABC"), installing the game, and finally powering the computer off. Clue: make the most of the fact that you have to do the same work in each computer. clue: '' 'nuevo12': - title: cleaning the wetland + title: Cleaning the wetland description: 'Capy needs to clean the wetland to go surfing. To achieve this, Capy needs to carry 3 cans and 3 papers to the trash, but Capy cannot throw more than one at a time. Then, Capy gets on the alligator and finally goes surfing!' clue: '' 'nuevo16': From 96484f0b8431097abed54783318f8f0099c4dd80 Mon Sep 17 00:00:00 2001 From: Daniel Ferro Date: Fri, 20 Oct 2023 16:21:02 -0300 Subject: [PATCH 7/7] Update pb-exercises 1.4.13 --- package-lock.json | 6 +++--- package.json | 2 +- public/pilas.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b70be9595..14d80eb74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33036,9 +33036,9 @@ } }, "pilas-bloques-exercises": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/pilas-bloques-exercises/-/pilas-bloques-exercises-1.4.11.tgz", - "integrity": "sha512-YNsRAg2D8UIJeYhUIvUShDlBOwPtUhF6Qweh3nAvkbt7W2SzWXZGs2HFWHUtri/JYPaEiX9RCy2rbxoRxaKCDA==", + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/pilas-bloques-exercises/-/pilas-bloques-exercises-1.4.13.tgz", + "integrity": "sha512-MnkR1aoXVs1raHSkaT4ESlv+wBXGYy4k5BpboiyfLdn9dZYUiiB+8AnbrFQoSx/GXSOInCfQ9nsd/A/qhaq00Q==", "requires": { "pilasweb": "^0.5.0" } diff --git a/package.json b/package.json index b625813a2..fb4063ef2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "creador-de-desafios-pilasbloques": "^1.0.1", "mulang": "^6.0.5", "pilas-bloques-ember-intl": "^1.1.2", - "pilas-bloques-exercises": "1.4.12", + "pilas-bloques-exercises": "1.4.13", "pilasweb": "^0.5.0", "proceds-blockly": "^1.1.0", "ramda": "^0.28.0", diff --git a/public/pilas.html b/public/pilas.html index 8770ee061..d51c8ee5a 100644 --- a/public/pilas.html +++ b/public/pilas.html @@ -22,7 +22,7 @@ - +