From 85cd6c2b866a43a974bc235e9cf8acb289511575 Mon Sep 17 00:00:00 2001
From: jboinembalome <jimmy.boinembalome@apside-groupe.com>
Date: Wed, 24 Feb 2021 10:37:58 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20du=20code=20dans=20ngOnChang?=
 =?UTF-8?q?es=20+=20ajout=20des=20filtres=20pour=20statut=20et=20intitul?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../participations-formation.table.ts         | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts b/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts
index a02b1d9..b4ed159 100644
--- a/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts
+++ b/src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ViewChild, AfterViewInit} from "@angular/core";
+import { Component, Input, OnInit, OnChanges, ViewChild, AfterViewInit} from "@angular/core";
 
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
@@ -13,7 +13,7 @@ import { DatePipe } from "@angular/common";
     templateUrl: "./participations-formation.table.html",
     styleUrls: ["./participations-formation.table.css"]
 })
-export class ParticipationsFormationTableComponent implements OnInit, AfterViewInit  {
+export class ParticipationsFormationTableComponent implements OnInit, OnChanges, AfterViewInit  {
 
   
   @ViewChild(MatPaginator) paginator: MatPaginator;
@@ -56,21 +56,31 @@ export class ParticipationsFormationTableComponent implements OnInit, AfterViewI
     }
 
     ngOnInit() {
-      this.dataSource = new MatTableDataSource(this.participations);
-      this.dataSource.sortingDataAccessor = (item, property) => {
-        switch(property) {
-          case 'collaborateur': return item.collaborateur.nom + " "+ item.collaborateur.prenom;
-          case 'ep': return item.ep.statut;
-          case 'evaluation': return item.estEvaluee;    
-          default: return item[property];
-        }
-      };
-      this.dataSource.filterPredicate = (data, filter) => {
-        const formatted=this.pipe.transform(data.dateCreation,'dd/MM/yyyy');
-        return formatted.indexOf(filter) >= 0 || 
-          data.collaborateur.nom.toLocaleLowerCase().includes(filter) ||
-          data.collaborateur.prenom.toLocaleLowerCase().includes(filter);
-      };
+     
+    }
+
+    ngOnChanges() {
+      if(this.participations.length > 0) {
+        this.dataSource = new MatTableDataSource(this.participations);
+        this.dataSource.sortingDataAccessor = (item, property) => {
+          switch(property) {
+            case 'collaborateur': return item.collaborateur.nom + " "+ item.collaborateur.prenom;
+            case 'ep': return item.ep.statut;
+            case 'evaluation': return item.estEvaluee; 
+            case 'statut': return item.statut.libelle;      
+            default: return item[property];
+          }
+        };
+        this.dataSource.filterPredicate = (data, filter) => {
+          const formatted=this.pipe.transform(data.dateCreation,'dd/MM/yyyy');
+          return formatted.indexOf(filter) >= 0 || 
+            data.collaborateur.nom.toLocaleLowerCase().includes(filter) ||
+            data.collaborateur.prenom.toLocaleLowerCase().includes(filter) ||
+            data.intitule.toLocaleLowerCase().includes(filter) ||
+            data.statut.libelle.toLocaleLowerCase().includes(filter);
+        };
+      }
+     
     }
 
     ngAfterViewInit() {