diff --git a/openapi.yaml b/openapi.yaml index ff55226..1dd2e4f 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -23,7 +23,7 @@ paths: $ref: ./paths/collaborateur/collaborateurById.yaml /collaborateurs/{idCollaborateur}/ep/referents: $ref: ./paths/collaborateur/referentsPrecedentEPCollaborateur.yaml - /collaborateurs/{mail}: + /collaborateurs/{mail}/mail: $ref: ./paths/collaborateur/collaborateurByMail.yaml /collaborateurs/referent/{idReferent}: $ref: ./paths/collaborateur/collaborateursReferent.yaml @@ -33,9 +33,9 @@ paths: #Note /notes/: $ref: ./paths/note/notes.yaml - /notes/{idAuteur}: + /notes/auteur/{idAuteur}: $ref: ./paths/note/notesIdAuteur.yaml - /notes/{idAuteur}/count: + /notes/auteur/{idAuteur}/count: $ref: ./paths/note/notesIdAuteurCount.yaml /notes/{idNote}: $ref: ./paths/note/notesIdNote.yaml diff --git a/parameters/query/parPage.yaml b/parameters/query/parPage.yaml index 3f24e18..63f8e6f 100644 --- a/parameters/query/parPage.yaml +++ b/parameters/query/parPage.yaml @@ -1,5 +1,5 @@ in: query -name: parPAge +name: parPage schema: type: integer default : 15 diff --git a/paths/collaborateur/collaborateursCount.yaml b/paths/collaborateur/collaborateursCount.yaml index f9abd62..1b48575 100644 --- a/paths/collaborateur/collaborateursCount.yaml +++ b/paths/collaborateur/collaborateursCount.yaml @@ -6,11 +6,7 @@ get: parameters: - $ref: ../../parameters/query/roles.yaml - $ref: ../../parameters/query/idBUs.yaml - - $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 - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml responses: diff --git a/paths/collaborateur/collaborateursReferentCount.yaml b/paths/collaborateur/collaborateursReferentCount.yaml index 0d0c7c9..0f04613 100644 --- a/paths/collaborateur/collaborateursReferentCount.yaml +++ b/paths/collaborateur/collaborateursReferentCount.yaml @@ -5,11 +5,7 @@ get: description: Récupérer le nombre total de collaborateurs d’un référent. parameters: - $ref: ../../parameters/path/idReferent.yaml - - $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/collaborateur/getCountCollaborateur.yaml diff --git a/paths/demandeformation/demandesFormationCount.yaml b/paths/demandeformation/demandesFormationCount.yaml index c46a27f..4e158b1 100644 --- a/paths/demandeformation/demandesFormationCount.yaml +++ b/paths/demandeformation/demandesFormationCount.yaml @@ -6,11 +6,7 @@ get: parameters: - $ref: ../../parameters/query/etatsDemande.yaml - $ref: ../../parameters/query/idBUs.yaml - - $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 - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml responses: diff --git a/paths/engagement/engagements.yaml b/paths/engagement/engagements.yaml index 216e64e..6fe0f33 100644 --- a/paths/engagement/engagements.yaml +++ b/paths/engagement/engagements.yaml @@ -4,8 +4,8 @@ get: operationId: getEngagements description: Récupérer la liste des engagements. parameters: - - $ref: ../../parameters/query/etatsEngagement.yaml - $ref: ../../parameters/query/idBUs.yaml + - $ref: ../../parameters/query/etatsEngagement.yaml - $ref: ../../parameters/query/asc.yaml - $ref: ../../parameters/query/numPage.yaml - $ref: ../../parameters/query/parPage.yaml diff --git a/paths/engagement/engagementsCount.yaml b/paths/engagement/engagementsCount.yaml index 8bbb7ed..548f3b9 100644 --- a/paths/engagement/engagementsCount.yaml +++ b/paths/engagement/engagementsCount.yaml @@ -4,13 +4,9 @@ get: operationId: getEngagementsCount description: Récupérer le nombre total d’engagements. parameters: - - $ref: ../../parameters/query/etatsEngagement.yaml - $ref: ../../parameters/query/idBUs.yaml - - $ref: ../../parameters/query/asc.yaml - - $ref: ../../parameters/query/numPage.yaml - - $ref: ../../parameters/query/parPage.yaml + - $ref: ../../parameters/query/etatsEngagement.yaml - $ref: ../../parameters/query/texte.yaml - - $ref: ../../parameters/query/tri.yaml responses: '200': diff --git a/paths/ep/epEnCours.yaml b/paths/ep/epEnCours.yaml index 9623fdc..5510fb5 100644 --- a/paths/ep/epEnCours.yaml +++ b/paths/ep/epEnCours.yaml @@ -9,6 +9,7 @@ get: - $ref: ../../parameters/query/numPage.yaml - $ref: ../../parameters/query/parPage.yaml - $ref: ../../parameters/query/texte.yaml + - $ref: ../../parameters/query/epObligatoire.yaml - $ref: ../../parameters/query/tri.yaml - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml diff --git a/paths/ep/epEnCoursCount.yaml b/paths/ep/epEnCoursCount.yaml index e257199..36267d0 100644 --- a/paths/ep/epEnCoursCount.yaml +++ b/paths/ep/epEnCoursCount.yaml @@ -5,11 +5,8 @@ get: description: Récupérer le nombre total d’EP en cours. parameters: - $ref: ../../parameters/query/idBUs.yaml - - $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 + - $ref: ../../parameters/query/epObligatoire.yaml - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml responses: diff --git a/paths/ep/epEnCoursIdReferent.yaml b/paths/ep/epEnCoursIdReferent.yaml index 0e01db9..60cc358 100644 --- a/paths/ep/epEnCoursIdReferent.yaml +++ b/paths/ep/epEnCoursIdReferent.yaml @@ -10,7 +10,6 @@ get: - $ref: ../../parameters/query/parPage.yaml - $ref: ../../parameters/query/texte.yaml - $ref: ../../parameters/query/tri.yaml - - $ref: ../../parameters/query/epObligatoire.yaml - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml diff --git a/paths/ep/epEnCoursIdReferentCount.yaml b/paths/ep/epEnCoursIdReferentCount.yaml index 720c4ff..e70bc14 100644 --- a/paths/ep/epEnCoursIdReferentCount.yaml +++ b/paths/ep/epEnCoursIdReferentCount.yaml @@ -5,12 +5,7 @@ get: description: Récupérer le nombre total de prochains EP d’un référent. parameters: - $ref: ../../parameters/path/idReferent.yaml - - $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 - - $ref: ../../parameters/query/epObligatoire.yaml - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml diff --git a/paths/ep/epSignesCount.yaml b/paths/ep/epSignesCount.yaml index 8770dd0..cd8a0ac 100644 --- a/paths/ep/epSignesCount.yaml +++ b/paths/ep/epSignesCount.yaml @@ -5,11 +5,7 @@ get: description: Récupérer le nombre total d’EP signés. parameters: - $ref: ../../parameters/query/idBUs.yaml - - $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 - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml responses: diff --git a/paths/ep/epSignesIdReferentCount.yaml b/paths/ep/epSignesIdReferentCount.yaml index 366bf31..3c35045 100644 --- a/paths/ep/epSignesIdReferentCount.yaml +++ b/paths/ep/epSignesIdReferentCount.yaml @@ -5,11 +5,7 @@ get: description: Récupérer le nombre total d’EP signés qu’un référent à fait passer. parameters: - $ref: ../../parameters/path/idReferent.yaml - - $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 - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml responses: diff --git a/paths/formation/formationsCount.yaml b/paths/formation/formationsCount.yaml index 9377556..b9e2713 100644 --- a/paths/formation/formationsCount.yaml +++ b/paths/formation/formationsCount.yaml @@ -6,11 +6,7 @@ get: parameters: - $ref: ../../parameters/query/idAgence.yaml - $ref: ../../parameters/query/idStatuts.yaml - - $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 - $ref: ../../parameters/query/dateDebut.yaml - $ref: ../../parameters/query/dateFin.yaml responses: diff --git a/paths/note/notesIdAuteurCount.yaml b/paths/note/notesIdAuteurCount.yaml index f849c65..85cf1a5 100644 --- a/paths/note/notesIdAuteurCount.yaml +++ b/paths/note/notesIdAuteurCount.yaml @@ -5,11 +5,7 @@ get: description: Récupérer le nombre total de notes d’un auteur. parameters: - $ref: ../../parameters/path/idAuteur.yaml - - $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/getCountNote.yaml diff --git a/paths/participationformation/participationsCollaborateur.yaml b/paths/participationformation/participationsCollaborateur.yaml index f2e19cb..8b223ca 100644 --- a/paths/participationformation/participationsCollaborateur.yaml +++ b/paths/participationformation/participationsCollaborateur.yaml @@ -1,15 +1,10 @@ get: tags: - participationsFormations - operationId: getParticipationByCollaborateur + operationId: getParticipationsByCollaborateur description: Récupérer la liste des participations de formation d’un collaborateur. parameters: - $ref: ../../parameters/path/idCollaborateur.yaml - - $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/formation/getListeParticipationsFormation.yaml diff --git a/schemas/enum/statutEP.yaml b/schemas/enum/statutEP.yaml index 319b2a5..dc87571 100644 --- a/schemas/enum/statutEP.yaml +++ b/schemas/enum/statutEP.yaml @@ -17,7 +17,7 @@ description: > * `Disponible` - L'EP est disponible pour être saisi par le collaborateur * `Saisi` - L'EP a été saisi par le collaborateur * `DatesProposees` - Des dates d'entretiens ont été proposées par le référent - * `AttenteEntretien` - Indique qu’il s’agit d’un EPS + * `AttenteEntretien` - Le collaborateur a choisi une date, il ne reste plus qu'à attendre l'entretien * `Effectue` - Le référent a marqué l'EP comme étant effectué et peut accéder à sa saisie * `SignatureReferent` - Le référent a complété en signé l'EP * `Signe` - Le collaborateur a signé l'EP diff --git a/schemas/ep/ep.yaml b/schemas/ep/ep.yaml index a4a7d4a..3c2163c 100644 --- a/schemas/ep/ep.yaml +++ b/schemas/ep/ep.yaml @@ -39,7 +39,9 @@ properties: rdvEntretien: $ref: ./rdvEntretien.yaml choixTypeEntretien: - $ref: ./typeEntretien.yaml + type: array + items: + $ref: ./typeEntretien.yaml obligatoire: type: boolean description: Indique si oui ou non l'EP doit obligatoirement être effectué @@ -70,11 +72,9 @@ properties: augmentationSalaire: $ref: ./augmentationSalaire.yaml demandesDelegation: - type: array - items: - $ref: ../demandedelegation/demandeDelegation.yaml + $ref: ../demandedelegation/demandeDelegation.yaml demandeEPI: - $ref: ../demandeepi/demandeEPI.yaml + $ref: ../demandeepi/demandeEPI.yaml documents: type: array items: diff --git a/schemas/formation/evaluation.yaml b/schemas/formation/evaluation.yaml index 248f3e4..be6c152 100644 --- a/schemas/formation/evaluation.yaml +++ b/schemas/formation/evaluation.yaml @@ -24,5 +24,5 @@ required: - id - intitule - dateDebut - - estCertifie + - estCertifiee - saisies \ No newline at end of file diff --git a/schemas/formation/formationDetails.yaml b/schemas/formation/formationDetails.yaml index cdfd614..8b2e0af 100644 --- a/schemas/formation/formationDetails.yaml +++ b/schemas/formation/formationDetails.yaml @@ -39,4 +39,4 @@ required: - dateDebut - dateFin - nbParticipations - - estCertifie \ No newline at end of file + - estCertifiee \ No newline at end of file diff --git a/schemas/saisie/saisie.yaml b/schemas/saisie/saisie.yaml index ebfe18a..08c5f02 100644 --- a/schemas/saisie/saisie.yaml +++ b/schemas/saisie/saisie.yaml @@ -2,9 +2,8 @@ type: object description: DTO concernant la saisie des documents de l'EP. properties: id: - type: string + type: integer format: int64 - description: Id de la saisie note: type: integer description: Note saisie