Skip to content
Snippets Groups Projects
Commit f6736225 authored by benoit-cty's avatar benoit-cty
Browse files

Add both ratio

parent 8192af37
Branches
No related tags found
1 merge request!152Modification des colonnes du tableau des déciles
Pipeline #1287 passed with warnings
......@@ -11,7 +11,6 @@ interface Props {
plf?: number;
poids: number;
sum_rfr: number;
}[];
}
......
......@@ -32,54 +32,48 @@ function createFromDeciles(index: number, decile: Props["deciles"][0], frontiere
? formatNumber(Math.round((decile.apres / decile.avant - 1) * 100))
: "-";
}
let ratioApresMoinsAvantSurRfrFoyer: string | undefined;
let ratioAvantSurRfr: string | undefined;
if (typeof decile.apres === "number") {
ratioApresMoinsAvantSurRfrFoyer = formatNumber(Math.round(
ratioAvantSurRfr = formatNumber(Math.round(
(decile.avant) / decile.sum_rfr * 10000
)/100);
}
let ratioPlfMoinsAvantSurRfrFoyer: string | undefined;
let ratioPlfSurRfr: string | undefined;
if (typeof decile.sum_rfr === "number" && typeof decile.plf === "number") {
//let ratio : number;
ratioPlfMoinsAvantSurRfrFoyer = formatNumber(Math.round(
ratioPlfSurRfr = formatNumber(Math.round(
(decile.plf) / decile.sum_rfr * 10000
)/100);
// ratioPlfMoinsAvantSurRfrFoyer = ratio != 0.0 ? formatNumber(ratio) : "-";
}
let ratioApresMoinsPlfSurRfrFoyer: string | undefined;
let ratioApresSurRfr: string | undefined;
if (typeof decile.sum_rfr === "number" && typeof decile.plf === "number" && typeof decile.apres === "number") {
//let ratio : number;
ratioApresMoinsPlfSurRfrFoyer = formatNumber(Math.round(
ratioApresSurRfr = formatNumber(Math.round(
(decile.apres) / decile.sum_rfr * 10000
)/100);
//ratioApresMoinsPlfSurRfrFoyer = ratio != 0.0 ? formatNumber(ratio) : "-";
}
// let ratioApresMoinsAvantSurRfrFoyer: string | undefined;
// if (typeof decile.apres === "number") {
// ratioApresMoinsAvantSurRfrFoyer = formatNumber(Math.round(
// (decile.apres - decile.avant) / decile.sum_rfr * 10000
// )/10);
// }
let ratioEcartApresMoinsAvantSurRfr: string | undefined;
if (typeof decile.apres === "number") {
ratioEcartApresMoinsAvantSurRfr = formatNumber(Math.round(
(decile.apres - decile.avant) / decile.sum_rfr * 10000
)/10);
}
// let ratioPlfMoinsAvantSurRfrFoyer: string | undefined;
// if (typeof decile.sum_rfr === "number" && typeof decile.plf === "number") {
// //let ratio : number;
// ratioPlfMoinsAvantSurRfrFoyer = formatNumber(Math.round(
// (decile.plf - decile.avant) / decile.sum_rfr * 10000
// )/10);
// // ratioPlfMoinsAvantSurRfrFoyer = ratio != 0.0 ? formatNumber(ratio) : "-";
// }
let ratioEcartPlfMoinsAvantSurRfr: string | undefined;
if (typeof decile.sum_rfr === "number" && typeof decile.plf === "number") {
ratioEcartPlfMoinsAvantSurRfr = formatNumber(Math.round(
(decile.plf - decile.avant) / decile.sum_rfr * 10000
)/10);
}
// let ratioApresMoinsPlfSurRfrFoyer: string | undefined;
// if (typeof decile.sum_rfr === "number" && typeof decile.plf === "number" && typeof decile.apres === "number") {
// //let ratio : number;
// ratioApresMoinsPlfSurRfrFoyer = formatNumber(Math.round(
// (decile.apres - decile.plf) / decile.sum_rfr * 10000
// )/10);
// //ratioApresMoinsPlfSurRfrFoyer = ratio != 0.0 ? formatNumber(ratio) : "-";
// }
let ratioEcartApresMoinsPlfSurRfr: string | undefined;
if (typeof decile.sum_rfr === "number" && typeof decile.plf === "number" && typeof decile.apres === "number") {
ratioEcartApresMoinsPlfSurRfr = formatNumber(Math.round(
(decile.apres - decile.plf) / decile.sum_rfr * 10000
)/10);
}
const impotMoyenFoyer = formatNumber(Math.round(decile.avant / decile.poids));
......@@ -113,9 +107,12 @@ function createFromDeciles(index: number, decile: Props["deciles"][0], frontiere
frontiereDecile: frontiere,
id,
rfrMoyenFoyer,
ratioApresMoinsAvantSurRfrFoyer,
ratioPlfMoinsAvantSurRfrFoyer,
ratioApresMoinsPlfSurRfrFoyer,
ratioAvantSurRfr,
ratioPlfSurRfr,
ratioApresSurRfr,
ratioEcartApresMoinsAvantSurRfr,
ratioEcartPlfMoinsAvantSurRfr,
ratioEcartApresMoinsPlfSurRfr,
impactMoyenFoyerPlf,
impactMoyenFoyerReforme,
impotMoyenFoyer,
......@@ -151,9 +148,6 @@ export function SimpopTableurInfosDeciles({ deciles, frontieresDeciles }: Props)
<br />
(limite supérieure)
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<b>Montant de l'impôt par rapport au RFR moyen des foyers</b>
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<b>Impôt moyen des foyers</b>
<br />
......@@ -164,6 +158,12 @@ export function SimpopTableurInfosDeciles({ deciles, frontieresDeciles }: Props)
<br />
(en Milliards d&apos;euros)
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<b>Pourcentage de l'impôt par rapport au RFR moyen des foyers</b>
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<b>Proportion de l'évolution de l'impôt moyen par rapport au RFR moyen des foyers</b>
</TableCell>
</TableRow>
</TableHead>
<TableBody>
......@@ -182,62 +182,6 @@ export function SimpopTableurInfosDeciles({ deciles, frontieresDeciles }: Props)
€/an<br/>
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<Tooltip classes={{
popper: styles.tooltipContainer,
tooltip: styles.tooltipContent,
}}
title={"Moyenne des RFR du décile : " + row.rfrMoyenFoyer + " € /an"}>
<div>
{ row.ratioApresMoinsAvantSurRfrFoyer === undefined
? null
: (
<span className={styles.plf}>
{row.ratioApresMoinsAvantSurRfrFoyer === "-"
? NON_APPLICABLE
: `${row.ratioApresMoinsAvantSurRfrFoyer}`}
</span>
)
}
{
row.ratioPlfMoinsAvantSurRfrFoyer === undefined
? null
: (
<span className={styles.plf}>
{row.ratioPlfMoinsAvantSurRfrFoyer === "-"
? NON_APPLICABLE
: `${row.ratioPlfMoinsAvantSurRfrFoyer}`}
</span>
)
}
{
row.ratioApresMoinsPlfSurRfrFoyer === undefined
? null
: (
<span className={styles.reform}>
{row.ratioApresMoinsPlfSurRfrFoyer === "-"
? NON_APPLICABLE
: `${row.ratioApresMoinsPlfSurRfrFoyer}`}
</span>
)
}
%
{/* <Tooltip
classes={{
popper: styles.tooltipContainer,
tooltip: styles.tooltipContent,
}}
title={{{row.rfrMoyenFoyer}€/an en moy.} || <span />}>
<HelpOutlineIcon className={styles.tooltipButton} fontSize="small" />
</Tooltip> */}
</div>
</Tooltip>
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<span className={styles.base}>
{row.impotMoyenFoyer}
......@@ -294,6 +238,86 @@ export function SimpopTableurInfosDeciles({ deciles, frontieresDeciles }: Props)
)
}
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<Tooltip classes={{
popper: styles.tooltipContainer,
tooltip: styles.tooltipContent,
}}
title={"Moyenne des RFR du décile : " + row.rfrMoyenFoyer + " € /an"}>
<div>
{ row.ratioAvantSurRfr === undefined
? null
: (
<span className={styles.base}>
{`${row.ratioAvantSurRfr}`}
</span>
)
}
{
row.ratioPlfSurRfr === undefined
? null
: (
<span className={styles.plf}>
{row.ratioPlfSurRfr === "-"
? NON_APPLICABLE
: `${row.ratioPlfSurRfr}`}
</span>
)
}
{
row.ratioApresSurRfr === undefined
? null
: (
<span className={styles.reform}>
{row.ratioApresSurRfr === "-"
? NON_APPLICABLE
: `${row.ratioApresSurRfr}`}
</span>
)
}
%
</div>
</Tooltip>
</TableCell>
<TableCell classes={{ root: styles.cellStyle }}>
<Tooltip classes={{
popper: styles.tooltipContainer,
tooltip: styles.tooltipContent,
}}
title={"On soustrait le montant après du montant avant et on le divise par le RFR moyen qui est de " + row.rfrMoyenFoyer + " € /an pour ce décile"}>
<div>
{
// If PLF, display diff with avant
(row.ratioEcartPlfMoinsAvantSurRfr === undefined)
? null
: (<span className={styles.plf}>
{`${row.ratioEcartPlfMoinsAvantSurRfr}`}
</span>)
}
{
// If reform and PLF, display diff with PLF
row.ratioEcartApresMoinsPlfSurRfr === undefined
? null
: (<span className={styles.reform}>
{`${row.ratioEcartApresMoinsPlfSurRfr}`}
</span>)
}
{
// If reform and NO PLF, display diff with avant
row.ratioEcartApresMoinsAvantSurRfr === undefined
? null
: (row.ratioEcartPlfMoinsAvantSurRfr === undefined)
? (<span className={styles.reform}>
{`${row.ratioEcartApresMoinsAvantSurRfr}`}
</span>)
: null
}
</div>
</Tooltip>
</TableCell>
</TableRow>
))}
</TableBody>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment