diff --git a/src/lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte index 88b839b0081c306efdb872be4ce7beac4d7416ef..7afa7addc7809452767d732a5d4bbad883a77938 100644 --- a/src/lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte +++ b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte @@ -4,7 +4,7 @@ const bubble = createBubbler() import type { ValueParameter } from "@openfisca/json-model" - import { billName, yearPLF } from "$lib/shared.svelte" + import { billName, revaluationName } from "$lib/shared.svelte" import { formatValue } from "$lib/values" interface Props { @@ -51,6 +51,21 @@ ? formatValue(billInflator.values["latest"].value, billInflator.unit) : undefined, ) + + let revaluationInflator = $derived( + revaluationName === undefined + ? undefined + : inflatorWithLatestByReformName?.[revaluationName], + ) + + let revaluationInflatorValueFormatted = $derived( + revaluationInflator?.values !== undefined + ? formatValue( + revaluationInflator.values["latest"].value, + revaluationInflator.unit, + ) + : undefined, + ) </script> <button @@ -73,7 +88,7 @@ Revalorisation de {billInflatorValueFormatted}, suite à l'indexation d'usage du barème de l'IR par le PLF. {:else} - Indexation sur l'inflation à {billInflatorValueFormatted}. + Indexation sur l'inflation à {revaluationInflatorValueFormatted}. {/if} </p> </button> diff --git a/src/lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte index 04903cd895434bf20fcd7411f30c9c426f6f0b5c..953fc3c526ad77d3a6a4592f36acdd3667055134 100644 --- a/src/lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte +++ b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte @@ -140,7 +140,9 @@ ) let revaluationInflator = $derived( - inflatorWithLatestByReformName?.[revaluationName], + revaluationName === undefined + ? undefined + : inflatorWithLatestByReformName?.[revaluationName], ) let revaluationInflatorValueFormatted = $derived( revaluationInflator !== undefined @@ -151,7 +153,12 @@ : undefined, ) - let billInflator = $derived(inflatorWithLatestByReformName?.[billName]) + let billInflator = $derived( + billName === undefined + ? undefined + : inflatorWithLatestByReformName?.[billName], + ) + let billInflatorValueFormatted = $derived( billInflator !== undefined ? formatValue(billInflator.values["latest"].value, billInflator.unit)