Mise à jour des services de l'api swagger

src/app/collaborateurs/collaborateurs.component.ts

@@ -93,7 +93,7 @@ export class CollaborateursComponent implements OnInit {
     */
   updateDataSource() {
     //récupérer la liste des collaborateur et mettre à jour le tableau
-    this.collaborateursDisponiblesSubscription = this.service.getCollaborateurs(this.asc, this.numPage, this.parPage, this.roles, undefined, undefined, this.search, this.tri).subscribe(
+    this.collaborateursDisponiblesSubscription = this.service.getCollaborateurs(this.roles,[1],this.asc, this.numPage, this.parPage, this.search, this.tri).subscribe(
       collaborateurs => { console.log(collaborateurs); this.dataSource = new MatTableDataSource(collaborateurs);},
       err => console.log(err)
     );

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

@@ -110,7 +110,7 @@ export class DetailsCollaborateurComponent implements OnInit {
     * La fonction est aussi appelé au début du chargement et à l'utilisation de la barre de recherche.
     */
   updateEP() {
-    this.epSubscription = this.epService.getEPByCollaborateur(this.asc, this.idCollaborateur, this.numPage, this.parPage, undefined, this.search, this.tri).subscribe(
+    this.epSubscription = this.epService.getEPSignesCollaborateur(this.idCollaborateur).subscribe(
       ep =>
       {
         console.log(ep);

src/app/formations/details-formation/formation.component.html

@@ -16,13 +16,13 @@
     <p>Type formation : {{ formation.type.libelle}}</p>
   </ng-container>
 
-  <ng-container *ngIf="formation.participantsFormation == undefined || formation.participantsFormation.length==0">
+  <ng-container *ngIf="formation.participations == undefined || formation.participations.length==0">
     <h3>Aucun participant</h3>
   </ng-container>
 
 
   <!-- Afficher la liste des participants -->
-  <ng-container *ngIf="formation.participantsFormation != undefined && formation.participantsFormation.length > 0">
+  <ng-container *ngIf="formation.participations != undefined && formation.participations.length > 0">
     <h3>Liste des participants</h3>
     <mat-table [dataSource]="dataSource">
 

src/app/formations/formations.component.ts

@@ -85,30 +85,10 @@ export class FormationsComponent implements OnInit {
   }
 
   updateDataSource() {
-    switch ((this.etat)) {
+    this.formationsDisponiblesSubscription = this.service.getFormations(1,[1,2,3,4], this.asc,this.numPage, this.parPage, this.search, this.tri).subscribe(
-      case 0:
+      formations => this.dataSource = new MatTableDataSource(formations),
-        this.formationsDisponiblesSubscription = this.service.getFormations(this.asc,this.numPage, this.parPage, 1, undefined, this.search, this.tri).subscribe(
+      err => console.log(err)
-          formations => this.dataSource = new MatTableDataSource(formations),
+    );
-          err => console.log(err)
-        );
-        break;
-
-      case 1:
-        this.formationsDisponiblesSubscription = this.service.getFormationRealisee(this.asc,this.numPage, this.parPage, 1, this.search, this.tri).subscribe(
-          formations => this.dataSource = new MatTableDataSource(formations),
-          err => console.log(err)
-        );
-        break;
-      case 2:
-        this.formationsDisponiblesSubscription = this.service.getFormationAnnulees(this.asc,this.numPage, this.parPage, 1, this.search, this.tri).subscribe(
-          formations => this.dataSource = new MatTableDataSource(formations),
-          err => console.log(err)
-        );
-        break;
-      default:
-        break;
-    }
-
     //this.dataSource.paginator = this.paginator;
     //this.dataSource.sort = this.sort;
   }

src/app/formations/new-formation/new-formation.component.ts

@@ -103,7 +103,7 @@ export class NewFormationComponent implements OnInit {
   }
 
   ajouterFormation() {
-    this.formationSubscription = this.service.ajouterFormation(this.formationForm.value).subscribe(
+    this.formationSubscription = this.service.addFormation(this.formationForm.value).subscribe(
       response => {
         console.log(response);
         this.router.navigate(['/formations',response["id"]]);

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

@@ -51,7 +51,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
     *
     * En fonction de son utilisation, pourrait remplacer "choixBU".
     */
-  idsBU : number[] = [];
+  idsBU : number[] = [1];
 
   taille = 100;
 
@@ -110,7 +110,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   ngAfterViewInit(){}
 
   updateDataSource() {
-    this.epDisponiblesSubscription = this.service.getEPEnCours(this.asc, this.numPage, this.parPage, 1, this.choixBU, this.search, this.tri).
+    this.epDisponiblesSubscription = this.service.getEPEnCours(this.idsBU, this.asc, this.numPage, this.parPage, this.search, this.tri).
        subscribe(eps => {
          
          this.dataSource = new MatTableDataSource(eps);

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

@@ -93,13 +93,13 @@ export class HomeRHComponent implements OnInit {
   updateFormations() {
     console.log(this.numPage);
     console.log(this.parPage);
-    this.formationsDisponiblesSubscription = this.service.getProchainesFormation(this.asc, this.numPage, this.parPage, 1, this.search, this.tri).subscribe(
+    this.formationsDisponiblesSubscription = this.service.getFormations(1,[1,2],this.asc, this.numPage, this.parPage,  this.search, this.tri).subscribe(
       formations => this.dataSource = new MatTableDataSource(formations),
       err => console.log(err)
     )
   }
 
-  estCertifiee(certifiee) {
+  estCertifiee(certifiee: boolean) {
     if(certifiee)
       return "Oui";
     return "Non";

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

@@ -7,7 +7,7 @@ import {MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 
-import { ReferentsService, EpService } from "@shared/api-swagger/api/api";
+import { CollaborateursService, EpService } from "@shared/api-swagger/api/api";
 
 import { CollaborateurDTO, EpDTO } from "@shared/api-swagger/model/models";
 
@@ -23,12 +23,12 @@ export class DetailsReferentComponent implements OnInit {
   idReferent : any;
 
 
-  constructor(private service:ReferentsService, private route: ActivatedRoute) {}
+  constructor(private service:CollaborateursService, private route: ActivatedRoute) {}
 
   ngOnInit() {
 
     this.idReferent = this.route.snapshot.paramMap.get("id");
-    this.referentSubscription = this.service.getReferentById(this.idReferent).subscribe(
+    this.referentSubscription = this.service.getCollaborateurById(this.idReferent).subscribe(
       referent => this.initReferent(referent[0]),
       err => console.log(err)
     )

src/app/referents/referents.component.ts

@@ -6,7 +6,7 @@ import {MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 
-import { ReferentsService } from "@shared/api-swagger/api/api";
+import { CollaborateursService } from "@shared/api-swagger/api/api";
 
 import { CollaborateurDTO } from "@shared/api-swagger/model/models";
 
@@ -52,7 +52,7 @@ export class ReferentsComponent implements OnInit {
   /**
     * Liste des rôles pour préciser que l'on souhaite récupérer les commerciaux
     */
-  roles : string[] = ["Commercial"];
+  roles : string[] = ["referent"];
   /**
     * contenu de la recherche.
     */
@@ -76,7 +76,7 @@ export class ReferentsComponent implements OnInit {
     */
   chargement = true;
   
-  constructor(private service: ReferentsService) {}
+  constructor(private service: CollaborateursService) {}
 
   ngOnInit() {
     this.updateDataSource();
@@ -87,7 +87,7 @@ export class ReferentsComponent implements OnInit {
     * Devra se faire à l'ouverture de la page, au changement de page ou du nombre d'éléments à afficher, au moment d'un tri ou encore lors de l'utilisation de la barre de recherche.
     */
   updateDataSource() {
-    this.referentsDisponiblesSubscription = this.service.getReferents(this.asc, this.numPage, this.parPage, this.roles, 1, undefined, this.search, this.tri).subscribe(
+    this.referentsDisponiblesSubscription = this.service.getCollaborateurs(this.roles,[1],this.asc, this.numPage, this.parPage, this.search, this.tri).subscribe(
       referents =>  this.dataSource = new MatTableDataSource(referents),
       err => console.log(err)
     );

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

@@ -12,12 +12,8 @@ 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';
+import { ReferentsEPService } from './api/referentsEP.service';
 
-/**
-  * Module généré par SwaggerHub à partir de la spécification OpenAPI.
-  * Lien spécification : https://app.swaggerhub.com/apis/ygrette/api-du_serveur_de_lapplication_de_digitalisation_des_ep/1.3.5
-  */
 @NgModule({
   imports:      [],
   declarations: [],
@@ -32,7 +28,7 @@ import { ReferentsService } from './api/referents.service';
     FormationsService,
     NotesService,
     ParticipationsFormationsService,
-    ReferentsService ]
+    ReferentsEPService ]
 })
 export class ApiModule {
     public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders {

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

@@ -16,6 +16,6 @@ export * from './notes.service';
 import { NotesService } from './notes.service';
 export * from './participationsFormations.service';
 import { ParticipationsFormationsService } from './participationsFormations.service';
-export * from './referents.service';
+export * from './referentsEP.service';
-import { ReferentsService } from './referents.service';
+import { ReferentsEPService } from './referentsEP.service';
-export const APIS = [CollaborateursService, DemandesDelegationService, DemandesEPIService, DemandesFormationService, EngagementsService, EpService, FormationsService, NotesService, ParticipationsFormationsService, ReferentsService];
+export const APIS = [CollaborateursService, DemandesDelegationService, DemandesEPIService, DemandesFormationService, EngagementsService, EpService, FormationsService, NotesService, ParticipationsFormationsService, ReferentsEPService];

src/app/shared/api-swagger/api/collaborateurs.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -27,7 +27,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class CollaborateursService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -57,9 +57,9 @@ export class CollaborateursService {
 
 
     /**
-     *
+     * 
-     * Récupérer un collaboratuer par son id
+     * Récupérer un collaborateur par son id.
-     * @param idCollaborateur id collaborateur
+     * @param idCollaborateur Id du 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.
      */
@@ -105,9 +105,9 @@ export class CollaborateursService {
     }
 
     /**
-     *
+     * 
-     * Récupérer un collaborateur par son mail
+     * Récupérer un collaborateur par son mail.
-     * @param mail mail de l'utilisateur connecté (mail obtenu via le token Keycloak)
+     * @param mail Mail de l'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.
      */
@@ -142,7 +142,7 @@ export class CollaborateursService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<CollaborateurDTO>('get',`${this.basePath}/collaborateurs/mail/${encodeURIComponent(String(mail))}`,
+        return this.httpClient.request<CollaborateurDTO>('get',`${this.basePath}/collaborateurs/${encodeURIComponent(String(mail))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -153,35 +153,28 @@ export class CollaborateursService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des collaborateurs
+     * Récupérer une liste de collaborateurs.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param roles Liste des rôles auquels appartiennent les collaborateurs (e.g [”CP”, ”Commerciaux”,”RA”])
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param idBUs liste des ids des BU auxquelles les données sont rattachées
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param fonctions Liste des fonctions des collaborateurs que l&#x27;on veut récupérer
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param idBU id de la business unit à laquelle sont rattachées les données à récupérer
+     * @param texte Texte permettant de filtrer les données
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param dateDebut Date à partir de laquelle les données son récupérées
+     * @param dateFin Date jusqu&#x27;à laquelle les données sont récupérées
      * @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(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(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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> {
+    public getCollaborateurs(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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.');
-        }
 
 
 
@@ -189,19 +182,18 @@ export class CollaborateursService {
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (asc !== undefined && asc !== null) {
+        if (roles) {
-            queryParameters = queryParameters.set('asc', <any>asc);
+            roles.forEach((element) => {
-        }
+                queryParameters = queryParameters.append('roles', <any>element);
-        if (fonctions) {
-            fonctions.forEach((element) => {
-                queryParameters = queryParameters.append('fonctions', <any>element);
             })
         }
-        if (idAgence !== undefined && idAgence !== null) {
+        if (idBUs) {
-            queryParameters = queryParameters.set('idAgence', <any>idAgence);
+            idBUs.forEach((element) => {
+                queryParameters = queryParameters.append('idBUs', <any>element);
+            })
         }
-        if (idBU !== undefined && idBU !== null) {
+        if (asc !== undefined && asc !== null) {
-            queryParameters = queryParameters.set('idBU', <any>idBU);
+            queryParameters = queryParameters.set('asc', <any>asc);
         }
         if (numPage !== undefined && numPage !== null) {
             queryParameters = queryParameters.set('numPage', <any>numPage);
@@ -215,6 +207,12 @@ export class CollaborateursService {
         if (tri !== undefined && tri !== null) {
             queryParameters = queryParameters.set('tri', <any>tri);
         }
+        if (dateDebut !== undefined && dateDebut !== null) {
+            queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
+        }
+        if (dateFin !== undefined && dateFin !== null) {
+            queryParameters = queryParameters.set('dateFin', <any>dateFin.toISOString());
+        }
 
         let headers = this.defaultHeaders;
 
@@ -250,41 +248,197 @@ export class CollaborateursService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des collaborateurs dont le référent à la charge
+     * Récupérer la liste des collaborateurs d’un 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 d&#x27;un référent
-     * @param idReferent id referent
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param texte Texte permettant de filtrer les données
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
      * @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(asc: boolean, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurDTO>>;
+    public getCollaborateursByReferent(idReferent: string, asc?: boolean, 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(idReferent: string, asc?: boolean, 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(idReferent: string, asc?: boolean, 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> {
+    public getCollaborateursByReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: 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 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;
 
-        if (asc === null || asc === undefined) {
+        // authentication (bearerAuth) required
-            throw new Error('Required parameter asc was null or undefined when calling getCollaborateursByReferent.');
+        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<CollaborateurDTO>>('get',`${this.basePath}/collaborateurs/referent/${encodeURIComponent(String(idReferent))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer le nombre total de collaborateurs d’un référent.
+     * @param idReferent Id d&#x27;un référent
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
+     * @param numPage Numéro de la page du tableau à afficher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
+     * @param texte Texte permettant de filtrer les données
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
+     * @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 getCollaborateursByReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<number>;
+    public getCollaborateursByReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
+    public getCollaborateursByReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
+    public getCollaborateursByReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: 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 getCollaborateursByReferent.');
+            throw new Error('Required parameter idReferent was null or undefined when calling getCollaborateursByReferentCount.');
         }
 
-        if (numPage === null || numPage === undefined) {
+
-            throw new Error('Required parameter numPage 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);
         }
 
-        if (parPAge === null || parPAge === undefined) {
+        let headers = this.defaultHeaders;
-            throw new Error('Required parameter parPAge was null or undefined when calling getCollaborateursByReferent.');
+
+        // 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<number>('get',`${this.basePath}/collaborateurs/referent/${encodeURIComponent(String(idReferent))}/count`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Récupérer le nombre total de collaborateurs.
+     * @param roles Liste des rôles auquels appartiennent les collaborateurs (e.g [”CP”, ”Commerciaux”,”RA”])
+     * @param idBUs liste des ids des BU auxquelles les données sont rattachées
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
+     * @param numPage Numéro de la page du tableau à afficher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
+     * @param texte Texte permettant de filtrer les données
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
+     * @param dateDebut Date à partir de laquelle les données son récupérées
+     * @param dateFin Date jusqu&#x27;à laquelle les données sont récupérées
+     * @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 getCollaborateursCount(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
+    public getCollaborateursCount(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
+    public getCollaborateursCount(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
+    public getCollaborateursCount(roles?: Array<string>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+
+
+
+
+
+
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (roles) {
+            roles.forEach((element) => {
+                queryParameters = queryParameters.append('roles', <any>element);
+            })
+        }
+        if (idBUs) {
+            idBUs.forEach((element) => {
+                queryParameters = queryParameters.append('idBUs', <any>element);
+            })
+        }
         if (asc !== undefined && asc !== null) {
             queryParameters = queryParameters.set('asc', <any>asc);
         }
@@ -300,6 +454,12 @@ export class CollaborateursService {
         if (tri !== undefined && tri !== null) {
             queryParameters = queryParameters.set('tri', <any>tri);
         }
+        if (dateDebut !== undefined && dateDebut !== null) {
+            queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
+        }
+        if (dateFin !== undefined && dateFin !== null) {
+            queryParameters = queryParameters.set('dateFin', <any>dateFin.toISOString());
+        }
 
         let headers = this.defaultHeaders;
 
@@ -323,7 +483,7 @@ export class CollaborateursService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<CollaborateurDTO>>('get',`${this.basePath}/collaborateurs/referent/${encodeURIComponent(String(idReferent))}`,
+        return this.httpClient.request<number>('get',`${this.basePath}/collaborateurs/count`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -334,4 +494,52 @@ export class CollaborateursService {
         );
     }
 
+    /**
+     * 
+     * Récupérer la liste des référents des précédents EP du collaborateur.
+     * @param idCollaborateur Id du 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 getReferentsPrecedentEPCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<Array<CollaborateurDTO>>;
+    public getReferentsPrecedentEPCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<CollaborateurDTO>>>;
+    public getReferentsPrecedentEPCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<CollaborateurDTO>>>;
+    public getReferentsPrecedentEPCollaborateur(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 getReferentsPrecedentEPCollaborateur.');
+        }
+
+        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<CollaborateurDTO>>('get',`${this.basePath}/collaborateurs/${encodeURIComponent(String(idCollaborateur))}/ep/referents`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
 }

src/app/shared/api-swagger/api/demandesDelegation.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -17,7 +17,6 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { CreationDemandeDelegationDTO } from '../model/creationDemandeDelegationDTO';
 import { DemandeDelegationDTO } from '../model/demandeDelegationDTO';
 import { ErreurDTO } from '../model/erreurDTO';
 
@@ -28,7 +27,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class DemandesDelegationService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -58,115 +57,19 @@ export class DemandesDelegationService {
 
 
     /**
-     *
+     * 
-     * Faire une demande de délégation à une autre personne
+     * Récupérer la liste des demandes de délégation d’un référent.
-     * @param idCollaborateur id collaborateur
+     * @param idReferent Id d'un référent
-     * @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 getDemandesDelegationReferent(idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeDelegationDTO>>;
-    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public getDemandesDelegationReferent(idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<DemandeDelegationDTO>>>;
-    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public getDemandesDelegationReferent(idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<DemandeDelegationDTO>>>;
-    public faireDemandeDelegation(idCollaborateur: string, idEP: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getDemandesDelegationReferent(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 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 (idReferent === null || idReferent === undefined) {
-        if (this.configuration.accessToken) {
+            throw new Error('Required parameter idReferent was null or undefined when calling getDemandesDelegationReferent.');
-            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;
@@ -191,9 +94,8 @@ export class DemandesDelegationService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<DemandeDelegationDTO>>('get',`${this.basePath}/demandesdelegation/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<Array<DemandeDelegationDTO>>('get',`${this.basePath}/demandesdelegation/referent/${encodeURIComponent(String(idReferent))}`,
             {
-                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -203,24 +105,24 @@ export class DemandesDelegationService {
     }
 
     /**
-     *
+     * 
-     * Faire une demande de délégation à une autre personne
+     * Répondre à une demande de délégation.
-     * @param body
+     * @param body 
-     * @param idDemandeDelegation id demande delegation
+     * @param idDemandeDelegation Id d&#x27;une 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 updateDemandeDelegation(body: DemandeDelegationDTO, idDemandeDelegation: number, observe?: 'body', reportProgress?: boolean): Observable<DemandeDelegationDTO>;
-    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateDemandeDelegation(body: DemandeDelegationDTO, idDemandeDelegation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeDelegationDTO>>;
-    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateDemandeDelegation(body: DemandeDelegationDTO, idDemandeDelegation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeDelegationDTO>>;
-    public repondreDemandeDelegation(body: CreationDemandeDelegationDTO, idDemandeDelegation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public updateDemandeDelegation(body: DemandeDelegationDTO, 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.');
+            throw new Error('Required parameter body was null or undefined when calling updateDemandeDelegation.');
         }
 
         if (idDemandeDelegation === null || idDemandeDelegation === undefined) {
-            throw new Error('Required parameter idDemandeDelegation was null or undefined when calling repondreDemandeDelegation.');
+            throw new Error('Required parameter idDemandeDelegation was null or undefined when calling updateDemandeDelegation.');
         }
 
         let headers = this.defaultHeaders;
@@ -250,7 +152,7 @@ export class DemandesDelegationService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/demandesdelegation/${encodeURIComponent(String(idDemandeDelegation))}/repondre`,
+        return this.httpClient.request<DemandeDelegationDTO>('put',`${this.basePath}/demandesdelegation/${encodeURIComponent(String(idDemandeDelegation))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/demandesEPI.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -19,6 +19,7 @@ import { Observable }                                        from 'rxjs';
 
 import { DemandeEPIDTO } from '../model/demandeEPIDTO';
 import { ErreurDTO } from '../model/erreurDTO';
+import { EtatDemande } from '../model/etatDemande';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -27,7 +28,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class DemandesEPIService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -57,19 +58,19 @@ export class DemandesEPIService {
 
 
     /**
-     *
+     * 
-     * Annuler la demande d'EPI
+     * Effectuer la création d’une demande d’EPI par l'assistant ou bien un responsable d'agence.
-     * @param idDemandeEPI id demande EPI
+     * @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 annulerDemandeEPI(idDemandeEPI: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public addDemandeEpiAssistant(body: DemandeEPIDTO, observe?: 'body', reportProgress?: boolean): Observable<DemandeEPIDTO>;
-    public annulerDemandeEPI(idDemandeEPI: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addDemandeEpiAssistant(body: DemandeEPIDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeEPIDTO>>;
-    public annulerDemandeEPI(idDemandeEPI: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addDemandeEpiAssistant(body: DemandeEPIDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeEPIDTO>>;
-    public annulerDemandeEPI(idDemandeEPI: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public addDemandeEpiAssistant(body: DemandeEPIDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idDemandeEPI === null || idDemandeEPI === undefined) {
+        if (body === null || body === undefined) {
-            throw new Error('Required parameter idDemandeEPI was null or undefined when calling annulerDemandeEPI.');
+            throw new Error('Required parameter body was null or undefined when calling addDemandeEpiAssistant.');
         }
 
         let headers = this.defaultHeaders;
@@ -92,10 +93,16 @@ export class DemandesEPIService {
 
         // 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}/demandesepi/${encodeURIComponent(String(idDemandeEPI))}/annuler`,
+        return this.httpClient.request<DemandeEPIDTO>('post',`${this.basePath}/demandesepi/demande/assistant`,
             {
+                body: body,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -105,24 +112,19 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Lancer la procedure pour un entretien professionnel intermediaire, une demande d&#x27;EPI validée est créé par la même occasion
+     * Effectuer la création d’une demande d’EPI par le collaborateur.
-     * @param idCollaborateur id collaborateur
+     * @param body 
-     * @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 addDemandeEpiCollaborateur(body: DemandeEPIDTO, observe?: 'body', reportProgress?: boolean): Observable<DemandeEPIDTO>;
-    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addDemandeEpiCollaborateur(body: DemandeEPIDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeEPIDTO>>;
-    public createEPI(idCollaborateur: string, idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addDemandeEpiCollaborateur(body: DemandeEPIDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeEPIDTO>>;
-    public createEPI(idCollaborateur: string, idReferent: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public addDemandeEpiCollaborateur(body: DemandeEPIDTO, 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) {
+        if (body === null || body === undefined) {
-            throw new Error('Required parameter idReferent was null or undefined when calling createEPI.');
+            throw new Error('Required parameter body was null or undefined when calling addDemandeEpiCollaborateur.');
         }
 
         let headers = this.defaultHeaders;
@@ -145,10 +147,16 @@ export class DemandesEPIService {
 
         // 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}/demandesepi/referent/${encodeURIComponent(String(idReferent))}/demande/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<DemandeEPIDTO>('post',`${this.basePath}/demandesepi/demande/collaborateur`,
             {
+                body: body,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -158,19 +166,19 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Demande d&#x27;EPI par un collaborateur
+     * Effectuer la création d’une demande d’EPI par le référent.
-     * @param idCollaborateur id 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 demandeEPI(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public addDemandeEpiReferent(body: DemandeEPIDTO, observe?: 'body', reportProgress?: boolean): Observable<DemandeEPIDTO>;
-    public demandeEPI(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addDemandeEpiReferent(body: DemandeEPIDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeEPIDTO>>;
-    public demandeEPI(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addDemandeEpiReferent(body: DemandeEPIDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeEPIDTO>>;
-    public demandeEPI(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public addDemandeEpiReferent(body: DemandeEPIDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idCollaborateur === null || idCollaborateur === undefined) {
+        if (body === null || body === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling demandeEPI.');
+            throw new Error('Required parameter body was null or undefined when calling addDemandeEpiReferent.');
         }
 
         let headers = this.defaultHeaders;
@@ -193,10 +201,16 @@ export class DemandesEPIService {
 
         // 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}/demandesepi/collaborateur/${encodeURIComponent(String(idCollaborateur))}/demande`,
+        return this.httpClient.request<DemandeEPIDTO>('post',`${this.basePath}/demandesepi/demande/referent`,
             {
+                body: body,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -206,19 +220,19 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Demande d&#x27;EPI et par l&#x27;assistant et création automatique de l&#x27;EPI
+     * Annuler une demande d’EPI.
-     * @param idCollaborateur id collaborateur
+     * @param idDemandeEPI Id d&#x27;une demande d&#x27;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 demandeEPIAssistante(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public deleteDemandeEPI(idDemandeEPI: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public demandeEPIAssistante(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public deleteDemandeEPI(idDemandeEPI: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public demandeEPIAssistante(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public deleteDemandeEPI(idDemandeEPI: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public demandeEPIAssistante(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public deleteDemandeEPI(idDemandeEPI: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idCollaborateur === null || idCollaborateur === undefined) {
+        if (idDemandeEPI === null || idDemandeEPI === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling demandeEPIAssistante.');
+            throw new Error('Required parameter idDemandeEPI was null or undefined when calling deleteDemandeEPI.');
         }
 
         let headers = this.defaultHeaders;
@@ -243,7 +257,7 @@ export class DemandesEPIService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<any>('get',`${this.basePath}/demandesepi/demandeassistante/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<any>('delete',`${this.basePath}/demandesepi/${encodeURIComponent(String(idDemandeEPI))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -254,63 +268,29 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Récupération de la liste des demandes EPI d&#x27;un collaborateur
+     * Récupérer la liste des demandes d’EPI d’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 du collaborateur
-     * @param idCollaborateur id collaborateur
+     * @param etatsDemande Liste des états des demandes à afficher
-     * @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(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, 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(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, 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(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, 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> {
+    public getDemandeEPICollaborateur(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, 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) {
+        if (etatsDemande) {
-            queryParameters = queryParameters.set('asc', <any>asc);
+            etatsDemande.forEach((element) => {
-        }
+                queryParameters = queryParameters.append('etatsDemande', <any>element);
-        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;
 
@@ -346,19 +326,28 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Récupération de l&#x27;EPI en cours d&#x27;un collaborateur
+     * Récupérer le nombre total de demandes d’EPI d’un collaborateur.
-     * @param idCollaborateur id collaborateur
+     * @param idCollaborateur Id du collaborateur
+     * @param etatsDemande Liste des états des demandes à afficher
      * @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 getDemandeEPICollaborateurCount(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    public getDemandeEPIEnCours(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeEPIDTO>>;
+    public getDemandeEPICollaborateurCount(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    public getDemandeEPIEnCours(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeEPIDTO>>;
+    public getDemandeEPICollaborateurCount(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getDemandeEPIEnCours(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getDemandeEPICollaborateurCount(idCollaborateur: string, etatsDemande?: Array<EtatDemande>, 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.');
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getDemandeEPICollaborateurCount.');
+        }
+
+
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (etatsDemande) {
+            etatsDemande.forEach((element) => {
+                queryParameters = queryParameters.append('etatsDemande', <any>element);
+            })
         }
 
         let headers = this.defaultHeaders;
@@ -383,8 +372,9 @@ export class DemandesEPIService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<DemandeEPIDTO>('get',`${this.basePath}/demandesepi/collaborateur/${encodeURIComponent(String(idCollaborateur))}/enCours`,
+        return this.httpClient.request<number>('get',`${this.basePath}/demandesepi/collaborateur/${encodeURIComponent(String(idCollaborateur))}/count`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -394,63 +384,87 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Récupération de la liste des demandes EPI d&#x27;un referent
+     * Récupérer la liste des demandes d’EPI qu’un référent a reçu.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idReferent Id d&#x27;un référent
-     * @param idReferent id referent
+     * @param etatsDemande Liste des états des demandes à afficher
-     * @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(idReferent: string, etatsDemande?: Array<EtatDemande>, 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(idReferent: string, etatsDemande?: Array<EtatDemande>, 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(idReferent: string, etatsDemande?: Array<EtatDemande>, 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> {
+    public getDemandeEPIReferent(idReferent: string, etatsDemande?: Array<EtatDemande>, 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.');
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        if (etatsDemande) {
+            etatsDemande.forEach((element) => {
+                queryParameters = queryParameters.append('etatsDemande', <any>element);
+            })
         }
 
-        if (parPAge === null || parPAge === undefined) {
+        let headers = this.defaultHeaders;
-            throw new Error('Required parameter parPAge was null or undefined when calling getDemandeEPIReferent.');
+
+        // 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écupérer le nombre total de demandes d’EPI qu’un référent a reçu.
+     * @param idReferent Id d&#x27;un référent
+     * @param etatsDemande Liste des états des demandes à afficher
+     * @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 getDemandeEPIReferentCount(idReferent: string, etatsDemande?: Array<EtatDemande>, observe?: 'body', reportProgress?: boolean): Observable<number>;
+    public getDemandeEPIReferentCount(idReferent: string, etatsDemande?: Array<EtatDemande>, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
+    public getDemandeEPIReferentCount(idReferent: string, etatsDemande?: Array<EtatDemande>, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
+    public getDemandeEPIReferentCount(idReferent: string, etatsDemande?: Array<EtatDemande>, 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 getDemandeEPIReferentCount.');
+        }
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (asc !== undefined && asc !== null) {
+        if (etatsDemande) {
-            queryParameters = queryParameters.set('asc', <any>asc);
+            etatsDemande.forEach((element) => {
-        }
+                queryParameters = queryParameters.append('etatsDemande', <any>element);
-        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;
 
@@ -474,7 +488,7 @@ export class DemandesEPIService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<DemandeEPIDTO>>('get',`${this.basePath}/demandesepi/referent/${encodeURIComponent(String(idReferent))}`,
+        return this.httpClient.request<number>('get',`${this.basePath}/demandesepi/referent/${encodeURIComponent(String(idReferent))}/count`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -486,24 +500,24 @@ export class DemandesEPIService {
     }
 
     /**
-     *
+     * 
-     * Répondre à une demande EPI en attente
+     * Répondre à une demande d’EPI.
-     * @param body
+     * @param body 
-     * @param idDemandeEPI id demande EPI
+     * @param idDemandeEPI Id d&#x27;une demande d&#x27;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 updateDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'body', reportProgress?: boolean): Observable<DemandeEPIDTO>;
-    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeEPIDTO>>;
-    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeEPIDTO>>;
-    public repondreDemandeEPI(body: DemandeEPIDTO, idDemandeEPI: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public updateDemandeEPI(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.');
+            throw new Error('Required parameter body was null or undefined when calling updateDemandeEPI.');
         }
 
         if (idDemandeEPI === null || idDemandeEPI === undefined) {
-            throw new Error('Required parameter idDemandeEPI was null or undefined when calling repondreDemandeEPI.');
+            throw new Error('Required parameter idDemandeEPI was null or undefined when calling updateDemandeEPI.');
         }
 
         let headers = this.defaultHeaders;
@@ -533,7 +547,7 @@ export class DemandesEPIService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/demandesepi/${encodeURIComponent(String(idDemandeEPI))}/repondre`,
+        return this.httpClient.request<DemandeEPIDTO>('put',`${this.basePath}/demandesepi/${encodeURIComponent(String(idDemandeEPI))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/demandesformation.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -17,11 +17,10 @@ import { CustomHttpUrlEncodingCodec }                        from '../encoder';
 
 import { Observable }                                        from 'rxjs';
 
-import { CreationDemandeFormationDTO } from '../model/creationDemandeFormationDTO';
 import { DemandeFormationDTO } from '../model/demandeFormationDTO';
 import { ErreurDTO } from '../model/erreurDTO';
+import { EtatDemande } from '../model/etatDemande';
 import { OrigineDemandeFormationDTO } from '../model/origineDemandeFormationDTO';
-import { ThemeDTO } from '../model/themeDTO';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -30,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class DemandesFormationService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -60,19 +59,19 @@ export class DemandesFormationService {
 
 
     /**
-     *
+     * 
-     * Créer une demande de formation pour un collaborateur
+     * Créer demande de formation pour un collaborateur.
-     * @param body
+     * @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: CreationDemandeFormationDTO, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public addDemandeFormation(body: DemandeFormationDTO, observe?: 'body', reportProgress?: boolean): Observable<DemandeFormationDTO>;
-    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addDemandeFormation(body: DemandeFormationDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeFormationDTO>>;
-    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addDemandeFormation(body: DemandeFormationDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeFormationDTO>>;
-    public creerDemandeFormation(body: CreationDemandeFormationDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public addDemandeFormation(body: DemandeFormationDTO, 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.');
+            throw new Error('Required parameter body was null or undefined when calling addDemandeFormation.');
         }
 
         let headers = this.defaultHeaders;
@@ -102,7 +101,7 @@ export class DemandesFormationService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('post',`${this.basePath}/demandeformation`,
+        return this.httpClient.request<DemandeFormationDTO>('post',`${this.basePath}/demandesformation`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -114,60 +113,19 @@ export class DemandesFormationService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des demandes de formations
+     * Supprimer une demande de formation.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idDemandeFormation Id d&#x27;une demande de 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 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(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<DemandeFormationDTO>>;
+    public deleteDemandeFormation(idDemandeFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    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 deleteDemandeFormation(idDemandeFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    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 deleteDemandeFormation(idDemandeFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public getDemandesFormation(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public deleteDemandeFormation(idDemandeFormation: number, 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 (idDemandeFormation === null || idDemandeFormation === undefined) {
-        if (asc !== undefined && asc !== null) {
+            throw new Error('Required parameter idDemandeFormation was null or undefined when calling deleteDemandeFormation.');
-            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;
@@ -192,9 +150,8 @@ export class DemandesFormationService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<DemandeFormationDTO>>('get',`${this.basePath}/demandeformation`,
+        return this.httpClient.request<any>('delete',`${this.basePath}/demandesformation/${encodeURIComponent(String(idDemandeFormation))}`,
             {
-                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -204,46 +161,48 @@ export class DemandesFormationService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des demandes de formations en attente d&#x27;une réponse
+     * Récupérer la liste des demandes de formation.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param etatsDemande Liste des états des demandes à afficher
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param idBUs liste des ids des BU auxquelles les données sont rattachées
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param theme Thème des demandes de formation à récupérer
+     * @param texte Texte permettant de filtrer les données
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
+     * @param dateDebut Date à partir de laquelle les données son récupérées
+     * @param dateFin Date jusqu&#x27;à laquelle les données sont récupérées
      * @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 getDemandesFormation(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 getDemandesFormation(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 getDemandesFormation(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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> {
+    public getDemandesFormation(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 (etatsDemande) {
+            etatsDemande.forEach((element) => {
+                queryParameters = queryParameters.append('etatsDemande', <any>element);
+            })
+        }
+        if (idBUs) {
+            idBUs.forEach((element) => {
+                queryParameters = queryParameters.append('idBUs', <any>element);
+            })
+        }
         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);
         }
@@ -253,12 +212,15 @@ export class DemandesFormationService {
         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);
         }
+        if (dateDebut !== undefined && dateDebut !== null) {
+            queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
+        }
+        if (dateFin !== undefined && dateFin !== null) {
+            queryParameters = queryParameters.set('dateFin', <any>dateFin.toISOString());
+        }
 
         let headers = this.defaultHeaders;
 
@@ -282,7 +244,7 @@ export class DemandesFormationService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<DemandeFormationDTO>>('get',`${this.basePath}/demandeformation/enattente`,
+        return this.httpClient.request<Array<DemandeFormationDTO>>('get',`${this.basePath}/demandesformation`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -294,46 +256,48 @@ export class DemandesFormationService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des demandes de formations ayant reçu une réponse
+     * Récupérer le nombre total de demandes de formation.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param etatsDemande Liste des états des demandes à afficher
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param idBUs liste des ids des BU auxquelles les données sont rattachées
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param theme Thème des demandes de formation à récupérer
+     * @param texte Texte permettant de filtrer les données
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
+     * @param dateDebut Date à partir de laquelle les données son récupérées
+     * @param dateFin Date jusqu&#x27;à laquelle les données sont récupérées
      * @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 getDemandesFormationCount(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    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 getDemandesFormationCount(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    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 getDemandesFormationCount(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getDemandesFormationRepondues(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, theme?: number, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getDemandesFormationCount(etatsDemande?: Array<EtatDemande>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 (etatsDemande) {
+            etatsDemande.forEach((element) => {
+                queryParameters = queryParameters.append('etatsDemande', <any>element);
+            })
+        }
+        if (idBUs) {
+            idBUs.forEach((element) => {
+                queryParameters = queryParameters.append('idBUs', <any>element);
+            })
+        }
         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);
         }
@@ -343,57 +307,16 @@ export class DemandesFormationService {
         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);
         }
-
+        if (dateDebut !== undefined && dateDebut !== null) {
-        let headers = this.defaultHeaders;
+            queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
-
-        // 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
+        if (dateFin !== undefined && dateFin !== null) {
-        let httpHeaderAccepts: string[] = [
+            queryParameters = queryParameters.set('dateFin', <any>dateFin.toISOString());
-            '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
@@ -416,8 +339,9 @@ export class DemandesFormationService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<OrigineDemandeFormationDTO>>('get',`${this.basePath}/originesdemandesformation`,
+        return this.httpClient.request<number>('get',`${this.basePath}/demandesformation/count`,
             {
+                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -427,15 +351,15 @@ export class DemandesFormationService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des thèmes des demandes de formation
+     * 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 getThemes(observe?: 'body', reportProgress?: boolean): Observable<Array<ThemeDTO>>;
+    public getOriginesDemandeFormation(observe?: 'body', reportProgress?: boolean): Observable<Array<OrigineDemandeFormationDTO>>;
-    public getThemes(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ThemeDTO>>>;
+    public getOriginesDemandeFormation(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<OrigineDemandeFormationDTO>>>;
-    public getThemes(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ThemeDTO>>>;
+    public getOriginesDemandeFormation(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<OrigineDemandeFormationDTO>>>;
-    public getThemes(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getOriginesDemandeFormation(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         let headers = this.defaultHeaders;
 
@@ -459,7 +383,7 @@ export class DemandesFormationService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<ThemeDTO>>('get',`${this.basePath}/themes`,
+        return this.httpClient.request<Array<OrigineDemandeFormationDTO>>('get',`${this.basePath}/originesdemandeformation`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -470,24 +394,24 @@ export class DemandesFormationService {
     }
 
     /**
-     *
+     * 
-     * Répondre a une demande de formation et la mettre à jour
+     * Répondre à une demande de formation.
-     * @param body
+     * @param body 
-     * @param idDemandeFormation id demande formation
+     * @param idDemandeFormation Id d&#x27;une demande 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 repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public updateDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'body', reportProgress?: boolean): Observable<DemandeFormationDTO>;
-    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DemandeFormationDTO>>;
-    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DemandeFormationDTO>>;
-    public repondreDemandeFormation(body: DemandeFormationDTO, idDemandeFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public updateDemandeFormation(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 repondreDemandeFormation.');
+            throw new Error('Required parameter body was null or undefined when calling updateDemandeFormation.');
         }
 
         if (idDemandeFormation === null || idDemandeFormation === undefined) {
-            throw new Error('Required parameter idDemandeFormation was null or undefined when calling repondreDemandeFormation.');
+            throw new Error('Required parameter idDemandeFormation was null or undefined when calling updateDemandeFormation.');
         }
 
         let headers = this.defaultHeaders;
@@ -517,7 +441,7 @@ export class DemandesFormationService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/demandeformation/${encodeURIComponent(String(idDemandeFormation))}/repondre`,
+        return this.httpClient.request<DemandeFormationDTO>('put',`${this.basePath}/demandesformation/${encodeURIComponent(String(idDemandeFormation))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/engagements.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -19,6 +19,7 @@ import { Observable }                                        from 'rxjs';
 
 import { EngagementDTO } from '../model/engagementDTO';
 import { ErreurDTO } from '../model/erreurDTO';
+import { EtatEngagement } from '../model/etatEngagement';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -27,7 +28,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class EngagementsService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -57,44 +58,44 @@ export class EngagementsService {
 
 
     /**
-     *
+     * 
-     * Récupérer la liste des engagements
+     * 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 etatsEngagement Etats de l'engagement
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param idBUs liste des ids des BU auxquelles les données sont rattachées
-     * @param parPAge Nombre d'éléments affiché sur chaque page du tableau
+     * @param asc Indique si les données sont récupérées dans l'ordre croissant ou non
-     * @param idAgence id de l'agence à laquelle sont rattachées les données à récupérer
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param texte Texte permettant d'identifier l'objet rechercher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param tri Colonne du tableau sur lequel le tri s'effectue
+     * @param texte Texte permettant de filtrer les données
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
      * @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(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<EngagementDTO>>;
+    public getEngagements(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: 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(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: 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(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: 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> {
+    public getEngagements(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, 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 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 (etatsEngagement) {
+            etatsEngagement.forEach((element) => {
+                queryParameters = queryParameters.append('etatsEngagement', <any>element);
+            })
+        }
+        if (idBUs) {
+            idBUs.forEach((element) => {
+                queryParameters = queryParameters.append('idBUs', <any>element);
+            })
+        }
         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);
         }
@@ -142,129 +143,44 @@ export class EngagementsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des engagements en attente
+     * Récupérer le nombre total d’engagements.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param etatsEngagement Etats de l&#x27;engagement
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param idBUs liste des ids des BU auxquelles les données sont rattachées
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param idAgence id de l&#x27;agence à laquelle sont rattachées les données à récupérer
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param texte Texte permettant de filtrer les données
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
      * @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 getEngagementsCount(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EngagementDTO>>>;
+    public getEngagementsCount(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EngagementDTO>>>;
+    public getEngagementsCount(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getEngagementsEnAttente(asc: boolean, numPage: number, parPAge: number, idAgence?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEngagementsCount(etatsEngagement?: Array<EtatEngagement>, idBUs?: Array<number>, 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 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
+        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (this.configuration.accessToken) {
+        if (etatsEngagement) {
-            const accessToken = typeof this.configuration.accessToken === 'function'
+            etatsEngagement.forEach((element) => {
-                ? this.configuration.accessToken()
+                queryParameters = queryParameters.append('etatsEngagement', <any>element);
-                : 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 (idBUs) {
-        if (parPAge === null || parPAge === undefined) {
+            idBUs.forEach((element) => {
-            throw new Error('Required parameter parPAge was null or undefined when calling getEngagementsRepondus.');
+                queryParameters = queryParameters.append('idBUs', <any>element);
+            })
         }
-
-
-
-
-        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);
         }
@@ -300,7 +216,7 @@ export class EngagementsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<EngagementDTO>>('get',`${this.basePath}/engagements/repondus`,
+        return this.httpClient.request<number>('get',`${this.basePath}/engagements/count`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -312,24 +228,24 @@ export class EngagementsService {
     }
 
     /**
-     *
+     * 
-     * Donnez une réponse à un engagement
+     * Répondre à un engagement.
-     * @param body
+     * @param body 
-     * @param idEngagement id engagement
+     * @param idEngagement Id d&#x27;un 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 updateEngagement(body: EngagementDTO, idEngagement: number, observe?: 'body', reportProgress?: boolean): Observable<EngagementDTO>;
-    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateEngagement(body: EngagementDTO, idEngagement: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EngagementDTO>>;
-    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateEngagement(body: EngagementDTO, idEngagement: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EngagementDTO>>;
-    public repondreEngagement(body: EngagementDTO, idEngagement: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public updateEngagement(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.');
+            throw new Error('Required parameter body was null or undefined when calling updateEngagement.');
         }
 
         if (idEngagement === null || idEngagement === undefined) {
-            throw new Error('Required parameter idEngagement was null or undefined when calling repondreEngagement.');
+            throw new Error('Required parameter idEngagement was null or undefined when calling updateEngagement.');
         }
 
         let headers = this.defaultHeaders;
@@ -359,7 +275,7 @@ export class EngagementsService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/engagements/${encodeURIComponent(String(idEngagement))}/repondre`,
+        return this.httpClient.request<EngagementDTO>('put',`${this.basePath}/engagements/${encodeURIComponent(String(idEngagement))}`,
             {
                 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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -32,7 +32,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class FormationsService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -62,19 +62,19 @@ export class FormationsService {
 
 
     /**
-     *
+     * 
-     * Ajouter une nouvelle formation
+     * Créer une nouvelle formation.
-     * @param body
+     * @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: FormationDTO, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public addFormation(body: FormationDTO, observe?: 'body', reportProgress?: boolean): Observable<FormationDTO>;
-    public ajouterFormation(body: FormationDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addFormation(body: FormationDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<FormationDTO>>;
-    public ajouterFormation(body: FormationDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addFormation(body: FormationDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<FormationDTO>>;
-    public ajouterFormation(body: FormationDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public addFormation(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.');
+            throw new Error('Required parameter body was null or undefined when calling addFormation.');
         }
 
         let headers = this.defaultHeaders;
@@ -103,7 +103,8 @@ export class FormationsService {
         if (httpContentTypeSelected != undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
-        return this.httpClient.request<any>('post',`${this.basePath}/formations`,
+
+        return this.httpClient.request<FormationDTO>('post',`${this.basePath}/formations`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -115,9 +116,9 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Supprimer une formation
+     * Supprimer une formation par son id.
-     * @param idFormation id formation
+     * @param idFormation Id d&#x27;une 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.
      */
@@ -152,93 +153,8 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<any>('delete',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}/supprimer`,
+        return this.httpClient.request<any>('delete',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}`,
-            {
-                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,
@@ -248,9 +164,9 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer une formation par son id
+     * Récupérer une formation par son id.
-     * @param idFormation id formation
+     * @param idFormation Id d&#x27;une 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.
      */
@@ -296,44 +212,46 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer les formations réalisées
+     * 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 texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param idStatuts liste des ids des statuts des formations à récupérer
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
+     * @param numPage Numéro de la page du tableau à afficher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
+     * @param texte Texte permettant de filtrer les données
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
+     * @param dateDebut Date à partir de laquelle les données son récupérées
+     * @param dateFin Date jusqu&#x27;à laquelle les données sont récupérées
      * @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 getFormations(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 getFormations(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 getFormations(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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> {
+    public getFormations(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 (idStatuts) {
+            idStatuts.forEach((element) => {
+                queryParameters = queryParameters.append('idStatuts', <any>element);
+            })
+        }
+        if (asc !== undefined && asc !== null) {
+            queryParameters = queryParameters.set('asc', <any>asc);
+        }
         if (numPage !== undefined && numPage !== null) {
             queryParameters = queryParameters.set('numPage', <any>numPage);
         }
@@ -346,6 +264,12 @@ export class FormationsService {
         if (tri !== undefined && tri !== null) {
             queryParameters = queryParameters.set('tri', <any>tri);
         }
+        if (dateDebut !== undefined && dateDebut !== null) {
+            queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
+        }
+        if (dateFin !== undefined && dateFin !== null) {
+            queryParameters = queryParameters.set('dateFin', <any>dateFin.toISOString());
+        }
 
         let headers = this.defaultHeaders;
 
@@ -369,7 +293,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations/realisees`,
+        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -381,61 +305,64 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des formations
+     * Récupérer le nombre total 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 statutFormation Statut de la formation
+     * @param idStatuts liste des ids des statuts des formations à récupérer
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param numPage Numéro de la page du tableau à afficher
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
+     * @param texte Texte permettant de filtrer les données
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
+     * @param dateDebut Date à partir de laquelle les données son récupérées
+     * @param dateFin Date jusqu&#x27;à laquelle les données sont récupérées
      * @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(asc: boolean, numPage: number, parPAge: number, idAgence?: number, statutFormation?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<FormationDetailsDTO>>;
+    public getFormationsCount(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    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 getFormationsCount(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    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 getFormationsCount(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getFormations(asc: boolean, numPage: number, parPAge: number, idAgence?: number, statutFormation?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getFormationsCount(idAgence?: number, idStatuts?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 (asc !== undefined && asc !== null) {
-            queryParameters = queryParameters.set('asc', <any>asc);
-        }
         if (idAgence !== undefined && idAgence !== null) {
             queryParameters = queryParameters.set('idAgence', <any>idAgence);
         }
+        if (idStatuts) {
+            idStatuts.forEach((element) => {
+                queryParameters = queryParameters.append('idStatuts', <any>element);
+            })
+        }
+        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 (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);
         }
+        if (dateDebut !== undefined && dateDebut !== null) {
+            queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
+        }
+        if (dateFin !== undefined && dateFin !== null) {
+            queryParameters = queryParameters.set('dateFin', <any>dateFin.toISOString());
+        }
 
         let headers = this.defaultHeaders;
 
@@ -459,7 +386,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<FormationDetailsDTO>>('get',`${this.basePath}/formations`,
+        return this.httpClient.request<number>('get',`${this.basePath}/formations/count`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -471,8 +398,8 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer les modes de formation
+     * Récupérer la liste des 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.
      */
@@ -503,7 +430,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<ModeFormationDTO>>('get',`${this.basePath}/modesFormation`,
+        return this.httpClient.request<Array<ModeFormationDTO>>('get',`${this.basePath}/modesformation`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -514,8 +441,8 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer les origines de formation
+     * Récupérer la liste des 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.
      */
@@ -546,93 +473,8 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<OrigineFormationDTO>>('get',`${this.basePath}/originesFormation`,
+        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(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 (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/prochaines`,
             {
-                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -642,8 +484,8 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer les statuts de formation
+     * Récupérer la liste des 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.
      */
@@ -674,7 +516,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<StatutFormationDTO>>('get',`${this.basePath}/statutsFormation`,
+        return this.httpClient.request<Array<StatutFormationDTO>>('get',`${this.basePath}/statutsformation`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -685,8 +527,8 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer les types de formation
+     * Récupérer la liste des 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.
      */
@@ -717,7 +559,7 @@ export class FormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<TypeFormationDTO>>('get',`${this.basePath}/typesFormation`,
+        return this.httpClient.request<Array<TypeFormationDTO>>('get',`${this.basePath}/typesformation`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -728,10 +570,10 @@ export class FormationsService {
     }
 
     /**
-     *
+     * 
-     * Mettre à jour une formation
+     * Mettre à jour une formation.
-     * @param body
+     * @param body 
-     * @param idFormation id formation
+     * @param idFormation Id d&#x27;une 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.
      */
@@ -775,7 +617,7 @@ export class FormationsService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}/update`,
+        return this.httpClient.request<any>('put',`${this.basePath}/formations/${encodeURIComponent(String(idFormation))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/notes.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -28,7 +28,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class NotesService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -58,19 +58,19 @@ export class NotesService {
 
 
     /**
-     *
+     * 
-     * Supprimer une note
+     * Créer une nouvelle note.
-     * @param idNote id 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 deleteNote(idNote: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public addNote(body: DetailsNoteDTO, observe?: 'body', reportProgress?: boolean): Observable<DetailsNoteDTO>;
-    public deleteNote(idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addNote(body: DetailsNoteDTO, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DetailsNoteDTO>>;
-    public deleteNote(idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addNote(body: DetailsNoteDTO, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DetailsNoteDTO>>;
-    public deleteNote(idNote: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public addNote(body: DetailsNoteDTO, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (idNote === null || idNote === undefined) {
+        if (body === null || body === undefined) {
-            throw new Error('Required parameter idNote was null or undefined when calling deleteNote.');
+            throw new Error('Required parameter body was null or undefined when calling addNote.');
         }
 
         let headers = this.defaultHeaders;
@@ -93,10 +93,16 @@ export class NotesService {
 
         // 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>('delete',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}/supprimer`,
+        return this.httpClient.request<DetailsNoteDTO>('post',`${this.basePath}/notes/`,
             {
+                body: body,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -106,19 +112,19 @@ export class NotesService {
     }
 
     /**
-     *
+     * 
-     * Récupérer une note par son id
+     * Supprimer une note.
-     * @param idNote id note
+     * @param idNote Id d&#x27;une 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 deleteNote(idNote: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public getNoteById(idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DetailsNoteDTO>>;
+    public deleteNote(idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public getNoteById(idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DetailsNoteDTO>>;
+    public deleteNote(idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public getNoteById(idNote: number, observe: any = 'body', reportProgress: boolean = false ): Observable<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 getNoteById.');
+            throw new Error('Required parameter idNote was null or undefined when calling deleteNote.');
         }
 
         let headers = this.defaultHeaders;
@@ -143,7 +149,7 @@ export class NotesService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<DetailsNoteDTO>('get',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}`,
+        return this.httpClient.request<any>('delete',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -154,50 +160,19 @@ export class NotesService {
     }
 
     /**
-     *
+     * 
-     * Récupérer toutes les notes
+     * 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 idNote Id d&#x27;une note
-     * @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 getNoteById(idNote: number, observe?: 'body', reportProgress?: boolean): Observable<DetailsNoteDTO>;
-    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<AffichageNoteDTO>>>;
+    public getNoteById(idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DetailsNoteDTO>>;
-    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<AffichageNoteDTO>>>;
+    public getNoteById(idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DetailsNoteDTO>>;
-    public getNotes(asc: boolean, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getNoteById(idNote: number, 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 (idNote === null || idNote === undefined) {
-        if (asc !== undefined && asc !== null) {
+            throw new Error('Required parameter idNote was null or undefined when calling getNoteById.');
-            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;
@@ -222,9 +197,8 @@ export class NotesService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/`,
+        return this.httpClient.request<DetailsNoteDTO>('get',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}`,
             {
-                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -234,37 +208,28 @@ export class NotesService {
     }
 
     /**
-     *
+     * 
-     * Récupérer les notes d&#x27;une personne a écrite
+     * Récupérer les notes d’un auteur.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idAuteur Id de l&#x27;auteur
-     * @param idReferent id referent
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param texte Texte permettant de filtrer les données
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
      * @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 getNotesAuteur(idAuteur: string, asc?: boolean, 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 getNotesAuteur(idAuteur: string, asc?: boolean, 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 getNotesAuteur(idAuteur: string, asc?: boolean, 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> {
+    public getNotesAuteur(idAuteur: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (asc === null || asc === undefined) {
+        if (idAuteur === null || idAuteur === undefined) {
-            throw new Error('Required parameter asc was null or undefined when calling getNotesByAuteur.');
+            throw new Error('Required parameter idAuteur was null or undefined when calling getNotesAuteur.');
         }
 
-        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.');
-        }
 
 
 
@@ -307,7 +272,7 @@ export class NotesService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/auteur/${encodeURIComponent(String(idReferent))}`,
+        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/${encodeURIComponent(String(idAuteur))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -319,42 +284,28 @@ export class NotesService {
     }
 
     /**
-     *
+     * 
-     * Récupérer une note par son id
+     * Récupérer le nombre total de notes d’un auteur.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idAuteur Id de l&#x27;auteur
-     * @param idCollaborateur id collaborateur
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param idReferent id referent
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param texte Texte permettant de filtrer les données
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
-     * @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 getNotesAuteurCount(idAuteur: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    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 getNotesAuteurCount(idAuteur: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    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 getNotesAuteurCount(idAuteur: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getNotesByCollaborateur(asc: boolean, idCollaborateur: string, idReferent: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getNotesAuteurCount(idAuteur: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (asc === null || asc === undefined) {
+        if (idAuteur === null || idAuteur === undefined) {
-            throw new Error('Required parameter asc was null or undefined when calling getNotesByCollaborateur.');
+            throw new Error('Required parameter idAuteur was null or undefined when calling getNotesAuteurCount.');
         }
 
-        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.');
-        }
 
 
 
@@ -397,7 +348,7 @@ export class NotesService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<AffichageNoteDTO>>('get',`${this.basePath}/notes/auteur/${encodeURIComponent(String(idReferent))}/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<number>('get',`${this.basePath}/notes/${encodeURIComponent(String(idAuteur))}/count`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -409,70 +360,16 @@ export class NotesService {
     }
 
     /**
-     *
+     * 
-     * Ajouter une nouvelle note
+     * Modifier une note.
-     * @param body
+     * @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 idNote Id d&#x27;une note
-     * @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?: 'body', reportProgress?: boolean): Observable<DetailsNoteDTO>;
-    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<DetailsNoteDTO>>;
-    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public updateNote(body: DetailsNoteDTO, idNote: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<DetailsNoteDTO>>;
     public updateNote(body: DetailsNoteDTO, idNote: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
@@ -510,7 +407,7 @@ export class NotesService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}/updateNote`,
+        return this.httpClient.request<DetailsNoteDTO>('put',`${this.basePath}/notes/${encodeURIComponent(String(idNote))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,

src/app/shared/api-swagger/api/participationsFormations.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.3.5
+ * OpenAPI spec version: 1.3.6
- *
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -28,7 +28,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class ParticipationsFormationsService {
 
-    protected basePath = 'https://localhost:44393/api';
+    protected basePath = 'http://localhost:3000/api';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
@@ -58,64 +58,16 @@ export class ParticipationsFormationsService {
 
 
     /**
-     *
+     * 
-     * Consulter une évaluation d'une formation
+     * Evaluer une formation.
-     * @param idParticipationFormation id participation 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 idParticipationFormation Id d'une participation formation
-     * @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?: 'body', reportProgress?: boolean): Observable<EvaluationDTO>;
-    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EvaluationDTO>>;
-    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EvaluationDTO>>;
     public evaluerFormation(body: EvaluationDTO, idParticipationFormation: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
         if (body === null || body === undefined) {
@@ -153,7 +105,7 @@ export class ParticipationsFormationsService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('put',`${this.basePath}/evaluations/participationformation/${encodeURIComponent(String(idParticipationFormation))}/evaluer`,
+        return this.httpClient.request<EvaluationDTO>('put',`${this.basePath}/participationsformation/${encodeURIComponent(String(idParticipationFormation))}/evaluation`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -165,55 +117,19 @@ export class ParticipationsFormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des formations auxquelles est inscrit le collaborateur
+     * Récupérer une évaluation faite par un collaborateur.
-     * @param asc Préciser si les données sont dans l&#x27;ordre (true) ou dans l&#x27;ordre inverse (false)
+     * @param idParticipationFormation Id d&#x27;une participation formation
-     * @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(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'body', reportProgress?: boolean): Observable<Array<ParticipationFormationDTO>>;
+    public getEvaluationCollaborateur(idParticipationFormation: number, observe?: 'body', reportProgress?: boolean): Observable<EvaluationDTO>;
-    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<ParticipationFormationDTO>>>;
+    public getEvaluationCollaborateur(idParticipationFormation: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<EvaluationDTO>>;
-    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<ParticipationFormationDTO>>>;
+    public getEvaluationCollaborateur(idParticipationFormation: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<EvaluationDTO>>;
-    public getParticipationByCollaborateur(asc: boolean, idCollaborateur: string, numPage: number, parPAge: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public getEvaluationCollaborateur(idParticipationFormation: number, 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) {
+        if (idParticipationFormation === null || idParticipationFormation === undefined) {
-            throw new Error('Required parameter idCollaborateur was null or undefined when calling getParticipationByCollaborateur.');
+            throw new Error('Required parameter idParticipationFormation was null or undefined when calling getEvaluationCollaborateur.');
-        }
-
-        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;
@@ -238,9 +154,8 @@ export class ParticipationsFormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<ParticipationFormationDTO>>('get',`${this.basePath}/participationsformation/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+        return this.httpClient.request<EvaluationDTO>('get',`${this.basePath}/participationsformation/${encodeURIComponent(String(idParticipationFormation))}/evaluation`,
             {
-                params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -250,37 +165,28 @@ export class ParticipationsFormationsService {
     }
 
     /**
-     *
+     * 
-     * Récupérer la liste des participants d&#x27;une formation
+     * Récupérer la liste des participations de formation d’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 du collaborateur
-     * @param idFormation id formation
+     * @param asc Indique si les données sont récupérées dans l&#x27;ordre croissant ou non
-     * @param numPage Numéro de la page du tableau qui affiche les données
+     * @param numPage Numéro de la page du tableau à afficher
-     * @param parPAge Nombre d&#x27;éléments affiché sur chaque page du tableau
+     * @param parPAge Nombre d’élément maximum à afficher dans le tableau
-     * @param texte Texte permettant d&#x27;identifier l&#x27;objet rechercher
+     * @param texte Texte permettant de filtrer les données
-     * @param tri Colonne du tableau sur lequel le tri s&#x27;effectue
+     * @param tri Colonne du tableau sur lequel le tri devra être effectué
      * @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 getParticipationByCollaborateur(idCollaborateur: string, asc?: boolean, 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 getParticipationByCollaborateur(idCollaborateur: string, asc?: boolean, 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 getParticipationByCollaborateur(idCollaborateur: string, asc?: boolean, 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> {
+    public getParticipationByCollaborateur(idCollaborateur: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
-        if (asc === null || asc === undefined) {
+        if (idCollaborateur === null || idCollaborateur === undefined) {
-            throw new Error('Required parameter asc was null or undefined when calling getParticipationByFormation.');
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling getParticipationByCollaborateur.');
         }
 
-        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.');
-        }
 
 
 
@@ -323,7 +229,7 @@ export class ParticipationsFormationsService {
         const consumes: string[] = [
         ];
 
-        return this.httpClient.request<Array<ParticipationFormationDTO>>('get',`${this.basePath}/participationsformation/formation/${encodeURIComponent(String(idFormation))}`,
+        return this.httpClient.request<Array<ParticipationFormationDTO>>('get',`${this.basePath}/participationsformation/${encodeURIComponent(String(idCollaborateur))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,

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

@@ -1,337 +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.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 { ErreurDTO } from '../model/erreurDTO';
-import { CollaborateurDTO } from '../model/models';
-
-import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
-import { Configuration }                                     from '../configuration';
-
-
-@Injectable()
-export class ReferentsService {
-
-    protected basePath = 'https://localhost:44393/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;
-    }
-
-
-    /**
-     *
-     * 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 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 getReferentActuelCollaborateur.');
-        }
-
-        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<ReferentDTO>('get',`${this.basePath}/referents/actuel/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
-            {
-                withCredentials: this.configuration.withCredentials,
-                headers: headers,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-    /**
-     *
-     * 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<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) {
-            throw new Error('Required parameter idReferent was null or undefined when calling getReferentById.');
-        }
-
-        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<ReferentDTO>('get',`${this.basePath}/referents/${encodeURIComponent(String(idReferent))}`,
-            {
-                withCredentials: this.configuration.withCredentials,
-                headers: headers,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-    /**
-     *
-     * 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 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(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 (asc !== undefined && asc !== null) {
-            queryParameters = queryParameters.set('asc', <any>asc);
-        }
-        if (fonctions) {
-            fonctions.forEach((element) => {
-                queryParameters = queryParameters.append('fonctions', <any>element);
-            })
-        }
-        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<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;
-
-        // 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/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
-            {
-                params: queryParameters,
-                withCredentials: this.configuration.withCredentials,
-                headers: headers,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-}

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

@@ -0,0 +1,177 @@
+/**
+ * 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.6
+ * 
+ *
+ * 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 { ErreurDTO } from '../model/erreurDTO';
+import { ReferentEPDTO } from '../model/referentEPDTO';
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+@Injectable()
+export class ReferentsEPService {
+
+    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;
+    }
+
+
+    /**
+     * 
+     * Mettre à jour les collaborateurs d'un référent.
+     * @param body 
+     * @param idReferent Id d'un référent
+     * @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 updateCollaborateursReferent(body: ReferentEPDTO, idReferent: string, observe?: 'body', reportProgress?: boolean): Observable<ReferentEPDTO>;
+    public updateCollaborateursReferent(body: ReferentEPDTO, idReferent: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ReferentEPDTO>>;
+    public updateCollaborateursReferent(body: ReferentEPDTO, idReferent: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ReferentEPDTO>>;
+    public updateCollaborateursReferent(body: ReferentEPDTO, idReferent: string, 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 updateCollaborateursReferent.');
+        }
+
+        if (idReferent === null || idReferent === undefined) {
+            throw new Error('Required parameter idReferent was null or undefined when calling updateCollaborateursReferent.');
+        }
+
+        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<ReferentEPDTO>('put',`${this.basePath}/referentsep/referent/${encodeURIComponent(String(idReferent))}`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * Mettre à jour le référent d&#x27;un collaborateur.
+     * @param body 
+     * @param idCollaborateur Id du 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 updateReferentCollaborateur(body: ReferentEPDTO, idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable<ReferentEPDTO>;
+    public updateReferentCollaborateur(body: ReferentEPDTO, idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ReferentEPDTO>>;
+    public updateReferentCollaborateur(body: ReferentEPDTO, idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ReferentEPDTO>>;
+    public updateReferentCollaborateur(body: ReferentEPDTO, idCollaborateur: string, 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 updateReferentCollaborateur.');
+        }
+
+        if (idCollaborateur === null || idCollaborateur === undefined) {
+            throw new Error('Required parameter idCollaborateur was null or undefined when calling updateReferentCollaborateur.');
+        }
+
+        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<ReferentEPDTO>('put',`${this.basePath}/referentsep/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}