From e21db16bad75dbb7f214ba2726f8fcc4a8e09746 Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Thu, 1 Apr 2021 04:39:36 -0300
Subject: [PATCH 01/13] Starting to work in terms and conditions.

---
 app/components/collapsable.js                 | 11 ++++++
 app/styles/app.scss                           |  4 ++
 app/styles/session.scss                       | 16 ++++++++
 app/templates/components/collapsable.hbs      | 11 ++++++
 app/templates/register.hbs                    | 39 ++++++++++++-------
 .../components/collapsable-test.js            | 26 +++++++++++++
 6 files changed, 92 insertions(+), 15 deletions(-)
 create mode 100644 app/components/collapsable.js
 create mode 100644 app/templates/components/collapsable.hbs
 create mode 100644 tests/integration/components/collapsable-test.js

diff --git a/app/components/collapsable.js b/app/components/collapsable.js
new file mode 100644
index 000000000..d8889de4f
--- /dev/null
+++ b/app/components/collapsable.js
@@ -0,0 +1,11 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  isExpanded: false,
+
+  actions: {
+    toggle: function() {
+      this.set('isExpanded', !this.get('isExpanded'));
+    }
+  }
+});
diff --git a/app/styles/app.scss b/app/styles/app.scss
index db3432355..95a0cd799 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -467,6 +467,10 @@ a:hover {
   text-align: center;
 }
 
+.left {
+  text-align: left;
+}
+
 .aplicar-modo-lectura-simple,
 .aplicar-modo-lectura-simple button // esta regla es necesaria para evitar que la sobreescriba Bootstrap
 {
diff --git a/app/styles/session.scss b/app/styles/session.scss
index 5f672988f..1732df071 100644
--- a/app/styles/session.scss
+++ b/app/styles/session.scss
@@ -35,4 +35,20 @@
 .register-form {
   max-width: 20rem;
   display: inline-block;
+}
+
+.register-form md-input-container {
+  width: 300px; // Makes the input labels readable
+}
+
+// TODO: Move to someplace component-specific
+.collapsable-title { 
+  color: var(--theme-font-color);
+  font-style: italic;
+  cursor: pointer;
+  margin-bottom: 18px;
+}
+
+.collapsable-title:hover {
+  background-color: var(--theme-background-color);
 }
\ No newline at end of file
diff --git a/app/templates/components/collapsable.hbs b/app/templates/components/collapsable.hbs
new file mode 100644
index 000000000..d82502080
--- /dev/null
+++ b/app/templates/components/collapsable.hbs
@@ -0,0 +1,11 @@
+<div class='collapsable-title' {{action 'toggle'}}>
+  {{title}}
+  {{#if isExpanded}}
+    {{paper-icon "keyboard_arrow_up"}}
+  {{else}}
+    {{paper-icon "keyboard_arrow_down"}}
+  {{/if}}
+</div>
+{{#if isExpanded}}
+  {{yield}}
+{{/if}}
diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index cdc5d535e..f7761cd65 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -16,15 +16,7 @@
 
     <PasswordConfirmation @password={{ registerData.password }} />
 
-    <PbInput @label="Nombre de madre, padre o tutor/a"
-      @model={{ registerData.parentName }} 
-      @required={{ true }} />
-
-    <PbInput @label="CUIL de madre, padre o tutor/a"
-      @model={{ registerData.parentCUIL }} 
-      @required={{ true }} />
-
-    <PbInput @type="email" @label="Email (opcional)"
+    <PbInput @type="email" @label="Email"
       @model={{ registerData.email }} />
 
     <p for="avatarURL">
@@ -41,12 +33,29 @@
       {{/each}}
     </PaperGridList>
 
-    <p for="Terms & Conditions"> Términos y condiciones </p>
-    <Textarea @value={{ "Acá van los términos y condiciones" }} disabled={{true}} />
-    <br>
-    <Link>Ver todos los términos y condiciones</Link>
-    <br><br>
-    <Input @type={{"checkbox"}} required /> <span>He leído y acepto los términos y condiciones.</span>
+    <p>Consentimiento parental</p>
+
+    <PbInput @label="Nombre de madre, padre o tutor/a"
+      @model={{ registerData.parentName }} 
+      @required={{ true }} />
+
+    <PbInput @label="CUIL de madre, padre o tutor/a"
+      @model={{ registerData.parentCUIL }} 
+      @required={{ true }} />
+
+    <Collapsable @class="left" @title="¿Por qué solicitamos estos datos?">
+        <p>
+          Para la FUNDACIÓN SADOSKY tu privacidad y la de tus hijos es muy importante. Para protegerla mejor, y para que puedas tener una experiencia gratificante al utilizar nuestra Plataforma te presentamos estas Condiciones de Uso en las que se resumen todas nuestras prácticas con la información en línea.
+        </p>
+        <p>
+          A fin de identificar tu cuenta con los datos de tu padre / padre / tutor en caso de hacer uso a los derechos emergentes de la Ley de Protección de Datos Personales del menor tutelado. Ver mas en (link)
+        </p>
+        <p>
+          Los padres o tutores podrán solicitar por email a ponerunemail@fundacionsadosky.org.ar al Administrador que le muestre los datos consignados por menor a su cargo y solicitar que se efectúen modificaciones en los datos suministrados.
+        </p>
+    </Collapsable>
+
+    <Input @type={{"checkbox"}} required /> <span>He leído y acepto los <Link @openOnNewTab={{true}} @href="https://docs.google.com/document/d/e/2PACX-1vTNX9zl8txZmuINNz2qODrodoQhvr0o2-r3T_6yFp6quEpidmPz6ORx1HSjo2KNUg6MnyHPN-Ti44z1/pub">términos y condiciones de uso</Link></span>
 
     <br><br>
     <ProgressButton class="link" type="submit" @isDisabled={{not validUsername}} @loading={{ pilasBloquesApi.loading.register }}>
diff --git a/tests/integration/components/collapsable-test.js b/tests/integration/components/collapsable-test.js
new file mode 100644
index 000000000..36833e859
--- /dev/null
+++ b/tests/integration/components/collapsable-test.js
@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | collapsable', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function(assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<Collapsable />`);
+
+    assert.equal(this.element.textContent.trim(), '');
+
+    // Template block usage:
+    await render(hbs`
+      <Collapsable>
+        template block text
+      </Collapsable>
+    `);
+
+    assert.equal(this.element.textContent.trim(), 'template block text');
+  });
+});

From 94817a5cc2ce42a8f67ea375b1ca76247848ed4d Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Wed, 7 Apr 2021 19:56:36 -0300
Subject: [PATCH 02/13] Terms and conditions link component

---
 app/components/terms-and-conditions-link.js            | 5 +++++
 app/styles/link.scss                                   | 6 +++++-
 app/templates/components/terms-and-conditions-link.hbs | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/components/terms-and-conditions-link.js
 create mode 100644 app/templates/components/terms-and-conditions-link.hbs

diff --git a/app/components/terms-and-conditions-link.js b/app/components/terms-and-conditions-link.js
new file mode 100644
index 000000000..4d60c322f
--- /dev/null
+++ b/app/components/terms-and-conditions-link.js
@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  classNames: ['terms-and-conditions-link']
+});
diff --git a/app/styles/link.scss b/app/styles/link.scss
index 08cf778ee..ff7ec69a9 100644
--- a/app/styles/link.scss
+++ b/app/styles/link.scss
@@ -1,4 +1,8 @@
 .link {
     color: #4ec2df;
     text-decoration: none;
-} 
\ No newline at end of file
+} 
+
+.terms-and-conditions-link {
+    display: inline;
+}
\ No newline at end of file
diff --git a/app/templates/components/terms-and-conditions-link.hbs b/app/templates/components/terms-and-conditions-link.hbs
new file mode 100644
index 000000000..8205f2a6d
--- /dev/null
+++ b/app/templates/components/terms-and-conditions-link.hbs
@@ -0,0 +1,3 @@
+<Link 
+  @openOnNewTab={{true}} 
+  @href={{"https://docs.google.com/document/d/e/2PACX-1vTNX9zl8txZmuINNz2qODrodoQhvr0o2-r3T_6yFp6quEpidmPz6ORx1HSjo2KNUg6MnyHPN-Ti44z1/pub"}}>términos y condiciones de uso</Link>
\ No newline at end of file

From d0ee4ddac404f06db57a2815f0a5fe1c586b5ad9 Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Wed, 7 Apr 2021 19:57:00 -0300
Subject: [PATCH 03/13] small survey changes

---
 app/components/personal-survey.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/components/personal-survey.js b/app/components/personal-survey.js
index 8d41fed38..9932ce059 100644
--- a/app/components/personal-survey.js
+++ b/app/components/personal-survey.js
@@ -21,7 +21,7 @@ export default Component.extend({
     },
     {
       id: 2,
-      title: "Edad y Género",
+      title: "Edad y género",
       logo: "imagenes/surveyLogoLita.png",
       pages: [{
         name: "ageAndGender", questions: [
@@ -32,7 +32,7 @@ export default Component.extend({
     },
     {
       id: 3,
-      title: "Escuela y Provincia",
+      title: "Escuela y provincia",
       logo: "imagenes/surveyLogoAlien.png",
       pages: [{
         name: "schoolAndProvince", questions: [
@@ -43,7 +43,7 @@ export default Component.extend({
     },
     {
       id: 4,
-      title: "Clase o Tarea",
+      title: "Clase o tarea",
       logo: "imagenes/surveyLogoHeroin.png",
       pages: [{
         name: "classOrHomework", questions: [
@@ -55,7 +55,7 @@ export default Component.extend({
     },
     {
       id: 5,
-      title: "Escuela y Compañía",
+      title: "Escuela y compañía",
       logo: "imagenes/surveyLogoCoty.png",
       pages: [{
         name: "schoolAndCompany", questions: [

From e435b6951ffd7def9feb4e0f721c74a7cdbd666c Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Wed, 7 Apr 2021 20:03:44 -0300
Subject: [PATCH 04/13] Validating email and parentname

---
 app/controllers/register.js | 22 ++++++++++++++++++++++
 app/templates/register.hbs  | 27 +++++++++++++--------------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index ae06e9959..4263fcf08 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -7,6 +7,8 @@ export default Controller.extend({
   pilasBloquesApi: service(),
   registerData: {},
   validUsername: true,
+  validEmail: true,
+  validParentName: true,
 
   avatars: computed('avatardb', function() {
     return this.avatardb.allAvatars()
@@ -22,5 +24,25 @@ export default Controller.extend({
       this.pilasBloquesApi.userExists(this.registerData.username)
         .then(exist => this.set("validUsername", !exist))
     },
+
+    checkEmail() {
+      this.set("validEmail", this._isValidEmail(this.registerData.email))
+    },
+
+    checkParentName() {
+      this.set("validParentName", this._isValidParentName(this.registerData.parentName))
+    },
+  },
+
+  // https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript
+  _isValidEmail(email) {
+    const re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return re.test(email);
+  },
+
+  _isValidParentName(parentName) {
+    const re = /.+ .+/;
+    return re.test(parentName);
   }
+
 })
\ No newline at end of file
diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index f7761cd65..d8969b08a 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -17,7 +17,9 @@
     <PasswordConfirmation @password={{ registerData.password }} />
 
     <PbInput @type="email" @label="Email"
-      @model={{ registerData.email }} />
+      @focusOut={{ action "checkEmail" }}
+      @model={{ registerData.email }}
+      @error={{ if (not validEmail) "Este no es un email válido" }} />
 
     <p for="avatarURL">
       <label>Elegí tu avatar:</label>
@@ -35,27 +37,24 @@
 
     <p>Consentimiento parental</p>
 
-    <PbInput @label="Nombre de madre, padre o tutor/a"
+    <PbInput @label="Nombre completo de madre, padre o tutor/a"
+      @focusOut={{ action "checkParentName" }}
       @model={{ registerData.parentName }} 
-      @required={{ true }} />
+      @required={{ true }}
+      @error={{ if (not validParentName) "Se requiere nombre y apellido" }} />
 
-    <PbInput @label="CUIL de madre, padre o tutor/a"
+    <PbInput @label="DNI de madre, padre o tutor/a"
       @model={{ registerData.parentCUIL }} 
       @required={{ true }} />
 
     <Collapsable @class="left" @title="¿Por qué solicitamos estos datos?">
-        <p>
-          Para la FUNDACIÓN SADOSKY tu privacidad y la de tus hijos es muy importante. Para protegerla mejor, y para que puedas tener una experiencia gratificante al utilizar nuestra Plataforma te presentamos estas Condiciones de Uso en las que se resumen todas nuestras prácticas con la información en línea.
-        </p>
-        <p>
-          A fin de identificar tu cuenta con los datos de tu padre / padre / tutor en caso de hacer uso a los derechos emergentes de la Ley de Protección de Datos Personales del menor tutelado. Ver mas en (link)
-        </p>
-        <p>
-          Los padres o tutores podrán solicitar por email a ponerunemail@fundacionsadosky.org.ar al Administrador que le muestre los datos consignados por menor a su cargo y solicitar que se efectúen modificaciones en los datos suministrados.
-        </p>
+      <p>Para la FUNDACIÓN SADOSKY tu privacidad y la de tus hijas/os es muy importante.</p>
+      <p>Identificamos la cuenta con los datos de madre, padre o tutor/a para poder saber de quién se trata en caso de que quiera hacer uso de los derechos emergentes de la Ley de Protección de Datos Personales del menor tutelado. Podés ver más en el punto 8.4 de los <TermsAndConditionsLink />.</p>
+      <p>Las madres, padres o tutores podrán comunicarse por email a pilasbloques@program.ar para conocer cuáles son los datos almacenados de los menores a su cargo y solicitar que se efectúen modificaciones en los datos suministrados.</p>
+
     </Collapsable>
 
-    <Input @type={{"checkbox"}} required /> <span>He leído y acepto los <Link @openOnNewTab={{true}} @href="https://docs.google.com/document/d/e/2PACX-1vTNX9zl8txZmuINNz2qODrodoQhvr0o2-r3T_6yFp6quEpidmPz6ORx1HSjo2KNUg6MnyHPN-Ti44z1/pub">términos y condiciones de uso</Link></span>
+    <Input @type={{"checkbox"}} required /> <span>He leído y acepto los <TermsAndConditionsLink /></span>
 
     <br><br>
     <ProgressButton class="link" type="submit" @isDisabled={{not validUsername}} @loading={{ pilasBloquesApi.loading.register }}>

From eaedfc14b82e8065da6923fb6d65b09edfebaef1 Mon Sep 17 00:00:00 2001
From: tfloxolodeiro <tfloxolodeiro@est.frba.utn.edu.ar>
Date: Fri, 9 Apr 2021 14:00:23 -0300
Subject: [PATCH 05/13] changing CUIL to DNI

---
 app/templates/password-recovery.hbs | 112 +++++++++++++---------------
 app/templates/register.hbs          |  43 +++++------
 2 files changed, 69 insertions(+), 86 deletions(-)

diff --git a/app/templates/password-recovery.hbs b/app/templates/password-recovery.hbs
index 68ef0f9b2..484104715 100644
--- a/app/templates/password-recovery.hbs
+++ b/app/templates/password-recovery.hbs
@@ -1,65 +1,57 @@
-<Header/>
+<Header />
 
 <div class="center">
-  {{#paper-stepper currentStep=currentStep onStepChange=(action (mut currentStep)) 
-      vertical=true as |stepper|}}
-
-    {{#stepper.step label="Ingrese su nombre de usuario" as |step|}}
-        {{#step.body}}
-          <PaperForm @onSubmit={{action "checkUsername" step.nextStep}} as |form|>
-
-            <PbInput @label="Usuario"
-              @model={{ credentials.username }} 
-              @required={{ true }}
-              @onKeyDown={{ action (mut usernameExists) true }}
-              @error={{ unless usernameExists "Este nombre de usuario no existe" }} />
-
-            <ProgressButton type="submit" @loading={{ pilasBloquesApi.loading.users-exists }}>
-              Continuar
-            </ProgressButton>
-
-          </PaperForm>
-        {{/step.body}}
-    {{/stepper.step}}
-
-    {{#stepper.step label="Nueva contraseña" as |step|}}
-      {{#step.body}}
-        <PaperForm @onSubmit={{action "changePassword" step.nextStep}} as |form|>
-
-          <PbInput @label="CUIL de madre, padre o tutor/a"
-            @model={{ credentials.parentCUIL }} 
-            @required={{ true }}
-            @onKeyDown={{ action (mut wrongCredentials) false }}
-            @error={{ if wrongCredentials "CUIL incorrecto" }} />
-
-          <PbInput @type="password" @label="Nueva contraseña"
-            @model={{ credentials.password }} 
-            @required={{ true }} />
-
-          <PasswordConfirmation @password={{ credentials.password }} />
-
-          <ProgressButton type="submit" @loading={{ pilasBloquesApi.loading.credentials }}>
-            Finalizar
-          </ProgressButton>
-          <PaperButton onClick={{ action step.previousStep }}>
-            Volver
-          </PaperButton>
-
-        </PaperForm>
-      {{/step.body}}
-    {{/stepper.step}}
-
-    {{#stepper.step label="Contraseña cambiada" as |step|}}
-      {{#step.body}}
-        <h2><strong>¡Hola de nuevo!</strong></h2>
-        <p>Tu contraseña ha sido cambiada. </p>
-      {{/step.body}}
-      {{#step.actions as |nextStep previousStep goTo|}}
-        {{#paper-button primary=true raised=true href="#"}}
-          Ok
-        {{/paper-button}}
-      {{/step.actions}}
-    {{/stepper.step}}
+  {{#paper-stepper currentStep=currentStep onStepChange=(action (mut currentStep))
+  vertical=true as |stepper|}}
+
+  {{#stepper.step label="Ingrese su nombre de usuario" as |step|}}
+  {{#step.body}}
+  <PaperForm @onSubmit={{action "checkUsername" step.nextStep}} as |form|>
+
+    <PbInput @label="Usuario" @model={{ credentials.username }} @required={{ true }} @onKeyDown={{ action (mut
+      usernameExists) true }} @error={{ unless usernameExists "Este nombre de usuario no existe" }} />
+
+    <ProgressButton type="submit" @loading={{ pilasBloquesApi.loading.users-exists }}>
+      Continuar
+    </ProgressButton>
+
+  </PaperForm>
+  {{/step.body}}
+  {{/stepper.step}}
+
+  {{#stepper.step label="Nueva contraseña" as |step|}}
+  {{#step.body}}
+  <PaperForm @onSubmit={{action "changePassword" step.nextStep}} as |form|>
+
+    <PbInput @label="DNI de madre, padre o tutor/a" @model={{ credentials.parentDNI }} @required={{ true }}
+      @onKeyDown={{ action (mut wrongCredentials) false }} @error={{ if wrongCredentials "DNI incorrecto" }} />
+
+    <PbInput @type="password" @label="Nueva contraseña" @model={{ credentials.password }} @required={{ true }} />
+
+    <PasswordConfirmation @password={{ credentials.password }} />
+
+    <ProgressButton type="submit" @loading={{ pilasBloquesApi.loading.credentials }}>
+      Finalizar
+    </ProgressButton>
+    <PaperButton onClick={{ action step.previousStep }}>
+      Volver
+    </PaperButton>
+
+  </PaperForm>
+  {{/step.body}}
+  {{/stepper.step}}
+
+  {{#stepper.step label="Contraseña cambiada" as |step|}}
+  {{#step.body}}
+  <h2><strong>¡Hola de nuevo!</strong></h2>
+  <p>Tu contraseña ha sido cambiada. </p>
+  {{/step.body}}
+  {{#step.actions as |nextStep previousStep goTo|}}
+  {{#paper-button primary=true raised=true href="#"}}
+  Ok
+  {{/paper-button}}
+  {{/step.actions}}
+  {{/stepper.step}}
 
 
   {{/paper-stepper}}
diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index cdc5d535e..8643f2dea 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -1,43 +1,33 @@
-<Header/>
+<Header />
 
 <div class="center">
-  <PaperForm class="register-form" @onSubmit={{action "doRegister"}} as |form|>
+  <PaperForm class="register-form" @onSubmit={{action "doRegister" }} as |form|>
     <img src="imagenes/session/register.png" />
-    
-    <PbInput @label="Usuario"
-      @model={{ registerData.username }} 
-      @focusOut={{ action "checkUsername" }}
-      @required={{ true }}
-      @error={{ if (not validUsername) "Este nombre de usuario ya existe" }} />
 
-    <PbInput @type="password" @label="Contraseña"
-      @model={{ registerData.password }} 
-      @required={{ true }} />
+    <PbInput @label="Usuario" @model={{ registerData.username }} @focusOut={{ action "checkUsername" }} @required={{
+      true }} @error={{ if (not validUsername) "Este nombre de usuario ya existe" }} />
+
+    <PbInput @type="password" @label="Contraseña" @model={{ registerData.password }} @required={{ true }} />
 
     <PasswordConfirmation @password={{ registerData.password }} />
 
-    <PbInput @label="Nombre de madre, padre o tutor/a"
-      @model={{ registerData.parentName }} 
-      @required={{ true }} />
+    <PbInput @label="Nombre de madre, padre o tutor/a" @model={{ registerData.parentName }} @required={{ true }} />
 
-    <PbInput @label="CUIL de madre, padre o tutor/a"
-      @model={{ registerData.parentCUIL }} 
-      @required={{ true }} />
+    <PbInput @label="DNI de madre, padre o tutor/a" @model={{ registerData.parentDNI }} @required={{ true }} />
 
-    <PbInput @type="email" @label="Email (opcional)"
-      @model={{ registerData.email }} />
+    <PbInput @type="email" @label="Email (opcional)" @model={{ registerData.email }} />
 
     <p for="avatarURL">
       <label>Elegí tu avatar:</label>
-      <PbInput class="invisible-input" @type="checkbox" @model={{ registerData.avatarURL }} @required={{ true }} />  
+      <PbInput class="invisible-input" @type="checkbox" @model={{ registerData.avatarURL }} @required={{ true }} />
     </p>
     <PaperGridList @cols="4" @rowHeight="gt-xs-1:1 gt-md-1:1" as |grid|>
       {{#each avatars as |avatar|}}
-        <grid.tile as |tile|>
-          <button type="button" class="avatar" onClick={{action (mut registerData.avatarURL) avatar}}>
-            <img class={{ if (not (eq registerData.avatarURL avatar)) "gray" "selected"}} src={{ avatar }} />
-          </button>
-        </grid.tile>
+      <grid.tile as |tile|>
+        <button type="button" class="avatar" onClick={{action (mut registerData.avatarURL) avatar}}>
+          <img class={{ if (not (eq registerData.avatarURL avatar)) "gray" "selected" }} src={{ avatar }} />
+        </button>
+      </grid.tile>
       {{/each}}
     </PaperGridList>
 
@@ -49,7 +39,8 @@
     <Input @type={{"checkbox"}} required /> <span>He leído y acepto los términos y condiciones.</span>
 
     <br><br>
-    <ProgressButton class="link" type="submit" @isDisabled={{not validUsername}} @loading={{ pilasBloquesApi.loading.register }}>
+    <ProgressButton class="link" type="submit" @isDisabled={{not validUsername}} @loading={{
+      pilasBloquesApi.loading.register }}>
       Registrar
     </ProgressButton>
   </PaperForm>

From 6201eae91ec0ec625b83a535fc42c6ad3a7703d9 Mon Sep 17 00:00:00 2001
From: tfloxolodeiro <tfloxolodeiro@est.frba.utn.edu.ar>
Date: Fri, 9 Apr 2021 19:57:37 -0300
Subject: [PATCH 06/13] checkDNI on register

---
 app/controllers/register.js | 11 +++++++++--
 app/templates/register.hbs  |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index ae06e9959..3205d8dee 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -7,20 +7,27 @@ export default Controller.extend({
   pilasBloquesApi: service(),
   registerData: {},
   validUsername: true,
+  validDNI: true,
 
-  avatars: computed('avatardb', function() {
+  avatars: computed('avatardb', function () {
     return this.avatardb.allAvatars()
   }),
 
   actions: {
     doRegister() {
       this.pilasBloquesApi.register(this.registerData)
-      .then(() => this.transitionToRoute("/"))
+        .then(() => this.transitionToRoute("/"))
     },
 
     checkUsername() {
       this.pilasBloquesApi.userExists(this.registerData.username)
         .then(exist => this.set("validUsername", !exist))
     },
+
+    checkDNI() {
+      // any string with at least 6 numbers
+      const re = new RegExp('(\\D*\\d\\D*){6,}')
+      this.set("validDNI", re.test(this.registerData.parentDNI))
+    },
   }
 })
\ No newline at end of file
diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index 8643f2dea..90f41124a 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -13,7 +13,8 @@
 
     <PbInput @label="Nombre de madre, padre o tutor/a" @model={{ registerData.parentName }} @required={{ true }} />
 
-    <PbInput @label="DNI de madre, padre o tutor/a" @model={{ registerData.parentDNI }} @required={{ true }} />
+    <PbInput @label="DNI de madre, padre o tutor/a" @focusOut={{ action "checkDNI" }} @model={{ registerData.parentDNI
+      }} @required={{ true }} @error={{ if (not validDNI) "El DNI es invalido" }} />
 
     <PbInput @type="email" @label="Email (opcional)" @model={{ registerData.email }} />
 

From 5796299387e8ea75c00a6e969d37a5fe2bb57a01 Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Mon, 12 Apr 2021 16:17:58 -0300
Subject: [PATCH 07/13] Fixing bug doesn't show questions every time

---
 app/components/personal-survey.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/personal-survey.js b/app/components/personal-survey.js
index 9932ce059..afac488ff 100644
--- a/app/components/personal-survey.js
+++ b/app/components/personal-survey.js
@@ -77,7 +77,7 @@ export default Component.extend({
 
   //TODO: Param window for testing?
   showSurveyDialog(question) {
-    if (window.surveyWindow) return; // don't create other surveyWindow if it exists.
+    if (window.surveyWindow && window.surveyWindow.isShowing) return; // don't create other surveyWindow if it exists.
     Survey.StylesManager.applyTheme("winterstone")
     window.surveyWindow = new Survey.SurveyWindow(question)
     window.surveyWindow.isExpanded = true

From e1c14d14bc00deb3ddac07022b1227bc362bb07e Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Mon, 12 Apr 2021 21:02:59 -0300
Subject: [PATCH 08/13] Adding Collapsable tests

---
 .../components/collapsable-test.js            | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/tests/integration/components/collapsable-test.js b/tests/integration/components/collapsable-test.js
index 36833e859..5e6ceea73 100644
--- a/tests/integration/components/collapsable-test.js
+++ b/tests/integration/components/collapsable-test.js
@@ -1,26 +1,25 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
+import { render, click } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
 module('Integration | Component | collapsable', function(hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
-    // Handle any actions with this.set('myAction', function(val) { ... });
-
-    await render(hbs`<Collapsable />`);
-
-    assert.equal(this.element.textContent.trim(), '');
-
-    // Template block usage:
+  hooks.beforeEach(async () => {
     await render(hbs`
       <Collapsable>
-        template block text
+        content
       </Collapsable>
     `);
+  })
+
+  test('Initial collapsable does not show content', async function(assert) {
+    assert.notOk(this.element.textContent.includes("content"));
+  });
 
-    assert.equal(this.element.textContent.trim(), 'template block text');
+  test('Content appears when clicked', async function(assert) {
+    await click('.collapsable-title');    
+    assert.ok(this.element.textContent.includes("content"));
   });
 });

From 32de2e74cce206f45314df066d1cbed025fc1cf1 Mon Sep 17 00:00:00 2001
From: tfloxolodeiro <tfloxolodeiro@est.frba.utn.edu.ar>
Date: Tue, 13 Apr 2021 13:33:54 -0300
Subject: [PATCH 09/13] validating valid DNI on register input

---
 app/templates/register.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index 90f41124a..336f9d151 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -40,7 +40,7 @@
     <Input @type={{"checkbox"}} required /> <span>He leído y acepto los términos y condiciones.</span>
 
     <br><br>
-    <ProgressButton class="link" type="submit" @isDisabled={{not validUsername}} @loading={{
+    <ProgressButton class="link" type="submit" @isDisabled={{or (not validUsername) (not validDNI)}} @loading={{
       pilasBloquesApi.loading.register }}>
       Registrar
     </ProgressButton>

From 438e677fe43581c3061edcba1afacc9971c78742 Mon Sep 17 00:00:00 2001
From: tfloxolodeiro <tfloxolodeiro@est.frba.utn.edu.ar>
Date: Tue, 13 Apr 2021 17:43:32 -0300
Subject: [PATCH 10/13] adding mailto in ToS

---
 app/templates/register.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index d8969b08a..0d68da5bb 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -50,7 +50,7 @@
     <Collapsable @class="left" @title="¿Por qué solicitamos estos datos?">
       <p>Para la FUNDACIÓN SADOSKY tu privacidad y la de tus hijas/os es muy importante.</p>
       <p>Identificamos la cuenta con los datos de madre, padre o tutor/a para poder saber de quién se trata en caso de que quiera hacer uso de los derechos emergentes de la Ley de Protección de Datos Personales del menor tutelado. Podés ver más en el punto 8.4 de los <TermsAndConditionsLink />.</p>
-      <p>Las madres, padres o tutores podrán comunicarse por email a pilasbloques@program.ar para conocer cuáles son los datos almacenados de los menores a su cargo y solicitar que se efectúen modificaciones en los datos suministrados.</p>
+      <p>Las madres, padres o tutores podrán comunicarse por email a <a href="mailto:pilasbloques@program.ar">pilasbloques@program.ar</a> para conocer cuáles son los datos almacenados de los menores a su cargo y solicitar que se efectúen modificaciones en los datos suministrados.</p>
 
     </Collapsable>
 

From 57f3f06d47cc4e5cc7074d3196f7cc6f0da5f348 Mon Sep 17 00:00:00 2001
From: Alfredo Sanzo <alfredo.sanzo@gmail.com>
Date: Wed, 14 Apr 2021 15:14:23 -0300
Subject: [PATCH 11/13] small text change

---
 app/templates/register.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index daae384f1..eeef4b91d 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -56,7 +56,7 @@
 
     </Collapsable>
 
-    <Input @type={{"checkbox"}} required /> <span>He leído y acepto los <TermsAndConditionsLink /></span>
+    <Input @type={{"checkbox"}} required /> <span>Leí y acepto los <TermsAndConditionsLink /></span>
 
     <br><br>
     <ProgressButton class="link" type="submit" 

From 411bedf92a6cc107eeb36f0df4fc47f184602b76 Mon Sep 17 00:00:00 2001
From: tfloxolodeiro <tfloxolodeiro@est.frba.utn.edu.ar>
Date: Wed, 14 Apr 2021 16:02:36 -0300
Subject: [PATCH 12/13] moving most register validations to controller

---
 app/controllers/register.js | 43 ++++++++++++++++++++++---------------
 app/templates/register.hbs  |  9 +++-----
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index 72c6a2dcd..0d0a4bcbc 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -18,6 +18,32 @@ export default Controller.extend({
     return this.avatardb.allAvatars()
   }),
 
+  mailValidation:[{
+    message: 'Este no es un email válido',
+    validate: (mail) => {
+      // https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript
+      const re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+      return re.test(mail)
+    }
+  }],
+
+  parentNameValidation:[{
+    message: 'Se requiere nombre y apellido',
+    validate: (parentName) => {
+      const re = /.+ .+/
+      return re.test(parentName)
+    }
+  }],
+
+  DNIValidation:[{
+    message: 'El DNI es invalido',
+    validate: (DNI) =>{
+      // any string with at least 6 numbers
+      const re = new RegExp('(\\D*\\d\\D*){6,}')
+      return re.test(DNI)
+    }
+  }],
+
   actions: {
     doRegister() {
       this.pilasBloquesApi.register(this.registerData)
@@ -28,22 +54,5 @@ export default Controller.extend({
       this.pilasBloquesApi.userExists(this.registerData.username)
         .then(exist => this.set("validUsername", !exist))
     },
-
-    checkEmail() {
-      // https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript
-      const re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-      this.set("validEmail", re.test(this.registerData.email))
-    },
-
-    checkParentName() {
-      const re = /.+ .+/
-      this.set("validParentName", re.test(this.registerData.parentName))
-    },
-
-    checkDNI() {
-      // any string with at least 6 numbers
-      const re = new RegExp('(\\D*\\d\\D*){6,}')
-      this.set("validDNI", re.test(this.registerData.parentDNI))
-    }
   },
 })
\ No newline at end of file
diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index eeef4b91d..a0044da21 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -17,9 +17,8 @@
     <PasswordConfirmation @password={{ registerData.password }} />
 
     <PbInput @type="email" @label="Email"
-      @focusOut={{ action "checkEmail" }}
       @model={{ registerData.email }}
-      @error={{ if (not validEmail) "Este no es un email válido" }} />
+      @customValidations={{ mailValidation }} />
 
     <p for="avatarURL">
       <label>Elegí tu avatar:</label>
@@ -38,16 +37,14 @@
     <p>Consentimiento parental</p>
 
     <PbInput @label="Nombre completo de madre, padre o tutor/a"
-      @focusOut={{ action "checkParentName" }}
       @model={{ registerData.parentName }} 
       @required={{ true }}
-      @error={{ if (not validParentName) "Se requiere nombre y apellido" }} />
+      @customValidations={{ parentNameValidation }} />
 
     <PbInput @label="DNI de madre, padre o tutor/a" 
-      @focusOut={{ action "checkDNI" }} 
       @model={{ registerData.parentDNI }} 
       @required={{ true }} 
-      @error={{ if (not validDNI) "El DNI es invalido" }} />
+      @customValidations={{ DNIValidation }} />
 
     <Collapsable @class="left" @title="¿Por qué solicitamos estos datos?">
       <p>Para la FUNDACIÓN SADOSKY tu privacidad y la de tus hijas/os es muy importante.</p>

From 0e3bd65aae2bda14d7eb822bc6d99d1de6127fd1 Mon Sep 17 00:00:00 2001
From: tfloxolodeiro <tfloxolodeiro@est.frba.utn.edu.ar>
Date: Wed, 14 Apr 2021 16:23:08 -0300
Subject: [PATCH 13/13] Validating empty mail and removing canRegister

---
 app/controllers/register.js | 12 +++---------
 app/templates/register.hbs  |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index 0d0a4bcbc..981139490 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -5,15 +5,9 @@ import Controller from '@ember/controller';
 export default Controller.extend({
   avatardb: service(),
   pilasBloquesApi: service(),
-  registerData: {},
+  registerData: {email:''},
   validUsername: true,
-  validEmail: true,
-  validParentName: true,
-  validDNI: true,
-  canRegister: computed('validUsername', 'validEmail', 'validParentName', 'validDNI', function() {
-    return this.validUsername && this.validEmail && this.validParentName && this.validDNI
-  }),
-
+  
   avatars: computed('avatardb', function () {
     return this.avatardb.allAvatars()
   }),
@@ -23,7 +17,7 @@ export default Controller.extend({
     validate: (mail) => {
       // https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript
       const re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-      return re.test(mail)
+      return re.test(mail) || mail == ''
     }
   }],
 
diff --git a/app/templates/register.hbs b/app/templates/register.hbs
index a0044da21..b4517bd2e 100644
--- a/app/templates/register.hbs
+++ b/app/templates/register.hbs
@@ -57,7 +57,7 @@
 
     <br><br>
     <ProgressButton class="link" type="submit" 
-      @isDisabled={{not canRegister}} 
+      @isDisabled={{not validUsername}} 
       @loading={{ pilasBloquesApi.loading.register }}>
         Registrar
     </ProgressButton>