diff --git a/src/app/collaborateurs/collaborateurs.component.ts b/src/app/collaborateurs/collaborateurs.component.ts
index 5ae3060..e47c05c 100644
--- a/src/app/collaborateurs/collaborateurs.component.ts
+++ b/src/app/collaborateurs/collaborateurs.component.ts
@@ -70,8 +70,8 @@ export class CollaborateursComponent implements OnInit {
collaborateurDisplay.prenom = c.prenom;
collaborateurDisplay.nom = c.nom;
collaborateurDisplay.agence = c.businessUnit.nom;
- collaborateurDisplay.embauche = c.dateArrive;
- collaborateurDisplay.anciennete = this.setAnciennete(new Date(c.dateArrive), today);
+ collaborateurDisplay.embauche = c.dateArrivee;
+ collaborateurDisplay.anciennete = this.setAnciennete(new Date(c.dateArrivee), today);
collaborateurDisplay.annee = Math.floor(collaborateurDisplay.anciennete / 31536000000);
collaborateurDisplay.mois = Math.floor(collaborateurDisplay.anciennete / 2629800000 % 12);
this.collaborateursDisponibles.push(collaborateurDisplay);
diff --git a/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html b/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html
index 3c923f8..6f50b1a 100644
--- a/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html
+++ b/src/app/collaborateurs/details-collaborateur/details-collaborateur.component.html
@@ -3,7 +3,7 @@
{{ collaborateur.prenom }} {{ collaborateur.nom }}
Agence : {{ collaborateur.businessUnit.nom}}
- Date embauche : {{ collaborateur.dateArrive}}
+ Date embauche : {{ collaborateur.dateArrivee}}
diff --git a/src/app/formations/details-formation/formation.component.ts b/src/app/formations/details-formation/formation.component.ts
index 654975c..ec651b7 100644
--- a/src/app/formations/details-formation/formation.component.ts
+++ b/src/app/formations/details-formation/formation.component.ts
@@ -34,7 +34,7 @@ export class FormationComponent implements OnInit {
if(this.formation.statut == 3) {
this.dateTexte = "Initialement prévue le";
}
- if(formation.participantsFormation != undefined )
+ //if(formation.participantsFormation != undefined )
}
getStatut(statut:number) {
diff --git a/src/app/home/home-assistante/home-assistante.component.html b/src/app/home/home-assistante/home-assistante.component.html
index 8820fa9..c06411b 100644
--- a/src/app/home/home-assistante/home-assistante.component.html
+++ b/src/app/home/home-assistante/home-assistante.component.html
@@ -26,7 +26,7 @@
Ancienneté
- {{row.collaborateur.dateArrive | date: 'yyyy/MM/dd'}} ({{row.annee}}an(s) {{row.mois | number: '2.0-0'}}mois)
+ {{row.collaborateur.dateArrivee | date: 'yyyy/MM/dd'}} ({{row.annee}}an(s) {{row.mois | number: '2.0-0'}}mois)
diff --git a/src/app/home/home-assistante/home-assistante.component.ts b/src/app/home/home-assistante/home-assistante.component.ts
index 97ed266..c09a8fc 100644
--- a/src/app/home/home-assistante/home-assistante.component.ts
+++ b/src/app/home/home-assistante/home-assistante.component.ts
@@ -110,7 +110,7 @@ export class HomeAssistanteComponent implements OnInit, AfterViewInit {
epDisplay.datemail = ep.dateDisponibilite;
epDisplay.etat = ep.etat;
epDisplay.type = ep.type;
- epDisplay.anciennete = this.setAnciennete(new Date(ep.collaborateur.dateArrive), today);
+ epDisplay.anciennete = this.setAnciennete(new Date(ep.collaborateur.dateArrivee), today);
epDisplay.annee = Math.floor(epDisplay.anciennete / 31536000000);
epDisplay.mois = Math.floor(epDisplay.anciennete / 2629800000 % 12);
this.epDisponibles.push(epDisplay);
diff --git a/src/app/shared/api-swagger/api/api.ts b/src/app/shared/api-swagger/api/api.ts
index f95a501..bcb62f3 100644
--- a/src/app/shared/api-swagger/api/api.ts
+++ b/src/app/shared/api-swagger/api/api.ts
@@ -2,10 +2,14 @@ export * from './collaborateurs.service';
import { CollaborateursService } from './collaborateurs.service';
export * from './demandesformation.service';
import { DemandesformationService } from './demandesformation.service';
+export * from './engagements.service';
+import { EngagementsService } from './engagements.service';
export * from './ep.service';
import { EpService } from './ep.service';
export * from './formations.service';
import { FormationsService } from './formations.service';
+export * from './participationsFormations.service';
+import { ParticipationsFormationsService } from './participationsFormations.service';
export * from './referents.service';
import { ReferentsService } from './referents.service';
-export const APIS = [CollaborateursService, DemandesformationService, EpService, FormationsService, ReferentsService];
+export const APIS = [CollaborateursService, DemandesformationService, EngagementsService, EpService, FormationsService, ParticipationsFormationsService, ReferentsService];
diff --git a/src/app/shared/api-swagger/api/collaborateurs.service.ts b/src/app/shared/api-swagger/api/collaborateurs.service.ts
index 47ca0bb..517a1cf 100644
--- a/src/app/shared/api-swagger/api/collaborateurs.service.ts
+++ b/src/app/shared/api-swagger/api/collaborateurs.service.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/api/demandesformation.service.ts b/src/app/shared/api-swagger/api/demandesformation.service.ts
index b386877..4c9fdfa 100644
--- a/src/app/shared/api-swagger/api/demandesformation.service.ts
+++ b/src/app/shared/api-swagger/api/demandesformation.service.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/api/engagements.service.ts b/src/app/shared/api-swagger/api/engagements.service.ts
new file mode 100644
index 0000000..258c07f
--- /dev/null
+++ b/src/app/shared/api-swagger/api/engagements.service.ts
@@ -0,0 +1,115 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.2.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *//* 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 { EngagementModel } from '../model/engagementModel';
+import { ErreurModel } from '../model/erreurModel';
+
+import { BASE_PATH, COLLECTION_FORMATS } from '../variables';
+import { Configuration } from '../configuration';
+
+
+@Injectable()
+export class EngagementsService {
+
+ 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;
+ }
+
+
+ /**
+ *
+ * récupérer la liste des engagements
+ * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+ * @param idAgence id de l'agence à laquelle sont rattachées les données à récupérer
+ * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+ * @param reportProgress flag to report request and response progress.
+ */
+ public getEngagements(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable>;
+ public getEngagements(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable>>;
+ public getEngagements(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable>>;
+ public getEngagements(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable {
+
+
+
+ let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+ if (idBu !== undefined && idBu !== null) {
+ queryParameters = queryParameters.set('idBu', idBu);
+ }
+ if (idAgence !== undefined && idAgence !== null) {
+ queryParameters = queryParameters.set('idAgence', idAgence);
+ }
+
+ 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>('get',`${this.basePath}/engagements/`,
+ {
+ params: queryParameters,
+ withCredentials: this.configuration.withCredentials,
+ headers: headers,
+ observe: observe,
+ reportProgress: reportProgress
+ }
+ );
+ }
+
+}
diff --git a/src/app/shared/api-swagger/api/ep.service.ts b/src/app/shared/api-swagger/api/ep.service.ts
index 647d496..713964e 100644
--- a/src/app/shared/api-swagger/api/ep.service.ts
+++ b/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.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/api/formations.service.ts b/src/app/shared/api-swagger/api/formations.service.ts
index ea21cb3..e7150be 100644
--- a/src/app/shared/api-swagger/api/formations.service.ts
+++ b/src/app/shared/api-swagger/api/formations.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.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -262,6 +262,62 @@ export class FormationsService {
);
}
+ /**
+ *
+ * Récupérer les formations plannifié et/ou replannifié
+ * @param idBu id de la business unit à laquelle sont rattachées les données à récupérer
+ * @param idAgence id de l'agence à laquelle sont rattachées les données à récupérer
+ * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+ * @param reportProgress flag to report request and response progress.
+ */
+ public getProchainesFormation(idBu?: number, idAgence?: number, observe?: 'body', reportProgress?: boolean): Observable>;
+ public getProchainesFormation(idBu?: number, idAgence?: number, observe?: 'response', reportProgress?: boolean): Observable>>;
+ public getProchainesFormation(idBu?: number, idAgence?: number, observe?: 'events', reportProgress?: boolean): Observable>>;
+ public getProchainesFormation(idBu?: number, idAgence?: number, observe: any = 'body', reportProgress: boolean = false ): Observable {
+
+
+
+ let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+ if (idBu !== undefined && idBu !== null) {
+ queryParameters = queryParameters.set('idBu', idBu);
+ }
+ if (idAgence !== undefined && idAgence !== null) {
+ queryParameters = queryParameters.set('idAgence', idAgence);
+ }
+
+ 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>('get',`${this.basePath}/formations/prochaines`,
+ {
+ params: queryParameters,
+ withCredentials: this.configuration.withCredentials,
+ headers: headers,
+ observe: observe,
+ reportProgress: reportProgress
+ }
+ );
+ }
+
/**
*
* update une formation
diff --git a/src/app/shared/api-swagger/api/participationsFormations.service.ts b/src/app/shared/api-swagger/api/participationsFormations.service.ts
new file mode 100644
index 0000000..cb43014
--- /dev/null
+++ b/src/app/shared/api-swagger/api/participationsFormations.service.ts
@@ -0,0 +1,107 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.2.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *//* 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 { ErreurModel } from '../model/erreurModel';
+import { ParticipationFormationModel } from '../model/participationFormationModel';
+
+import { BASE_PATH, COLLECTION_FORMATS } from '../variables';
+import { Configuration } from '../configuration';
+
+
+@Injectable()
+export class ParticipationsFormationsService {
+
+ 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;
+ }
+
+
+ /**
+ *
+ * récupérer la liste des formations auxquelles est inscrit le 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 getParticipationByCollaborateur(idCollaborateur: string, observe?: 'body', reportProgress?: boolean): Observable>;
+ public getParticipationByCollaborateur(idCollaborateur: string, observe?: 'response', reportProgress?: boolean): Observable>>;
+ public getParticipationByCollaborateur(idCollaborateur: string, observe?: 'events', reportProgress?: boolean): Observable>>;
+ public getParticipationByCollaborateur(idCollaborateur: string, observe: any = 'body', reportProgress: boolean = false ): Observable {
+
+ if (idCollaborateur === null || idCollaborateur === undefined) {
+ throw new Error('Required parameter idCollaborateur was null or undefined when calling getParticipationByCollaborateur.');
+ }
+
+ 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>('get',`${this.basePath}/participationsformation/collaborateur/${encodeURIComponent(String(idCollaborateur))}`,
+ {
+ withCredentials: this.configuration.withCredentials,
+ headers: headers,
+ observe: observe,
+ reportProgress: reportProgress
+ }
+ );
+ }
+
+}
diff --git a/src/app/shared/api-swagger/api/referents.service.ts b/src/app/shared/api-swagger/api/referents.service.ts
index c0d5a28..7773ae5 100644
--- a/src/app/shared/api-swagger/api/referents.service.ts
+++ b/src/app/shared/api-swagger/api/referents.service.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/model/agenceModel.ts b/src/app/shared/api-swagger/model/agenceModel.ts
index b7fe8ef..0036ff4 100644
--- a/src/app/shared/api-swagger/model/agenceModel.ts
+++ b/src/app/shared/api-swagger/model/agenceModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/model/augmentationSalaireModel.ts b/src/app/shared/api-swagger/model/augmentationSalaireModel.ts
index 7f4d45f..2ade473 100644
--- a/src/app/shared/api-swagger/model/augmentationSalaireModel.ts
+++ b/src/app/shared/api-swagger/model/augmentationSalaireModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -14,6 +14,5 @@ import { EpModel } from './epModel';
export interface AugmentationSalaireModel {
id: number;
augmentation: number;
- dateDemande: Date;
ep: EpModel;
}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/autorisationModel.ts b/src/app/shared/api-swagger/model/autorisationModel.ts
new file mode 100644
index 0000000..6ec3a4f
--- /dev/null
+++ b/src/app/shared/api-swagger/model/autorisationModel.ts
@@ -0,0 +1,19 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.2.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { CollaborateurModel } from './collaborateurModel';
+import { EpModel } from './epModel';
+
+export interface AutorisationModel {
+ id: number;
+ referent?: CollaborateurModel;
+ ep: EpModel;
+}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/businessUnitModel.ts b/src/app/shared/api-swagger/model/businessUnitModel.ts
index c00b788..8e17f46 100644
--- a/src/app/shared/api-swagger/model/businessUnitModel.ts
+++ b/src/app/shared/api-swagger/model/businessUnitModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/model/champModel.ts b/src/app/shared/api-swagger/model/champModel.ts
index 444dba2..a99055b 100644
--- a/src/app/shared/api-swagger/model/champModel.ts
+++ b/src/app/shared/api-swagger/model/champModel.ts
@@ -2,18 +2,21 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
+import { SaisieModel } from './saisieModel';
export interface ChampModel {
id: number;
texte: string;
section: string;
- ordre: string;
- type: string;
+ ordre: number;
+ typeChamp: string;
+ typeSaisie: string;
+ saisies?: Array;
}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/collaborateurModel.ts b/src/app/shared/api-swagger/model/collaborateurModel.ts
index b94509c..6d2d37f 100644
--- a/src/app/shared/api-swagger/model/collaborateurModel.ts
+++ b/src/app/shared/api-swagger/model/collaborateurModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -16,7 +16,7 @@ export interface CollaborateurModel {
nom: string;
prenom: string;
mailApside: string;
- dateArrive: Date;
+ dateArrivee?: Date;
dateDepart?: Date;
businessUnit?: BusinessUnitModel;
referent: CollaborateurModel;
diff --git a/src/app/shared/api-swagger/model/demandeDelegationModel.ts b/src/app/shared/api-swagger/model/demandeDelegationModel.ts
index 120ab07..6090c41 100644
--- a/src/app/shared/api-swagger/model/demandeDelegationModel.ts
+++ b/src/app/shared/api-swagger/model/demandeDelegationModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -16,8 +16,8 @@ export interface DemandeDelegationModel {
id: number;
ep: EpModel;
referent: CollaborateurModel;
- reponse?: boolean;
dateDemande: Date;
+ reponse?: boolean;
dateReponse?: Date;
raisonRefus?: string;
}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/demandeFormationModel.ts b/src/app/shared/api-swagger/model/demandeFormationModel.ts
index 703e9f5..b5d7d30 100644
--- a/src/app/shared/api-swagger/model/demandeFormationModel.ts
+++ b/src/app/shared/api-swagger/model/demandeFormationModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -14,9 +14,14 @@ import { ThemeModel } from './themeModel';
export interface DemandeFormationModel {
id: number;
- ep: EpModel;
status: string;
libelle: string;
description: string;
+ demandeRH: boolean;
+ dateDemande: Date;
+ reponse?: boolean;
+ commentaireRefus?: string;
+ dateDerniereReponse?: Date;
theme: ThemeModel;
+ ep: EpModel;
}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/documentModel.ts b/src/app/shared/api-swagger/model/documentModel.ts
new file mode 100644
index 0000000..f1d4733
--- /dev/null
+++ b/src/app/shared/api-swagger/model/documentModel.ts
@@ -0,0 +1,21 @@
+/**
+ * API du serveur de l'application de digitalisation des EP
+ * API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
+ *
+ * OpenAPI spec version: 1.2.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { EpModel } from './epModel';
+import { SaisieModel } from './saisieModel';
+
+export interface DocumentModel {
+ id: number;
+ type: string;
+ ep?: EpModel;
+ saisieCollaborateur?: Array;
+ saisieCommercial?: Array;
+}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/engagementModel.ts b/src/app/shared/api-swagger/model/engagementModel.ts
index 031524b..1ce2be9 100644
--- a/src/app/shared/api-swagger/model/engagementModel.ts
+++ b/src/app/shared/api-swagger/model/engagementModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -17,8 +17,8 @@ export interface EngagementModel {
modalite: string;
dispositif: string;
datePrevisionnelle: Date;
- realisable: boolean;
- realise: boolean;
- raisonNonRealisable: string;
+ realisable?: boolean;
+ realise?: boolean;
+ raisonNonRealisable?: string;
ep: EpModel;
}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/epModel.ts b/src/app/shared/api-swagger/model/epModel.ts
index c1a2fc1..ca416cb 100644
--- a/src/app/shared/api-swagger/model/epModel.ts
+++ b/src/app/shared/api-swagger/model/epModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,10 +10,12 @@
* Do not edit the class manually.
*/
import { AugmentationSalaireModel } from './augmentationSalaireModel';
+import { AutorisationModel } from './autorisationModel';
import { CollaborateurModel } from './collaborateurModel';
import { DemandeDelegationModel } from './demandeDelegationModel';
+import { DemandeFormationModel } from './demandeFormationModel';
+import { DocumentModel } from './documentModel';
import { EngagementModel } from './engagementModel';
-import { ParticipationEPModel } from './participationEPModel';
import { RDVEntretienModel } from './rDVEntretienModel';
export interface EpModel {
@@ -21,21 +23,24 @@ export interface EpModel {
type: string;
dateCreation: Date;
dateDisponibilite: Date;
+ datePrevisionnelle: Date;
dateSaisie?: Date;
etat: number;
cv?: string;
- obligatoire: boolean;
dateEntretien?: Date;
typeEntretien?: string;
+ obligatoire: boolean;
commentaireAssistant?: string;
commentaireCollaborateur?: string;
commentaireCommercial?: string;
- rdvEntretien?: Array;
- augmentationSalaire?: AugmentationSalaireModel;
- participants?: Array;
collaborateur: CollaborateurModel;
- referent: CollaborateurModel;
- nbRappelSignature?: number;
+ referent?: CollaborateurModel;
+ demandesFormation?: Array;
+ participants?: Array;
engagements?: Array;
- delegation?: DemandeDelegationModel;
+ propositionsRDV?: Array;
+ augmentationSalaire?: AugmentationSalaireModel;
+ autorisations?: Array;
+ demandesDelegation?: Array;
+ documents: Array;
}
\ No newline at end of file
diff --git a/src/app/shared/api-swagger/model/erreurModel.ts b/src/app/shared/api-swagger/model/erreurModel.ts
index 98e5ac1..fa24381 100644
--- a/src/app/shared/api-swagger/model/erreurModel.ts
+++ b/src/app/shared/api-swagger/model/erreurModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/model/formationModel.ts b/src/app/shared/api-swagger/model/formationModel.ts
index dcfdf7f..71bfbde 100644
--- a/src/app/shared/api-swagger/model/formationModel.ts
+++ b/src/app/shared/api-swagger/model/formationModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -14,24 +14,29 @@ import { ParticipationFormationModel } from './participationFormationModel';
export interface FormationModel {
id: number;
intitule: string;
+ origine?: string;
+ statut?: FormationModel.StatutEnum;
dateDebut: Date;
dateFin: Date;
- statut: FormationModel.StatusEnum;
- lieu: string;
- duree: number;
- jours?: number;
- origine: string;
+ heure: number;
+ jour: number;
organisme: string;
+ mode: string;
+ type: FormationModel.TypeEnum;
+ estCertifie: boolean;
participantsFormation?: Array;
- modeFormation?: string;
- typeFormation?: string;
}
export namespace FormationModel {
- export type StatusEnum = 0 | 1 | 2 | 3;
- export const StatusEnum = {
- Planifie: 0 as StatusEnum,
- Replanifie: 1 as StatusEnum,
- Realise: 2 as StatusEnum,
- Annule: 3 as StatusEnum
+ export type StatutEnum = 0 | 1 | 2 | 3;
+ export const StatutEnum = {
+ NUMBER_0: 0 as StatutEnum,
+ NUMBER_1: 1 as StatutEnum,
+ NUMBER_2: 2 as StatutEnum,
+ NUMBER_3: 3 as StatutEnum
+ };
+ export type TypeEnum = 'Externe' | 'Interne';
+ export const TypeEnum = {
+ Externe: 'Externe' as TypeEnum,
+ Interne: 'Interne' as TypeEnum
};
}
diff --git a/src/app/shared/api-swagger/model/models.ts b/src/app/shared/api-swagger/model/models.ts
index 8cd18d2..213e666 100644
--- a/src/app/shared/api-swagger/model/models.ts
+++ b/src/app/shared/api-swagger/model/models.ts
@@ -1,15 +1,15 @@
export * from './agenceModel';
export * from './augmentationSalaireModel';
+export * from './autorisationModel';
export * from './businessUnitModel';
export * from './champModel';
export * from './collaborateurModel';
-export * from './critereModel';
export * from './demandeDelegationModel';
export * from './demandeFormationModel';
+export * from './documentModel';
export * from './engagementModel';
export * from './epModel';
export * from './erreurModel';
-export * from './evaluationFormationModel';
export * from './formationModel';
export * from './participationEPModel';
export * from './participationFormationModel';
diff --git a/src/app/shared/api-swagger/model/participationEPModel.ts b/src/app/shared/api-swagger/model/participationEPModel.ts
index c9fe3c8..379d4a1 100644
--- a/src/app/shared/api-swagger/model/participationEPModel.ts
+++ b/src/app/shared/api-swagger/model/participationEPModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/model/participationFormationModel.ts b/src/app/shared/api-swagger/model/participationFormationModel.ts
index f100d5a..15cb3e0 100644
--- a/src/app/shared/api-swagger/model/participationFormationModel.ts
+++ b/src/app/shared/api-swagger/model/participationFormationModel.ts
@@ -2,20 +2,21 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
-import { CollaborateurModel } from './collaborateurModel';
-import { EvaluationFormationModel } from './evaluationFormationModel';
+import { DemandeFormationModel } from './demandeFormationModel';
import { FormationModel } from './formationModel';
+import { SaisieModel } from './saisieModel';
export interface ParticipationFormationModel {
id: number;
+ dateCreation: Date;
formation: FormationModel;
- collaborateur: CollaborateurModel;
- evaluation?: Array;
+ demandeformation: DemandeFormationModel;
+ evaluations?: Array;
}
diff --git a/src/app/shared/api-swagger/model/rDVEntretienModel.ts b/src/app/shared/api-swagger/model/rDVEntretienModel.ts
index f7bbbf5..43a9493 100644
--- a/src/app/shared/api-swagger/model/rDVEntretienModel.ts
+++ b/src/app/shared/api-swagger/model/rDVEntretienModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
diff --git a/src/app/shared/api-swagger/model/saisieBoolTexteModel.ts b/src/app/shared/api-swagger/model/saisieBoolTexteModel.ts
index 43d41a8..24d1be3 100644
--- a/src/app/shared/api-swagger/model/saisieBoolTexteModel.ts
+++ b/src/app/shared/api-swagger/model/saisieBoolTexteModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,6 +10,7 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
import { SaisieModel } from './saisieModel';
export interface SaisieBoolTexteModel extends SaisieModel {
diff --git a/src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts b/src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts
index f4af233..4bc27d4 100644
--- a/src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts
+++ b/src/app/shared/api-swagger/model/saisieDeuxTextesModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,6 +10,7 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
import { SaisieModel } from './saisieModel';
export interface SaisieDeuxTextesModel extends SaisieModel {
diff --git a/src/app/shared/api-swagger/model/saisieModel.ts b/src/app/shared/api-swagger/model/saisieModel.ts
index c88ee3c..5007899 100644
--- a/src/app/shared/api-swagger/model/saisieModel.ts
+++ b/src/app/shared/api-swagger/model/saisieModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,9 +10,11 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
export interface SaisieModel {
- id?: string;
- type?: string;
- champ?: ChampModel;
+ id: string;
+ type: string;
+ champ: ChampModel;
+ participationFormation?: ParticipationFormationModel;
}
diff --git a/src/app/shared/api-swagger/model/saisieNoteTexteModel.ts b/src/app/shared/api-swagger/model/saisieNoteTexteModel.ts
index de0ffa0..45bb819 100644
--- a/src/app/shared/api-swagger/model/saisieNoteTexteModel.ts
+++ b/src/app/shared/api-swagger/model/saisieNoteTexteModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,6 +10,7 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
import { SaisieModel } from './saisieModel';
export interface SaisieNoteTexteModel extends SaisieModel {
diff --git a/src/app/shared/api-swagger/model/saisieObjectifsModel.ts b/src/app/shared/api-swagger/model/saisieObjectifsModel.ts
index 462adb2..a220d9b 100644
--- a/src/app/shared/api-swagger/model/saisieObjectifsModel.ts
+++ b/src/app/shared/api-swagger/model/saisieObjectifsModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,6 +10,7 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
import { SaisieModel } from './saisieModel';
export interface SaisieObjectifsModel extends SaisieModel {
diff --git a/src/app/shared/api-swagger/model/saisieUnBoolModel.ts b/src/app/shared/api-swagger/model/saisieUnBoolModel.ts
index a8925bf..b7b80d1 100644
--- a/src/app/shared/api-swagger/model/saisieUnBoolModel.ts
+++ b/src/app/shared/api-swagger/model/saisieUnBoolModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,6 +10,7 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
import { SaisieModel } from './saisieModel';
export interface SaisieUnBoolModel extends SaisieModel {
diff --git a/src/app/shared/api-swagger/model/saisieUnTexteModel.ts b/src/app/shared/api-swagger/model/saisieUnTexteModel.ts
index 7466b02..3f1093a 100644
--- a/src/app/shared/api-swagger/model/saisieUnTexteModel.ts
+++ b/src/app/shared/api-swagger/model/saisieUnTexteModel.ts
@@ -2,7 +2,7 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
@@ -10,6 +10,7 @@
* Do not edit the class manually.
*/
import { ChampModel } from './champModel';
+import { ParticipationFormationModel } from './participationFormationModel';
import { SaisieModel } from './saisieModel';
export interface SaisieUnTexteModel extends SaisieModel {
diff --git a/src/app/shared/api-swagger/model/themeModel.ts b/src/app/shared/api-swagger/model/themeModel.ts
index 37b5d55..4183b72 100644
--- a/src/app/shared/api-swagger/model/themeModel.ts
+++ b/src/app/shared/api-swagger/model/themeModel.ts
@@ -2,15 +2,17 @@
* API du serveur de l'application de digitalisation des EP
* API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire.
*
- * OpenAPI spec version: 1.1.0
+ * OpenAPI spec version: 1.2.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
+import { DemandeFormationModel } from './demandeFormationModel';
export interface ThemeModel {
id: number;
nom: string;
+ demandesFormation: Array;
}