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 c00164222f80905e32682dd8ccc87da6299407f0..72fb64411fe9640846c75ff3a0c50abb3d667270 100644 --- a/src/app/members/account/edit-data/edit-data.component.ts +++ b/src/app/members/account/edit-data/edit-data.component.ts @@ -95,7 +95,6 @@ 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}$")], diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html index 68c6854639694462398a05c5fa769c4143a5e217..31e460d98d2eb944c214c92d8d263b7074be2824 100644 --- a/src/app/signup/student-signup/student-signup.component.html +++ b/src/app/signup/student-signup/student-signup.component.html @@ -33,10 +33,7 @@ </mat-hint> </mat-form-field> -<<<<<<< HEAD -======= ->>>>>>> donnees_personnelles <p> Il ne te reste plus qu'à choisir un mot de passe. :-) </p> @@ -61,6 +58,7 @@ <app-load-spinner *ngIf="loading" [block]="false"></app-load-spinner> </button> </div> + <p class="text-center">{{error}}</p> <p class="text-center"> diff --git a/src/app/signup/student-signup/student-signup.component.ts b/src/app/signup/student-signup/student-signup.component.ts index a07350b4b48ac2c3ac3732fd816c3e5e1d8e8ad0..398a968772ff0e1f237e32c0925fa3e8d572544e 100644 --- a/src/app/signup/student-signup/student-signup.component.ts +++ b/src/app/signup/student-signup/student-signup.component.ts @@ -18,6 +18,7 @@ export class StudentSignupComponent implements OnInit { registration: Registration; personnalData: PersonnalData formGroup: FormGroup; + error: String; loading = false; public showPersonnalDataForm = false; public zipPattern = new RegExp(/^\d{5}(?:\d{2})?$/) @@ -123,10 +124,25 @@ export class StudentSignupComponent implements OnInit { 'OK', { duration: 3000 }, )), + tap(()=> this.error = ""), tap(() => this.loading = false), + tap(() => { + setTimeout(()=>{ + this.router.navigate(['./membres']) + + },3000)}) + ).subscribe( () => {}, - (error) => this.loading = false, + (error) => { + + + this.loading=false + + if(error.error.email){ + this.error = "Erreur, cet email est déjà utilisé !" + } + } ); // this.personnalDataService.create(personnalData).pipe( // tap(() => this.loading = false),