- | {salary.month} |
+ {salary.month} |
{salary.value} € |
{salary.prime} {salary.prime !== undefined && "€"}
@@ -226,4 +228,14 @@ export const StyledFilledElementTable = styled(Table)`
th {
vertical-align: top;
}
+ tbody {
+ th {
+ font-weight: normal;
+ }
+ }
+`;
+
+const Caption = styled.caption`
+ text-align: left;
+ display: none;
`;
diff --git a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/components/index.ts b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/components/index.ts
index 932d96c89a..87eb5fcebe 100644
--- a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/components/index.ts
+++ b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/components/index.ts
@@ -3,3 +3,4 @@ export { default as DecryptResult } from "./DecryptResult";
export { default as FormulaInterpreter } from "./FormulaInterpreter";
export { default as FilledElements } from "./FilledElements";
export { default as Result } from "./Result";
+export { default as ErrorPublicodes } from "./ErrorPublicodes";
diff --git a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/index.tsx b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/index.tsx
index 1668795308..1e1d05e6ac 100644
--- a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/index.tsx
+++ b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/index.tsx
@@ -1,33 +1,36 @@
import React, { useContext, useEffect } from "react";
-import { IndemniteLicenciementStepName } from "../..";
-import {
- MatomoBaseEvent,
- MatomoActionEvent,
- MatomoSimulatorEvent,
-} from "../../../../lib";
-import { push as matopush } from "@socialgouv/matomo-next";
-
import {
IndemniteLicenciementContext,
useIndemniteLicenciementStore,
} from "../../store";
import Eligible from "./Eligible";
import Ineligible from "./Ineligible";
+import { ErrorPublicodes } from "./components";
const StepResult = () => {
const store = useContext(IndemniteLicenciementContext);
- const { isEligible, init } = useIndemniteLicenciementStore(
- store,
- (state) => ({
+ const { isEligible, init, errorPublicodes, getPublicodesResult } =
+ useIndemniteLicenciementStore(store, (state) => ({
isEligible: state.resultData.input.isEligible,
init: state.resultFunction.init,
- })
- );
+ errorPublicodes: state.resultData.error.errorPublicodes,
+ getPublicodesResult: state.resultFunction.getPublicodesResult,
+ }));
useEffect(() => {
init();
}, []);
+ useEffect(() => {
+ if (isEligible) {
+ getPublicodesResult();
+ }
+ }, [isEligible]);
+
+ if (errorPublicodes) {
+ return ;
+ }
+
return <>{isEligible ? : };
};
diff --git a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/store.ts b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/store.ts
index 3f343cf0a2..c152e15032 100644
--- a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/store.ts
+++ b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/store.ts
@@ -48,6 +48,7 @@ import {
} from "../../../../../lib";
import { push as matopush } from "@socialgouv/matomo-next";
import getSupportedCcIndemniteLicenciement from "../../../common/usecase/getSupportedCc";
+import * as Sentry from "@sentry/nextjs";
const initialState: ResultStoreData = {
input: {
@@ -59,7 +60,9 @@ const initialState: ResultStoreData = {
isEligible: false,
isParentalNoticeHidden: false,
},
- error: {},
+ error: {
+ errorPublicodes: false,
+ },
hasBeenSubmit: true,
isStepValid: true,
};
@@ -184,21 +187,34 @@ const createResultStore: StoreSlice<
dateSortie: get().ancienneteData.input.dateSortie!,
absencePeriods: get().ancienneteData.input.absencePeriods,
});
-
- const publicodesSituationLegal = publicodes.setSituation(
- mapToPublicodesSituationForIndemniteLicenciementLegal(
- legalSeniority.value,
- legalRequiredSeniority.value,
- refSalary,
- isLicenciementInaptitude,
- longTermDisability
- )
- ).result;
+ let publicodesSituationLegal: PublicodesIndemniteLicenciementResult = {
+ value: null,
+ };
+ let errorPublicodes = false;
+
+ try {
+ publicodesSituationLegal = publicodes.setSituation(
+ mapToPublicodesSituationForIndemniteLicenciementLegal(
+ legalSeniority.value,
+ legalRequiredSeniority.value,
+ refSalary,
+ isLicenciementInaptitude,
+ longTermDisability
+ )
+ ).result;
+ } catch (e) {
+ errorPublicodes = true;
+ Sentry.captureException(e);
+ console.error(e);
+ }
const legalFormula = publicodes.getFormule();
const legalReferences = publicodes.getReferences();
- let publicodesSituationConventionnel: PublicodesIndemniteLicenciementResult;
+ let publicodesSituationConventionnel: PublicodesIndemniteLicenciementResult =
+ {
+ value: null,
+ };
let agreementSeniority: SeniorityResult;
let agreementRefSalary: number;
let agreementReferences: References[];
@@ -255,20 +271,26 @@ const createResultStore: StoreSlice<
get as StoreApi["getState"]
);
- publicodesSituationConventionnel = publicodes.setSituation(
- mapToPublicodesSituationForIndemniteLicenciementConventionnelWithValues(
- agreement.num,
- agreementSeniority,
- agreementRefSalary,
- agreementRequiredSeniority.value,
- get().ancienneteData.input.dateNotification!,
- get().ancienneteData.input.dateEntree!,
- isLicenciementInaptitude,
- longTermDisability,
- { ...infos, ...agreementSalaryExtraInfo }
- ),
- "contrat salarié . indemnité de licenciement . résultat conventionnel"
- ).result;
+ try {
+ publicodesSituationConventionnel = publicodes.setSituation(
+ mapToPublicodesSituationForIndemniteLicenciementConventionnelWithValues(
+ agreement.num,
+ agreementSeniority,
+ agreementRefSalary,
+ agreementRequiredSeniority.value,
+ get().ancienneteData.input.dateNotification!,
+ get().ancienneteData.input.dateEntree!,
+ isLicenciementInaptitude,
+ longTermDisability,
+ { ...infos, ...agreementSalaryExtraInfo }
+ ),
+ "contrat salarié . indemnité de licenciement . résultat conventionnel"
+ ).result;
+ } catch (e) {
+ errorPublicodes = true;
+ Sentry.captureException(e);
+ console.error(e);
+ }
agreementReferences = publicodes.getReferences(
"résultat conventionnel"
@@ -312,11 +334,17 @@ const createResultStore: StoreSlice<
);
}
- if (isAgreementBetter || isAgreementEqualToLegal) {
+ if (isAgreementBetter) {
notifications = agreementNotifications?.filter(
(item) =>
item.show === "conventionnel" ||
- item.show === "légal et conventionnel"
+ item.show === "légal et conventionnel" ||
+ item.show === "default"
+ );
+ } else if (isAgreementEqualToLegal) {
+ notifications = agreementNotifications?.filter(
+ (item) =>
+ item.show === "légal et conventionnel" || item.show === "default"
);
} else {
notifications = agreementNotifications?.filter(
@@ -327,6 +355,7 @@ const createResultStore: StoreSlice<
set(
produce((state: ResultStoreSlice) => {
+ state.resultData.error.errorPublicodes = errorPublicodes;
state.resultData.input.legalSeniority = legalSeniority.value;
state.resultData.input.legalFormula = legalFormula;
state.resultData.input.legalReferences = legalReferences;
diff --git a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/types.ts b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/types.ts
index 7377f1aafe..1b68db982e 100644
--- a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/types.ts
+++ b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Resultat/store/types.ts
@@ -28,7 +28,9 @@ export type ResultStoreInput = {
isParentalNoticeHidden: boolean;
};
-export type ResultStoreError = {};
+export type ResultStoreError = {
+ errorPublicodes: boolean;
+};
export type ResultStoreData = StepData;
diff --git a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/components/SalaireTempsPlein.tsx b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/components/SalaireTempsPlein.tsx
index b83122ac25..f5ad289a44 100644
--- a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/components/SalaireTempsPlein.tsx
+++ b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/components/SalaireTempsPlein.tsx
@@ -19,6 +19,7 @@ type Props = {
tooltip?: Tooltip;
dataTestidSalaries?: string;
noPrime?: boolean;
+ autoFocus?: boolean;
};
export const SalaireTempsPlein = ({
@@ -31,6 +32,7 @@ export const SalaireTempsPlein = ({
tooltip,
dataTestidSalaries,
noPrime,
+ autoFocus = false,
}: Props): JSX.Element => {
const [isFirstEdit, setIsFirstEdit] = React.useState(true);
const [errorsSalaries, setErrorsSalaries] = React.useState({});
@@ -98,17 +100,17 @@ export const SalaireTempsPlein = ({
- | Mois |
- Salaire mensuel brut |
- {!noPrime && Dont primes | }
+ Mois |
+ Salaire mensuel brut |
+ {!noPrime && Dont primes | }
{salaryPeriods.map((sPeriod, index) => (
- |
+ |
-
+ |
onChangeSalaries(index, e.target.value)}
onBlur={() => setIsFirstEdit(false)}
data-testid={dataTestidSalaries ?? "salary-input"}
+ autoFocus={autoFocus ? index === 0 : false}
+ tabIndex={1}
/>
{errorsSalaries[`${index}`] && (
@@ -153,6 +157,7 @@ export const SalaireTempsPlein = ({
? "prime-" + dataTestidSalaries
: "prime-input"
}
+ tabIndex={1}
/>
{errorsPrimes[`${index}`] && (
@@ -191,6 +196,12 @@ const Table = styled.table`
@media (max-width: ${breakpoints.mobile}) {
width: 100%;
}
+
+ tbody {
+ th {
+ font-weight: normal;
+ }
+ }
`;
const Caption = styled.caption`
diff --git a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/index.tsx b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/index.tsx
index 3cc82d45d4..f8c3b01e30 100644
--- a/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/index.tsx
+++ b/packages/code-du-travail-frontend/src/outils/IndemniteLicenciement/steps/Salaires/index.tsx
@@ -39,7 +39,7 @@ const StepSalaires = () => {
arretTravail,
showHasTempsPartiel,
initShowHasTempsPartiel,
- isAgreementSupported
+ isAgreementSupported,
} = useIndemniteLicenciementStore(store, (state) => ({
hasTempsPartiel: state.salairesData.input.hasTempsPartiel,
onChangeHasTempsPartiel: state.salairesFunction.onChangeHasTempsPartiel,
@@ -58,7 +58,8 @@ const StepSalaires = () => {
arretTravail: state.contratTravailData.input.arretTravail,
showHasTempsPartiel: state.salairesData.input.showHasTempsPartiel,
initShowHasTempsPartiel: state.salairesFunction.initShowHasTempsPartiel,
- isAgreementSupported: state.agreementData.input.isAgreementSupportedIndemniteLicenciement
+ isAgreementSupported:
+ state.agreementData.input.isAgreementSupportedIndemniteLicenciement,
}));
React.useEffect(() => {
@@ -88,6 +89,7 @@ const StepSalaires = () => {
onChangeSelectedOption={onChangeHasTempsPartiel}
error={errorHasTempsPartiel}
showRequired
+ autoFocus={showHasTempsPartiel}
/>
)}
@@ -113,6 +115,7 @@ const StepSalaires = () => {
onChangeSelectedOption={onChangeHasSameSalary}
error={errorHasSameSalary}
showRequired
+ autoFocus={hasTempsPartiel === "non"}
/>
{hasSameSalary === "oui" && (
{
showRequired
icon={icons.Euro}
dataTestId={"same-salary-value"}
+ autoFocus={hasSameSalary === "oui"}
/>
)}
{hasSameSalary === "non" && (
@@ -139,10 +143,12 @@ const StepSalaires = () => {
onSalariesChange={onSalariesChange}
salaryPeriods={salaryPeriods}
error={errorSalaryPeriods}
+ autoFocus={hasSameSalary === "non"}
/>
)}
{(hasSameSalary === "oui" || hasSameSalary === "non") &&
- agreement && isAgreementSupported && (
+ agreement &&
+ isAgreementSupported && (
should render 1`] = `
class="sc-iGgWBj biWgIW"
>
| |