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..1a6260dab4240bed6e3dc7419b32f18d386336cd 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/members/student-home/account-overview/account-overview.component.html b/src/app/members/student-home/account-overview/account-overview.component.html index 38703168e287a2eea46c11741ab1a7980900d18c..1619aacb978c99ab34482bb342046997d0e41ae3 100644 --- a/src/app/members/student-home/account-overview/account-overview.component.html +++ b/src/app/members/student-home/account-overview/account-overview.component.html @@ -4,9 +4,12 @@ <p> + Remplie ou modifie tes données personnelles qui te serviront pour valider ton inscription à OSER. + + </p> <a mat-raised-button color="accent" routerLink="compte/donnees"> Voir mon compte diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html index 64ba46da0421255eb37e9b2ad0c7ebb5b2e64d8c..31e460d98d2eb944c214c92d8d263b7074be2824 100644 --- a/src/app/signup/student-signup/student-signup.component.html +++ b/src/app/signup/student-signup/student-signup.component.html @@ -33,6 +33,7 @@ </mat-hint> </mat-form-field> + <p> Il ne te reste plus qu'à choisir un mot de passe. :-) </p> @@ -57,10 +58,11 @@ <app-load-spinner *ngIf="loading" [block]="false"></app-load-spinner> </button> </div> + <p class="text-center">{{error}}</p> <p class="text-center"> J'ai déjà un compte ! <a routerLink="/connexion">Me connecter</a> </p> </form> -</app-form-page> \ No newline at end of file +</app-form-page> 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),