From 703725e6656cca6a99dd9a2454961bed8c10d3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= Date: Wed, 21 Oct 2020 15:44:01 +0200 Subject: [PATCH] 1.3.5 --- openapi.yaml | 8 +++---- parameters/path/idDemandeDelegation.yaml | 1 + parameters/path/idDemandeEPI.yaml | 1 + parameters/path/idDemandeFormation.yaml | 1 + parameters/path/idEP.yaml | 1 + parameters/path/idEngagement.yaml | 1 + parameters/path/idEvaluation.yaml | 1 + parameters/path/idFormation.yaml | 3 ++- parameters/path/idNote.yaml | 1 + parameters/path/idParticipationFormation.yaml | 3 ++- parameters/query/idAgence.yaml | 1 + parameters/query/idBu.yaml | 1 + .../collaborateurProfilByMail.yaml | 16 ------------- .../demandedelegation/demandesDelegation.yaml | 6 +++++ paths/demandeepi/demandeEPIEnCours.yaml | 2 +- .../demandeepi/demandesEPICollaborateur.yaml | 10 ++++++-- paths/demandeepi/demandesEPIReferent.yaml | 11 +++++++-- paths/note/notes.yaml | 6 +++++ paths/note/notesAuteur.yaml | 5 ++++ paths/note/notesParCollaborateur.yaml | 5 ++++ .../referentActuelByCollaborateur.yaml | 16 +++++++++++++ ...eur.yaml => referentsByCollaborateur.yaml} | 2 +- responses/_index.yaml | 3 --- responses/collaborateur/getProfil.yaml | 5 ---- schemas/_index.yaml | 3 --- schemas/collaborateur/agence.yaml | 3 ++- schemas/collaborateur/businessunit.yaml | 3 ++- schemas/collaborateur/profil.yaml | 24 ------------------- schemas/collaborateur/referent.yaml | 4 ---- .../creationDemandeDelegation.yaml | 1 + .../demandedelegation/demandeDelegation.yaml | 1 + schemas/demandeepi/demandeEPI.yaml | 1 + .../creationDemandeFormation.yaml | 1 + .../demandeformation/demandeFormation.yaml | 1 + schemas/ep/augmentationsalaire.yaml | 3 +++ schemas/ep/document.yaml | 1 + schemas/ep/engagement.yaml | 3 ++- schemas/ep/ep.yaml | 7 +++--- schemas/ep/epInformations.yaml | 7 +++--- schemas/ep/epSaisie.yaml | 3 ++- schemas/ep/objectif.yaml | 1 + schemas/ep/objectifPrecedent.yaml | 1 + schemas/ep/participationEP.yaml | 1 + schemas/ep/prochainEP.yaml | 1 + schemas/ep/rdventretien.yaml | 3 ++- schemas/formation/evaluation.yaml | 1 + schemas/formation/formation.yaml | 8 ++++--- schemas/formation/formationDetails.yaml | 3 +++ schemas/formation/participationformation.yaml | 1 + schemas/note/affichageNote.yaml | 1 + schemas/note/detailsNote.yaml | 1 + schemas/saisie/champ.yaml | 3 ++- schemas/saisie/saisie.yaml | 1 + 53 files changed, 120 insertions(+), 82 deletions(-) delete mode 100644 paths/collaborateur/collaborateurProfilByMail.yaml create mode 100644 paths/referents/referentActuelByCollaborateur.yaml rename paths/referents/{referentbycollaborateur.yaml => referentsByCollaborateur.yaml} (85%) delete mode 100644 responses/collaborateur/getProfil.yaml delete mode 100644 schemas/collaborateur/profil.yaml diff --git a/openapi.yaml b/openapi.yaml index 147c92a..3710b79 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1,6 +1,6 @@ openapi: 3.0.0 info: - version: 1.3.2 + version: 1.3.5 title: API du serveur de l'application de digitalisation des EP description: API qui sra utilisée afin de faire communiquer le client et le serveur ainsi que le serveur et la boîte noire. @@ -19,8 +19,6 @@ paths: $ref: ./paths/collaborateur/collaborateurById.yaml /collaborateurs/mail/{mail}: $ref: ./paths/collaborateur/collaborateurByMail.yaml - /collaborateurs/profil/{mail}: - $ref: ./paths/collaborateur/collaborateurProfilByMail.yaml /collaborateurs/referent/{idReferent}: $ref: ./paths/collaborateur/collaborateursReferent.yaml @@ -46,7 +44,9 @@ paths: /referents/{idReferent}: $ref: ./paths/referents/referentById.yaml /referents/collaborateur/{idCollaborateur}: - $ref: ./paths/referents/referentByCollaborateur.yaml + $ref: ./paths/referents/referentsByCollaborateur.yaml + /referents/actuel/collaborateur/{idCollaborateur}: + $ref: ./paths/referents/referentActuelByCollaborateur.yaml #EP /ep: diff --git a/parameters/path/idDemandeDelegation.yaml b/parameters/path/idDemandeDelegation.yaml index 3961f67..1e4b33d 100644 --- a/parameters/path/idDemandeDelegation.yaml +++ b/parameters/path/idDemandeDelegation.yaml @@ -2,5 +2,6 @@ in: path name: idDemandeDelegation schema: type: integer + format: int64 required: true description: id demande delegation diff --git a/parameters/path/idDemandeEPI.yaml b/parameters/path/idDemandeEPI.yaml index a4e1b75..8711041 100644 --- a/parameters/path/idDemandeEPI.yaml +++ b/parameters/path/idDemandeEPI.yaml @@ -2,5 +2,6 @@ in: path name: idDemandeEPI schema: type: integer + format: int64 required: true description: id demande EPI diff --git a/parameters/path/idDemandeFormation.yaml b/parameters/path/idDemandeFormation.yaml index 4e9f6fa..e248816 100644 --- a/parameters/path/idDemandeFormation.yaml +++ b/parameters/path/idDemandeFormation.yaml @@ -2,5 +2,6 @@ in: path name: idDemandeFormation schema: type: integer + format: int64 required: true description: id demande formation diff --git a/parameters/path/idEP.yaml b/parameters/path/idEP.yaml index 15c6157..76b4767 100644 --- a/parameters/path/idEP.yaml +++ b/parameters/path/idEP.yaml @@ -2,5 +2,6 @@ in: path name: idEP schema: type: integer + format: int64 required: true description: id EP diff --git a/parameters/path/idEngagement.yaml b/parameters/path/idEngagement.yaml index ead38a7..46c9167 100644 --- a/parameters/path/idEngagement.yaml +++ b/parameters/path/idEngagement.yaml @@ -2,5 +2,6 @@ in: path name: idEngagement schema: type: integer + format: int64 required: true description: id engagement diff --git a/parameters/path/idEvaluation.yaml b/parameters/path/idEvaluation.yaml index e24a903..3a52107 100644 --- a/parameters/path/idEvaluation.yaml +++ b/parameters/path/idEvaluation.yaml @@ -2,5 +2,6 @@ in: path name: idEvaluation schema: type: integer + format: int64 required: true description: id evaluation \ No newline at end of file diff --git a/parameters/path/idFormation.yaml b/parameters/path/idFormation.yaml index 322ebed..a01b584 100644 --- a/parameters/path/idFormation.yaml +++ b/parameters/path/idFormation.yaml @@ -1,6 +1,7 @@ in: path name: idFormation schema: - type: number + type: integer + format: int64 required: true description: id formation \ No newline at end of file diff --git a/parameters/path/idNote.yaml b/parameters/path/idNote.yaml index 3613452..7301056 100644 --- a/parameters/path/idNote.yaml +++ b/parameters/path/idNote.yaml @@ -2,5 +2,6 @@ in: path name: idNote schema: type: integer + format: int64 required: true description: id note diff --git a/parameters/path/idParticipationFormation.yaml b/parameters/path/idParticipationFormation.yaml index a3d3325..c3c0a2a 100644 --- a/parameters/path/idParticipationFormation.yaml +++ b/parameters/path/idParticipationFormation.yaml @@ -1,6 +1,7 @@ in: path name: idParticipationFormation schema: - type: number + type: integer + format: int64 required: true description: id participation formation \ No newline at end of file diff --git a/parameters/query/idAgence.yaml b/parameters/query/idAgence.yaml index af56fec..8572611 100644 --- a/parameters/query/idAgence.yaml +++ b/parameters/query/idAgence.yaml @@ -2,4 +2,5 @@ in: query name: idAgence schema: type: integer + format: int64 description: id de l'agence à laquelle sont rattachées les données à récupérer \ No newline at end of file diff --git a/parameters/query/idBu.yaml b/parameters/query/idBu.yaml index d25b8f5..508919a 100644 --- a/parameters/query/idBu.yaml +++ b/parameters/query/idBu.yaml @@ -2,4 +2,5 @@ in: query name: idBU schema: type: integer + format: int64 description: id de la business unit à laquelle sont rattachées les données à récupérer \ No newline at end of file diff --git a/paths/collaborateur/collaborateurProfilByMail.yaml b/paths/collaborateur/collaborateurProfilByMail.yaml deleted file mode 100644 index ea9ae0f..0000000 --- a/paths/collaborateur/collaborateurProfilByMail.yaml +++ /dev/null @@ -1,16 +0,0 @@ -get: - tags: - - collaborateurs - operationId: getProfilCollaborateurByMail - description: Récupérer un profil collaborateur par mail - parameters: - - $ref: ../../parameters/path/mail.yaml - responses: - '200': - $ref: ../../responses/collaborateur/getProfil.yaml - - '403': - $ref: ../../responses/erreur/forbidden.yaml - - '404': - $ref: ../../responses/erreur/notFound.yaml \ No newline at end of file diff --git a/paths/demandedelegation/demandesDelegation.yaml b/paths/demandedelegation/demandesDelegation.yaml index dba2fe0..5dbdb55 100644 --- a/paths/demandedelegation/demandesDelegation.yaml +++ b/paths/demandedelegation/demandesDelegation.yaml @@ -4,7 +4,13 @@ get: operationId: getDemandesDelegation description: Récupération de la liste des demandes de délégation parameters: + - $ref: ../../parameters/query/asc.yaml + - $ref: ../../parameters/query/fonctions.yaml - $ref: ../../parameters/path/idCollaborateur.yaml + - $ref: ../../parameters/query/numPage.yaml + - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/tri.yaml responses: '200': $ref: ../../responses/demandedelegation/getListeDemandesDelegation.yaml diff --git a/paths/demandeepi/demandeEPIEnCours.yaml b/paths/demandeepi/demandeEPIEnCours.yaml index f9f176d..471ddd2 100644 --- a/paths/demandeepi/demandeEPIEnCours.yaml +++ b/paths/demandeepi/demandeEPIEnCours.yaml @@ -1,7 +1,7 @@ get: tags: - demandesEPI - operationId: getEPIEnCours + operationId: getDemandeEPIEnCours description: Récupération de l'EPI en cours d'un collaborateur parameters: - $ref: ../../parameters/path/idCollaborateur.yaml diff --git a/paths/demandeepi/demandesEPICollaborateur.yaml b/paths/demandeepi/demandesEPICollaborateur.yaml index 30a9729..2caceba 100644 --- a/paths/demandeepi/demandesEPICollaborateur.yaml +++ b/paths/demandeepi/demandesEPICollaborateur.yaml @@ -1,10 +1,16 @@ get: tags: - demandesEPI - operationId: getEPICollaborateur - description: Récupération de la liste des précédents EPI d'un collaborateur + operationId: getDemandeEPICollaborateur + description: Récupération de la liste des demandes EPI d'un collaborateur parameters: + - $ref: ../../parameters/query/asc.yaml + - $ref: ../../parameters/query/fonctions.yaml - $ref: ../../parameters/path/idCollaborateur.yaml + - $ref: ../../parameters/query/numPage.yaml + - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/tri.yaml responses: '200': $ref: ../../responses/demandeepi/getListeDemandesEPI.yaml diff --git a/paths/demandeepi/demandesEPIReferent.yaml b/paths/demandeepi/demandesEPIReferent.yaml index b9e0f82..4ed0b43 100644 --- a/paths/demandeepi/demandesEPIReferent.yaml +++ b/paths/demandeepi/demandesEPIReferent.yaml @@ -1,10 +1,17 @@ get: tags: - demandesEPI - operationId: getEPIReferent - description: Récupération de la liste des précédents EPI d'un referent + operationId: getDemandeEPIReferent + description: Récupération de la liste des demandes EPI d'un referent parameters: + - $ref: ../../parameters/query/asc.yaml + - $ref: ../../parameters/query/fonctions.yaml - $ref: ../../parameters/path/idReferent.yaml + - $ref: ../../parameters/query/numPage.yaml + - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/tri.yaml + responses: '200': $ref: ../../responses/demandeepi/getListeDemandesEPI.yaml diff --git a/paths/note/notes.yaml b/paths/note/notes.yaml index 3a672da..94f8598 100644 --- a/paths/note/notes.yaml +++ b/paths/note/notes.yaml @@ -3,6 +3,12 @@ get: - notes operationId: getNotes description: Récupérer toutes les notes + parameters: + - $ref: ../../parameters/query/asc.yaml + - $ref: ../../parameters/query/numPage.yaml + - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/tri.yaml responses: '200': $ref: ../../responses/note/getListeNotes.yaml diff --git a/paths/note/notesAuteur.yaml b/paths/note/notesAuteur.yaml index 551b850..87db0fb 100644 --- a/paths/note/notesAuteur.yaml +++ b/paths/note/notesAuteur.yaml @@ -4,7 +4,12 @@ get: operationId: getNotesByAuteur description: Récupérer les notes d'une personne a écrite parameters: + - $ref: ../../parameters/query/asc.yaml - $ref: ../../parameters/path/idReferent.yaml + - $ref: ../../parameters/query/numPage.yaml + - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/tri.yaml responses: '200': $ref: ../../responses/note/getListeNotes.yaml diff --git a/paths/note/notesParCollaborateur.yaml b/paths/note/notesParCollaborateur.yaml index 81e38eb..d748e96 100644 --- a/paths/note/notesParCollaborateur.yaml +++ b/paths/note/notesParCollaborateur.yaml @@ -4,8 +4,13 @@ get: operationId: getNotesByCollaborateur description: Récupérer une note par son id parameters: + - $ref: ../../parameters/query/asc.yaml - $ref: ../../parameters/path/idCollaborateur.yaml - $ref: ../../parameters/path/idReferent.yaml + - $ref: ../../parameters/query/numPage.yaml + - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/tri.yaml responses: '200': $ref: ../../responses/note/getListeNotes.yaml diff --git a/paths/referents/referentActuelByCollaborateur.yaml b/paths/referents/referentActuelByCollaborateur.yaml new file mode 100644 index 0000000..9b0132a --- /dev/null +++ b/paths/referents/referentActuelByCollaborateur.yaml @@ -0,0 +1,16 @@ +get: + tags: + - referents + operationId: getReferentActuelCollaborateur + description: Récupérer le référent d'un collaborateur + parameters: + - $ref: ../../parameters/path/idCollaborateur.yaml + responses: + '200': + $ref: ../../responses/referent/getReferent.yaml + + '403': + $ref: ../../responses/erreur/forbidden.yaml + + '404': + $ref: ../../responses/erreur/notFound.yaml \ No newline at end of file diff --git a/paths/referents/referentbycollaborateur.yaml b/paths/referents/referentsByCollaborateur.yaml similarity index 85% rename from paths/referents/referentbycollaborateur.yaml rename to paths/referents/referentsByCollaborateur.yaml index b2459bb..c86743a 100644 --- a/paths/referents/referentbycollaborateur.yaml +++ b/paths/referents/referentsByCollaborateur.yaml @@ -1,7 +1,7 @@ get: tags: - referents - operationId: getReferentByCollaborateur + operationId: getReferentsByCollaborateur description: Récupérer la liste des référents d'un collaborateur parameters: - $ref: ../../parameters/query/asc.yaml diff --git a/responses/_index.yaml b/responses/_index.yaml index 5279f9b..9951c7d 100644 --- a/responses/_index.yaml +++ b/responses/_index.yaml @@ -13,9 +13,6 @@ GetCollaborateurResponse: GetListecollaborateursResponse: $ref: ./collaborateur/getListeCollaborateurs.yaml -GetProfilResponse: - $ref: ./collaborateur/getProfil.yaml - #Note GetListeNoteResponse: diff --git a/responses/collaborateur/getProfil.yaml b/responses/collaborateur/getProfil.yaml deleted file mode 100644 index 762504d..0000000 --- a/responses/collaborateur/getProfil.yaml +++ /dev/null @@ -1,5 +0,0 @@ -description: OK -content: - application/json: - schema: - $ref: ../../schemas/collaborateur/profil.yaml diff --git a/schemas/_index.yaml b/schemas/_index.yaml index 9e9efea..b2f894b 100644 --- a/schemas/_index.yaml +++ b/schemas/_index.yaml @@ -11,9 +11,6 @@ CollaborateurDTO: ReferentDTO: $ref: ./collaborateur/referent.yaml -ProfilDTO: - $ref: ./collaborateur/profil.yaml - #Note AffichageNoteDTO: $ref: ./note/affichageNote.yaml diff --git a/schemas/collaborateur/agence.yaml b/schemas/collaborateur/agence.yaml index e505c37..9f3d9ff 100644 --- a/schemas/collaborateur/agence.yaml +++ b/schemas/collaborateur/agence.yaml @@ -2,7 +2,8 @@ type: object description: Une agence de Apside properties: id: - type: number + type: integer + format: int64 nom: type: string bu: diff --git a/schemas/collaborateur/businessunit.yaml b/schemas/collaborateur/businessunit.yaml index 7496ef4..d0111c4 100644 --- a/schemas/collaborateur/businessunit.yaml +++ b/schemas/collaborateur/businessunit.yaml @@ -2,7 +2,8 @@ type: object description: Une business unit d'une agence properties: id: - type: number + type: integer + format: int64 nom: type: string agence: diff --git a/schemas/collaborateur/profil.yaml b/schemas/collaborateur/profil.yaml deleted file mode 100644 index 820cc95..0000000 --- a/schemas/collaborateur/profil.yaml +++ /dev/null @@ -1,24 +0,0 @@ -type: object -description: Information utile à avoir lorsqu'un utilisateur se connecte -properties: - id: - type: string - format: uuid - nom: - type: string - prenom: - type: string - mailApside: - type: string - format: email - dateArrivee: - type: string - format: date-time - businessUnit: - $ref: ./businessUnit.yaml -required: - - id - - nom - - prenom - - mailApside - - businessunit \ No newline at end of file diff --git a/schemas/collaborateur/referent.yaml b/schemas/collaborateur/referent.yaml index 05f1d69..71c3185 100644 --- a/schemas/collaborateur/referent.yaml +++ b/schemas/collaborateur/referent.yaml @@ -13,10 +13,6 @@ properties: format: email businessUnit: $ref: ./businessUnit.yaml - collaborateurs: - type: array - items: - $ref: ./collaborateur.yaml required: - id - nom diff --git a/schemas/demandedelegation/creationDemandeDelegation.yaml b/schemas/demandedelegation/creationDemandeDelegation.yaml index c242ee7..3f6a5aa 100644 --- a/schemas/demandedelegation/creationDemandeDelegation.yaml +++ b/schemas/demandedelegation/creationDemandeDelegation.yaml @@ -3,6 +3,7 @@ description: Objet à envoyer lorsqu'un référent fait une demande de délégat properties: idEp: type: integer + format: int64 idReferent: $ref: ../collaborateur/collaborateur.yaml raisonDemande: diff --git a/schemas/demandedelegation/demandeDelegation.yaml b/schemas/demandedelegation/demandeDelegation.yaml index 554409d..43d70de 100644 --- a/schemas/demandedelegation/demandeDelegation.yaml +++ b/schemas/demandedelegation/demandeDelegation.yaml @@ -3,6 +3,7 @@ description: Les détails d'une demande de délégation d'un EP properties: id: type: integer + format: int64 ep: $ref: ../ep/epInformations.yaml dateDemande: diff --git a/schemas/demandeepi/demandeEPI.yaml b/schemas/demandeepi/demandeEPI.yaml index 168f44f..c76cf92 100644 --- a/schemas/demandeepi/demandeEPI.yaml +++ b/schemas/demandeepi/demandeEPI.yaml @@ -3,6 +3,7 @@ description: Demande d'EPI faite par un collaborateur properties: id: type: integer + format: int64 idCollaborateur: type: string format: uuid diff --git a/schemas/demandeformation/creationDemandeFormation.yaml b/schemas/demandeformation/creationDemandeFormation.yaml index 9250ce8..fc8db42 100644 --- a/schemas/demandeformation/creationDemandeFormation.yaml +++ b/schemas/demandeformation/creationDemandeFormation.yaml @@ -3,6 +3,7 @@ description: Objet à envoyer lors d'une demande de formation properties: id: type: integer + format: int64 libelle: type: string description: diff --git a/schemas/demandeformation/demandeFormation.yaml b/schemas/demandeformation/demandeFormation.yaml index 532f6a7..cfceed3 100644 --- a/schemas/demandeformation/demandeFormation.yaml +++ b/schemas/demandeformation/demandeFormation.yaml @@ -3,6 +3,7 @@ description: Les détails d'une demande de formation properties: id: type: integer + format: int64 libelle: type: string description: diff --git a/schemas/ep/augmentationsalaire.yaml b/schemas/ep/augmentationsalaire.yaml index 9046e7e..a93a4cb 100644 --- a/schemas/ep/augmentationsalaire.yaml +++ b/schemas/ep/augmentationsalaire.yaml @@ -3,10 +3,13 @@ description: Demande d'augmentation du salaire du collaborateur properties: id: type: integer + format: int64 augmentation: type: number + format : float primeMission: type: number + format: float message: type: string required: diff --git a/schemas/ep/document.yaml b/schemas/ep/document.yaml index bd730bd..eb6aa62 100644 --- a/schemas/ep/document.yaml +++ b/schemas/ep/document.yaml @@ -3,6 +3,7 @@ description: Un document pour récupérer les saisies et leur champ en fonction properties: id: type: integer + format: int64 type: type: string saisies: diff --git a/schemas/ep/engagement.yaml b/schemas/ep/engagement.yaml index d3b28c3..004eced 100644 --- a/schemas/ep/engagement.yaml +++ b/schemas/ep/engagement.yaml @@ -2,7 +2,8 @@ type: object description: Les détails d'un engagement pris par un référent pour un EP properties: id: - type: number + type: integer + format: int64 action: type: string modalite: diff --git a/schemas/ep/ep.yaml b/schemas/ep/ep.yaml index 5eeb418..7ed78f9 100644 --- a/schemas/ep/ep.yaml +++ b/schemas/ep/ep.yaml @@ -2,7 +2,8 @@ type: object description: Tous les détails d'un EP lorsqu'il est consulté properties: id: - type: number + type: integer + format: int64 type: type: string dateDisponibilite: @@ -15,7 +16,7 @@ properties: type: string format: date-time statut: - type: number + type: integer cv: type: string propositionsEntretien: @@ -43,7 +44,7 @@ properties: collaborateur: $ref: ../collaborateur/collaborateur.yaml referent: - $ref: ../collaborateur/collaborateur.yaml + $ref: ../collaborateur/referent.yaml demandesFormation: type: array items: diff --git a/schemas/ep/epInformations.yaml b/schemas/ep/epInformations.yaml index ab719aa..c544de0 100644 --- a/schemas/ep/epInformations.yaml +++ b/schemas/ep/epInformations.yaml @@ -2,11 +2,12 @@ type: object description: Les informations de base d'un EP properties: id: - type: number + type: integer + format: int64 type: type: integer statut: - type: number + type: integer dateDisponibilite: type: string format: date-time @@ -18,7 +19,7 @@ properties: collaborateur: $ref: ../collaborateur/collaborateur.yaml referent: - $ref: ../collaborateur/collaborateur.yaml + $ref: ../collaborateur/referent.yaml required: - id diff --git a/schemas/ep/epSaisie.yaml b/schemas/ep/epSaisie.yaml index 61feaed..c517f89 100644 --- a/schemas/ep/epSaisie.yaml +++ b/schemas/ep/epSaisie.yaml @@ -2,7 +2,8 @@ type: object description: Objet de l'EP au moment de la saisie du collaborateur properties: id: - type: number + type: integer + format: int64 type: type: string datePrevisionnelle: diff --git a/schemas/ep/objectif.yaml b/schemas/ep/objectif.yaml index f69608d..a981ce9 100644 --- a/schemas/ep/objectif.yaml +++ b/schemas/ep/objectif.yaml @@ -3,6 +3,7 @@ description: Les objectifs pris par le collaborateur properties: id: type: integer + format: int64 libelle: type: string diff --git a/schemas/ep/objectifPrecedent.yaml b/schemas/ep/objectifPrecedent.yaml index 7c5204a..ec760ff 100644 --- a/schemas/ep/objectifPrecedent.yaml +++ b/schemas/ep/objectifPrecedent.yaml @@ -3,6 +3,7 @@ description: Les objectifs pris par le collaborateur durant le précédent EP properties: id: type: integer + format: int64 libelle: type: string atteint: diff --git a/schemas/ep/participationEP.yaml b/schemas/ep/participationEP.yaml index cd90744..92f4b9d 100644 --- a/schemas/ep/participationEP.yaml +++ b/schemas/ep/participationEP.yaml @@ -3,6 +3,7 @@ description: Information des participants d'un EP (autre que le référent et le properties: id: type: integer + format: int64 idCollaborateur: type: string format: uuid diff --git a/schemas/ep/prochainEP.yaml b/schemas/ep/prochainEP.yaml index 28b9260..fb69175 100644 --- a/schemas/ep/prochainEP.yaml +++ b/schemas/ep/prochainEP.yaml @@ -3,6 +3,7 @@ description: Objet contenant les détails du prochain EP non saisi du collaborat properties: id: type: integer + format: int64 type: type: integer dateDisponibilite: diff --git a/schemas/ep/rdventretien.yaml b/schemas/ep/rdventretien.yaml index ef0185a..bfe569f 100644 --- a/schemas/ep/rdventretien.yaml +++ b/schemas/ep/rdventretien.yaml @@ -2,7 +2,8 @@ type: object description: RDV pour un entretien properties: id: - type: number + type: integer + format: int64 dateEntretien: type: string format: date-time diff --git a/schemas/formation/evaluation.yaml b/schemas/formation/evaluation.yaml index 47f71bc..49a4c49 100644 --- a/schemas/formation/evaluation.yaml +++ b/schemas/formation/evaluation.yaml @@ -3,6 +3,7 @@ description: Evaluation d'une participation formation properties: idParticipation: type: integer + format: int64 saisies: type: array items: diff --git a/schemas/formation/formation.yaml b/schemas/formation/formation.yaml index 35430dd..adcb031 100644 --- a/schemas/formation/formation.yaml +++ b/schemas/formation/formation.yaml @@ -3,6 +3,7 @@ description: Toutes les informations d'une formation properties: id: type: integer + format: int64 intitule: type: string origine: @@ -11,6 +12,7 @@ properties: $ref: ./statutFormation.yaml idAgence: type: integer + format: int64 dateDebut: type: string format: date-time @@ -18,9 +20,9 @@ properties: type: string format: date-time heure: - type: number + type: integer jour: - type: number + type: integer organisme: type: string mode: @@ -32,7 +34,7 @@ properties: participantsFormation: type: array items: - $ref: participationformation.yaml + $ref: ./participationformation.yaml required: diff --git a/schemas/formation/formationDetails.yaml b/schemas/formation/formationDetails.yaml index de5d8d4..67fe266 100644 --- a/schemas/formation/formationDetails.yaml +++ b/schemas/formation/formationDetails.yaml @@ -3,6 +3,7 @@ description: Les détails d'une formation properties: id: type: integer + format: int64 intitule: type: string statut: @@ -15,6 +16,8 @@ properties: format: date-time nbPartitipants: type: integer + origine: + $ref: ./origineFormation.yaml mode: $ref: ./modeFormation.yaml type: diff --git a/schemas/formation/participationformation.yaml b/schemas/formation/participationformation.yaml index ba5d05b..e8b3133 100644 --- a/schemas/formation/participationformation.yaml +++ b/schemas/formation/participationformation.yaml @@ -2,6 +2,7 @@ type: object properties: id: type: integer + format: int64 dateCreation: type: string format: date-time diff --git a/schemas/note/affichageNote.yaml b/schemas/note/affichageNote.yaml index 801fedb..abed374 100644 --- a/schemas/note/affichageNote.yaml +++ b/schemas/note/affichageNote.yaml @@ -3,6 +3,7 @@ description: Note affiché dans un tableau properties: id: type: integer + format: int64 titre: type: string idCollaborateur: diff --git a/schemas/note/detailsNote.yaml b/schemas/note/detailsNote.yaml index ada06a2..9bc37f1 100644 --- a/schemas/note/detailsNote.yaml +++ b/schemas/note/detailsNote.yaml @@ -3,6 +3,7 @@ description: Détails d'une note que peut prendre un commercial, un delivery ou properties: id: type: integer + format: int64 titre: type: string texte: diff --git a/schemas/saisie/champ.yaml b/schemas/saisie/champ.yaml index 015095b..4e24dff 100644 --- a/schemas/saisie/champ.yaml +++ b/schemas/saisie/champ.yaml @@ -3,6 +3,7 @@ description: Les champs d'un EP ou d'une évaluation à remplir properties: id: type: integer + format: int64 texte: type: string section: @@ -10,7 +11,7 @@ properties: soussection: type: string ordre: - type: number + type: integer typeChamp: type: string typeSaisie: diff --git a/schemas/saisie/saisie.yaml b/schemas/saisie/saisie.yaml index 3cfc40e..5188212 100644 --- a/schemas/saisie/saisie.yaml +++ b/schemas/saisie/saisie.yaml @@ -3,6 +3,7 @@ description: Saisi d'un collaborateur ou d'un référent sur un champ properties: id: type: string + format: int64 typeSaisie: type: integer note: