Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2955 - Possibilité de valider un mini-stage si on a moins de 15 ans #2989

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#2955 - Possibilité de valider un mini-stage si on a moins de 15 ans #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions front/src/app/components/forms/convention/ConventionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ export const ConventionForm = ({
<div className={fr.cx("fr-accordions-group")}>
<Accordion
label={
<RenderSectionTitle
<SectionTitle
title={t.agencySection.title}
step={1}
currentStep={currentStep}
Expand Down Expand Up @@ -433,7 +433,7 @@ export const ConventionForm = ({

<Accordion
label={
<RenderSectionTitle
<SectionTitle
title={t.beneficiarySection.title}
step={2}
currentStep={currentStep}
Expand All @@ -451,7 +451,7 @@ export const ConventionForm = ({
</Accordion>
<Accordion
label={
<RenderSectionTitle
<SectionTitle
title={t.establishmentSection.title}
step={3}
currentStep={currentStep}
Expand All @@ -467,7 +467,7 @@ export const ConventionForm = ({
</Accordion>
<Accordion
label={
<RenderSectionTitle
<SectionTitle
title={t.immersionHourLocationSection.title}
step={4}
currentStep={currentStep}
Expand Down Expand Up @@ -495,7 +495,7 @@ export const ConventionForm = ({
</Accordion>
<Accordion
label={
<RenderSectionTitle
<SectionTitle
title={t.immersionDetailsSection.title}
step={5}
currentStep={currentStep}
Expand Down Expand Up @@ -644,7 +644,14 @@ const useWaitForReduxFormUiReadyBeforeInitialisation = (

useEffect(() => {
dispatch(
conventionSlice.actions.isMinorChanged(isBeneficiaryMinor(initialValues)),
conventionSlice.actions.isMinorChanged(
isBeneficiaryMinor({
beneficiaryRepresentative:
initialValues.signatories.beneficiaryRepresentative,
beneficiaryBirthdate: initialValues.signatories.beneficiary.birthdate,
conventionDateStart: initialValues.dateStart,
}),
),
);
dispatch(
conventionSlice.actions.isCurrentEmployerChanged(
Expand All @@ -662,7 +669,7 @@ const useWaitForReduxFormUiReadyBeforeInitialisation = (
return reduxFormUiReady;
};

const RenderSectionTitle = ({
const SectionTitle = ({
title,
step,
stepsStatus,
Expand Down
11 changes: 5 additions & 6 deletions front/src/app/components/forms/convention/sections/beneficiary/BeneficiaryFormSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Input } from "@codegouvfr/react-dsfr/Input";
import { RadioButtons } from "@codegouvfr/react-dsfr/RadioButtons";
import { Select } from "@codegouvfr/react-dsfr/SelectNext";
import { differenceInYears } from "date-fns";
import { keys } from "ramda";
import React, { useCallback, useEffect, useState } from "react";
import { useFormContext } from "react-hook-form";
Expand All @@ -13,6 +12,7 @@ import {
addressDtoToString,
domElementIds,
emailSchema,
isBeneficiaryMinorAccordingToAge,
isBeneficiaryStudent,
levelsOfEducation,
toLowerCaseWithoutDiacritics,
Expand Down Expand Up @@ -119,11 +119,10 @@ export const BeneficiaryFormSection = ({

const onBirthdateChange = useCallback(
(value: string) => {
const age = differenceInYears(
new Date(values.dateStart),
new Date(value),
const newIsMinor = isBeneficiaryMinorAccordingToAge(
values.dateStart,
value,
);
const newIsMinor = age < 18;
if (newIsMinor) {
setValue(
"signatories.beneficiaryRepresentative.role",
Expand All @@ -136,7 +135,7 @@ export const BeneficiaryFormSection = ({
setIsMinorAccordingToAge(newIsMinor);
dispatch(conventionSlice.actions.isMinorChanged(newIsMinor));
},
[dispatch, values.dateStart, setValue, getValues],
[dispatch, values.dateStart, setValue, isMinorOrProtected],
);

useEffect(() => {
Expand Down
32 changes: 29 additions & 3 deletions shared/src/convention/convention.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { differenceInCalendarISOWeekYears } from "date-fns";
import { keys, mapObjIndexed, values } from "ramda";
import { Role, SignatoryRole, allSignatoryRoles } from "../role/role.dto";
import { DotNestedKeys } from "../utils";
import { DateString } from "../utils/date";
import {
BeneficiaryRepresentative,
ConventionDto,
ConventionRenewed,
ConventionStatus,
Expand Down Expand Up @@ -108,9 +111,32 @@ export const isEstablishmentTutorIsEstablishmentRepresentative = (
);
};

export const isBeneficiaryMinor = (
convention: Pick<ConventionDto, "signatories">,
): boolean => !!convention.signatories.beneficiaryRepresentative;
export const isBeneficiaryMinorAccordingToAge = (
conventionDateStart: DateString,
beneficiaryBirthdate: string,
): boolean => {
const age = differenceInCalendarISOWeekYears(
new Date(conventionDateStart),
new Date(beneficiaryBirthdate),
);
return age < 18;
};

export const isBeneficiaryMinor = ({
beneficiaryRepresentative,
beneficiaryBirthdate,
conventionDateStart,
}: {
beneficiaryBirthdate: string;
beneficiaryRepresentative?: BeneficiaryRepresentative;
conventionDateStart?: DateString;
}): boolean =>
!!beneficiaryRepresentative ||
(!!conventionDateStart &&
isBeneficiaryMinorAccordingToAge(
conventionDateStart,
beneficiaryBirthdate,
));

export const hasBeneficiaryCurrentEmployer = (
convention: Pick<ConventionDto, "signatories">,
Expand Down
Loading