Récupération du code généré par Swagger-OpenAPI avec le test pour récupérer les prochains EP passé

src/app/api-swagger/.npmignore

@@ -0,0 +1,5 @@
+wwwroot/*.js
+node
+node_modules
+typings
+dist

src/app/api-swagger/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

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

@@ -0,0 +1 @@
+3.0.20

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

@@ -0,0 +1,33 @@
+import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core';
+import { Configuration } from './configuration';
+import { HttpClient } from '@angular/common/http';
+
+
+import { DefaultService } from './api/default.service';
+
+@NgModule({
+  imports:      [],
+  declarations: [],
+  exports:      [],
+  providers: [
+    DefaultService ]
+})
+export class ApiModule {
+    public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ { provide: Configuration, useFactory: configurationFactory } ]
+        };
+    }
+
+    constructor( @Optional() @SkipSelf() parentModule: ApiModule,
+                 @Optional() http: HttpClient) {
+        if (parentModule) {
+            throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
+        }
+        if (!http) {
+            throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
+            'See also https://github.com/angular/angular/issues/20575');
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+export * from './default.service';
+import { DefaultService } from './default.service';
+export const APIS = [DefaultService];

src/app/api-swagger/configuration.ts

@@ -0,0 +1,79 @@
+export interface ConfigurationParameters {
+    apiKeys?: {[ key: string ]: string};
+    username?: string;
+    password?: string;
+    accessToken?: string | (() => string);
+    basePath?: string;
+    withCredentials?: boolean;
+}
+
+export class Configuration {
+    apiKeys?: {[ key: string ]: string};
+    username?: string;
+    password?: string;
+    accessToken?: string | (() => string);
+    basePath?: string;
+    withCredentials?: boolean;
+
+    constructor(configurationParameters: ConfigurationParameters = {}) {
+        this.apiKeys = configurationParameters.apiKeys;
+        this.username = configurationParameters.username;
+        this.password = configurationParameters.password;
+        this.accessToken = configurationParameters.accessToken;
+        this.basePath = configurationParameters.basePath;
+        this.withCredentials = configurationParameters.withCredentials;
+    }
+
+    /**
+     * Select the correct content-type to use for a request.
+     * Uses {@link Configuration#isJsonMime} to determine the correct content-type.
+     * If no content type is found return the first found type if the contentTypes is not empty
+     * @param contentTypes - the array of content types that are available for selection
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
+     */
+    public selectHeaderContentType (contentTypes: string[]): string | undefined {
+        if (contentTypes.length == 0) {
+            return undefined;
+        }
+
+        let type = contentTypes.find(x => this.isJsonMime(x));
+        if (type === undefined) {
+            return contentTypes[0];
+        }
+        return type;
+    }
+
+    /**
+     * Select the correct accept content-type to use for a request.
+     * Uses {@link Configuration#isJsonMime} to determine the correct accept content-type.
+     * If no content type is found return the first found type if the contentTypes is not empty
+     * @param accepts - the array of content types that are available for selection.
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
+     */
+    public selectHeaderAccept(accepts: string[]): string | undefined {
+        if (accepts.length == 0) {
+            return undefined;
+        }
+
+        let type = accepts.find(x => this.isJsonMime(x));
+        if (type === undefined) {
+            return accepts[0];
+        }
+        return type;
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    public isJsonMime(mime: string): boolean {
+        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
+        return mime != null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
+    }
+}

src/app/api-swagger/encoder.ts

@@ -0,0 +1,18 @@
+    import { HttpUrlEncodingCodec } from '@angular/common/http';
+
+/**
+* CustomHttpUrlEncodingCodec
+* Fix plus sign (+) not encoding, so sent as blank space
+* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+*/
+export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+    encodeKey(k: string): string {
+        k = super.encodeKey(k);
+        return k.replace(/\+/gi, '%2B');
+    }
+    encodeValue(v: string): string {
+        v = super.encodeValue(v);
+        return v.replace(/\+/gi, '%2B');
+    }
+}
+

src/app/api-swagger/index.ts

@@ -0,0 +1,5 @@
+export * from './api/api';
+export * from './model/models';
+export * from './variables';
+export * from './configuration';
+export * from './api.module';

src/app/api-swagger/model/augmentationSalaireModel.ts

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

src/app/api-swagger/model/collaborateurModel.ts

@@ -0,0 +1,22 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface CollaborateurModel { 
+    idCollaborateur: string;
+    nom: string;
+    prenom: string;
+    mail?: string;
+    agence: string;
+    fonction: string;
+    dateEmbauche: string;
+    dateDepart?: string;
+}

src/app/api-swagger/model/critereModel.ts

@@ -0,0 +1,19 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface CritereModel { 
+    idCritere: number;
+    texte: string;
+    type: string;
+    ordre: string;
+    section: string;
+}

src/app/api-swagger/model/demandeDelegationModel.ts

@@ -0,0 +1,23 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { CollaborateurModel } from './collaborateurModel';
+import { EpModel } from './epModel';
+
+export interface DemandeDelegationModel { 
+    idDemande: number;
+    ep: EpModel;
+    nouveauRef: CollaborateurModel;
+    reponse?: boolean;
+    dateDemande: Date;
+    dateReponse?: Date;
+    raisonRefus?: string;
+}

src/app/api-swagger/model/demandeFormationModel.ts

@@ -0,0 +1,22 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { EpModel } from './epModel';
+import { ThemeModel } from './themeModel';
+
+export interface DemandeFormationModel { 
+    idDemandeformation: number;
+    ep: EpModel;
+    status: string;
+    libelle: string;
+    description: string;
+    theme: ThemeModel;
+}

src/app/api-swagger/model/engagementModel.ts

@@ -0,0 +1,20 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { EpModel } from './epModel';
+
+export interface EngagementModel { 
+    idEngagement: number;
+    engagement: string;
+    dateLimite: string;
+    accomplie?: boolean;
+    ep: EpModel;
+}

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

@@ -0,0 +1,40 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { AugmentationSalaireModel } from './augmentationSalaireModel';
+import { CollaborateurModel } from './collaborateurModel';
+import { DemandeDelegationModel } from './demandeDelegationModel';
+import { EngagementModel } from './engagementModel';
+import { NotificationModel } from './notificationModel';
+import { ParticpantModel } from './particpantModel';
+import { RDVEntretienModel } from './rDVEntretienModel';
+
+export interface EpModel { 
+    idEp: number;
+    typeEP: string;
+    dateCreation: string;
+    dateDisponibilite: string;
+    dateSaisie?: string;
+    etat: number;
+    cv?: string;
+    dateEntretien?: Date;
+    typeEntretien?: string;
+    commentaireCommercial?: string;
+    rdvEntretien?: Array<RDVEntretienModel>;
+    augmentationSalaire?: AugmentationSalaireModel;
+    participants: Array<ParticpantModel>;
+    collaborateur: CollaborateurModel;
+    referent: CollaborateurModel;
+    nbRappelSignature?: number;
+    notifications?: Array<NotificationModel>;
+    engagements?: Array<EngagementModel>;
+    delegation?: DemandeDelegationModel;
+}

src/app/api-swagger/model/erreurModel.ts

@@ -0,0 +1,16 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface ErreurModel { 
+    code: string;
+    message: string;
+}

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

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

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

@@ -0,0 +1,34 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { ParticipationFormationModel } from './participationFormationModel';
+
+export interface FormationModel { 
+    idFormation: number;
+    intitule: string;
+    dateDebut: Date;
+    dateFin: Date;
+    status: FormationModel.StatusEnum;
+    lieu: string;
+    duree: number;
+    organisme: string;
+    nomFormateur: string;
+    participantsFormation?: Array<ParticipationFormationModel>;
+}
+export namespace FormationModel {
+    export type StatusEnum = 'Planifiée' | 'Replanifiée' | 'Annulée' | 'Réalisée';
+    export const StatusEnum = {
+        Planifie: 'Planifiée' as StatusEnum,
+        Replanifie: 'Replanifiée' as StatusEnum,
+        Annule: 'Annulée' as StatusEnum,
+        Ralise: 'Réalisée' as StatusEnum
+    };
+}

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

@@ -0,0 +1,15 @@
+export * from './augmentationSalaireModel';
+export * from './collaborateurModel';
+export * from './critereModel';
+export * from './demandeDelegationModel';
+export * from './demandeFormationModel';
+export * from './engagementModel';
+export * from './epModel';
+export * from './erreurModel';
+export * from './evaluationFormationModel';
+export * from './formationModel';
+export * from './notificationModel';
+export * from './participationFormationModel';
+export * from './particpantModel';
+export * from './rDVEntretienModel';
+export * from './themeModel';

src/app/api-swagger/model/notificationModel.ts

@@ -0,0 +1,19 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface NotificationModel { 
+    idNotification: number;
+    typeNotification?: string;
+    titre: string;
+    description: string;
+    lu: boolean;
+}

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

@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { CollaborateurModel } from './collaborateurModel';
+import { EvaluationFormationModel } from './evaluationFormationModel';
+import { FormationModel } from './formationModel';
+
+export interface ParticipationFormationModel { 
+    idParticipation: number;
+    formation: FormationModel;
+    collaborateur: CollaborateurModel;
+    evaluation?: Array<EvaluationFormationModel>;
+}

src/app/api-swagger/model/particpantModel.ts

@@ -0,0 +1,28 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { CollaborateurModel } from './collaborateurModel';
+import { EpModel } from './epModel';
+
+export interface ParticpantModel { 
+    idParticipant: number;
+    collaborateur: CollaborateurModel;
+    role: ParticpantModel.RoleEnum;
+    ep: EpModel;
+}
+export namespace ParticpantModel {
+    export type RoleEnum = 'participant' | 'referent' | 'collaborateur';
+    export const RoleEnum = {
+        Participant: 'participant' as RoleEnum,
+        Referent: 'referent' as RoleEnum,
+        Collaborateur: 'collaborateur' as RoleEnum
+    };
+}

src/app/api-swagger/model/rDVEntretienModel.ts

@@ -0,0 +1,17 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface RDVEntretienModel { 
+    idTypeEntretien: number;
+    typeEntretien: string;
+    dateEntretien: Date;
+}

src/app/api-swagger/model/themeModel.ts

@@ -0,0 +1,16 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui seront utilisés afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface ThemeModel { 
+    idTheme: number;
+    nom: string;
+}

src/app/api-swagger/ng-package.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "index.ts"
+  }
+}

src/app/api-swagger/variables.ts

@@ -0,0 +1,9 @@
+import { InjectionToken } from '@angular/core';
+
+export const BASE_PATH = new InjectionToken<string>('basePath');
+export const COLLECTION_FORMATS = {
+    'csv': ',',
+    'tsv': '   ',
+    'ssv': ' ',
+    'pipes': '|'
+}

src/app/app.module.ts

@@ -8,6 +8,7 @@ import { KeycloakAngularModule, KeycloakService } from 'keycloak-angular';
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 import { MaterialModule } from "./angular-material/angular-material.module";
+import { ApiModule } from './api-swagger'
 
 import { HomeComponent, HomeAssistanteComponent, HomeCollaborateurComponent,
    HomeCommercialComponent, HomeRHComponent } from './home';
@@ -41,7 +42,8 @@ let keycloakService: KeycloakService = new KeycloakService();
     BrowserAnimationsModule,
     MaterialModule,
     HttpClientModule,
-    FormsModule
+    FormsModule,
+    ApiModule
   ],
   providers: [
     {

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

@@ -11,7 +11,7 @@ import { ServiceCollaborateur, ServiceEP } from "../../service";
 import { CollaborateurModel } from "../../modeles/modele-collaborateur";
 import { EpModel } from "../../modeles/modele-ep";
 import { DisplayEP } from "../../utils/displayEP";
-
+import { DefaultService } from "../../api-swagger/api/api";
 
 /**
   * Le composant home qui sera affiché uniquement pour les assistantes.
@@ -73,7 +73,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
   chargement = true;
 
   constructor(public keycloakService : KeycloakService, private serviceCollaborateur : ServiceCollaborateur,
-                                        private serviceEP : ServiceEP) {
+                                        private serviceEP : ServiceEP, private service:DefaultService) {
   }
 
   ngAfterViewInit() {
@@ -121,7 +121,8 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
     */
   ngOnInit() {
     console.log("INIT");
-    this.epDisponiblesSubscription = this.serviceEP.listeEPDisponibles().
+    //this.epDisponiblesSubscription = this.serviceEP.listeEPDisponibles().
+    this.epDisponiblesSubscription = this.service.epProchainsGet().
        subscribe(eps => {
          this.initDisplay(eps);
          this.refreshDataSource();