Mise à jour de l'affichage de la liste des référents et des détails d'un référent

src/app/app-routing.module.ts

@@ -25,7 +25,7 @@ const routes: Routes = [
   {
     path: paths_collaborateurs.path,
     loadChildren: () => import('./collaborateurs/collaborateurs.module').then(m=> m.CollaborateursModule)
-  }/*,
+  },
   {
     path: paths_demandes_delegation.path,
     loadChildren: () => import('./demandes-delegation/demandes-delegation.module').then(m=> m.DemandesDelegationModule)
@@ -41,15 +41,15 @@ const routes: Routes = [
   {
     path: paths_saisie_ep.path,
     loadChildren: () => import('./ep-saisie/ep-saisie.module').then(m=> m.EpSaisieModule)
-  },
+  }/*,
   {
     path: paths_formation.path,
     loadChildren: () => import('./formations/formations.module').then(m=> m.FormationsModule)
-  },
+  }*/,
   {
     path: paths_referents.path,
     loadChildren: () => import('./referents/referents.module').then(m=> m.ReferentsModule)
-  }*/
+  }
 ];
 
 @NgModule({

src/app/app.module.ts

@@ -17,14 +17,14 @@ import { ApiModule } from '@shared/api-swagger'
 
 import { HomeModule } from './home';
 import { CollaborateursModule } from './collaborateurs';
-/*
+
 import { ReferentsModule } from './referents';
-import { FormationsModule } from './formations';
+//import { FormationsModule } from './formations';
 import { DemandesFormationModule } from './demandes-formation';
 import { DemandesDelegationModule } from './demandes-delegation';
 import { EpSaisieModule } from "./ep-saisie";
 import { EpModule } from "./ep"
-*/
+
 import { environment } from '@env';
 
 
@@ -42,10 +42,10 @@ let keycloakService: KeycloakService = new KeycloakService();
     BrowserModule, BrowserAnimationsModule,
     KeycloakAngularModule, AppRoutingModule,
     HttpClientModule, ApiModule,
-    HomeModule, CollaborateursModule//,
+    HomeModule, CollaborateursModule,
     //ReferentsModule, FormationsModule,
-    //DemandesFormationModule, DemandesDelegationModule,
+    DemandesFormationModule, DemandesDelegationModule,
-    //EpSaisieModule
+    EpSaisieModule, EpModule
   ],
   providers: [
     {

src/app/collaborateurs/details-collaborateur/details-collaborateur.component.ts

@@ -48,7 +48,6 @@ export class DetailsCollaborateurComponent implements OnInit {
 
   ngOnInit() {
     this.idCollaborateur = this.route.snapshot.paramMap.get('id');
-    console.log(this.idCollaborateur);
     this.collaborateurSubscription = this.collaborateusrService.getCollaborateurById(this.idCollaborateur).subscribe(
       collaborateur => this.initCollaborateur(collaborateur[0]),
       err => console.log(err)

src/app/referents/details-referent/details-referent.component.html

@@ -1,6 +1,6 @@
 <app-nav-menu></app-nav-menu>
 <ng-container  *ngIf="referent!=undefined">
-  <h2> {{referent.prenom }} {{referent.nom }} ({{referent.businessUnit.nom }}) </h2>
+  <h2> {{ referent.prenom}} {{referent.nom}} ({{referent.businessUnit.nom}})</h2>
 </ng-container>
 <ng-container *ngIf="referent==undefined">
   <mat-spinner></mat-spinner>

src/app/referents/details-referent/details-referent.component.ts

@@ -7,11 +7,9 @@ import {MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 
-import { ReferentsService } from "@shared/api-swagger/api/api";
+import { ReferentsService, EpService } from "@shared/api-swagger/api/api";
 
-import { CollaborateurModel } from "@shared/api-swagger/model/collaborateurModel";
+import { ReferentDTO, EpDTO } from "@shared/api-swagger/model/models";
-import { EpModel } from "@shared/api-swagger/model/epModel";
-import { DisplayEP } from "@shared/displayInfo/displays";
 
 /**
     */
@@ -20,7 +18,7 @@ import { DisplayEP } from "@shared/displayInfo/displays";
   templateUrl: './details-referent.component.html'
 })
 export class DetailsReferentComponent implements OnInit {
-  referent: CollaborateurModel;
+  referent: ReferentDTO;
   private referentSubscription : Subscription;
   idReferent : any;
 
@@ -28,14 +26,17 @@ export class DetailsReferentComponent implements OnInit {
   constructor(private service:ReferentsService, private route: ActivatedRoute) {}
 
   ngOnInit() {
+
     this.idReferent = this.route.snapshot.paramMap.get("id");
     this.referentSubscription = this.service.getReferentById(this.idReferent).subscribe(
-      referent => this.initReferent(referent)
+      referent => this.initReferent(referent[0]),
+      err => console.log(err)
     )
   }
 
-  initReferent(referent:CollaborateurModel) {
+  initReferent(referent:ReferentDTO) {
     this.referent = referent;
+
   }
 
   ngOnDestroy() {

src/app/referents/referents.component.html

@@ -4,7 +4,7 @@
 <mat-table matSort [dataSource]="dataSource">
   <ng-container matColumnDef="agence">
     <mat-header-cell *matHeaderCellDef mat-sort-header>Agence</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ row.agence}}</mat-cell>
+    <mat-cell *matCellDef="let row">{{ row.businessUnit.nom}}</mat-cell>
   </ng-container>
 
   <ng-container matColumnDef="referent">

src/app/referents/referents.component.ts

@@ -8,8 +8,7 @@ import {MatSort} from '@angular/material/sort';
 
 import { ReferentsService } from "@shared/api-swagger/api/api";
 
-import { CollaborateurModel } from "@shared/api-swagger/model/collaborateurModel";
+import { ReferentDTO } from "@shared/api-swagger/model/models";
-import { DisplayCollaborateur } from "@shared/displayInfo/displays";
 
 
 /**
@@ -20,19 +19,22 @@ import { DisplayCollaborateur } from "@shared/displayInfo/displays";
 })
 export class ReferentsComponent implements OnInit {
 
-  referentsDiponibles : DisplayCollaborateur[];
+  asc = true;
-  referentsFiltre : DisplayCollaborateur[];
+  numPage = 1;
+  parPage = 5;
+
+
   private referentsDisponiblesSubscription : Subscription;
 
   displayedColumns : string[] = ["agence", "referent"];
 
-  dataSource : MatTableDataSource<DisplayCollaborateur>;
+  dataSource : MatTableDataSource<ReferentDTO>;
-
+  roles : string[] = ["Commercial"];
   /**
     * contenu de la recherche.
     */
   search = "";
-
+  tri = "";
   /**
     * Pagination du tableau.
     */
@@ -50,26 +52,16 @@ export class ReferentsComponent implements OnInit {
   constructor(private service: ReferentsService) {}
 
   ngOnInit() {
-    this.referentsDisponiblesSubscription = this.service.getReferents(undefined, undefined, 1).subscribe(
+    this.updateDataSource();
-      referents => { this.initReferents(referents); }
-    );
   }
 
-  initReferents(referents:CollaborateurModel[]) {
+  updateDataSource() {
-    this.referentsDiponibles = [];
+    this.referentsDisponiblesSubscription = this.service.getReferents(this.asc, this.numPage, this.parPage, this.roles, 1, undefined, this.search, this.tri).subscribe(
-    let referentDisplay: DisplayCollaborateur;
+      referents =>  this.dataSource = new MatTableDataSource(referents),
-    for(let r of referents) {
+      err => console.log(err)
-      referentDisplay = new DisplayCollaborateur();
+    );
-      referentDisplay.id = r.id;
+    //this.dataSource.paginator = this.paginator;
-      referentDisplay.prenom = r.prenom;
+    //this.dataSource.sort = this.sort;
-      referentDisplay.nom = r.nom;
-      referentDisplay.agence = r.businessUnit.nom;
-      this.referentsDiponibles.push(referentDisplay);
-    }
-    this.referentsFiltre = this.referentsDiponibles;
-    this.dataSource = new MatTableDataSource(this.referentsFiltre);
-    this.dataSource.paginator = this.paginator;
-    this.dataSource.sort = this.sort;
   }
 
   ngOnDestroy() {