Skip to content
Snippets Groups Projects
Commit f2a19a01 authored by Dorine Lambinet's avatar Dorine Lambinet
Browse files

Merge branch 'fix-erreur-inflator-revaluation' into 'master'

Fix affichage inflator pour les montants révalués, même retrait du PLF/PLFSS

See merge request !303
parents 4bd35169 6491a4c9
No related branches found
No related tags found
1 merge request!303Fix affichage inflator pour les montants révalués, même retrait du PLF/PLFSS
Pipeline #19736 passed
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
const bubble = createBubbler() const bubble = createBubbler()
import type { ValueParameter } from "@openfisca/json-model" 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" import { formatValue } from "$lib/values"
interface Props { interface Props {
...@@ -51,6 +51,21 @@ ...@@ -51,6 +51,21 @@
? formatValue(billInflator.values["latest"].value, billInflator.unit) ? formatValue(billInflator.values["latest"].value, billInflator.unit)
: undefined, : undefined,
) )
let revaluationInflator = $derived(
revaluationName === undefined
? undefined
: inflatorWithLatestByReformName?.[revaluationName],
)
let revaluationInflatorValueFormatted = $derived(
revaluationInflator?.values !== undefined
? formatValue(
revaluationInflator.values["latest"].value,
revaluationInflator.unit,
)
: undefined,
)
</script> </script>
<button <button
...@@ -73,7 +88,7 @@ ...@@ -73,7 +88,7 @@
Revalorisation de {billInflatorValueFormatted}, suite à l'indexation Revalorisation de {billInflatorValueFormatted}, suite à l'indexation
d'usage du barème de l'IR par le PLF. d'usage du barème de l'IR par le PLF.
{:else} {:else}
Indexation sur l'inflation à {billInflatorValueFormatted}. Indexation sur l'inflation à {revaluationInflatorValueFormatted}.
{/if} {/if}
</p> </p>
</button> </button>
......
...@@ -140,7 +140,9 @@ ...@@ -140,7 +140,9 @@
) )
let revaluationInflator = $derived( let revaluationInflator = $derived(
inflatorWithLatestByReformName?.[revaluationName], revaluationName === undefined
? undefined
: inflatorWithLatestByReformName?.[revaluationName],
) )
let revaluationInflatorValueFormatted = $derived( let revaluationInflatorValueFormatted = $derived(
revaluationInflator !== undefined revaluationInflator !== undefined
...@@ -151,7 +153,12 @@ ...@@ -151,7 +153,12 @@
: undefined, : undefined,
) )
let billInflator = $derived(inflatorWithLatestByReformName?.[billName]) let billInflator = $derived(
billName === undefined
? undefined
: inflatorWithLatestByReformName?.[billName],
)
let billInflatorValueFormatted = $derived( let billInflatorValueFormatted = $derived(
billInflator !== undefined billInflator !== undefined
? formatValue(billInflator.values["latest"].value, billInflator.unit) ? formatValue(billInflator.values["latest"].value, billInflator.unit)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment