isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add member avec role ok account récupère les membre en focntion de la team

Browse source
This commit is contained in:
Sana EL HIRI 2022-02-25 09:52:06 +01:00
parent 7784870446
commit 466a146174
6 changed files with 56 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/app/services/membre.service.ts
View file

@ -1,8 +1,10 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
import { Membre } from '../models/membre';
import { TokenService } from './token.service';
@Injectable({
providedIn: 'root'
@ -11,7 +13,7 @@ export class MembreService {
apiUrl: string;
tokenKey: string;
constructor(private http: HttpClient) {
constructor(private http: HttpClient, private tokenService: TokenService, private router: Router) {
this.apiUrl = environment.apiUrl;
this.tokenKey = environment.tokenKey;
}
@ -20,13 +22,27 @@ export class MembreService {
return this.http.get(`${this.apiUrl}/membres/all`);
}
getMembresByTeamId(): Observable<any> | void{
const teamId = this.tokenService.getCurrentTeamId();
if (teamId){
return this.http.get(`${this.apiUrl}/membres/team/${teamId}`);
}else {
this.router.navigate(['accueil']);
}
}
getMembreId(id: any): Observable<any> {
return this.http.get(`${this.apiUrl}/membres/` + id);
}
addMembre(membre: Membre): Observable<any> {
console.log(membre);
return this.http.post(`${this.apiUrl}/membres/sign-up`, membre);
addMembre(membre: Membre): Observable<any> | void{
const teamId = this.tokenService.getCurrentTeamId();
if (teamId){
return this.http.post(`${this.apiUrl}/membres/add/${teamId}`, membre);
}else {
this.router.navigate(['accueil']);
}
}
deleteMembre(membre: Membre): Observable<any> {

13
src/app/services/team.service.ts
View file

@ -1,8 +1,10 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
import { Team } from '../models/team';
import { TokenService } from './token.service';
@Injectable({
providedIn: 'root'
@ -12,7 +14,7 @@ export class TeamService {
tokenKey: string;
constructor(private http: HttpClient) {
constructor(private http: HttpClient, private tokenService: TokenService, private router: Router) {
this.apiUrl = environment.apiUrl;
this.tokenKey = environment.tokenKey;
}
@ -20,8 +22,13 @@ export class TeamService {
return this.http.get(`${this.apiUrl}/teams/all`);
}
getTeamById(id: any): Observable<any> {
return this.http.get(`${this.apiUrl}/teams/1` + id);
getTeamById(): Observable<any> | void {
const teamId = this.tokenService.getCurrentTeamId();
if (teamId){
return this.http.get(`${this.apiUrl}/teams/${teamId}`);
} else {
this.router.navigate(['accueil']);
}
}
addTeam(team: Team): Observable<any> {