diff --git a/src/lib/components/AllocationsFamilialesBudgetView.svelte b/src/lib/components/AllocationsFamilialesBudgetView.svelte index a6aca5fb2343be8647de5607f823de79c00318ab..4fad72673d6b48e539deca7f5be16fc9f0ba8db2 100644 --- a/src/lib/components/AllocationsFamilialesBudgetView.svelte +++ b/src/lib/components/AllocationsFamilialesBudgetView.svelte @@ -184,10 +184,9 @@ } } - y = y * 1.25 // Keep a blank space of 25% above zoomed y. + y = y * 1.25 // Adjust the blank space above zoomed y. return y } - const yFromQuantile = ({ af_menage_sum }: BudgetQuantile): number => af_menage_sum </script> @@ -314,7 +313,7 @@ icon="ri-checkbox-blank-circle-fill" width="18" height="18" - />RFR + />Revenus nets </div> <div class="flex items-center"> <iconify-icon @@ -323,10 +322,12 @@ width="18" height="18" /> - <span>Allocations familiales</span> - {#if showRevaluation} - <span> 2024</span> - {/if} + <span + >Allocations familiales + {#if showRevaluation} + 2024 + {/if}</span + > </div> {#if showBill} <div class="flex items-center"> @@ -424,7 +425,7 @@ type="button" > {#if zoomed} - Dé-zoomer pour voir le RFR<iconify-icon + Dé-zoomer pour voir les revenus nets<iconify-icon class="ml-1" icon="ri-zoom-out-line" flip="horizontal" @@ -642,14 +643,16 @@ unitName="currency-EUR" valueByCalculationName={{ amendment: showAmendment - ? -amendmentQuantile.af_menage_mean + ? Math.abs(-amendmentQuantile.af_menage_mean) + : undefined, + bill: showBill + ? Math.abs(-billQuantile.af_menage_mean) : undefined, - bill: showBill ? -billQuantile.af_menage_mean : undefined, law: showRevaluation ? undefined - : -lawQuantile.af_menage_mean, + : Math.abs(-lawQuantile.af_menage_mean), revaluation: showRevaluation - ? -lawQuantile.af_menage_mean + ? Math.abs(-lawQuantile.af_menage_mean) : undefined, }} /></span @@ -664,20 +667,28 @@ unitName="/1" valueByCalculationName={{ amendment: showAmendment - ? -amendmentQuantile.af_menage_mean / - amendmentQuantile.revenus_menage_mean + ? Math.abs( + -amendmentQuantile.af_menage_mean / + amendmentQuantile.revenus_menage_mean, + ) : undefined, bill: showBill - ? -billQuantile.af_menage_mean / - billQuantile.revenus_menage_mean + ? Math.abs( + -billQuantile.af_menage_mean / + billQuantile.revenus_menage_mean, + ) : undefined, law: showRevaluation ? undefined - : -lawQuantile.af_menage_mean / - lawQuantile.revenus_menage_mean, + : Math.abs( + -lawQuantile.af_menage_mean / + lawQuantile.revenus_menage_mean, + ), revaluation: showRevaluation - ? -lawQuantile.af_menage_mean / - lawQuantile.revenus_menage_mean + ? Math.abs( + -lawQuantile.af_menage_mean / + lawQuantile.revenus_menage_mean, + ) : undefined, }} /></span diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index ba3910fd5041aebbc8e562e92adf8e265aa9773b..96de651e54ade25c71b5715ac349d680c4c9a03e 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -127,6 +127,11 @@ icon: "picto-csg-retraites.png", parametersVariableName: "csg_retraite", }, + { + title: "Allocations familiales", + icon: "picto-allocations-familiales.png", + parametersVariableName: "af", + }, { title: "Prime de partage de la valeur", icon: "illustration-pepa.png", diff --git a/static/picto-allocations-familiales.png b/static/picto-allocations-familiales.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2dc0a616407594696b55769a316684265eb771 Binary files /dev/null and b/static/picto-allocations-familiales.png differ