From b2614b17a1f6bf40a988c1bace0342136a74d101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20Gu=C3=A9don?=
<60623551+arthurgdn@users.noreply.github.com>
Date: Tue, 22 Dec 2020 18:33:40 +0100
Subject: [PATCH] Improve error message (#63)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* improves phone number validation format
---
src/app/members/account/edit-data/edit-data.component.ts | 8 +++++---
.../signup/student-signup/student-signup.component.html | 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/app/members/account/edit-data/edit-data.component.ts b/src/app/members/account/edit-data/edit-data.component.ts
index 34a1fb6..c001642 100644
--- a/src/app/members/account/edit-data/edit-data.component.ts
+++ b/src/app/members/account/edit-data/edit-data.component.ts
@@ -95,8 +95,10 @@ export class EditDataComponent implements OnInit {
street:this.personalData.street,
zipCode:this.personalData.zipCode,
city:this.personalData.city,
- personalPhone:[this.personalData.personalPhone,Validators.pattern("^([0-9]{2}[. ]?){5}$")],
- parentsPhone:[this.personalData.parentsPhone,Validators.pattern("^([0-9]{2}[. ]?){5}$")],
+
+ personalPhone:[this.personalData.personalPhone,Validators.pattern("^([0-9]{2}[]?){5}$")],
+ parentsPhone:[this.personalData.parentsPhone,Validators.pattern("^([0-9]{2}[]?){5}$")],
+
parentsEmail:[this.personalData.parentsEmail,Validators.email],
school:this.personalData.school,
grade:this.personalData.grade,
@@ -131,7 +133,7 @@ export class EditDataComponent implements OnInit {
).subscribe(
() => {},
(error) => {
- this.error = "Erreur lors de la modification des données"
+ this.error = "Erreur lors de la modification des données, vérifie que tes données rentrées sont sous le bon format"
this.loading = false
},
);
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index c567456..68c6854 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,7 +33,10 @@
</mat-hint>
</mat-form-field>
+<<<<<<< HEAD
+=======
+>>>>>>> donnees_personnelles
<p>
Il ne te reste plus qu'à choisir un mot de passe. :-)
</p>
--
GitLab