Mise à jour suite à des modifications OpenApi

src/app/ep/details-ep/details-ep.component.ts

@@ -25,11 +25,13 @@ export class DetailsEPComponent implements OnInit {
     }
 
     ngOnInit() {
-        /*
         this.idEp = this.route.snapshot.paramMap.get("id");
         this.epSubscription = this.epService.getEPById(this.idEp).subscribe(
-            ep => this.ep = ep,
+            ep => {
+                this.ep = ep;
+                console.log(this.ep);
+            },
             err => console.log(err) 
-        );*/
+        );
     }
 }

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

@@ -63,7 +63,7 @@ export class HomeCollaborateurComponent implements OnInit {
   }
 
   checkEPReferent() {
-    this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, true, 1, 15, "", "", true, undefined, undefined).subscribe(
+    this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id,  "", undefined, undefined).subscribe(
       count => this.estReferentEPEnCours = count > 0,
       err => console.log(err)
     );

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

@@ -45,7 +45,7 @@ export class HomeCommercialComponent implements OnInit {
   }
 
   checkEPReferent() {
-    this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, true, 1, 15, "", "", true, undefined, undefined).subscribe(
+    this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, "",undefined, undefined).subscribe(
       count => this.estReferentEPEnCours = count > 0,
       err => console.log(err)
     );

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

@@ -2,7 +2,7 @@
  * API du serveur de l'application de digitalisation des EP
  * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
  *
- * OpenAPI spec version: 1.3.6
+ * OpenAPI spec version: 1.3.7
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -21,6 +21,7 @@ import { EpDTO } from '../model/epDTO';
  import { EpInformationDTO } from '../model/epInformationDTO';
  import { EpSaisieDTO } from '../model/epSaisieDTO';
  import { ErreurDTO } from '../model/erreurDTO';
+ import { TypeEntretienDTO } from '../model/typeEntretienDTO';
  
  import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
  import { Configuration }                                     from '../configuration';
@@ -470,19 +471,18 @@ export class EpService {
       * @param idReferent Id d'un référent
       * @param asc Indique si les données sont récupérées dans l'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 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 epObligatoire Récupérer la liste des EP obligatoires
       * @param dateDebut Date à partir de laquelle les données son récupérées
       * @param dateFin Date jusqu'à 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 getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+     public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
-    public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+     public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
-    public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+     public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
-    public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+     public getEPEnCoursReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 getEPEnCoursReferent.');
@@ -495,7 +495,6 @@ export class EpService {
  
  
  
-
          let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
          if (asc !== undefined && asc !== null) {
              queryParameters = queryParameters.set('asc', <any>asc);
@@ -503,8 +502,8 @@ export class EpService {
          if (numPage !== undefined && numPage !== null) {
              queryParameters = queryParameters.set('numPage', <any>numPage);
          }
-        if (parPAge !== undefined && parPAge !== null) {
+         if (parPage !== undefined && parPage !== null) {
-            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+             queryParameters = queryParameters.set('parPage', <any>parPage);
          }
          if (texte !== undefined && texte !== null) {
              queryParameters = queryParameters.set('texte', <any>texte);
@@ -512,9 +511,6 @@ export class EpService {
          if (tri !== undefined && tri !== null) {
              queryParameters = queryParameters.set('tri', <any>tri);
          }
-        if (epObligatoire !== undefined && epObligatoire !== null) {
-            queryParameters = queryParameters.set('epObligatoire', <any>epObligatoire);
-        }
          if (dateDebut !== undefined && dateDebut !== null) {
              queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
          }
@@ -559,21 +555,16 @@ export class EpService {
       * 
       * Récupérer le nombre total de prochains EP 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 epObligatoire Récupérer la liste des EP obligatoires
       * @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 getEPEnCoursReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
+     public getEPEnCoursReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    public getEPEnCoursReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
+     public getEPEnCoursReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    public getEPEnCoursReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
+     public getEPEnCoursReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getEPEnCoursReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, epObligatoire?: boolean, dateDebut?: Date, dateFin?: Date, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+     public getEPEnCoursReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, 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 getEPEnCoursReferentCount.');
@@ -582,30 +573,10 @@ export class EpService {
  
  
  
-
-
-
-
-
          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 (epObligatoire !== undefined && epObligatoire !== null) {
-            queryParameters = queryParameters.set('epObligatoire', <any>epObligatoire);
-        }
          if (dateDebut !== undefined && dateDebut !== null) {
              queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
          }
@@ -748,7 +719,7 @@ export class EpService {
       * @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 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
@@ -756,10 +727,10 @@ export class EpService {
       * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
       * @param reportProgress flag to report request and response progress.
       */
-    public getEPSignes(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+     public getEPSignes(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
-    public getEPSignes(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+     public getEPSignes(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
-    public getEPSignes(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+     public getEPSignes(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
-    public getEPSignes(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> {
+     public getEPSignes(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> {
  
  
  
@@ -781,8 +752,8 @@ export class EpService {
          if (numPage !== undefined && numPage !== null) {
              queryParameters = queryParameters.set('numPage', <any>numPage);
          }
-        if (parPAge !== undefined && parPAge !== null) {
+         if (parPage !== undefined && parPage !== null) {
-            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+             queryParameters = queryParameters.set('parPage', <any>parPage);
          }
          if (texte !== undefined && texte !== null) {
              queryParameters = queryParameters.set('texte', <any>texte);
@@ -882,24 +853,16 @@ export class EpService {
       * 
       * Récupérer le nombre total d’EP signés.
       * @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 getEPSignesCount(idBUs?: Array<number>, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
+     public getEPSignesCount(idBUs?: Array<number>, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    public getEPSignesCount(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 getEPSignesCount(idBUs?: Array<number>, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    public getEPSignesCount(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 getEPSignesCount(idBUs?: Array<number>, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getEPSignesCount(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> {
+     public getEPSignesCount(idBUs?: Array<number>, texte?: string, dateDebut?: Date, dateFin?: Date, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
-
-
-
-
  
  
  
@@ -911,21 +874,9 @@ export class EpService {
                  queryParameters = queryParameters.append('idBUs', <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 (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());
          }
@@ -972,7 +923,7 @@ export class EpService {
       * @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 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
@@ -980,10 +931,10 @@ export class EpService {
       * @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 getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
+     public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<Array<EpInformationDTO>>;
-    public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
+     public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<EpInformationDTO>>>;
-    public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
+     public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<EpInformationDTO>>>;
-    public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+     public getEPSignesReferent(idReferent: string, asc?: boolean, numPage?: number, parPage?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, 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 getEPSignesReferent.');
@@ -1003,8 +954,8 @@ export class EpService {
          if (numPage !== undefined && numPage !== null) {
              queryParameters = queryParameters.set('numPage', <any>numPage);
          }
-        if (parPAge !== undefined && parPAge !== null) {
+         if (parPage !== undefined && parPage !== null) {
-            queryParameters = queryParameters.set('parPAge', <any>parPAge);
+             queryParameters = queryParameters.set('parPage', <any>parPage);
          }
          if (texte !== undefined && texte !== null) {
              queryParameters = queryParameters.set('texte', <any>texte);
@@ -1056,20 +1007,16 @@ export class EpService {
       * 
       * Récupérer le nombre total d’EP signés qu’un référent à fait passer.
       * @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 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 getEPSignesReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
+     public getEPSignesReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    public getEPSignesReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
+     public getEPSignesReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    public getEPSignesReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
+     public getEPSignesReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getEPSignesReferentCount(idReferent: string, asc?: boolean, numPage?: number, parPAge?: number, texte?: string, tri?: string, dateDebut?: Date, dateFin?: Date, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+     public getEPSignesReferentCount(idReferent: string, texte?: string, dateDebut?: Date, dateFin?: Date, 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 getEPSignesReferentCount.');
@@ -1078,26 +1025,10 @@ export class EpService {
  
  
  
-
-
-
-
          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 (dateDebut !== undefined && dateDebut !== null) {
              queryParameters = queryParameters.set('dateDebut', <any>dateDebut.toISOString());
          }
@@ -1186,6 +1117,49 @@ export class EpService {
          );
      }
  
+     /**
+      * 
+      * Récupérer la liste des types d&#x27;entretiens EP possible
+      * @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 getTypesEntretien(observe?: 'body', reportProgress?: boolean): Observable<Array<TypeEntretienDTO>>;
+     public getTypesEntretien(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<TypeEntretienDTO>>>;
+     public getTypesEntretien(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<TypeEntretienDTO>>>;
+     public getTypesEntretien(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+ 
+         let headers = this.defaultHeaders;
+ 
+         // authentication (bearerAuth) required
+         if (this.configuration.accessToken) {
+             const accessToken = typeof this.configuration.accessToken === 'function'
+                 ? this.configuration.accessToken()
+                 : this.configuration.accessToken;
+             headers = headers.set('Authorization', 'Bearer ' + accessToken);
+         }
+         // to determine the Accept header
+         let httpHeaderAccepts: string[] = [
+             'application/json'
+         ];
+         const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+         if (httpHeaderAcceptSelected != undefined) {
+             headers = headers.set('Accept', httpHeaderAcceptSelected);
+         }
+ 
+         // to determine the Content-Type header
+         const consumes: string[] = [
+         ];
+ 
+         return this.httpClient.request<Array<TypeEntretienDTO>>('get',`${this.basePath}/typesentretien`,
+             {
+                 withCredentials: this.configuration.withCredentials,
+                 headers: headers,
+                 observe: observe,
+                 reportProgress: reportProgress
+             }
+         );
+     }
+ 
      /**
       * 
       * Effectuer un rappel de signature.
@@ -1353,3 +1327,4 @@ export class EpService {
      }
  
  }
+ 

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

@@ -61,7 +61,7 @@ export interface EpDTO {
     cv: string;
     propositionsEntretien?: Array<RDVEntretienDTO>;
     rdvEntretien?: RDVEntretienDTO;
-    choixTypeEntretien?: TypeEntretienDTO;
+    choixTypeEntretien?: Array<TypeEntretienDTO>;
     /**
      * Indique si oui ou non l'EP doit obligatoirement être effectué
      */

src/app/shared/mat-tables/ep-table/ep-table.ts

@@ -133,7 +133,7 @@ export class EpTableComponent implements OnInit{
         this.epSubscription = this.epService.getEPSignesReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe(
             eps => {
                 this.dataSource = new MatTableDataSource(eps);
-                this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe(
+                this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.search, this.dateDebut, this.dateFin).subscribe(
                     count => this.taille = count,
                     err => console.log(err)
                 );
@@ -143,10 +143,10 @@ export class EpTableComponent implements OnInit{
     }
 
     getEPEnCoursReferent() {
-        this.epSubscription = this.epService.getEPEnCoursReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, true, this.dateDebut, this.dateFin ).subscribe(
+        this.epSubscription = this.epService.getEPEnCoursReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin ).subscribe(
             eps => {
                 this.dataSource = new MatTableDataSource(eps);
-                this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin ).subscribe(
+                this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.search, this.dateDebut, this.dateFin ).subscribe(
                     count => this.taille = count,
                     err => console.log(err)
                 );
@@ -185,7 +185,7 @@ export class EpTableComponent implements OnInit{
             eps => {
                 console.log(eps);
                 this.dataSource = new MatTableDataSource(eps);
-                this.epCountSubscription = this.epService.getEPSignesCount(this.busIds, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe(
+                this.epCountSubscription = this.epService.getEPSignesCount(this.busIds, this.search, this.dateDebut, this.dateFin).subscribe(
                     count => this.taille = count,
                     err => console.log(err)
                 );