Skip to content

Commit 4cf210d

Browse files
fbonniecfbonniec
committed
feat(admin,api): added missing rncpPublishedAt and rncpEffectiveAt properties
1 parent 8150c45 commit 4cf210d

File tree

15 files changed

+71
-27
lines changed

15 files changed

+71
-27
lines changed

‎packages/reva-admin-react/cypress/e2e/responsable-certifications/certifications/update-certification-description-page/fixtures/certification-bp-boucher.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"status": "A_VALIDER_PAR_CERTIFICATEUR",
88
"rncpExpiresAt": 1788127200000,
99
"rncpDeliveryDeadline": null,
10+
"rncpPublishedAt": null,
11+
"rncpEffectiveAt": null,
1012
"availableAt": 1688162400000,
1113
"expiresAt": null,
1214
"typeDiplome": null,

‎packages/reva-admin-react/cypress/e2e/responsable-certifications/certifications/update-certification-description-page/update-certification-description-page.cy.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,10 @@ context("when i access the update certification description page ", () => {
4242
"@getCertificationForCertificationRegistryManagerUpdateCertificationDescriptionPage",
4343
);
4444

45-
cy.get(
46-
'[data-test="certification-registry-manager-update-certification-description-page"]',
47-
)
48-
.children("h1")
49-
.should("have.text", "Descriptif de la certification");
50-
51-
cy.get('[data-test="rncp-code-title"]')
52-
.children("dd")
53-
.should("have.text", "37310");
45+
cy.get('[data-test="certification-description-card"]')
46+
.children("div")
47+
.children("div")
48+
.children("h2")
49+
.should("have.text", "Informations liées au code RNCP 37310");
5450
});
5551
});

‎packages/reva-admin-react/cypress/e2e/responsable-certifications/certifications/update-certification-page/fixtures/certification-bp-boucher.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"status": "A_VALIDER_PAR_CERTIFICATEUR",
88
"rncpExpiresAt": 1788127200000,
99
"rncpDeliveryDeadline": null,
10+
"rncpPublishedAt": null,
11+
"rncpEffectiveAt": null,
1012
"availableAt": 1688162400000,
1113
"expiresAt": null,
1214
"typeDiplome": null,

‎packages/reva-admin-react/src/app/responsable-certifications/certifications/[certificationId]/description/page.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -264,25 +264,23 @@ const PageContent = ({
264264
<div className="flex flex-col gap-8">
265265
<EnhancedSectionCard
266266
data-test="certification-description-card"
267-
title="Descriptif de la certification"
267+
title={`Informations liées au code RNCP ${certification.codeRncp}`}
268268
status="TO_COMPLETE"
269-
titleIconClass="fr-icon-award-fill"
270269
>
271270
<div className="flex flex-col gap-4">
272-
<Info data_test="rncp-code-title" title="Code RNCP">
273-
{certification.codeRncp}
274-
</Info>
275-
<h3 className="mb-0">Descriptif de la certification</h3>
271+
<h3 className="mb-0">
272+
Descriptif de la certification dans France compétences
273+
</h3>
276274
<Info title="Intitulé">{certification.label}</Info>
277275
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
278276
<Info title="Niveau">{certification.degree.label}</Info>
279277
<Info title="Type">{certification.typeDiplome || "Inconnu"}</Info>
280-
<Info title="Date d’échéance">
281-
{certification.rncpExpiresAt
282-
? format(certification.rncpExpiresAt, "dd/MM/yyyy")
278+
<Info title="Date de publication">
279+
{certification.rncpPublishedAt
280+
? format(certification.rncpPublishedAt, "dd/MM/yyyy")
283281
: "Inconnue"}
284282
</Info>
285-
<Info title="Date de dernière delivrance">
283+
<Info title="Date d'échéance">
286284
{certification.rncpDeliveryDeadline
287285
? format(certification.rncpDeliveryDeadline, "dd/MM/yyyy")
288286
: "Inconnue"}
@@ -481,14 +479,12 @@ const Info = ({
481479
title,
482480
children,
483481
className,
484-
data_test,
485482
}: {
486483
title: string;
487484
children: ReactNode;
488485
className?: string;
489-
data_test?: string;
490486
}) => (
491-
<dl data-test={data_test} className={`${className || ""}`}>
487+
<dl className={`${className || ""}`}>
492488
<dt className="mb-1">{title}</dt>
493489
<dd className="font-medium">{children}</dd>
494490
</dl>

‎packages/reva-admin-react/src/app/responsable-certifications/certifications/[certificationId]/description/updateCertificationDescription.hook.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ const getCertificationQuery = graphql(`
1313
codeRncp
1414
status
1515
rncpExpiresAt
16+
rncpPublishedAt
17+
rncpEffectiveAt
1618
rncpDeliveryDeadline
1719
availableAt
1820
expiresAt

‎packages/reva-admin-react/src/app/responsable-certifications/certifications/[certificationId]/page.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,24 @@ const PageContent = ({
113113
{certification.availableAt && certification.expiresAt ? (
114114
<div>{`du ${format(certification.availableAt, "dd/MM/yyyy")} au ${format(certification.expiresAt, "dd/MM/yyyy")}`}</div>
115115
) : (
116-
"Non renseigné"
116+
"À compléter"
117117
)}
118118
</Info>
119119

120120
<div>
121121
<label className="text-xs text-dsfrGray-mentionGrey">{`RNCP ${certification.codeRncp}`}</label>
122122
<h3 className="mb-0">{certification.label}</h3>
123123
</div>
124-
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
124+
<div className="grid grid-cols-1 md:grid-cols-4 gap-4">
125125
<Info title="Niveau">{certification.degree.label}</Info>
126-
<Info title="Type">{certification.typeDiplome || "Inconnu"}</Info>
126+
<Info title="Type de certification">
127+
{certification.typeDiplome || "Inconnu"}
128+
</Info>
129+
<Info title="Date de publication">
130+
{certification.rncpPublishedAt
131+
? format(certification.rncpPublishedAt, "dd/MM/yyyy")
132+
: "Inconnue"}
133+
</Info>
127134
<Info title="Date d’échéance">
128135
{certification.rncpDeliveryDeadline
129136
? format(certification.rncpDeliveryDeadline, "dd/MM/yyyy")
@@ -138,7 +145,7 @@ const PageContent = ({
138145
JuryFrequencies.find(
139146
({ id }) => id == certification.juryFrequency,
140147
)?.label ||
141-
"Non renseigné"}
148+
"À compléter"}
142149
</Info>
143150
<Info title="Modalités d'évaluation :">
144151
{certification.juryModalities.length > 0
@@ -147,7 +154,7 @@ const PageContent = ({
147154
`${acc}${acc && ","} ${EvaluationModalities.find(({ id }) => id == modality)?.label}`,
148155
"",
149156
)
150-
: "Non renseigné"}
157+
: "À compléter"}
151158
</Info>
152159
{certification.juryPlace && (
153160
<Info title="Lieu où se déroulera le passage : ">

‎packages/reva-admin-react/src/app/responsable-certifications/certifications/[certificationId]/updateCertification.hook.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ const getCertificationQuery = graphql(`
1212
codeRncp
1313
status
1414
rncpExpiresAt
15+
rncpPublishedAt
16+
rncpEffectiveAt
1517
rncpDeliveryDeadline
1618
availableAt
1719
expiresAt

‎packages/reva-api/modules/referential/features/addCertification.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ export const addCertification = async (params: { codeRncp: string }) => {
6464
rncpDeliveryDeadline: rncpCertification.DATE_LIMITE_DELIVRANCE
6565
? new Date(rncpCertification.DATE_LIMITE_DELIVRANCE)
6666
: null,
67+
rncpPublishedAt: rncpCertification.DATE_DE_PUBLICATION
68+
? new Date(rncpCertification.DATE_DE_PUBLICATION)
69+
: null,
70+
rncpEffectiveAt: rncpCertification.DATE_EFFET
71+
? new Date(rncpCertification.DATE_EFFET)
72+
: null,
6773
fcPrerequisites: rncpCertification.PREREQUIS.LISTE_PREREQUIS,
6874
prerequisites: {
6975
createMany: {

‎packages/reva-api/modules/referential/features/updateCertificationWithRncpFields.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ export const updateCertificationWithRncpFields = async (params: {
5555
rncpDeliveryDeadline: rncpCertification.DATE_LIMITE_DELIVRANCE
5656
? new Date(rncpCertification.DATE_LIMITE_DELIVRANCE)
5757
: null,
58+
rncpPublishedAt: rncpCertification.DATE_DE_PUBLICATION
59+
? new Date(rncpCertification.DATE_DE_PUBLICATION)
60+
: null,
61+
rncpEffectiveAt: rncpCertification.DATE_EFFET
62+
? new Date(rncpCertification.DATE_EFFET)
63+
: null,
5864
},
5965
});
6066
};

‎packages/reva-api/modules/referential/features/updateCertificationWithRncpFieldsAndSubDomains.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ export const updateCertificationWithRncpFieldsAndSubDomains = async (params: {
4141
rncpDeliveryDeadline: rncpCertification.DATE_LIMITE_DELIVRANCE
4242
? new Date(rncpCertification.DATE_LIMITE_DELIVRANCE)
4343
: null,
44+
rncpPublishedAt: rncpCertification.DATE_DE_PUBLICATION
45+
? new Date(rncpCertification.DATE_DE_PUBLICATION)
46+
: null,
47+
rncpEffectiveAt: rncpCertification.DATE_EFFET
48+
? new Date(rncpCertification.DATE_EFFET)
49+
: null,
4450
},
4551
});
4652

0 commit comments

Comments
 (0)