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

Ajoute vignette vers allocations familiales, transforme montant en valeur absolue

parent ff4e7537
Branches
Tags
1 merge request!195Resolve "Squelette de l'UI allocations familiales"
......@@ -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>
<span
>Allocations familiales
{#if showRevaluation}
<span>&nbsp;2024</span>
{/if}
&nbsp;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 /
: 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
......
......@@ -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",
......
static/picto-allocations-familiales.png

16.9 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment