diff --git a/admin/app/components/certification-centers/habilitation-tag.gjs b/admin/app/components/certification-centers/habilitation-tag.gjs index 54d0fb12431..1d36cc24fdb 100644 --- a/admin/app/components/certification-centers/habilitation-tag.gjs +++ b/admin/app/components/certification-centers/habilitation-tag.gjs @@ -14,7 +14,7 @@ export default class HabilitationTag extends Component { diff --git a/admin/app/components/certifications/certification/details-v3.gjs b/admin/app/components/certifications/certification/details-v3.gjs index 418cff3188b..7352c9acc67 100644 --- a/admin/app/components/certifications/certification/details-v3.gjs +++ b/admin/app/components/certifications/certification/details-v3.gjs @@ -354,7 +354,7 @@ export default class DetailsV3 extends Component { {{certificationChallenge.competenceIndex}} {{certificationChallenge.competenceName}} {{certificationChallenge.skillName}} - + - + {{#if certificationChallenge.validatedLiveAlert}} diff --git a/admin/app/components/certifications/certification/details-v3.scss b/admin/app/components/certifications/certification/details-v3.scss index 45c098661b8..41ccdb338fc 100644 --- a/admin/app/components/certifications/certification/details-v3.scss +++ b/admin/app/components/certifications/certification/details-v3.scss @@ -70,6 +70,14 @@ width: 18%; } + &__challenge-informations-cell { + & a, a:visited { + align-items: center; + display: flex; + gap: var(--pix-spacing-1x); + } + } + &__challenge-action-cell { display: flex; height: inherit; @@ -79,7 +87,7 @@ padding: 2px 5px; } - & a, a:visited, { + & a, a:visited, button { align-items: center; display: flex; flex-direction: column; diff --git a/admin/app/components/certifications/certification/informations.gjs b/admin/app/components/certifications/certification/informations.gjs new file mode 100644 index 00000000000..0e64affa2e7 --- /dev/null +++ b/admin/app/components/certifications/certification/informations.gjs @@ -0,0 +1,282 @@ +import PixButton from '@1024pix/pix-ui/components/pix-button'; +import PixButtonLink from '@1024pix/pix-ui/components/pix-button-link'; +import PixIconButton from '@1024pix/pix-ui/components/pix-icon-button'; +import PixSelect from '@1024pix/pix-ui/components/pix-select'; +import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip'; +import dayjsFormat from 'ember-dayjs/helpers/dayjs-format'; + +import ConfirmPopup from '../../confirm-popup'; +import CandidateEditModal from '../candidate-edit-modal'; +import CertificationCompetenceList from '../competence-list'; +import CertificationInfoField from '../info-field'; +import CertificationInfoTag from '../info-tag'; +import CertificationIssueReports from '../issue-reports'; +import CertificationComments from './comments'; + + diff --git a/admin/app/components/certifications/issue-report.gjs b/admin/app/components/certifications/issue-report.gjs index 8f3ffada4b5..d0930f1e088 100644 --- a/admin/app/components/certifications/issue-report.gjs +++ b/admin/app/components/certifications/issue-report.gjs @@ -29,10 +29,9 @@ export default class CertificationIssueReport extends Component { {{#if (or (not @issueReport.isImpactful) @issueReport.resolvedAt)}} {{else}} {{/if}} diff --git a/admin/app/templates/authenticated/certifications/certification/informations.hbs b/admin/app/templates/authenticated/certifications/certification/informations.hbs index ee6830af940..8ecc968c140 100644 --- a/admin/app/templates/authenticated/certifications/certification/informations.hbs +++ b/admin/app/templates/authenticated/certifications/certification/informations.hbs @@ -1,274 +1,39 @@ -
-
- - Voir les détails de l'utilisateur - - {{#if this.certification.isCancelled}} - - Désannuler la certification - - {{else}} - - - Annuler la certification - - - {{#if this.shouldDisplayUnrejectCertificationButton}} - - Annuler le rejet - - {{/if}} - - {{#if this.shouldDisplayRejectCertificationButton}} - {{#if this.certification.isPublished}} - - <:triggerElement> - - Rejeter la certification - - - - <:tooltip>Vous ne pouvez pas rejeter une certification publiée. Merci de dépublier la session avant de - rejeter cette certification. - - - {{else}} - - Rejeter la certification - - {{/if}} - {{/if}} - - {{/if}} -
- -
-
-

- - État -

- - - - - -
- -
-

Candidat

-
- Prénom : - {{this.certification.firstName}} -
-
- Nom de famille : - {{this.certification.lastName}} -
-
- Date de naissance : - {{dayjs-format this.certification.birthdate "DD/MM/YYYY" allow-empty=true}} -
-
- Sexe : - {{this.certification.sex}} -
-
- Commune de naissance : - {{this.certification.birthplace}} -
-
- Code postal de naissance : - {{this.certification.birthPostalCode}} -
-
- Code INSEE de naissance : - {{this.certification.birthInseeCode}} -
-
- Pays de naissance : - {{this.certification.birthCountry}} -
- -
- - Modifier infos candidat - -
-
-
- - {{#if this.certification.hasComplementaryCertifications}} -
-
-

Certification complémentaire

- - {{#if this.certification.commonComplementaryCertificationCourseResult}} -
    -
  • - - {{this.certification.commonComplementaryCertificationCourseResult.label}} - : - - {{this.certification.commonComplementaryCertificationCourseResult.status}} -
  • -
- {{/if}} - - {{#if this.certification.complementaryCertificationCourseResultWithExternal}} -
-

Résultats de la certification complémentaire Pix+ Edu - :

-
-
-

VOLET PIX

-

- {{this.certification.complementaryCertificationCourseResultWithExternal.pixResult}} -

-
-
-

VOLET JURY

- {{#if this.displayJuryLevelSelect}} -
-
- - <:label>Sélectionner un niveau - -
-
- - Annuler - - - Enregistrer - -
-
- {{else}} -
-

- {{this.certification.complementaryCertificationCourseResultWithExternal.externalResult}} -

- {{#if this.shouldDisplayJuryLevelEditButton}} - - {{/if}} -
- {{/if}} -
-
-

NIVEAU FINAL

-

{{this.certification.complementaryCertificationCourseResultWithExternal.finalResult}}

-
-
-
- {{/if}} -
-
- {{/if}} - - {{#if this.hasIssueReports}} -
-

Signalements

- -
- {{/if}} - - - -
-
-

Résultats

- - - -
-
-
- - - -{{#if this.isCandidateEditModalOpen}} - -{{/if}} \ No newline at end of file + \ No newline at end of file diff --git a/admin/tests/integration/components/certifications/certification/details-v3-test.gjs b/admin/tests/integration/components/certifications/certification/details-v3-test.gjs index 437c4a68cf8..328fc1e768a 100644 --- a/admin/tests/integration/components/certifications/certification/details-v3-test.gjs +++ b/admin/tests/integration/components/certifications/certification/details-v3-test.gjs @@ -483,7 +483,7 @@ module('Integration | Component | Certifications | certification > details v3', answer.answerStatusName, `${answer.competenceIndex} ${answer.competenceName}`, answer.skillName, - `${answer.id.toString()} `, + `${answer.id.toString()}`, ]); assert.deepEqual(expected, result); });