From 9321c05fd161504a263acc197868b245352206c1 Mon Sep 17 00:00:00 2001 From: jboinembalome Date: Wed, 24 Feb 2021 10:39:07 +0100 Subject: [PATCH] Ajout du composant ParticipationsFormationTableComponent dans affichage-details-collaborateur --- .../affichage-details-collaborateur.html | 1 + .../affichage-details-collaborateur.ts | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.html b/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.html index f4181f2..2b0f210 100644 --- a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.html +++ b/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.html @@ -15,6 +15,7 @@ + diff --git a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts b/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts index 6037dc9..d036ea4 100644 --- a/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts +++ b/src/app/shared/affichage-details-collaboarteur/affichage-details-collaborateur.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from "@angular/core"; -import { CollaborateurDTO, CollaborateursService } from "@shared/api-swagger"; +import { CollaborateurDTO, CollaborateursService, ParticipationFormationDTO, ParticipationsFormationsService } from "@shared/api-swagger"; import { Subscription } from "rxjs"; import { collaborateurTypeRecherche } from "@shared/utils/cles"; import { MatDialog } from "@angular/material/dialog"; @@ -19,26 +19,37 @@ export class AffichageDetailsCollaborateurComponent implements OnInit{ typeRecherche : string = collaborateurTypeRecherche.collaborateursEP; displayedColumns : string[] = ["businessunit", "collaborateur", "datearrivee"]; - + displayedColumnsParticipationFormaton: string[]= ["intitule", "statut", "dateCreation", "ep", "evaluation"]; rechercherParBU: boolean = false; rechercherParDate: boolean= false; collaborateur: CollaborateurDTO = undefined; + participationsFormation: Array = []; private collaborateurSubscription: Subscription; + private participationFormationSubscription: Subscription; - constructor(private collaborateurService: CollaborateursService, private dialog: MatDialog, private router: Router) {} + constructor(private collaborateurService: CollaborateursService, private participationFormationService: ParticipationsFormationsService, private dialog: MatDialog, private router: Router) {} ngOnInit() { this.collaborateurSubscription = this.collaborateurService.getCollaborateurById(this.idCollaborateur).subscribe( collab => this.collaborateur = collab, err => console.log(err) ); + + this.participationFormationSubscription = this.participationFormationService.getParticipationByCollaborateur(this.idCollaborateur).subscribe( + participationsFormation => this.participationsFormation = participationsFormation, + err => console.log(err) + ); } ngOnDestroy() { if(this.collaborateurSubscription != undefined) { this.collaborateurSubscription.unsubscribe(); } + + if(this.participationFormationSubscription != undefined) { + this.participationFormationSubscription.unsubscribe(); + } }