From c07b32cad1a057ea3c2e0dc6b5f6a6c1e5fc3479 Mon Sep 17 00:00:00 2001 From: Sana EL HIRI Date: Mon, 7 Mar 2022 18:29:53 +0100 Subject: [PATCH] =?UTF-8?q?avanc=C3=A9es=20signup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/models/membre.ts | 1 + .../page-signup/page-signup.component.ts | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/models/membre.ts b/src/app/models/membre.ts index f8fad13..bda9dd1 100644 --- a/src/app/models/membre.ts +++ b/src/app/models/membre.ts @@ -8,4 +8,5 @@ export interface Membre { couleur: string; passwordConfirm: string; roleList: string[]; + teamId?: string; } diff --git a/src/app/pages/page-signup/page-signup.component.ts b/src/app/pages/page-signup/page-signup.component.ts index f46ce63..8ec6f26 100644 --- a/src/app/pages/page-signup/page-signup.component.ts +++ b/src/app/pages/page-signup/page-signup.component.ts @@ -5,7 +5,7 @@ import { FormGroup, Validators, } from '@angular/forms'; -import { Router, RouterLink } from '@angular/router'; +import { Router} from '@angular/router'; import { Team } from 'src/app/models/team'; import { TeamService } from 'src/app/services/team.service'; import { Membre } from '../../models/membre'; @@ -59,7 +59,7 @@ export class PageSignupComponent implements OnInit { } public onSubmit(): void { - const teamIdValue = this.signupForm.value['']; + let teamIdValue = ''; const teamNameValue = this.signupForm.value['teamNameFc']; const idValue = this.signupForm.value['']; const prenomValue = this.signupForm.value['firstNameFc']; @@ -85,16 +85,20 @@ export class PageSignupComponent implements OnInit { couleur: couleurValue, dateNaissance: dateNaissanceValue, passwordConfirm: passwordConfirmValue, - //team: teamIdValue, + teamId: teamIdValue, roleList: roleValue, }; if (membre.email !== '' && membre.password !== '' && team.nom!== '') { - this.teamService.addTeam(team).subscribe((resp) => { - return resp - }); - this.authService.signup(membre).subscribe((resp) => { - this.router.navigate(['accueil']); + this.teamService.addTeam(team).subscribe((respTeam) => { + teamIdValue = respTeam.id; + console.log(teamIdValue); + this.authService.signup(membre).subscribe((respMembre) => { + this.router.navigate(['accueil']); + console.log(teamIdValue); + return respMembre + }); + }); } else { // affichage erreur