Mise à jour de l'API, des DTO et de l'affichage du home assistante

src/app/app-routing.module.ts

@@ -21,7 +21,7 @@ const routes: Routes = [
     component: HomeComponent,
     canActivate: [KeycloakGuard],
     pathMatch: 'full'
-  },
+  }/*,
   {
     path: paths_collaborateurs.path,
     loadChildren: () => import('./collaborateurs/collaborateurs.module').then(m=> m.CollaborateursModule)
@@ -49,7 +49,7 @@ const routes: Routes = [
   {
     path: paths_referents.path,
     loadChildren: () => import('./referents/referents.module').then(m=> m.ReferentsModule)
-  }
+  }*/
 ];
 
 @NgModule({

src/app/app.module.ts

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

src/app/collaborateurs/collaborateurs.component.ts

@@ -8,8 +8,6 @@ import {MatSort} from '@angular/material/sort';
 
 import { CollaborateursService } from "@shared/api-swagger/api/api";
 
-import { CollaborateurModel } from "@shared/api-swagger/model/models";
-import { DisplayCollaborateur } from "@shared/displayInfo/displays";
 
 /**
     * Composant qui sert à l'affichage de la liste des collaborateurs en fonction de l'agence de son utilitateur.

src/app/home/home-assistante/home-assistante.component.html

@@ -5,7 +5,7 @@
 
 <mat-form-field>
   <mat-label>Recherche un collaborateur</mat-label>
-  <input matInput type="text" [(ngModel)]="search" (keyup)="applyFilter($event.target.value)">
+  <input matInput type="text" [(ngModel)]="search" (keyup)="updateDataSource()">
   <mat-button *ngIf="search" matSuffix mat-icon-button aria-label="Clear" (click)="search=''">
     <mat-icon>close</mat-icon>
   </mat-button>
@@ -16,22 +16,23 @@
 
   <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.collaborateur.businessunit.agence.nom}} </mat-cell>
   </ng-container>
 
   <ng-container  matColumnDef="collaborateur">
     <mat-header-cell *matHeaderCellDef mat-sort-header> Collaborateur </mat-header-cell>
-    <mat-cell  *matCellDef="let row" [routerLink]="['/collaborateurs', row.collaborateur.idCollaborateur]"> {{row.collaborateur.nom}} {{row.collaborateur.prenom}} </mat-cell>
+    <mat-cell  *matCellDef="let row" [routerLink]="['/collaborateurs', row.collaborateur.id]"> {{row.collaborateur.nom}} {{row.collaborateur.prenom}} </mat-cell>
   </ng-container>
 
   <ng-container matColumnDef="anciennete">
     <mat-header-cell *matHeaderCellDef mat-sort-header> Ancienneté </mat-header-cell>
-    <mat-cell  *matCellDef="let row"> {{row.collaborateur.dateArrivee | date: 'yyyy/MM/dd'}} ({{row.annee}}an(s) {{row.mois | number: '2.0-0'}}mois) </mat-cell>
+    <!--<mat-cell  *matCellDef="let row"> {{row.collaborateur.dateArrivee | date: 'yyyy/MM/dd'}} ({{row.annee}}an(s) {{row.mois | number: '2.0-0'}}mois) </mat-cell>-->
+    <mat-cell  *matCellDef="let row"> {{row.collaborateur.dateArrivee | date: 'yyyy/MM/dd'}} </mat-cell>
   </ng-container>
 
   <ng-container  matColumnDef="referent">
     <mat-header-cell *matHeaderCellDef mat-sort-header> Referent </mat-header-cell>
-    <mat-cell  *matCellDef="let row" [routerLink]="['/referents', row.referent.idCollaborateur]"> {{row.referent.nom}} {{row.referent.prenom}} </mat-cell>
+    <mat-cell  *matCellDef="let row" [routerLink]="['/referents', row.referent.id]"> {{row.referent.nom}} {{row.referent.prenom}} </mat-cell>
   </ng-container>
 
   <ng-container matColumnDef="type">
@@ -41,17 +42,17 @@
 
   <ng-container matColumnDef="etat">
     <mat-header-cell *matHeaderCellDef mat-sort-header> Etat </mat-header-cell>
-    <mat-cell *matCellDef="let row"> {{getEtat(row.etat)}} </mat-cell>
+    <mat-cell *matCellDef="let row"> {{row.statut}} </mat-cell>
   </ng-container>
 
   <ng-container matColumnDef="datemail">
     <mat-header-cell *matHeaderCellDef mat-sort-header> Date envoie mail </mat-header-cell>
-    <mat-cell  *matCellDef="let row"> {{row.datemail}} </mat-cell>
+    <mat-cell  *matCellDef="let row"> {{row.dateDisponibilite}} </mat-cell>
   </ng-container>
 
   <ng-container matColumnDef="dateentretien">
     <mat-header-cell *matHeaderCellDef mat-sort-header> Date entretient </mat-header-cell>
-    <mat-cell  *matCellDef="let row"> {{row.dateentretien}} </mat-cell>
+    <mat-cell  *matCellDef="let row"> {{row.datePrevisionnelle}} </mat-cell>
   </ng-container>
 
 

src/app/home/home-assistante/home-assistante.component.ts

@@ -7,9 +7,7 @@ import {MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 
-import { CollaborateurModel } from "@shared/api-swagger/model/collaborateurModel";
-import { EpModel } from "@shared/api-swagger/model/epModel";
-import { DisplayEP } from "@shared/displayInfo/displays";
+import { EpInformationDTO, CollaborateurDTO } from "@shared/api-swagger/model/models";
 import { EpService } from "@shared/api-swagger/api/api";
 
 
@@ -27,16 +25,13 @@ import { EpService } from "@shared/api-swagger/api/api";
 })
 export class HomeAssistanteComponent implements OnInit, AfterViewInit {
 
-  /**
-    * Une liste qui contiendra la liste des EP avec les informations à faire conserver.
-    */
-  epDisponibles : DisplayEP[];
-
-  /**
-    * Liste des EP qui seront affichées en fonction des filtres.
-    */
-  epFiltre : DisplayEP[];
 
+  asc = true;
+  parPage = 15;
+  numPage = 1;
+  choixBU = undefined;
+  checkboxes : string[] = ["Tous"];
+  idsBU : number[] = [];
   /**
     * Subscription pour récupérer les EP.
     */
@@ -51,12 +46,13 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   /**
     * source pour l'affichage des EP dans le tableau qui est affichée.
     */
-  dataSource : MatTableDataSource<DisplayEP>;
+  dataSource : MatTableDataSource<EpInformationDTO>;
 
   /**
     * contenu de la recherche.
     */
   search = "";
+  tri = "";
 
   /**
     * Pagination du tableau.
@@ -67,7 +63,6 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
     * Tri par les éléments du tableau selon la colonne choisie.
     */
   @ViewChild(MatSort) sort: MatSort;
-
   /**
     * Spécifie si la liste des EP est en cours de chargement et d'écriture dans le tableau.
     */
@@ -82,40 +77,18 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   ngOnInit() {
     //this.epDisponiblesSubscription = this.serviceEP.listeEPDisponibles().
     //this.epDisponiblesSubscription = this.service.collaborateursBuIdBuGet("ORL").
-    let idAgence = 1;
-    this.epDisponiblesSubscription = this.service.getProchainsEP(undefined, 1).
-       subscribe(eps => {
-         this.initDisplay(eps);
-         this.refreshDataSource();
-       });
+    this.updateDataSource();
+
   }
 
   ngAfterViewInit(){}
 
-  /**
-    * Initialisation de l'affichage des EP dans le tableau.
-    */
-  initDisplay(eps: EpModel[]) {
-    this.epDisponibles = []
-    let epDisplay : DisplayEP;
-    let today = new Date();
-    console.log(eps);
-    for(let ep of eps) {
-      epDisplay = new DisplayEP();
-      epDisplay.id = ep.id;
-      epDisplay.agence = ep.collaborateur.businessUnit.nom;
-      epDisplay.collaborateur = ep.collaborateur;
-      epDisplay.referent = ep.referent;
-      epDisplay.dateentretien = ep.dateEntretien;
-      epDisplay.datemail = ep.dateDisponibilite;
-      epDisplay.etat = ep.etat;
-      epDisplay.type = ep.type;
-      epDisplay.anciennete = this.setAnciennete(new Date(ep.collaborateur.dateArrivee), today);
-      epDisplay.annee = Math.floor(epDisplay.anciennete / 31536000000);
-      epDisplay.mois = Math.floor(epDisplay.anciennete / 2629800000 % 12);
-      this.epDisponibles.push(epDisplay);
-    }
-    this.epFiltre = this.epDisponibles;
+  updateDataSource() {
+    this.epDisponiblesSubscription = this.service.getEPEnCours(this.asc, this.numPage, this.parPage, 1, this.choixBU, this.search, this.tri).
+       subscribe(eps => {
+         this.dataSource = new MatTableDataSource(eps);
+         err => console.log(err);
+       });
   }
 
   getAnciennete(anciennete) {
@@ -150,28 +123,6 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
     return res;
   }
 
-  /**
-    * Mise à jour du tableau lorsque qu'un tri est fait via les checkboxes.
-    */
-  refreshDataSource() {
-    this.dataSource = new MatTableDataSource(this.epFiltre);
-    this.dataSource.paginator = this.paginator;
-    this.dataSource.sort = this.sort;
-  }
-
-
-
-
-  /**
-    * Cette fonction permet de mettre à jour les informations du tableau en fontionne de la barre de recherche
-    */
-  applyFilter(filterValue: string) {
-    console.log(filterValue);
-    filterValue = filterValue.trim();
-    filterValue = filterValue.toLowerCase();
-    this.dataSource.filter = filterValue;
-  }
-
   /**
     * Détruire toutes les Subscriptions utilisées pour libérer de la mémoire après le changement de page.
     */

src/app/home/home.component.html

@@ -1,6 +1,7 @@
 <app-nav-menu></app-nav-menu>
 <h1> Bonjour</h1>
 <home-assistante *ngIf="this.userRole == role.assistante"></home-assistante>
+<!--
 <home-collaborateur *ngIf="this.userRole ==role.collaborateur"></home-collaborateur>
 <home-commercial *ngIf="this.userRole ==role.commercial"></home-commercial>
-<home-rh *ngIf="this.userRole ==role.rh"></home-rh>
+<home-rh *ngIf="this.userRole ==role.rh"></home-rh>-->

src/app/home/home.module.ts

@@ -6,16 +6,18 @@ import { FormsModule } from '@angular/forms';
 import { MaterialModule } from "@shared/angular-material/angular-material.module";
 
 import {HomeAssistanteComponent} from './home-assistante/home-assistante.component';
+/*
 import {HomeCollaborateurComponent} from './home-collaborateur/home-collaborateur.component';
 import {HomeCommercialComponent} from './home-commercial/home-commercial.component';
 import {HomeRHComponent} from './home-rh/home-rh.component';
+*/
 import {HomeComponent} from './home.component';
 import {NavMenuModule} from '@shared/nav-menu/nav-menu.module';
-
 @NgModule({
   declarations: [
-    HomeComponent, HomeAssistanteComponent, HomeCollaborateurComponent,
-    HomeCommercialComponent, HomeRHComponent
+    HomeComponent, HomeAssistanteComponent
+    /*, HomeCollaborateurComponent,
+    HomeCommercialComponent, HomeRHComponent*/
   ],
   exports: [
     HomeComponent

src/app/shared/api-swagger/.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.20
+3.0.21

src/app/shared/api-swagger/api.module.ts

@@ -4,9 +4,14 @@ import { HttpClient } from '@angular/common/http';
 
 
 import { CollaborateursService } from './api/collaborateurs.service';
-import { DemandesformationService } from './api/demandesformation.service';
+import { DemandesDelegationService } from './api/demandesDelegation.service';
+import { DemandesEPIService } from './api/demandesEPI.service';
+import { DemandesFormationService } from './api/demandesFormation.service';
+import { EngagementsService } from './api/engagements.service';
 import { EpService } from './api/ep.service';
 import { FormationsService } from './api/formations.service';
+import { NotesService } from './api/notes.service';
+import { ParticipationsFormationsService } from './api/participationsFormations.service';
 import { ReferentsService } from './api/referents.service';
 
 @NgModule({
@@ -15,9 +20,14 @@ import { ReferentsService } from './api/referents.service';
   exports:      [],
   providers: [
     CollaborateursService,
-    DemandesformationService,
+    DemandesDelegationService,
+    DemandesEPIService,
+    DemandesFormationService,
+    EngagementsService,
     EpService,
     FormationsService,
+    NotesService,
+    ParticipationsFormationsService,
     ReferentsService ]
 })
 export class ApiModule {

src/app/shared/api-swagger/api/api.ts

@@ -1,15 +1,21 @@
 export * from './collaborateurs.service';
 import { CollaborateursService } from './collaborateurs.service';
-export * from './demandesformation.service';
-import { DemandesformationService } from './demandesformation.service';
+export * from './demandesDelegation.service';
+import { DemandesDelegationService } from './demandesDelegation.service';
+export * from './demandesEPI.service';
+import { DemandesEPIService } from './demandesEPI.service';
+export * from './demandesFormation.service';
+import { DemandesFormationService } from './demandesFormation.service';
 export * from './engagements.service';
 import { EngagementsService } from './engagements.service';
 export * from './ep.service';
 import { EpService } from './ep.service';
 export * from './formations.service';
 import { FormationsService } from './formations.service';
+export * from './notes.service';
+import { NotesService } from './notes.service';
 export * from './participationsFormations.service';
 import { ParticipationsFormationsService } from './participationsFormations.service';
 export * from './referents.service';
 import { ReferentsService } from './referents.service';
-export const APIS = [CollaborateursService, DemandesformationService, EngagementsService, EpService, FormationsService, ParticipationsFormationsService, ReferentsService];
+export const APIS = [CollaborateursService, DemandesDelegationService, DemandesEPIService, DemandesFormationService, EngagementsService, EpService, FormationsService, NotesService, ParticipationsFormationsService, ReferentsService];

src/app/shared/api-swagger/api/collaborateurs.service.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -17,8 +17,8 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { CollaborateurModel } from '../model/collaborateurModel';
-import { ErreurModel } from '../model/erreurModel';
+import { CollaborateurDTO } from '../model/collaborateurDTO';
+import { ErreurDTO } from '../model/erreurDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -58,14 +58,14 @@ export class CollaborateursService {
 
     /**
      * 
-     * recevoir un collaboratuer par son id
+     * Récupérer un collaboratuer par son id
      * @param idCollaborateur id collaborateur
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getCollaborateurById(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<CollaborateurModel>;
-    public getCollaborateurById(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<CollaborateurModel>>;
-    public getCollaborateurById(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<CollaborateurModel>>;
+    public getCollaborateurById(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<CollaborateurDTO>;
+    public getCollaborateurById(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<CollaborateurDTO>>;
+    public getCollaborateurById(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<CollaborateurDTO>>;
     public getCollaborateurById(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (idCollaborateur === null || idCollaborateur === undefined) {
@@ -94,7 +94,7 @@ export class CollaborateursService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<CollaborateurModel>('get',`${this.basePath}/collaborateurs/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<CollaborateurDTO>('get',`${this.basePath}/collaborateurs/${encodeURIComponent(String(idCollaborateur))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -106,14 +106,14 @@ export class CollaborateursService {
 
     /**
      * 
-     * recevoir un collaborateur par son mail
-     * @param mail mail de l&#x27;utilisateur connecté (mail obetenu via Keycloak)
+     * Récupérer un collaborateur par son mail
+     * @param mail mail de l&#x27;utilisateur connecté (mail obtenu via le token Keycloak)
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getCollaborateurByMail(mail: string, observe?: 'body', reportProgress?: boolean): Observable<CollaborateurModel>;
-    public getCollaborateurByMail(mail: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<CollaborateurModel>>;
-    public getCollaborateurByMail(mail: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<CollaborateurModel>>;
+    public getCollaborateurByMail(mail: string, observe?: 'body', reportProgress?: boolean): Observable<CollaborateurDTO>;
+    public getCollaborateurByMail(mail: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<CollaborateurDTO>>;
+    public getCollaborateurByMail(mail: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<CollaborateurDTO>>;
     public getCollaborateurByMail(mail: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (mail === null || mail === undefined) {
@@ -142,7 +142,7 @@ export class CollaborateursService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<CollaborateurModel>('get',`${this.basePath}/collaborateurs/${encodeURIComponent(String(mail))}`,
+        return this.httpClient.request<CollaborateurDTO>('get',`${this.basePath}/collaborateurs/mail/${encodeURIComponent(String(mail))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -154,21 +154,34 @@ export class CollaborateursService {
 
     /**
      * 
-     * recevoir la liste des collaborateurs
-     * @param assistants paramètre pour indiquer explicitement que l&#x27;on souhaite récupérer les assistants dans la requête
-     * @param collaborateurs paramètre pour indiquer explicitement que l&#x27;on souhaite récupérer les collaborateurs dans la requête
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+     * Récupérer la liste des collaborateurs
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param fonctions Liste des fonctions des collaborateurs que l&#x27;on veut récupérer
      * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
-     * @param referents paramètre pour indiquer explicitement que l&#x27;on souhaite récupérer les référents dans la requête
-     * @param rh paramètre pour indiquer explicitement que l&#x27;on souhaite récupérer les RH dans la requête
+     * @param idBU id de la business unit à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getCollaborateurs(assistants?: boolean, collaborateurs?: boolean, idBu?: number, idAgence?: number, referents?: boolean, rh?: boolean, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurModel>>;
-    public getCollaborateurs(assistants?: boolean, collaborateurs?: boolean, idBu?: number, idAgence?: number, referents?: boolean, rh?: boolean, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<CollaborateurModel>>>;
-    public getCollaborateurs(assistants?: boolean, collaborateurs?: boolean, idBu?: number, idAgence?: number, referents?: boolean, rh?: boolean, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<CollaborateurModel>>>;
-    public getCollaborateurs(assistants?: boolean, collaborateurs?: boolean, idBu?: number, idAgence?: number, referents?: boolean, rh?: boolean, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getCollaborateurs(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurDTO>>;
+    public getCollaborateurs(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<CollaborateurDTO>>>;
+    public getCollaborateurs(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<CollaborateurDTO>>>;
+    public getCollaborateurs(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getCollaborateurs.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getCollaborateurs.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getCollaborateurs.');
+        }
 
 
 
@@ -176,23 +189,31 @@ export class CollaborateursService {
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (assistants !== undefined && assistants !== null) {
-            queryParameters = queryParameters.set('assistants', <any>assistants);
-        }
-        if (collaborateurs !== undefined && collaborateurs !== null) {
-            queryParameters = queryParameters.set('collaborateurs', <any>collaborateurs);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (fonctions) {
+            fonctions.forEach((element) => {
+                queryParameters = queryParameters.append('fonctions', <any>element);
+            })
         }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
-        if (referents !== undefined && referents !== null) {
-            queryParameters = queryParameters.set('referents', <any>referents);
+        if (idBU !== undefined && idBU !== null) {
+            queryParameters = queryParameters.set('idBU', <any>idBU);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
         }
-        if (rh !== undefined && rh !== null) {
-            queryParameters = queryParameters.set('rh', <any>rh);
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -217,7 +238,7 @@ export class CollaborateursService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<CollaborateurModel>>('get',`${this.basePath}/collaborateurs`,
+        return this.httpClient.request<Array<CollaborateurDTO>>('get',`${this.basePath}/collaborateurs`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -230,20 +251,56 @@ export class CollaborateursService {
 
     /**
      * 
-     * Recevoir la liste des collaborateurs de le référent à la charge
+     * Récupérer la liste des collaborateurs dont le référent à la charge
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
      * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getCollaborateursByReferent(idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<CollaborateurModel>;
-    public getCollaborateursByReferent(idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<CollaborateurModel>>;
-    public getCollaborateursByReferent(idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<CollaborateurModel>>;
-    public getCollaborateursByReferent(idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getCollaborateursByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurDTO>>;
+    public getCollaborateursByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<CollaborateurDTO>>>;
+    public getCollaborateursByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<CollaborateurDTO>>>;
+    public getCollaborateursByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getCollaborateursByReferent.');
+        }
 
         if (idReferent === null || idReferent === undefined) {
             throw new Error('Required parameter idReferent was null or undefined when calling getCollaborateursByReferent.');
         }
 
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getCollaborateursByReferent.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getCollaborateursByReferent.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
         let headers = this.defaultHeaders;
 
         // authentication (bearerAuth) required
@@ -266,8 +323,9 @@ export class CollaborateursService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<CollaborateurModel>('get',`${this.basePath}/collaborateurs/referent/${encodeURIComponent(String(idReferent))}`,
+        return this.httpClient.request<Array<CollaborateurDTO>>('get',`${this.basePath}/collaborateurs/referent/${encodeURIComponent(String(idReferent))}`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,

src/app/shared/api-swagger/api/demandesDelegation.service.ts

@@ -0,0 +1,264 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *//* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams,
+         HttpResponse, HttpEvent }                           from '@angular/common/http';
+import { CustomHttpUrlEncodingCodec }                        from '../encoder';
+
+import { Observable }                                        from 'rxjs';
+
+import { CreationDemandeDelegationDTO } from '../model/creationDemandeDelegationDTO';
+import { DemandeDelegationDTO } from '../model/demandeDelegationDTO';
+import { ErreurDTO } from '../model/erreurDTO';
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+@Injectable()
+export class DemandesDelegationService {
+
+    protected basePath = 'http://localhost:3000/api';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    private canConsumeForm(consumes: string[]): boolean {
+        const form = 'multipart/form-data';
+        for (const consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * 
+     * Faire une demande de délégation à une autre personne
+     * @param idCollaborateur id collaborateur
+     * @param idEP id EP
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling faireDemandeDelegation.');
+        }
+
+        if (idEP === null || idEP === undefined) {
+            throw new Error('Required parameter idEP was null or undefined when calling faireDemandeDelegation.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('get',`${this.basePath}/demandesdelegation/ep/${encodeURIComponent(String(idEP))}/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupération de la liste des demandes de délégation
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idCollaborateur id collaborateur
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param fonctions Liste des fonctions des collaborateurs que l&#x27;on veut récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDemandesDelegation(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeDelegationDTO>>;
+    public getDemandesDelegation(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeDelegationDTO>>>;
+    public getDemandesDelegation(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeDelegationDTO>>>;
+    public getDemandesDelegation(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getDemandesDelegation.');
+        }
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getDemandesDelegation.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getDemandesDelegation.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getDemandesDelegation.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (fonctions) {
+            fonctions.forEach((element) => {
+                queryParameters = queryParameters.append('fonctions', <any>element);
+            })
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<DemandeDelegationDTO>>('get',`${this.basePath}/demandesdelegation/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Faire une demande de délégation à une autre personne
+     * @param body 
+     * @param idDemandeDelegation id demande delegation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling repondreDemandeDelegation.');
+        }
+
+        if (idDemandeDelegation === null || idDemandeDelegation === undefined) {
+            throw new Error('Required parameter idDemandeDelegation was null or undefined when calling repondreDemandeDelegation.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<any>('put',`${this.basePath}/demandesdelegation/${encodeURIComponent(String(idDemandeDelegation))}/repondre`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}

src/app/shared/api-swagger/api/demandesEPI.service.ts

@@ -0,0 +1,547 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *//* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams,
+         HttpResponse, HttpEvent }                           from '@angular/common/http';
+import { CustomHttpUrlEncodingCodec }                        from '../encoder';
+
+import { Observable }                                        from 'rxjs';
+
+import { DemandeEPIDTO } from '../model/demandeEPIDTO';
+import { ErreurDTO } from '../model/erreurDTO';
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+@Injectable()
+export class DemandesEPIService {
+
+    protected basePath = 'http://localhost:3000/api';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    private canConsumeForm(consumes: string[]): boolean {
+        const form = 'multipart/form-data';
+        for (const consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * 
+     * Annuler la demande d'EPI
+     * @param idDemandeEPI id demande EPI
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public annulerDemandeEPI(idDemandeEPI: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public annulerDemandeEPI(idDemandeEPI: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public annulerDemandeEPI(idDemandeEPI: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public annulerDemandeEPI(idDemandeEPI: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idDemandeEPI === null || idDemandeEPI === undefined) {
+            throw new Error('Required parameter idDemandeEPI was null or undefined when calling annulerDemandeEPI.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('get',`${this.basePath}/demandesepi/${encodeURIComponent(String(idDemandeEPI))}/annuler`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Lancer la procedure pour un entretien professionnel intermediaire, une demande d&#x27;EPI validée est créé par la même occasion
+     * @param idCollaborateur id collaborateur
+     * @param idReferent id referent
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public createEPI(idCollaborateur: string, idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling createEPI.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling createEPI.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('get',`${this.basePath}/demandesepi/referent/${encodeURIComponent(String(idReferent))}/demande/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Demande d&#x27;EPI par un collaborateur
+     * @param idCollaborateur id collaborateur
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public demandeEPI(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public demandeEPI(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public demandeEPI(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public demandeEPI(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling demandeEPI.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('get',`${this.basePath}/demandesepi/collaborateur/${encodeURIComponent(String(idCollaborateur))}/demande`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Demande d&#x27;EPI et par l&#x27;assistant et création automatique de l&#x27;EPI
+     * @param idCollaborateur id collaborateur
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public demandeEPIAssistante(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public demandeEPIAssistante(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public demandeEPIAssistante(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public demandeEPIAssistante(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling demandeEPIAssistante.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('get',`${this.basePath}/demandesepi/demandeassistante/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupération de la liste des demandes EPI d&#x27;un collaborateur
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idCollaborateur id collaborateur
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param fonctions Liste des fonctions des collaborateurs que l&#x27;on veut récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDemandeEPICollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeEPIDTO>>;
+    public getDemandeEPICollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeEPIDTO>>>;
+    public getDemandeEPICollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeEPIDTO>>>;
+    public getDemandeEPICollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getDemandeEPICollaborateur.');
+        }
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getDemandeEPICollaborateur.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getDemandeEPICollaborateur.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getDemandeEPICollaborateur.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (fonctions) {
+            fonctions.forEach((element) => {
+                queryParameters = queryParameters.append('fonctions', <any>element);
+            })
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<DemandeEPIDTO>>('get',`${this.basePath}/demandesepi/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupération de l&#x27;EPI en cours d&#x27;un collaborateur
+     * @param idCollaborateur id collaborateur
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDemandeEPIEnCours(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<DemandeEPIDTO>;
+    public getDemandeEPIEnCours(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeEPIDTO>>;
+    public getDemandeEPIEnCours(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeEPIDTO>>;
+    public getDemandeEPIEnCours(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getDemandeEPIEnCours.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<DemandeEPIDTO>('get',`${this.basePath}/demandesepi/collaborateur/${encodeURIComponent(String(idCollaborateur))}/enCours`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupération de la liste des demandes EPI d&#x27;un referent
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param fonctions Liste des fonctions des collaborateurs que l&#x27;on veut récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDemandeEPIReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeEPIDTO>>;
+    public getDemandeEPIReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeEPIDTO>>>;
+    public getDemandeEPIReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeEPIDTO>>>;
+    public getDemandeEPIReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, fonctions?: Array<string>, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getDemandeEPIReferent.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling getDemandeEPIReferent.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getDemandeEPIReferent.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getDemandeEPIReferent.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (fonctions) {
+            fonctions.forEach((element) => {
+                queryParameters = queryParameters.append('fonctions', <any>element);
+            })
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<DemandeEPIDTO>>('get',`${this.basePath}/demandesepi/referent/${encodeURIComponent(String(idReferent))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Répondre à une demande EPI en attente
+     * @param body 
+     * @param idDemandeEPI id demande EPI
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling repondreDemandeEPI.');
+        }
+
+        if (idDemandeEPI === null || idDemandeEPI === undefined) {
+            throw new Error('Required parameter idDemandeEPI was null or undefined when calling repondreDemandeEPI.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<any>('put',`${this.basePath}/demandesepi/${encodeURIComponent(String(idDemandeEPI))}/repondre`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}

src/app/shared/api-swagger/api/demandesformation.service.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -17,15 +17,18 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { DemandeFormationModel } from '../model/demandeFormationModel';
-import { ErreurModel } from '../model/erreurModel';
+import { CreationDemandeFormationDTO } from '../model/creationDemandeFormationDTO';
+import { DemandeFormationDTO } from '../model/demandeFormationDTO';
+import { ErreurDTO } from '../model/erreurDTO';
+import { OrigineDemandeFormationDTO } from '../model/origineDemandeFormationDTO';
+import { ThemeDTO } from '../model/themeDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
 
 
 @Injectable()
-export class DemandesformationService {
+export class DemandesFormationService {
 
     protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
@@ -58,15 +61,15 @@ export class DemandesformationService {
 
     /**
      * 
-     * créer une demande de formation pour un collaborateur
+     * Créer une demande de formation pour un collaborateur
      * @param body 
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public creerDemandeFormation(body: DemandeFormationModel, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public creerDemandeFormation(body: DemandeFormationModel, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public creerDemandeFormation(body: DemandeFormationModel, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public creerDemandeFormation(body: DemandeFormationModel, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
             throw new Error('Required parameter body was null or undefined when calling creerDemandeFormation.');
@@ -112,26 +115,60 @@ export class DemandesformationService {
 
     /**
      * 
-     * recevoir la liste des demandes de formations
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+     * Récupérer la liste des demandes de formations
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
      * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param theme Thème des demandes de formation à récupérer
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getDemandesFormation(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeFormationModel>>;
-    public getDemandesFormation(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeFormationModel>>>;
-    public getDemandesFormation(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeFormationModel>>>;
-    public getDemandesFormation(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getDemandesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeFormationDTO>>;
+    public getDemandesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeFormationDTO>>>;
+    public getDemandesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeFormationDTO>>>;
+    public getDemandesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getDemandesFormation.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getDemandesFormation.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getDemandesFormation.');
+        }
+
+
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (theme !== undefined && theme !== null) {
+            queryParameters = queryParameters.set('theme', <any>theme);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
 
         let headers = this.defaultHeaders;
 
@@ -155,7 +192,7 @@ export class DemandesformationService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<DemandeFormationModel>>('get',`${this.basePath}/demandeformation`,
+        return this.httpClient.request<Array<DemandeFormationDTO>>('get',`${this.basePath}/demandeformation`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -168,18 +205,289 @@ export class DemandesformationService {
 
     /**
      * 
-     * repondre a une demande de formation et la mettre a jour
+     * Récupérer la liste des demandes de formations en attente d&#x27;une réponse
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param theme Thème des demandes de formation à récupérer
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDemandesFormationEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeFormationDTO>>;
+    public getDemandesFormationEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeFormationDTO>>>;
+    public getDemandesFormationEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeFormationDTO>>>;
+    public getDemandesFormationEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getDemandesFormationEnAttente.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getDemandesFormationEnAttente.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getDemandesFormationEnAttente.');
+        }
+
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (theme !== undefined && theme !== null) {
+            queryParameters = queryParameters.set('theme', <any>theme);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<DemandeFormationDTO>>('get',`${this.basePath}/demandeformation/enattente`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des demandes de formations ayant reçu une réponse
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param theme Thème des demandes de formation à récupérer
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDemandesFormationRepondues(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeFormationDTO>>;
+    public getDemandesFormationRepondues(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeFormationDTO>>>;
+    public getDemandesFormationRepondues(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeFormationDTO>>>;
+    public getDemandesFormationRepondues(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getDemandesFormationRepondues.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getDemandesFormationRepondues.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getDemandesFormationRepondues.');
+        }
+
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (theme !== undefined && theme !== null) {
+            queryParameters = queryParameters.set('theme', <any>theme);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<DemandeFormationDTO>>('get',`${this.basePath}/demandeformation/repondus`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des origines des demandes de formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getOriginesDemandesFormation(observe?: 'body', reportProgress?: boolean): Observable<Array<OrigineDemandeFormationDTO>>;
+    public getOriginesDemandesFormation(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<OrigineDemandeFormationDTO>>>;
+    public getOriginesDemandesFormation(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<OrigineDemandeFormationDTO>>>;
+    public getOriginesDemandesFormation(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<OrigineDemandeFormationDTO>>('get',`${this.basePath}/originesdemandesformation`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des thèmes des demandes de formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getThemes(observe?: 'body', reportProgress?: boolean): Observable<Array<ThemeDTO>>;
+    public getThemes(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ThemeDTO>>>;
+    public getThemes(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ThemeDTO>>>;
+    public getThemes(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<ThemeDTO>>('get',`${this.basePath}/themes`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Répondre a une demande de formation et la mettre à jour
      * @param body 
+     * @param idDemandeFormation id demande formation
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public updateDemandeFormation(body: DemandeFormationModel, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public updateDemandeFormation(body: DemandeFormationModel, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public updateDemandeFormation(body: DemandeFormationModel, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public updateDemandeFormation(body: DemandeFormationModel, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updateDemandeFormation.');
+            throw new Error('Required parameter body was null or undefined when calling repondreDemandeFormation.');
+        }
+
+        if (idDemandeFormation === null || idDemandeFormation === undefined) {
+            throw new Error('Required parameter idDemandeFormation was null or undefined when calling repondreDemandeFormation.');
         }
 
         let headers = this.defaultHeaders;
@@ -209,7 +517,7 @@ export class DemandesformationService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/demandeformation`,
+        return this.httpClient.request<any>('put',`${this.basePath}/demandeformation/${encodeURIComponent(String(idDemandeFormation))}/repondre`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/engagements.service.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -17,8 +17,8 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { EngagementModel } from '../model/engagementModel';
-import { ErreurModel } from '../model/erreurModel';
+import { EngagementDTO } from '../model/engagementDTO';
+import { ErreurDTO } from '../model/erreurDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -58,26 +58,225 @@ export class EngagementsService {
 
     /**
      * 
-     * récupérer la liste des engagements
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+     * Récupérer la liste des engagements
+     * @param asc Préciser si les données sont dans l'ordre (true) ou dans l'ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d'éléments affiché sur chaque page du tableau
      * @param idAgence id de l'agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d'identifier l'objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s'effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getEngagements(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable<Array<EngagementModel>>;
-    public getEngagements(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EngagementModel>>>;
-    public getEngagements(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EngagementModel>>>;
-    public getEngagements(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEngagements(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EngagementDTO>>;
+    public getEngagements(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EngagementDTO>>>;
+    public getEngagements(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EngagementDTO>>>;
+    public getEngagements(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEngagements.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEngagements.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEngagements.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<EngagementDTO>>('get',`${this.basePath}/engagements`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des engagements en attente
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EngagementDTO>>;
+    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EngagementDTO>>>;
+    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EngagementDTO>>>;
+    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEngagementsEnAttente.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEngagementsEnAttente.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEngagementsEnAttente.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<EngagementDTO>>('get',`${this.basePath}/engagements/enattente`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des engagements ayant reçu une réponse
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getEngagementsRepondus(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EngagementDTO>>;
+    public getEngagementsRepondus(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EngagementDTO>>>;
+    public getEngagementsRepondus(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EngagementDTO>>>;
+    public getEngagementsRepondus(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEngagementsRepondus.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEngagementsRepondus.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEngagementsRepondus.');
+        }
+
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
 
         let headers = this.defaultHeaders;
 
@@ -101,7 +300,7 @@ export class EngagementsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EngagementModel>>('get',`${this.basePath}/engagements/`,
+        return this.httpClient.request<Array<EngagementDTO>>('get',`${this.basePath}/engagements/repondus`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -112,4 +311,63 @@ export class EngagementsService {
         );
     }
 
+    /**
+     * 
+     * Donnez une réponse à un engagement
+     * @param body 
+     * @param idEngagement id engagement
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling repondreEngagement.');
+        }
+
+        if (idEngagement === null || idEngagement === undefined) {
+            throw new Error('Required parameter idEngagement was null or undefined when calling repondreEngagement.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<any>('put',`${this.basePath}/engagements/${encodeURIComponent(String(idEngagement))}/repondre`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
 }

src/app/shared/api-swagger/api/ep.service.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -17,8 +17,11 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { EpModel } from '../model/epModel';
-import { ErreurModel } from '../model/erreurModel';
+import { EpDTO } from '../model/epDTO';
+import { EpInformationDTO } from '../model/epInformationDTO';
+import { EpSaisieDTO } from '../model/epSaisieDTO';
+import { ErreurDTO } from '../model/erreurDTO';
+import { ProchainEPDTO } from '../model/prochainEPDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -58,23 +61,64 @@ export class EpService {
 
     /**
      * 
-     * lancer la procedure entretien professionnel intermediaire
-     * @param idCollaborateur id collaborateur
-     * @param idReferent id referent
+     * Récupérer la liste de tous les EP collaborateurs
+     * @param asc Préciser si les données sont dans l'ordre (true) ou dans l'ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d'éléments affiché sur chaque page du tableau
+     * @param idAgence id de l'agence à laquelle sont rattachées les données à récupérer
+     * @param idBU id de la business unit à laquelle sont rattachées les données à récupérer
+     * @param statutEP Statut de l'EP
+     * @param texte Texte permettant d'identifier l'objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s'effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public createEPI(idCollaborateur: string, idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEP(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, statutEP?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+    public getEP(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, statutEP?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+    public getEP(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, statutEP?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+    public getEP(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, statutEP?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idCollaborateur === null || idCollaborateur === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling createEPI.');
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEP.');
         }
 
-        if (idReferent === null || idReferent === undefined) {
-            throw new Error('Required parameter idReferent was null or undefined when calling createEPI.');
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEP.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEP.');
+        }
+
+
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (idBU !== undefined && idBU !== null) {
+            queryParameters = queryParameters.set('idBU', <any>idBU);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (statutEP !== undefined && statutEP !== null) {
+            queryParameters = queryParameters.set('statutEP', <any>statutEP);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -99,8 +143,9 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<any>('get',`${this.basePath}/ep/epi`,
+        return this.httpClient.request<Array<EpInformationDTO>>('get',`${this.basePath}/ep`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -111,25 +156,59 @@ export class EpService {
 
     /**
      * 
-     * recevoir la liste de tous les EP collaborateurs
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
-     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * Récupérer la liste des EP d&#x27;un collaborateur
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idCollaborateur id collaborateur
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param statutEP Statut de l&#x27;EP
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getEP(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable<Array<EpModel>>;
-    public getEP(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpModel>>>;
-    public getEP(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpModel>>>;
-    public getEP(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEPByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, statutEP?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+    public getEPByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, statutEP?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+    public getEPByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, statutEP?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+    public getEPByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, statutEP?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEPByCollaborateur.');
+        }
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getEPByCollaborateur.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEPByCollaborateur.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEPByCollaborateur.');
+        }
+
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
-        if (idAgence !== undefined && idAgence !== null) {
-            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (statutEP !== undefined && statutEP !== null) {
+            queryParameters = queryParameters.set('statutEP', <any>statutEP);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -154,7 +233,7 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EpModel>>('get',`${this.basePath}/ep`,
+        return this.httpClient.request<Array<EpInformationDTO>>('get',`${this.basePath}/ep/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -167,18 +246,18 @@ export class EpService {
 
     /**
      * 
-     * recevoir la liste des EP collaborateur
-     * @param idCollaborateur id collaborateur
+     * Récupérer un EP par son id
+     * @param idEP id EP
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getEPByCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpModel>>;
-    public getEPByCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpModel>>>;
-    public getEPByCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpModel>>>;
-    public getEPByCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEPById(idEP: number, observe?: 'body', reportProgress?: boolean): Observable<EpDTO>;
+    public getEPById(idEP: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EpDTO>>;
+    public getEPById(idEP: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EpDTO>>;
+    public getEPById(idEP: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idCollaborateur === null || idCollaborateur === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling getEPByCollaborateur.');
+        if (idEP === null || idEP === undefined) {
+            throw new Error('Required parameter idEP was null or undefined when calling getEPById.');
         }
 
         let headers = this.defaultHeaders;
@@ -203,7 +282,7 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EpModel>>('get',`${this.basePath}/ep/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<EpDTO>('get',`${this.basePath}/ep/${encodeURIComponent(String(idEP))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -215,18 +294,54 @@ export class EpService {
 
     /**
      * 
-     * recevoir un EP par via son id
-     * @param idEP id EP
+     * Récupérer la liste de tous les EP fait passer par le référent
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getEPById(idEP: string, observe?: 'body', reportProgress?: boolean): Observable<EpModel>;
-    public getEPById(idEP: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EpModel>>;
-    public getEPById(idEP: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EpModel>>;
-    public getEPById(idEP: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+    public getEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+    public getEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+    public getEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idEP === null || idEP === undefined) {
-            throw new Error('Required parameter idEP was null or undefined when calling getEPById.');
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEPByReferent.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling getEPByReferent.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEPByReferent.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEPByReferent.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -251,8 +366,9 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<EpModel>('get',`${this.basePath}/ep/${encodeURIComponent(String(idEP))}`,
+        return this.httpClient.request<Array<EpInformationDTO>>('get',`${this.basePath}/ep/referent/${encodeURIComponent(String(idReferent))}`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -263,18 +379,59 @@ export class EpService {
 
     /**
      * 
-     * recevoir la liste de tous les EP fait passer par le référent
-     * @param idReferent id referent
+     * Récupérer la liste de tous les prochaines EP collaborateurs
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param idBU id de la business unit à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getEPByReferent(idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpModel>>;
-    public getEPByReferent(idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpModel>>>;
-    public getEPByReferent(idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpModel>>>;
-    public getEPByReferent(idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEPEnCours(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+    public getEPEnCours(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+    public getEPEnCours(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+    public getEPEnCours(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idReferent === null || idReferent === undefined) {
-            throw new Error('Required parameter idReferent was null or undefined when calling getEPByReferent.');
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEPEnCours.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEPEnCours.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEPEnCours.');
+        }
+
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (idBU !== undefined && idBU !== null) {
+            queryParameters = queryParameters.set('idBU', <any>idBU);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -299,8 +456,9 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EpModel>>('get',`${this.basePath}/ep/referent/${encodeURIComponent(String(idReferent))}`,
+        return this.httpClient.request<Array<EpInformationDTO>>('get',`${this.basePath}/ep/enCours`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -311,18 +469,108 @@ export class EpService {
 
     /**
      * 
-     * recevoir son prochain EP
+     * Récupérer la liste de tous les EP collaborateur signés
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param idBU id de la business unit à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getEPSignes(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+    public getEPSignes(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+    public getEPSignes(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+    public getEPSignes(asc: boolean, numPage: number, parPAge: number, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getEPSignes.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getEPSignes.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getEPSignes.');
+        }
+
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (idBU !== undefined && idBU !== null) {
+            queryParameters = queryParameters.set('idBU', <any>idBU);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<EpInformationDTO>>('get',`${this.basePath}/ep/signes`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les détails sur quand aura lieu le prochain EP du collaborateur
      * @param idCollaborateur id collaborateur
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getProchainEPByCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<EpModel>;
-    public getProchainEPByCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EpModel>>;
-    public getProchainEPByCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EpModel>>;
-    public getProchainEPByCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getProchainEPCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<ProchainEPDTO>;
+    public getProchainEPCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ProchainEPDTO>>;
+    public getProchainEPCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ProchainEPDTO>>;
+    public getProchainEPCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (idCollaborateur === null || idCollaborateur === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling getProchainEPByCollaborateur.');
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getProchainEPCollaborateur.');
         }
 
         let headers = this.defaultHeaders;
@@ -347,7 +595,7 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<EpModel>('get',`${this.basePath}/ep/collaborateur/${encodeURIComponent(String(idCollaborateur))}/prochain`,
+        return this.httpClient.request<ProchainEPDTO>('get',`${this.basePath}/ep/collaborateur/${encodeURIComponent(String(idCollaborateur))}/prochain`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -359,25 +607,54 @@ export class EpService {
 
     /**
      * 
-     * recevoir la liste de tous les prochaines EP collaborateurs
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
-     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * Récupérer la liste de tous les prochaines EP que fera passer le référent
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getProchainsEP(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable<Array<EpModel>>;
-    public getProchainsEP(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpModel>>>;
-    public getProchainsEP(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpModel>>>;
-    public getProchainsEP(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getProchainsEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+    public getProchainsEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+    public getProchainsEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+    public getProchainsEPByReferent(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getProchainsEPByReferent.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling getProchainsEPByReferent.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getProchainsEPByReferent.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getProchainsEPByReferent.');
+        }
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
-        if (idAgence !== undefined && idAgence !== null) {
-            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -402,7 +679,7 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EpModel>>('get',`${this.basePath}/ep/prochains`,
+        return this.httpClient.request<Array<EpInformationDTO>>('get',`${this.basePath}/ep/referent/${encodeURIComponent(String(idReferent))}/prochains`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -415,18 +692,18 @@ export class EpService {
 
     /**
      * 
-     * recevoir la liste de tous les prochaines EP que fera passer le référent
-     * @param idReferent id referent
+     * Faire un rappel de signature EP
+     * @param idEP id EP
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getProchainsEPByReferent(idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EpModel>>;
-    public getProchainsEPByReferent(idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpModel>>>;
-    public getProchainsEPByReferent(idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpModel>>>;
-    public getProchainsEPByReferent(idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public rappelSignature(idEP: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public rappelSignature(idEP: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public rappelSignature(idEP: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public rappelSignature(idEP: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idReferent === null || idReferent === undefined) {
-            throw new Error('Required parameter idReferent was null or undefined when calling getProchainsEPByReferent.');
+        if (idEP === null || idEP === undefined) {
+            throw new Error('Required parameter idEP was null or undefined when calling rappelSignature.');
         }
 
         let headers = this.defaultHeaders;
@@ -451,7 +728,7 @@ export class EpService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EpModel>>('get',`${this.basePath}/ep/referent/${encodeURIComponent(String(idReferent))}/prochains`,
+        return this.httpClient.request<any>('get',`${this.basePath}/ep/${encodeURIComponent(String(idEP))}/rappelSignature`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -463,18 +740,71 @@ export class EpService {
 
     /**
      * 
-     * faire un rappel de signature EP
+     * Récupérer le prochain EP du collaborateur dans le but de le saisir
+     * @param idCollaborateur id collaborateur
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public saisieProchainEP(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<EpSaisieDTO>;
+    public saisieProchainEP(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EpSaisieDTO>>;
+    public saisieProchainEP(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EpSaisieDTO>>;
+    public saisieProchainEP(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling saisieProchainEP.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<EpSaisieDTO>('get',`${this.basePath}/ep/collaborateur/${encodeURIComponent(String(idCollaborateur))}/prochain/saisir`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Mettre à jour l&#x27;EP déjà saisie
+     * @param body 
      * @param idEP id EP
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public rappelSignature(idEP: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public rappelSignature(idEP: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public rappelSignature(idEP: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public rappelSignature(idEP: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public updateEP(body: EpDTO, idEP: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public updateEP(body: EpDTO, idEP: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateEP(body: EpDTO, idEP: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateEP(body: EpDTO, idEP: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling updateEP.');
+        }
 
         if (idEP === null || idEP === undefined) {
-            throw new Error('Required parameter idEP was null or undefined when calling rappelSignature.');
+            throw new Error('Required parameter idEP was null or undefined when calling updateEP.');
         }
 
         let headers = this.defaultHeaders;
@@ -497,10 +827,16 @@ export class EpService {
 
         // to determine the Content-Type header
         const consumes: string[] = [
+            'application/json'
         ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
 
-        return this.httpClient.request<any>('get',`${this.basePath}/ep/${encodeURIComponent(String(idEP))}/rappelSignature`,
+        return this.httpClient.request<any>('put',`${this.basePath}/ep/${encodeURIComponent(String(idEP))}/updateep`,
             {
+                body: body,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -511,18 +847,23 @@ export class EpService {
 
     /**
      * 
-     * update ep
+     * Poursuivre le processus de l&#x27;EP ou bien seulement sauvegarder les modifications
      * @param body 
+     * @param idEP id EP
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public updateEP(body: EpModel, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public updateEP(body: EpModel, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public updateEP(body: EpModel, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public updateEP(body: EpModel, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public updateSaisieEP(body: EpSaisieDTO, idEP: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public updateSaisieEP(body: EpSaisieDTO, idEP: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateSaisieEP(body: EpSaisieDTO, idEP: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateSaisieEP(body: EpSaisieDTO, idEP: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updateEP.');
+            throw new Error('Required parameter body was null or undefined when calling updateSaisieEP.');
+        }
+
+        if (idEP === null || idEP === undefined) {
+            throw new Error('Required parameter idEP was null or undefined when calling updateSaisieEP.');
         }
 
         let headers = this.defaultHeaders;
@@ -552,7 +893,7 @@ export class EpService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/ep/update`,
+        return this.httpClient.request<any>('put',`${this.basePath}/ep/${encodeURIComponent(String(idEP))}/updatesaisie`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/formations.service.ts

@@ -2,8 +2,8 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
- *
+ * OpenAPI spec version: 1.3.5
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -17,8 +17,13 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { ErreurModel } from '../model/erreurModel';
-import { FormationModel } from '../model/formationModel';
+import { ErreurDTO } from '../model/erreurDTO';
+import { FormationDTO } from '../model/formationDTO';
+import { FormationDetailsDTO } from '../model/formationDetailsDTO';
+import { ModeFormationDTO } from '../model/modeFormationDTO';
+import { OrigineFormationDTO } from '../model/origineFormationDTO';
+import { StatutFormationDTO } from '../model/statutFormationDTO';
+import { TypeFormationDTO } from '../model/typeFormationDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -57,64 +62,16 @@ export class FormationsService {
 
 
     /**
-     *
-     * Supprimer une formation
-     * @param idFormation id formation
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-   public deleteFormation(idFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
-   public deleteFormation(idFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-   public deleteFormation(idFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-   public deleteFormation(idFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
-
-       if (idFormation === null || idFormation === undefined) {
-           throw new Error('Required parameter idFormation was null or undefined when calling deleteFormation.');
-       }
-
-       let headers = this.defaultHeaders;
-
-       // authentication (bearerAuth) required
-       if (this.configuration.accessToken) {
-           const accessToken = typeof this.configuration.accessToken === 'function'
-               ? this.configuration.accessToken()
-               : this.configuration.accessToken;
-           headers = headers.set('Authorization', 'Bearer ' + accessToken);
-       }
-       // to determine the Accept header
-       let httpHeaderAccepts: string[] = [
-           'application/json'
-       ];
-       const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-       if (httpHeaderAcceptSelected != undefined) {
-           headers = headers.set('Accept', httpHeaderAcceptSelected);
-       }
-
-       // to determine the Content-Type header
-       const consumes: string[] = [
-       ];
-
-       return this.httpClient.request<any>('delete',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}`,
-           {
-               withCredentials: this.configuration.withCredentials,
-               headers: headers,
-               observe: observe,
-               reportProgress: reportProgress
-           }
-       );
-   }
-
-    /**
-     *
-     * ajouter une nouvelle formations
-     * @param body
+     * 
+     * Ajouter une nouvelle formation
+     * @param body 
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public ajouterFormation(body: FormationModel, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public ajouterFormation(body: FormationModel, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public ajouterFormation(body: FormationModel, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public ajouterFormation(body: FormationModel, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public ajouterFormation(body: FormationDTO, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public ajouterFormation(body: FormationDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public ajouterFormation(body: FormationDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public ajouterFormation(body: FormationDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
             throw new Error('Required parameter body was null or undefined when calling ajouterFormation.');
@@ -159,75 +116,327 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
+     * Supprimer une formation
+     * @param idFormation id formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public deleteFormation(idFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public deleteFormation(idFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public deleteFormation(idFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public deleteFormation(idFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idFormation === null || idFormation === undefined) {
+            throw new Error('Required parameter idFormation was null or undefined when calling deleteFormation.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('delete',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}/supprimer`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les formations annulées
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getFormationAnnulees(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationDetailsDTO>>;
+    public getFormationAnnulees(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<FormationDetailsDTO>>>;
+    public getFormationAnnulees(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<FormationDetailsDTO>>>;
+    public getFormationAnnulees(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getFormationAnnulees.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getFormationAnnulees.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getFormationAnnulees.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations/annulees`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
      * Récupérer une formation par son id
      * @param idFormation id formation
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-   public getFormationById(idFormation: number, observe?: 'body', reportProgress?: boolean): Observable<FormationModel>;
-   public getFormationById(idFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<FormationModel>>;
-   public getFormationById(idFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<FormationModel>>;
-   public getFormationById(idFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
-
-       if (idFormation === null || idFormation === undefined) {
-           throw new Error('Required parameter idFormation was null or undefined when calling getFormationById.');
-       }
-
-       let headers = this.defaultHeaders;
-
-       // authentication (bearerAuth) required
-       if (this.configuration.accessToken) {
-           const accessToken = typeof this.configuration.accessToken === 'function'
-               ? this.configuration.accessToken()
-               : this.configuration.accessToken;
-           headers = headers.set('Authorization', 'Bearer ' + accessToken);
-       }
-       // to determine the Accept header
-       let httpHeaderAccepts: string[] = [
-           'application/json'
-       ];
-       const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-       if (httpHeaderAcceptSelected != undefined) {
-           headers = headers.set('Accept', httpHeaderAcceptSelected);
-       }
-
-       // to determine the Content-Type header
-       const consumes: string[] = [
-       ];
-
-       return this.httpClient.request<FormationModel>('get',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}`,
-           {
-               withCredentials: this.configuration.withCredentials,
-               headers: headers,
-               observe: observe,
-               reportProgress: reportProgress
-           }
-       );
-   }
+    public getFormationById(idFormation: number, observe?: 'body', reportProgress?: boolean): Observable<FormationDTO>;
+    public getFormationById(idFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<FormationDTO>>;
+    public getFormationById(idFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<FormationDTO>>;
+    public getFormationById(idFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idFormation === null || idFormation === undefined) {
+            throw new Error('Required parameter idFormation was null or undefined when calling getFormationById.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<FormationDTO>('get',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les formations réalisées
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getFormationRealisee(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationDetailsDTO>>;
+    public getFormationRealisee(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<FormationDetailsDTO>>>;
+    public getFormationRealisee(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<FormationDetailsDTO>>>;
+    public getFormationRealisee(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getFormationRealisee.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getFormationRealisee.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getFormationRealisee.');
+        }
+
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (idAgence !== undefined && idAgence !== null) {
+            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations/realisees`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
 
     /**
-     *
-     * recevoir la liste des formations
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+     * 
+     * Récupérer la liste des formations
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
      * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param statutFormation Statut de la formation
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getFormations(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationModel>>;
-    public getFormations(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<FormationModel>>>;
-    public getFormations(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<FormationModel>>>;
-    public getFormations(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getFormations(asc: boolean, numPage: number, parPAge: number, idAgence?: number, statutFormation?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationDetailsDTO>>;
+    public getFormations(asc: boolean, numPage: number, parPAge: number, idAgence?: number, statutFormation?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<FormationDetailsDTO>>>;
+    public getFormations(asc: boolean, numPage: number, parPAge: number, idAgence?: number, statutFormation?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<FormationDetailsDTO>>>;
+    public getFormations(asc: boolean, numPage: number, parPAge: number, idAgence?: number, statutFormation?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getFormations.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getFormations.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getFormations.');
+        }
+
+
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (statutFormation !== undefined && statutFormation !== null) {
+            queryParameters = queryParameters.set('statutFormation', <any>statutFormation);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
 
         let headers = this.defaultHeaders;
 
@@ -251,7 +460,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<FormationModel>>('get',`${this.basePath}/formations`,
+        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -263,27 +472,142 @@ export class FormationsService {
     }
 
     /**
-     *
-     * Récupérer les formations plannifié et/ou replannifié
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+     * 
+     * Récupérer les modes de formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getModesFormation(observe?: 'body', reportProgress?: boolean): Observable<Array<ModeFormationDTO>>;
+    public getModesFormation(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ModeFormationDTO>>>;
+    public getModesFormation(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ModeFormationDTO>>>;
+    public getModesFormation(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<ModeFormationDTO>>('get',`${this.basePath}/modesFormation`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les origines de formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getOriginesFormation(observe?: 'body', reportProgress?: boolean): Observable<Array<OrigineFormationDTO>>;
+    public getOriginesFormation(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<OrigineFormationDTO>>>;
+    public getOriginesFormation(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<OrigineFormationDTO>>>;
+    public getOriginesFormation(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<OrigineFormationDTO>>('get',`${this.basePath}/originesFormation`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les formations plannifié et replannifié
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
      * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getProchainesFormation(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationModel>>;
-    public getProchainesFormation(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<FormationModel>>>;
-    public getProchainesFormation(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<FormationModel>>>;
-    public getProchainesFormation(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getProchainesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationDetailsDTO>>;
+    public getProchainesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<FormationDetailsDTO>>>;
+    public getProchainesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<FormationDetailsDTO>>>;
+    public getProchainesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getProchainesFormation.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getProchainesFormation.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getProchainesFormation.');
+        }
+
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
 
         let headers = this.defaultHeaders;
 
@@ -307,7 +631,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<FormationModel>>('get',`${this.basePath}/formations/prochaines`,
+        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations/prochaines`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -319,21 +643,112 @@ export class FormationsService {
     }
 
     /**
-     *
-     * update une formation
-     * @param body
+     * 
+     * Récupérer les statuts de formation
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public updateFormation(body: FormationModel, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public updateFormation(body: FormationModel, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public updateFormation(body: FormationModel, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public updateFormation(body: FormationModel, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getStatutsFormation(observe?: 'body', reportProgress?: boolean): Observable<Array<StatutFormationDTO>>;
+    public getStatutsFormation(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<StatutFormationDTO>>>;
+    public getStatutsFormation(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<StatutFormationDTO>>>;
+    public getStatutsFormation(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<StatutFormationDTO>>('get',`${this.basePath}/statutsFormation`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les types de formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getTypesFormation(observe?: 'body', reportProgress?: boolean): Observable<Array<TypeFormationDTO>>;
+    public getTypesFormation(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<TypeFormationDTO>>>;
+    public getTypesFormation(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<TypeFormationDTO>>>;
+    public getTypesFormation(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<TypeFormationDTO>>('get',`${this.basePath}/typesFormation`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Mettre à jour une formation
+     * @param body 
+     * @param idFormation id formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public updateFormation(body: FormationDTO, idFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public updateFormation(body: FormationDTO, idFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateFormation(body: FormationDTO, idFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateFormation(body: FormationDTO, idFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
             throw new Error('Required parameter body was null or undefined when calling updateFormation.');
         }
 
+        if (idFormation === null || idFormation === undefined) {
+            throw new Error('Required parameter idFormation was null or undefined when calling updateFormation.');
+        }
+
         let headers = this.defaultHeaders;
 
         // authentication (bearerAuth) required
@@ -361,7 +776,7 @@ export class FormationsService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/formations`,
+        return this.httpClient.request<any>('put',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}/update`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/notes.service.ts

@@ -0,0 +1,524 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *//* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams,
+         HttpResponse, HttpEvent }                           from '@angular/common/http';
+import { CustomHttpUrlEncodingCodec }                        from '../encoder';
+
+import { Observable }                                        from 'rxjs';
+
+import { AffichageNoteDTO } from '../model/affichageNoteDTO';
+import { DetailsNoteDTO } from '../model/detailsNoteDTO';
+import { ErreurDTO } from '../model/erreurDTO';
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+@Injectable()
+export class NotesService {
+
+    protected basePath = 'http://localhost:3000/api';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    private canConsumeForm(consumes: string[]): boolean {
+        const form = 'multipart/form-data';
+        for (const consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * 
+     * Supprimer une note
+     * @param idNote id note
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public deleteNote(idNote: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public deleteNote(idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public deleteNote(idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public deleteNote(idNote: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idNote === null || idNote === undefined) {
+            throw new Error('Required parameter idNote was null or undefined when calling deleteNote.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<any>('delete',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}/supprimer`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer une note par son id
+     * @param idNote id note
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getNoteById(idNote: number, observe?: 'body', reportProgress?: boolean): Observable<DetailsNoteDTO>;
+    public getNoteById(idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DetailsNoteDTO>>;
+    public getNoteById(idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DetailsNoteDTO>>;
+    public getNoteById(idNote: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idNote === null || idNote === undefined) {
+            throw new Error('Required parameter idNote was null or undefined when calling getNoteById.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<DetailsNoteDTO>('get',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer toutes les notes
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<AffichageNoteDTO>>;
+    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<AffichageNoteDTO>>>;
+    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<AffichageNoteDTO>>>;
+    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getNotes.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getNotes.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getNotes.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer les notes d&#x27;une personne a écrite
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getNotesByAuteur(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<AffichageNoteDTO>>;
+    public getNotesByAuteur(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<AffichageNoteDTO>>>;
+    public getNotesByAuteur(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<AffichageNoteDTO>>>;
+    public getNotesByAuteur(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getNotesByAuteur.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling getNotesByAuteur.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getNotesByAuteur.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getNotesByAuteur.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/auteur/${encodeURIComponent(String(idReferent))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer une note par son id
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idCollaborateur id collaborateur
+     * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getNotesByCollaborateur(asc: boolean, idCollaborateur: string, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<AffichageNoteDTO>>;
+    public getNotesByCollaborateur(asc: boolean, idCollaborateur: string, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<AffichageNoteDTO>>>;
+    public getNotesByCollaborateur(asc: boolean, idCollaborateur: string, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<AffichageNoteDTO>>>;
+    public getNotesByCollaborateur(asc: boolean, idCollaborateur: string, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getNotesByCollaborateur.');
+        }
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getNotesByCollaborateur.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling getNotesByCollaborateur.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getNotesByCollaborateur.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getNotesByCollaborateur.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/auteur/${encodeURIComponent(String(idReferent))}/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Ajouter une nouvelle note
+     * @param body 
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public nouvelleNote(body: DetailsNoteDTO, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public nouvelleNote(body: DetailsNoteDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public nouvelleNote(body: DetailsNoteDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public nouvelleNote(body: DetailsNoteDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling nouvelleNote.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<any>('post',`${this.basePath}/notes/nouvellenote`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Mettre à jour une note
+     * @param body 
+     * @param idNote id note
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateNote(body: DetailsNoteDTO, idNote: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling updateNote.');
+        }
+
+        if (idNote === null || idNote === undefined) {
+            throw new Error('Required parameter idNote was null or undefined when calling updateNote.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<any>('put',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}/updateNote`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}

src/app/shared/api-swagger/api/participationsFormations.service.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -17,8 +17,9 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { ErreurModel } from '../model/erreurModel';
-import { ParticipationFormationModel } from '../model/participationFormationModel';
+import { ErreurDTO } from '../model/erreurDTO';
+import { EvaluationDTO } from '../model/evaluationDTO';
+import { ParticipationFormationDTO } from '../model/participationFormationDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -58,20 +59,248 @@ export class ParticipationsFormationsService {
 
     /**
      * 
-     * récupérer la liste des formations auxquelles est inscrit le collaborateur
+     * Consulter une évaluation d'une formation
+     * @param idParticipationFormation id participation formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public consulterEvaluation(idParticipationFormation: number, observe?: 'body', reportProgress?: boolean): Observable<EvaluationDTO>;
+    public consulterEvaluation(idParticipationFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EvaluationDTO>>;
+    public consulterEvaluation(idParticipationFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EvaluationDTO>>;
+    public consulterEvaluation(idParticipationFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (idParticipationFormation === null || idParticipationFormation === undefined) {
+            throw new Error('Required parameter idParticipationFormation was null or undefined when calling consulterEvaluation.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<EvaluationDTO>('get',`${this.basePath}/evaluations/participationformation/${encodeURIComponent(String(idParticipationFormation))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Evaluer une formation
+     * @param body 
+     * @param idParticipationFormation id participation formation
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling evaluerFormation.');
+        }
+
+        if (idParticipationFormation === null || idParticipationFormation === undefined) {
+            throw new Error('Required parameter idParticipationFormation was null or undefined when calling evaluerFormation.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<any>('put',`${this.basePath}/evaluations/participationformation/${encodeURIComponent(String(idParticipationFormation))}/evaluer`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des formations auxquelles est inscrit le collaborateur
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
      * @param idCollaborateur id collaborateur
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getParticipationByCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<Array<ParticipationFormationModel>>;
-    public getParticipationByCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ParticipationFormationModel>>>;
-    public getParticipationByCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ParticipationFormationModel>>>;
-    public getParticipationByCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<ParticipationFormationDTO>>;
+    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ParticipationFormationDTO>>>;
+    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ParticipationFormationDTO>>>;
+    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getParticipationByCollaborateur.');
+        }
 
         if (idCollaborateur === null || idCollaborateur === undefined) {
             throw new Error('Required parameter idCollaborateur was null or undefined when calling getParticipationByCollaborateur.');
         }
 
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getParticipationByCollaborateur.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getParticipationByCollaborateur.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<ParticipationFormationDTO>>('get',`${this.basePath}/participationsformation/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des participants d&#x27;une formation
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idFormation id formation
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getParticipationByFormation(asc: boolean, idFormation: number, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<ParticipationFormationDTO>>;
+    public getParticipationByFormation(asc: boolean, idFormation: number, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ParticipationFormationDTO>>>;
+    public getParticipationByFormation(asc: boolean, idFormation: number, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ParticipationFormationDTO>>>;
+    public getParticipationByFormation(asc: boolean, idFormation: number, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getParticipationByFormation.');
+        }
+
+        if (idFormation === null || idFormation === undefined) {
+            throw new Error('Required parameter idFormation was null or undefined when calling getParticipationByFormation.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getParticipationByFormation.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getParticipationByFormation.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
         let headers = this.defaultHeaders;
 
         // authentication (bearerAuth) required
@@ -94,8 +323,9 @@ export class ParticipationsFormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<ParticipationFormationModel>>('get',`${this.basePath}/participationsformation/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<Array<ParticipationFormationDTO>>('get',`${this.basePath}/participationsformation/formation/${encodeURIComponent(String(idFormation))}`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,

src/app/shared/api-swagger/api/referents.service.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -17,8 +17,8 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { CollaborateurModel } from '../model/collaborateurModel';
-import { ErreurModel } from '../model/erreurModel';
+import { ErreurDTO } from '../model/erreurDTO';
+import { ReferentDTO } from '../model/referentDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -58,18 +58,18 @@ export class ReferentsService {
 
     /**
      * 
-     * renvoie la liste des collaborateurs referents
+     * Récupérer le référent d'un collaborateur
      * @param idCollaborateur id collaborateur
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getReferentByCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurModel>>;
-    public getReferentByCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<CollaborateurModel>>>;
-    public getReferentByCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<CollaborateurModel>>>;
-    public getReferentByCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getReferentActuelCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<ReferentDTO>;
+    public getReferentActuelCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ReferentDTO>>;
+    public getReferentActuelCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ReferentDTO>>;
+    public getReferentActuelCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (idCollaborateur === null || idCollaborateur === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling getReferentByCollaborateur.');
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getReferentActuelCollaborateur.');
         }
 
         let headers = this.defaultHeaders;
@@ -94,7 +94,7 @@ export class ReferentsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<CollaborateurModel>>('get',`${this.basePath}/referents/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<ReferentDTO>('get',`${this.basePath}/referents/actuel/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -106,14 +106,14 @@ export class ReferentsService {
 
     /**
      * 
-     * recevoir un referent par son id
+     * Récupérer un referent par son id
      * @param idReferent id referent
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getReferentById(idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<CollaborateurModel>;
-    public getReferentById(idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<CollaborateurModel>>;
-    public getReferentById(idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<CollaborateurModel>>;
+    public getReferentById(idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<ReferentDTO>;
+    public getReferentById(idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ReferentDTO>>;
+    public getReferentById(idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ReferentDTO>>;
     public getReferentById(idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (idReferent === null || idReferent === undefined) {
@@ -142,7 +142,7 @@ export class ReferentsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<CollaborateurModel>('get',`${this.basePath}/referents/${encodeURIComponent(String(idReferent))}`,
+        return this.httpClient.request<ReferentDTO>('get',`${this.basePath}/referents/${encodeURIComponent(String(idReferent))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -154,35 +154,151 @@ export class ReferentsService {
 
     /**
      * 
-     * recevoir la liste de tous les referents
-     * @param cptechlead paramètre pour indiquer explicitement que l&#x27;on souhaite récupérer les CP et TeachLead dans la requête
-     * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+     * Récupérer la liste de tous les referents
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param fonctions Liste des fonctions des collaborateurs que l&#x27;on veut récupérer
      * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
-     * @param referents paramètre pour indiquer explicitement que l&#x27;on souhaite récupérer les référents dans la requête
+     * @param idBU id de la business unit à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getReferents(cptechlead?: boolean, idBu?: number, idAgence?: number, referents?: boolean, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurModel>>;
-    public getReferents(cptechlead?: boolean, idBu?: number, idAgence?: number, referents?: boolean, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<CollaborateurModel>>>;
-    public getReferents(cptechlead?: boolean, idBu?: number, idAgence?: number, referents?: boolean, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<CollaborateurModel>>>;
-    public getReferents(cptechlead?: boolean, idBu?: number, idAgence?: number, referents?: boolean, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getReferents(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<ReferentDTO>>;
+    public getReferents(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ReferentDTO>>>;
+    public getReferents(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ReferentDTO>>>;
+    public getReferents(asc: boolean, numPage: number, parPAge: number, fonctions?: Array<string>, idAgence?: number, idBU?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getReferents.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getReferents.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getReferents.');
+        }
+
 
 
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (cptechlead !== undefined && cptechlead !== null) {
-            queryParameters = queryParameters.set('cptechlead', <any>cptechlead);
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
-        if (idBu !== undefined && idBu !== null) {
-            queryParameters = queryParameters.set('idBu', <any>idBu);
+        if (fonctions) {
+            fonctions.forEach((element) => {
+                queryParameters = queryParameters.append('fonctions', <any>element);
+            })
         }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
-        if (referents !== undefined && referents !== null) {
-            queryParameters = queryParameters.set('referents', <any>referents);
+        if (idBU !== undefined && idBU !== null) {
+            queryParameters = queryParameters.set('idBU', <any>idBU);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (bearerAuth) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<Array<ReferentDTO>>('get',`${this.basePath}/referents`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer la liste des référents d&#x27;un collaborateur
+     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idCollaborateur id collaborateur
+     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getReferentsByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<ReferentDTO>>;
+    public getReferentsByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ReferentDTO>>>;
+    public getReferentsByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ReferentDTO>>>;
+    public getReferentsByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (asc === null || asc === undefined) {
+            throw new Error('Required parameter asc was null or undefined when calling getReferentsByCollaborateur.');
+        }
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getReferentsByCollaborateur.');
+        }
+
+        if (numPage === null || numPage === undefined) {
+            throw new Error('Required parameter numPage was null or undefined when calling getReferentsByCollaborateur.');
+        }
+
+        if (parPAge === null || parPAge === undefined) {
+            throw new Error('Required parameter parPAge was null or undefined when calling getReferentsByCollaborateur.');
+        }
+
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
+        if (numPage !== undefined && numPage !== null) {
+            queryParameters = queryParameters.set('numPage', <any>numPage);
+        }
+        if (parPAge !== undefined && parPAge !== null) {
+            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+        }
+        if (texte !== undefined && texte !== null) {
+            queryParameters = queryParameters.set('texte', <any>texte);
+        }
+        if (tri !== undefined && tri !== null) {
+            queryParameters = queryParameters.set('tri', <any>tri);
         }
 
         let headers = this.defaultHeaders;
@@ -207,7 +323,7 @@ export class ReferentsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<CollaborateurModel>>('get',`${this.basePath}/referents`,
+        return this.httpClient.request<Array<ReferentDTO>>('get',`${this.basePath}/referents/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/model/affichageNoteDTO.ts

@@ -0,0 +1,22 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Note affiché dans un tableau
+ */
+export interface AffichageNoteDTO { 
+    id: number;
+    titre: string;
+    idCollaborateur?: string;
+    collaborateur: string;
+    dateMiseAjour?: Date;
+}

src/app/shared/api-swagger/model/agenceDTO.ts

@@ -2,17 +2,20 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
- *
+ * OpenAPI spec version: 1.3.5
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { DemandeFormationModel } from './demandeFormationModel';
+import { BusinessUnitDTO } from './businessUnitDTO';
 
-export interface ThemeModel {
+/**
+ * Une agence de Apside
+ */
+export interface AgenceDTO { 
     id: number;
     nom: string;
-    demandesFormation: Array<DemandeFormationModel>;
-}
+    bu: Array<BusinessUnitDTO>;
+}

src/app/shared/api-swagger/model/augmentationSalaireDTO.ts

@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Demande d'augmentation du salaire du collaborateur
+ */
+export interface AugmentationSalaireDTO { 
+    id: number;
+    augmentation: number;
+    primeMission?: number;
+    message?: string;
+}

src/app/shared/api-swagger/model/businessUnitDTO.ts

@@ -2,17 +2,20 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { BusinessUnitModel } from './businessUnitModel';
+import { AgenceDTO } from './agenceDTO';
 
-export interface AgenceModel { 
+/**
+ * Une business unit d'une agence
+ */
+export interface BusinessUnitDTO { 
     id: number;
     nom: string;
-    bus?: Array<BusinessUnitModel>;
+    agence: AgenceDTO;
 }

src/app/shared/api-swagger/model/champDTO.ts

@@ -2,21 +2,23 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { SaisieModel } from './saisieModel';
 
-export interface ChampModel { 
+/**
+ * Les champs d'un EP ou d'une évaluation à remplir
+ */
+export interface ChampDTO { 
     id: number;
     texte: string;
     section: string;
+    soussection?: string;
     ordre: number;
     typeChamp: string;
     typeSaisie: string;
-    saisies?: Array<SaisieModel>;
 }

src/app/shared/api-swagger/model/collaborateurDTO.ts

@@ -0,0 +1,27 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { BusinessUnitDTO } from './businessUnitDTO';
+import { ReferentDTO } from './referentDTO';
+
+/**
+ * Les informations d'un collaborateur
+ */
+export interface CollaborateurDTO { 
+    id: string;
+    nom: string;
+    prenom: string;
+    mailApside: string;
+    dateArrivee: Date;
+    dateDepart?: Date;
+    businessUnit?: BusinessUnitDTO;
+    referent?: ReferentDTO;
+}

src/app/shared/api-swagger/model/creationDemandeDelegationDTO.ts

@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { CollaborateurDTO } from './collaborateurDTO';
+
+/**
+ * Objet à envoyer lorsqu'un référent fait une demande de délégation
+ */
+export interface CreationDemandeDelegationDTO { 
+    idEp?: number;
+    idReferent?: CollaborateurDTO;
+    raisonDemande: string;
+}

src/app/shared/api-swagger/model/creationDemandeFormationDTO.ts

@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Objet à envoyer lors d'une demande de formation
+ */
+export interface CreationDemandeFormationDTO { 
+    id: number;
+    libelle: string;
+    description: string;
+    theme: number;
+}

src/app/shared/api-swagger/model/demandeDelegationDTO.ts

@@ -2,20 +2,21 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { CollaborateurModel } from './collaborateurModel';
-import { EpModel } from './epModel';
+import { EpInformationDTO } from './epInformationDTO';
 
-export interface DemandeDelegationModel { 
+/**
+ * Les détails d'une demande de délégation d'un EP
+ */
+export interface DemandeDelegationDTO { 
     id: number;
-    ep: EpModel;
-    referent: CollaborateurModel;
+    ep: EpInformationDTO;
     dateDemande: Date;
     reponse?: boolean;
     dateReponse?: Date;

src/app/shared/api-swagger/model/demandeEPIDTO.ts

@@ -0,0 +1,27 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { EpInformationDTO } from './epInformationDTO';
+
+/**
+ * Demande d'EPI faite par un collaborateur
+ */
+export interface DemandeEPIDTO { 
+    id: number;
+    idCollaborateur: string;
+    idReferent: string;
+    dateDemande: Date;
+    etat?: number;
+    reponse?: boolean;
+    dateReponse?: Date;
+    raisonRefus?: string;
+    ep?: EpInformationDTO;
+}

src/app/shared/api-swagger/model/demandeFormationDTO.ts

@@ -2,19 +2,21 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { EpModel } from './epModel';
-import { ThemeModel } from './themeModel';
+import { EpInformationDTO } from './epInformationDTO';
+import { ThemeDTO } from './themeDTO';
 
-export interface DemandeFormationModel { 
+/**
+ * Les détails d'une demande de formation
+ */
+export interface DemandeFormationDTO { 
     id: number;
-    status: string;
     libelle: string;
     description: string;
     demandeRH: boolean;
@@ -22,6 +24,6 @@ export interface DemandeFormationModel {
     reponse?: boolean;
     commentaireRefus?: string;
     dateDerniereReponse?: Date;
-    theme: ThemeModel;
-    ep: EpModel;
+    theme: ThemeDTO;
+    ep: EpInformationDTO;
 }

src/app/shared/api-swagger/model/detailsNoteDTO.ts

@@ -2,18 +2,24 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-import { SaisieModel } from './saisieModel';
+import { CollaborateurDTO } from './collaborateurDTO';
 
-export interface SaisieNoteTexteModel extends SaisieModel { 
-    note: number;
+/**
+ * Détails d'une note que peut prendre un commercial, un delivery ou un RA sur un collaborateur
+ */
+export interface DetailsNoteDTO { 
+    id: number;
+    titre: string;
     texte: string;
+    idAuteur: string;
+    collaborateur: CollaborateurDTO;
+    dateCreation?: Date;
+    dateMiseAjour?: Date;
 }

src/app/shared/api-swagger/model/documentDTO.ts

@@ -2,20 +2,20 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { EpModel } from './epModel';
-import { SaisieModel } from './saisieModel';
+import { SaisieDTO } from './saisieDTO';
 
-export interface DocumentModel { 
+/**
+ * Un document pour récupérer les saisies et leur champ en fonction du type de l'EP qui peut être EPS, EPA ou EPASIXANS
+ */
+export interface DocumentDTO { 
     id: number;
     type: string;
-    ep?: EpModel;
-    saisieCollaborateur?: Array<SaisieModel>;
-    saisieCommercial?: Array<SaisieModel>;
+    saisies?: Array<SaisieDTO>;
 }

src/app/shared/api-swagger/model/engagementDTO.ts

@@ -2,16 +2,19 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { EpModel } from './epModel';
+import { EpInformationDTO } from './epInformationDTO';
 
-export interface EngagementModel { 
+/**
+ * Les détails d'un engagement pris par un référent pour un EP
+ */
+export interface EngagementDTO { 
     id: number;
     action: string;
     modalite: string;
@@ -20,5 +23,5 @@ export interface EngagementModel {
     realisable?: boolean;
     realise?: boolean;
     raisonNonRealisable?: string;
-    ep: EpModel;
+    ep?: EpInformationDTO;
 }

src/app/shared/api-swagger/model/epDTO.ts

@@ -0,0 +1,52 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { AugmentationSalaireDTO } from './augmentationSalaireDTO';
+import { CollaborateurDTO } from './collaborateurDTO';
+import { DemandeDelegationDTO } from './demandeDelegationDTO';
+import { DemandeFormationDTO } from './demandeFormationDTO';
+import { DocumentDTO } from './documentDTO';
+import { EngagementDTO } from './engagementDTO';
+import { ObjectifDTO } from './objectifDTO';
+import { ObjectifPrecedentDTO } from './objectifPrecedentDTO';
+import { ParticipationEPDTO } from './participationEPDTO';
+import { RDVEntretienDTO } from './rDVEntretienDTO';
+import { ReferentDTO } from './referentDTO';
+import { TypeEntretienDTO } from './typeEntretienDTO';
+
+/**
+ * Tous les détails d'un EP lorsqu'il est consulté
+ */
+export interface EpDTO {
+    id: number;
+    type: string;
+    dateDisponibilite: Date;
+    datePrevisionnelle: Date;
+    dateSaisie?: Date;
+    statut: number;
+    cv: string;
+    propositionsEntretien?: Array<RDVEntretienDTO>;
+    rdvEntretien?: RDVEntretienDTO;
+    choixTypeEntretien?: TypeEntretienDTO;
+    obligatoire: boolean;
+    objectif?: Array<ObjectifDTO>;
+    objectifPrecedent?: Array<ObjectifPrecedentDTO>;
+    commentaireAssistant?: string;
+    commentaireCommercial?: string;
+    collaborateur: CollaborateurDTO;
+    referent: ReferentDTO;
+    demandesFormation?: Array<DemandeFormationDTO>;
+    participants?: Array<ParticipationEPDTO>;
+    engagements?: Array<EngagementDTO>;
+    augmentationSalaire?: AugmentationSalaireDTO;
+    demandesDelegation?: Array<DemandeDelegationDTO>;
+    documents: Array<DocumentDTO>;
+}

src/app/shared/api-swagger/model/epInformationDTO.ts

@@ -0,0 +1,27 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { CollaborateurDTO } from './collaborateurDTO';
+import { ReferentDTO } from './ReferentDTO';
+
+/**
+ * Les informations de base d'un EP
+ */
+export interface EpInformationDTO {
+    id: number;
+    type: number;
+    statut: number;
+    dateDisponibilite: Date;
+    datePrevisionnelle: Date;
+    obligatoire: boolean;
+    collaborateur: CollaborateurDTO;
+    referent: ReferentDTO;
+}

src/app/shared/api-swagger/model/epModel.ts

@@ -1,46 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { AugmentationSalaireModel } from './augmentationSalaireModel';
-import { AutorisationModel } from './autorisationModel';
-import { CollaborateurModel } from './collaborateurModel';
-import { DemandeDelegationModel } from './demandeDelegationModel';
-import { DemandeFormationModel } from './demandeFormationModel';
-import { DocumentModel } from './documentModel';
-import { EngagementModel } from './engagementModel';
-import { RDVEntretienModel } from './rDVEntretienModel';
-
-export interface EpModel { 
-    id: number;
-    type: string;
-    dateCreation: Date;
-    dateDisponibilite: Date;
-    datePrevisionnelle: Date;
-    dateSaisie?: Date;
-    etat: number;
-    cv?: string;
-    dateEntretien?: Date;
-    typeEntretien?: string;
-    obligatoire: boolean;
-    commentaireAssistant?: string;
-    commentaireCollaborateur?: string;
-    commentaireCommercial?: string;
-    collaborateur: CollaborateurModel;
-    referent?: CollaborateurModel;
-    demandesFormation?: Array<DemandeFormationModel>;
-    participants?: Array<CollaborateurModel>;
-    engagements?: Array<EngagementModel>;
-    propositionsRDV?: Array<RDVEntretienModel>;
-    augmentationSalaire?: AugmentationSalaireModel;
-    autorisations?: Array<AutorisationModel>;
-    demandesDelegation?: Array<DemandeDelegationModel>;
-    documents: Array<DocumentModel>;
-}

src/app/shared/api-swagger/model/epSaisieDTO.ts

@@ -0,0 +1,30 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { DocumentDTO } from './documentDTO';
+import { ObjectifDTO } from './objectifDTO';
+import { ObjectifPrecedentDTO } from './objectifPrecedentDTO';
+import { TypeEntretienDTO } from './typeEntretienDTO';
+
+/**
+ * Objet de l'EP au moment de la saisie du collaborateur
+ */
+export interface EpSaisieDTO { 
+    id: number;
+    type: string;
+    datePrevisionnelle: Date;
+    cv?: string;
+    choixEntretien?: TypeEntretienDTO;
+    obligatoire: boolean;
+    objectif?: Array<ObjectifDTO>;
+    objectifPrecedent?: Array<ObjectifPrecedentDTO>;
+    documents: Array<DocumentDTO>;
+}

src/app/shared/api-swagger/model/erreurDTO.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -10,7 +10,10 @@
  * Do not edit the class manually.
  */
 
-export interface ErreurModel { 
+/**
+ * Objet pour la gestion des erreurs
+ */
+export interface ErreurDTO { 
     code: string;
     message: string;
 }

src/app/shared/api-swagger/model/evaluationDTO.ts

@@ -0,0 +1,20 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { SaisieDTO } from './saisieDTO';
+
+/**
+ * Evaluation d'une participation formation
+ */
+export interface EvaluationDTO { 
+    idParticipation: number;
+    saisies: Array<SaisieDTO>;
+}

src/app/shared/api-swagger/model/evaluationFormationModel.ts

@@ -1,19 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.1.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { CritereModel } from './critereModel';
-
-export interface EvaluationFormationModel { 
-    id: number;
-    note?: number;
-    commentaire?: string;
-    critere: CritereModel;
-}

src/app/shared/api-swagger/model/formationDTO.ts

@@ -0,0 +1,36 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { FormationDTOParticipantsFormation } from './formationDTOParticipantsFormation';
+import { ModeFormationDTO } from './modeFormationDTO';
+import { OrigineFormationDTO } from './origineFormationDTO';
+import { StatutFormationDTO } from './statutFormationDTO';
+import { TypeFormationDTO } from './typeFormationDTO';
+
+/**
+ * Toutes les informations d'une formation
+ */
+export interface FormationDTO { 
+    id: number;
+    intitule: string;
+    origine: OrigineFormationDTO;
+    statut?: StatutFormationDTO;
+    idAgence?: number;
+    dateDebut: Date;
+    dateFin: Date;
+    heure: number;
+    jour: number;
+    organisme: string;
+    mode: ModeFormationDTO;
+    type: TypeFormationDTO;
+    estCertifie: boolean;
+    participantsFormation?: Array<FormationDTOParticipantsFormation>;
+}

src/app/shared/api-swagger/model/formationDTOParticipantsFormation.ts

@@ -0,0 +1,22 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface FormationDTOParticipantsFormation { 
+    id: number;
+    dateCreation: Date;
+    formation: string;
+    date?: Date;
+    statut?: string;
+    idCollaborateur?: string;
+    collaborateur?: string;
+    estEvaluee: boolean;
+}

src/app/shared/api-swagger/model/formationDetailsDTO.ts

@@ -0,0 +1,29 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { ModeFormationDTO } from './modeFormationDTO';
+import { StatutFormationDTO } from './statutFormationDTO';
+import { TypeFormationDTO } from './typeFormationDTO';
+
+/**
+ * Les détails d'une formation
+ */
+export interface FormationDetailsDTO { 
+    id?: number;
+    intitule: string;
+    statut?: StatutFormationDTO;
+    dateDebut: Date;
+    dateFin: Date;
+    nbPartitipants: number;
+    mode: ModeFormationDTO;
+    type: TypeFormationDTO;
+    estCertifie: boolean;
+}

src/app/shared/api-swagger/model/formationModel.ts

@@ -1,47 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { ParticipationFormationModel } from './participationFormationModel';
-
-export interface FormationModel {
-    id: number;
-    intitule: string;
-    origine?: string;
-    statut?: FormationModel.StatutEnum;
-    dateDebut: Date;
-    dateFin: Date;
-    heure: number;
-    jour: number;
-    organisme: string;
-    mode: string;
-    type: FormationModel.TypeEnum;
-    estCertifie: boolean;
-    participantsFormation?: Array<ParticipationFormationModel>;
-}
-export namespace FormationModel {
-    export type StatutEnum = 'Planifiée' | 'Replanifiée' | 'Réalisée' | 'Annulée';
-    export const StatutEnum = {
-        Planifie: 'Planifiée' as StatutEnum,
-        Replanifie: 'Replanifiée' as StatutEnum,
-        Realise: 'Réalisée' as StatutEnum,
-        Annule: 'Annulée' as StatutEnum
-    };
-    export type ModeEnum = 'Présentiel' | 'Visioconférence';
-    export const ModeEnum = {
-        Presentiel: 'Présentiel' as ModeEnum,
-        Visioconference: 'Visioconférence' as ModeEnum
-    };
-    export type TypeEnum = 'Externe' | 'Interne';
-    export const TypeEnum = {
-        Externe: 'Externe' as TypeEnum,
-        Interne: 'Interne' as TypeEnum
-    };
-}

src/app/shared/api-swagger/model/modeFormationDTO.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -10,8 +10,10 @@
  * Do not edit the class manually.
  */
 
-export interface RDVEntretienModel { 
+/**
+ * Mode d'une formation
+ */
+export interface ModeFormationDTO { 
     id: number;
-    typeEntretien: string;
-    dateEntretien: Date;
+    libelle: string;
 }

src/app/shared/api-swagger/model/models.ts

@@ -1,24 +1,37 @@
-export * from './agenceModel';
-export * from './augmentationSalaireModel';
-export * from './autorisationModel';
-export * from './businessUnitModel';
-export * from './champModel';
-export * from './collaborateurModel';
-export * from './demandeDelegationModel';
-export * from './demandeFormationModel';
-export * from './documentModel';
-export * from './engagementModel';
-export * from './epModel';
-export * from './erreurModel';
-export * from './formationModel';
-export * from './participationEPModel';
-export * from './participationFormationModel';
-export * from './rDVEntretienModel';
-export * from './saisieBoolTexteModel';
-export * from './saisieDeuxTextesModel';
-export * from './saisieModel';
-export * from './saisieNoteTexteModel';
-export * from './saisieObjectifsModel';
-export * from './saisieUnBoolModel';
-export * from './saisieUnTexteModel';
-export * from './themeModel';
+export * from './affichageNoteDTO';
+export * from './agenceDTO';
+export * from './augmentationSalaireDTO';
+export * from './businessUnitDTO';
+export * from './champDTO';
+export * from './collaborateurDTO';
+export * from './creationDemandeDelegationDTO';
+export * from './creationDemandeFormationDTO';
+export * from './demandeDelegationDTO';
+export * from './demandeEPIDTO';
+export * from './demandeFormationDTO';
+export * from './detailsNoteDTO';
+export * from './documentDTO';
+export * from './engagementDTO';
+export * from './epDTO';
+export * from './epInformationDTO';
+export * from './epSaisieDTO';
+export * from './erreurDTO';
+export * from './evaluationDTO';
+export * from './formationDTO';
+export * from './formationDTOParticipantsFormation';
+export * from './formationDetailsDTO';
+export * from './modeFormationDTO';
+export * from './objectifDTO';
+export * from './objectifPrecedentDTO';
+export * from './origineDemandeFormationDTO';
+export * from './origineFormationDTO';
+export * from './participationEPDTO';
+export * from './participationFormationDTO';
+export * from './prochainEPDTO';
+export * from './rDVEntretienDTO';
+export * from './referentDTO';
+export * from './saisieDTO';
+export * from './statutFormationDTO';
+export * from './themeDTO';
+export * from './typeEntretienDTO';
+export * from './typeFormationDTO';

src/app/shared/api-swagger/model/objectifDTO.ts

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -10,10 +10,10 @@
  * Do not edit the class manually.
  */
 
-export interface CritereModel { 
+/**
+ * Les objectifs pris par le collaborateur
+ */
+export interface ObjectifDTO { 
     id: number;
-    texte: string;
-    type: string;
-    ordre: string;
-    section: string;
+    libelle: string;
 }

src/app/shared/api-swagger/model/objectifPrecedentDTO.ts

@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Les objectifs pris par le collaborateur durant le précédent EP
+ */
+export interface ObjectifPrecedentDTO { 
+    id: number;
+    libelle: string;
+    atteint: boolean;
+    commentaire: string;
+}

src/app/shared/api-swagger/model/origineDemandeFormationDTO.ts

@@ -2,17 +2,18 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { EpModel } from './epModel';
 
-export interface AugmentationSalaireModel { 
+/**
+ * Origine d'une demande de formation
+ */
+export interface OrigineDemandeFormationDTO { 
     id: number;
-    augmentation: number;
-    ep: EpModel;
+    libelle: string;
 }

src/app/shared/api-swagger/model/origineFormationDTO.ts

@@ -2,17 +2,18 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { AgenceModel } from './agenceModel';
 
-export interface BusinessUnitModel { 
+/**
+ * Origine d'une formation
+ */
+export interface OrigineFormationDTO { 
     id: number;
-    nom: string;
-    agence: AgenceModel;
+    libelle: string;
 }

src/app/shared/api-swagger/model/participationEPDTO.ts

@@ -0,0 +1,20 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Information des participants d'un EP (autre que le référent et le collaborateur)
+ */
+export interface ParticipationEPDTO { 
+    id: number;
+    idCollaborateur: string;
+    collaborateur: string;
+}

src/app/shared/api-swagger/model/participationEPModel.ts

@@ -1,19 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { CollaborateurModel } from './collaborateurModel';
-import { EpModel } from './epModel';
-
-export interface ParticipationEPModel { 
-    id: number;
-    collaborateur: CollaborateurModel;
-    ep: EpModel;
-}

src/app/shared/api-swagger/model/participationFormationDTO.ts

@@ -0,0 +1,22 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface ParticipationFormationDTO { 
+    id: number;
+    dateCreation: Date;
+    formation: string;
+    date?: Date;
+    statut?: string;
+    idCollaborateur?: string;
+    collaborateur?: string;
+    estEvaluee: boolean;
+}

src/app/shared/api-swagger/model/participationFormationModel.ts

@@ -1,23 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { DemandeFormationModel } from './demandeFormationModel';
-import { FormationModel } from './formationModel';
-import { SaisieModel } from './saisieModel';
-
-export interface ParticipationFormationModel {
-    id: number;
-    dateCreation: Date;
-    estEvaluee: boolean;
-    formation: FormationModel;
-    demandeformation: DemandeFormationModel;
-    evaluations?: Array<SaisieModel>;
-}

src/app/shared/api-swagger/model/prochainEPDTO.ts

@@ -0,0 +1,22 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Objet contenant les détails du prochain EP non saisi du collaborateur
+ */
+export interface ProchainEPDTO { 
+    id: number;
+    type: number;
+    dateDisponibilite: Date;
+    datePrevisionnelle: Date;
+    obligatoire: boolean;
+}

src/app/shared/api-swagger/model/rDVEntretienDTO.ts

@@ -2,18 +2,20 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { CollaborateurModel } from './collaborateurModel';
-import { EpModel } from './epModel';
+import { TypeEntretienDTO } from './typeEntretienDTO';
 
-export interface AutorisationModel { 
+/**
+ * RDV pour un entretien
+ */
+export interface RDVEntretienDTO { 
     id: number;
-    referent?: CollaborateurModel;
-    ep: EpModel;
+    dateEntretien: Date;
+    typeEntretien: TypeEntretienDTO;
 }

src/app/shared/api-swagger/model/referentDTO.ts

@@ -2,22 +2,22 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { BusinessUnitModel } from './businessUnitModel';
+import { BusinessUnitDTO } from './businessUnitDTO';
 
-export interface CollaborateurModel { 
+/**
+ * Les informations d'un collaborateur
+ */
+export interface ReferentDTO { 
     id: string;
     nom: string;
     prenom: string;
     mailApside: string;
-    dateArrivee?: Date;
-    dateDepart?: Date;
-    businessUnit?: BusinessUnitModel;
-    referent: CollaborateurModel;
+    businessUnit?: BusinessUnitDTO;
 }

src/app/shared/api-swagger/model/saisieDTO.ts

@@ -2,18 +2,24 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.2.0
+ * OpenAPI spec version: 1.3.5
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-import { SaisieModel } from './saisieModel';
+import { ChampDTO } from './champDTO';
 
-export interface SaisieBoolTexteModel extends SaisieModel { 
-    bool: boolean;
+/**
+ * Saisi d'un collaborateur ou d'un référent sur un champ
+ */
+export interface SaisieDTO { 
+    id: string;
+    typeSaisie?: number;
+    note?: number;
     texte?: string;
+    texte2?: string;
+    niveau?: number;
+    champ: ChampDTO;
 }

src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts

@@ -1,19 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-import { SaisieModel } from './saisieModel';
-
-export interface SaisieDeuxTextesModel extends SaisieModel { 
-    texte1: string;
-    texte2: string;
-}

src/app/shared/api-swagger/model/saisieModel.ts

@@ -1,20 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-
-export interface SaisieModel {
-    id: string;
-    type: string;
-    champ: ChampModel;
-    participationFormation?: ParticipationFormationModel;
-}

src/app/shared/api-swagger/model/saisieObjectifsModel.ts

@@ -1,20 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-import { SaisieModel } from './saisieModel';
-
-export interface SaisieObjectifsModel extends SaisieModel { 
-    objectif1: string;
-    objectif2?: string;
-    objectif3?: string;
-}

src/app/shared/api-swagger/model/saisieUnBoolModel.ts

@@ -1,18 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-import { SaisieModel } from './saisieModel';
-
-export interface SaisieUnBoolModel extends SaisieModel { 
-    bool: boolean;
-}

src/app/shared/api-swagger/model/saisieUnTexteModel.ts

@@ -1,18 +0,0 @@
-/**
- * API du serveur de l'application de digitalisation des EP
- * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
- *
- * OpenAPI spec version: 1.2.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { ChampModel } from './champModel';
-import { ParticipationFormationModel } from './participationFormationModel';
-import { SaisieModel } from './saisieModel';
-
-export interface SaisieUnTexteModel extends SaisieModel { 
-    texte: string;
-}

src/app/shared/api-swagger/model/statutFormationDTO.ts

@@ -0,0 +1,19 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Statut actuel d'une formation
+ */
+export interface StatutFormationDTO { 
+    id: number;
+    libelle: string;
+}

src/app/shared/api-swagger/model/themeDTO.ts

@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { DemandeFormationDTO } from './demandeFormationDTO';
+
+/**
+ * Thème d'une demande de formation
+ */
+export interface ThemeDTO { 
+    id: number;
+    nom: string;
+    demandesFormation: Array<DemandeFormationDTO>;
+}

src/app/shared/api-swagger/model/typeEntretienDTO.ts

@@ -0,0 +1,19 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Type de l'entretien d'un EP
+ */
+export interface TypeEntretienDTO { 
+    id: number;
+    libelle: string;
+}

src/app/shared/api-swagger/model/typeFormationDTO.ts

@@ -0,0 +1,19 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.3.5
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Type d'une formation
+ */
+export interface TypeFormationDTO { 
+    id: number;
+    libelle: string;
+}

src/app/shared/displayInfo/displayCollaborateur.ts

@@ -1,10 +0,0 @@
-export class DisplayCollaborateur {
-  id: string;
-  agence: string;
-  nom: string;
-  prenom: string;
-  embauche : Date;
-  anciennete : number;
-  annee: number;
-  mois: number;
-}

src/app/shared/displayInfo/displayEP.ts

@@ -1,19 +0,0 @@
-/**
-  * Class pour récupérer les informations d'un EP qui seront affichées et/ou utilisées.
-  */
-
-import {CollaborateurModel} from "../api-swagger/model/collaborateurModel";
-
-export class DisplayEP {
-  id : number;
-  agence : string;
-  collaborateur : CollaborateurModel;
-  referent : CollaborateurModel;
-  type : string;
-  etat : number;
-  datemail : Date;
-  dateentretien : Date;
-  anciennete : number;
-  annee: number;
-  mois: number;
-}

src/app/shared/displayInfo/displayFormation.ts

@@ -1,10 +0,0 @@
-import { FormationModel } from "@shared/api-swagger/model/models";
-
-export class DisplayFormation {
-  id: number;
-  intitule: string;
-  nbParticipants : number;
-  datePrevu: Date;
-  origine : string;
-  statut: FormationModel.StatutEnum;
-}

src/app/shared/displayInfo/displayParticipation.ts

@@ -1,14 +0,0 @@
-import { CollaborateurModel, EpModel, FormationModel } from "@shared/api-swagger/model/models";
-
-export class DisplayParticipation {
-  id: number;
-  intitule: string;
-  agence: string;
-  collaborateur: string;
-  idCollaborateur: string;
-  idEP: number;
-  estEvaluee: boolean;
-  statutEP : number;
-  dateCreation: Date;
-  formation: FormationModel;
-}

src/app/shared/displayInfo/displays.ts

@@ -1,4 +0,0 @@
-export * from "./displayEP";
-export * from "./displayCollaborateur";
-export * from "./displayFormation";
-export * from "./displayParticipation";

src/app/shared/utils/typeenums.ts

@@ -0,0 +1,2 @@
+//avoir des tableau en fait qui vont nous retourner les types des trucs en fait LOOL WOLA
+//ORORORORRORORORORO