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 34a1fb61158e392e151bd69802921b2a27946ab8..c00164222f80905e32682dd8ccc87da6299407f0 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 c5674563502f75362e3e63353477ff3f0206874a..68c6854639694462398a05c5fa769c4143a5e217 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>