Skip to content
Snippets Groups Projects
Commit 8d145fc0 authored by Benoît Courty's avatar Benoît Courty
Browse files

Merge branch '136-libelles-incorrects' into 'master' 

Affiche des libellés plus clairs

Closes #136

See merge request leximpact/leximpact-client!154
parents 9d38c8f9 b31620ba
No related branches found
No related tags found
1 merge request!154Affiche des libellés plus clairs
Pipeline #1503 passed
Stage: install
Stage: test
Stage: deploy
Show whitespace changes
Inline Side-by-side
components/ir/cartes-impact/carte-etat/CarteEtat.tsx
+ 2
− 1
View file @ 8d145fc0
...@@ -78,6 +78,7 @@ class CarteEtat extends PureComponent<PropsFromRedux> { ...@@ -78,6 +78,7 @@ class CarteEtat extends PureComponent<PropsFromRedux> {
<ul> <ul>
<li>La réforme de l'IR du PLF 2022 se résume à une revalorisation par l'inflation, <span className={styles.bold}>sans changements du mécanisme de calcul</span>.</li> <li>La réforme de l'IR du PLF 2022 se résume à une revalorisation par l'inflation, <span className={styles.bold}>sans changements du mécanisme de calcul</span>.</li>
<li>L'augmentation du montant total des recettes visible ci-dessous correspond à la <span className={styles.bold}>"dynamique économique" actuelle telle qu'évaluée par le PLF 2022 (p.15)</span>, traduite par une augmentation de la masse totale des revenus imposés.</li> <li>L'augmentation du montant total des recettes visible ci-dessous correspond à la <span className={styles.bold}>"dynamique économique" actuelle telle qu'évaluée par le PLF 2022 (p.15)</span>, traduite par une augmentation de la masse totale des revenus imposés.</li>
<li>En l'absence d'autres éléments nous traduisons cela par une augmentation de l'impôt sur les foyers déjà imposables.</li>
</ul> </ul>
</div> </div>
{isDisabledEtat && ( {isDisabledEtat && (
...@@ -195,7 +196,7 @@ class CarteEtat extends PureComponent<PropsFromRedux> { ...@@ -195,7 +196,7 @@ class CarteEtat extends PureComponent<PropsFromRedux> {
className={styles.styleExpansionPanel} className={styles.styleExpansionPanel}
expandIcon={<ExpandMoreIcon />}> expandIcon={<ExpandMoreIcon />}>
<Typography className={styles.subtitleCarteEtat}> <Typography className={styles.subtitleCarteEtat}>
En savoir plus sur les déciles de population (🚧 Intégration PLF 2022 en cours) En savoir plus sur les déciles de population
</Typography> </Typography>
</ExpansionPanelSummary> </ExpansionPanelSummary>
<ExpansionPanelDetails className={styles.styleExpansionPanel}> <ExpansionPanelDetails className={styles.styleExpansionPanel}>
......
components/ir/cartes-impact/carte-etat/simpop-tableur-infos-deciles/SimpopTableurInfosDeciles.tsx
+ 2
− 2
View file @ 8d145fc0
...@@ -159,10 +159,10 @@ export function SimpopTableurInfosDeciles({ deciles, frontieresDeciles }: Props) ...@@ -159,10 +159,10 @@ export function SimpopTableurInfosDeciles({ deciles, frontieresDeciles }: Props)
(en Milliards d&apos;euros) (en Milliards d&apos;euros)
</TableCell> </TableCell>
<TableCell classes={{ root: styles.cellStyle }}> <TableCell classes={{ root: styles.cellStyle }}>
<b>Pourcentage de l'impôt par rapport au RFR moyen des foyers</b> <b>Part de l'impôt<br/>par rapport au RFR des foyers</b>
</TableCell> </TableCell>
<TableCell classes={{ root: styles.cellStyle }}> <TableCell classes={{ root: styles.cellStyle }}>
<b>Proportion de l'évolution de l'impôt moyen par rapport au RFR moyen des foyers</b><br/>En € pour mille €. <b>Part de l'évolution de l'impôt<br/>par rapport au RFR des foyers</b><br/>En € pour mille €.
</TableCell> </TableCell>
</TableRow> </TableRow>
</TableHead> </TableHead>
......
redux/reducers/results/total-pop.ts
+ 115
− 115
View file @ 8d145fc0
...@@ -59,154 +59,154 @@ const DEFAULT_STATE: State = { ...@@ -59,154 +59,154 @@ const DEFAULT_STATE: State = {
deciles: [ deciles: [
{ {
"sum_rfr": 1252677818.581457, "sum_rfr": 1248595294.3250895,
"avg_rfr": 326.68321756417095, "avg_rfr": 325.6424932857625,
"poids": 3834533.73553048, "poids": 3834251.733324631,
"avant": 0, "avant": 0,
"sum_irpp_avant": 0, "sum_irpp_avant": 0,
"avg_irpp_avant": 0, "avg_irpp_avant": 0,
"irpp_on_rfr_avant": 0, "irpp_on_rfr_avant": 0,
"avg_irpp_on_avg_rfr_avant": 0, "avg_irpp_on_avg_rfr_avant": 0,
"plf": 0, "apres": 0,
"sum_irpp_plf": 0, "sum_irpp_apres": 0,
"avg_irpp_plf": 0, "avg_irpp_apres": 0,
"irpp_on_rfr_plf": 0, "irpp_on_rfr_apres": 0,
"avg_irpp_on_avg_rfr_plf": 0, "avg_irpp_on_avg_rfr_apres": 0,
}, },
{ {
"sum_rfr": 23470489219.061764, "sum_rfr": 23436330862.321556,
"avg_rfr": 6124.1881811296835, "avg_rfr": 6114.03411542516,
"poids": 3832424.5638599135, "poids": 3833202.5009795064,
"avant": 0, "avant": 0,
"sum_irpp_avant": 0, "sum_irpp_avant": 0,
"avg_irpp_avant": 0, "avg_irpp_avant": 0,
"irpp_on_rfr_avant": 0, "irpp_on_rfr_avant": 0,
"avg_irpp_on_avg_rfr_avant": 0, "avg_irpp_on_avg_rfr_avant": 0,
"plf": 0, "apres": 0,
"sum_irpp_plf": 0, "sum_irpp_apres": 0,
"avg_irpp_plf": 0, "avg_irpp_apres": 0,
"irpp_on_rfr_plf": 0, "irpp_on_rfr_apres": 0,
"avg_irpp_on_avg_rfr_plf": 0, "avg_irpp_on_avg_rfr_apres": 0,
}, },
{ {
"sum_rfr": 43418481403.56084, "sum_rfr": 43302552094.83705,
"avg_rfr": 11326.562644238173, "avg_rfr": 11298.140156590667,
"poids": 3833332.5623417096, "poids": 3832715.074753033,
"avant": 0, "avant": 0,
"sum_irpp_avant": 0, "sum_irpp_avant": 0,
"avg_irpp_avant": 0, "avg_irpp_avant": 0,
"irpp_on_rfr_avant": 0, "irpp_on_rfr_avant": 0,
"avg_irpp_on_avg_rfr_avant": 0, "avg_irpp_on_avg_rfr_avant": 0,
"plf": 0, "apres": 0,
"sum_irpp_plf": 0, "sum_irpp_apres": 0,
"avg_irpp_plf": 0, "avg_irpp_apres": 0,
"irpp_on_rfr_plf": 0, "irpp_on_rfr_apres": 0,
"avg_irpp_on_avg_rfr_plf": 0, "avg_irpp_on_avg_rfr_apres": 0,
}, },
{ {
"sum_rfr": 59195142768.90582, "sum_rfr": 59109327425.504074,
"avg_rfr": 15442.321989659275, "avg_rfr": 15420.218819854104,
"poids": 3833305.8207531814, "poids": 3833235.320201719,
"avant": 191369261.51103774, "avant": 185851978.16184786,
"sum_irpp_avant": 191369261.51103774, "sum_irpp_avant": 185851978.16184786,
"avg_irpp_avant": 49.922774351835194, "avg_irpp_avant": 48.48436441727962,
"irpp_on_rfr_avant": 0.0032328541255172154, "irpp_on_rfr_avant": 0.003144207289383871,
"avg_irpp_on_avg_rfr_avant": 0.003232854125517215, "avg_irpp_on_avg_rfr_avant": 0.0031442072893838706,
"plf": 163283773.89462832, "apres": 163391066.7322619,
"sum_irpp_plf": 163283773.89462832, "sum_irpp_apres": 163391066.7322619,
"avg_irpp_plf": 42.596072823259775, "avg_irpp_apres": 42.62484639833265,
"irpp_on_rfr_plf": 0.0027583981768922843, "irpp_on_rfr_apres": 0.002764217998220076,
"avg_irpp_on_avg_rfr_plf": 0.0027583981768922843, "avg_irpp_on_avg_rfr_apres": 0.002764217998220076,
}, },
{ {
"sum_rfr": 72191524013.83925, "sum_rfr": 72143223721.7203,
"avg_rfr": 18834.163874921964, "avg_rfr": 18819.276995759777,
"poids": 3833009.2322262693, "poids": 3833474.7789712735,
"avant": 917780002.9172739, "avant": 921462479.5895522,
"sum_irpp_avant": 917780002.9172739, "sum_irpp_avant": 921462479.5895522,
"avg_irpp_avant": 239.44111462110996, "avg_irpp_avant": 240.37264693751766,
"irpp_on_rfr_avant": 0.012713126858789319, "irpp_on_rfr_avant": 0.012772682340117351,
"avg_irpp_on_avg_rfr_avant": 0.01271312685878932, "avg_irpp_on_avg_rfr_avant": 0.012772682340117353,
"plf": 935230197.1103759, "apres": 944751019.7222807,
"sum_irpp_plf": 935230197.1103759, "sum_irpp_apres": 944751019.7222807,
"avg_irpp_plf": 243.99372410777337, "avg_irpp_apres": 246.4476941141624,
"irpp_on_rfr_plf": 0.0129548476761772, "irpp_on_rfr_apres": 0.013095492147211086,
"avg_irpp_on_avg_rfr_plf": 0.0129548476761772, "avg_irpp_on_avg_rfr_apres": 0.013095492147211086,
}, },
{ {
"sum_rfr": 87833442676.15701, "sum_rfr": 87683818162.51213,
"avg_rfr": 22912.00135274118, "avg_rfr": 22873.391349911217,
"poids": 3833512.4603006355, "poids": 3833441.959749177,
"avant": 1608905816.1233876, "avant": 1617616912.5847774,
"sum_irpp_avant": 1608905816.1233876, "sum_irpp_avant": 1617616912.5847774,
"avg_irpp_avant": 419.69494889739747, "avg_irpp_avant": 421.9750630294255,
"irpp_on_rfr_avant": 0.01831769047304047, "irpp_on_rfr_avant": 0.018448294639573128,
"avg_irpp_on_avg_rfr_avant": 0.01831769047304047, "avg_irpp_on_avg_rfr_avant": 0.018448294639573128,
"plf": 1690954495.5475247, "apres": 1703341992.9176059,
"sum_irpp_plf": 1690954495.5475247, "sum_irpp_apres": 1703341992.9176059,
"avg_irpp_plf": 441.09795208933275, "avg_irpp_apres": 444.3374937725895,
"irpp_on_rfr_plf": 0.019251829872843476, "irpp_on_rfr_apres": 0.019425955992936488,
"avg_irpp_on_avg_rfr_plf": 0.019251829872843476, "avg_irpp_on_avg_rfr_apres": 0.01942595599293649,
}, },
{ {
"sum_rfr": 110144936227.22296, "sum_rfr": 110115965949.4268,
"avg_rfr": 28734.979944092873, "avg_rfr": 28726.174096337054,
"poids": 3833130.784901388, "poids": 3833297.3120660484,
"avant": 2901850265.4018636, "avant": 2923222966.9631305,
"sum_irpp_avant": 2901850265.4018636, "sum_irpp_avant": 2923222966.9631305,
"avg_irpp_avant": 757.0444183204687, "avg_irpp_avant": 762.5870703432805,
"irpp_on_rfr_avant": 0.02634574375180994, "irpp_on_rfr_avant": 0.026546767689489145,
"avg_irpp_on_avg_rfr_avant": 0.02634574375180994, "avg_irpp_on_avg_rfr_avant": 0.026546767689489145,
"plf": 2997228429.2594943, "apres": 3031830109.6376085,
"sum_irpp_plf": 2997228429.2594943, "sum_irpp_apres": 3031830109.6376085,
"avg_irpp_plf": 781.9269932206851, "avg_irpp_apres": 790.919634669199,
"irpp_on_rfr_plf": 0.0272116770132435, "irpp_on_rfr_apres": 0.02753306555953969,
"avg_irpp_on_avg_rfr_plf": 0.0272116770132435, "avg_irpp_on_avg_rfr_apres": 0.027533065559539695,
}, },
{ {
"sum_rfr": 137332385090.17035, "sum_rfr": 137184876883.36745,
"avg_rfr": 35824.69945481416, "avg_rfr": 35787.99053345202,
"poids": 3833455.3305433616, "poids": 3833265.708370462,
"avant": 5596342948.006156, "avant": 5622143411.826297,
"sum_irpp_avant": 5596342948.006156, "sum_irpp_avant": 5622143411.826297,
"avg_irpp_avant": 1459.86909079568, "avg_irpp_avant": 1466.6719814255537,
"irpp_on_rfr_avant": 0.04075035137802116, "irpp_on_rfr_avant": 0.04098223900150568,
"avg_irpp_on_avg_rfr_avant": 0.04075035137802116, "avg_irpp_on_avg_rfr_avant": 0.04098223900150568,
"plf": 5876543181.734198, "apres": 5920010075.927875,
"sum_irpp_plf": 5876543181.734198, "sum_irpp_apres": 5920010075.927875,
"avg_irpp_plf": 1532.9624777188367, "avg_irpp_apres": 1544.3776994119555,
"irpp_on_rfr_plf": 0.042790658429734174, "irpp_on_rfr_apres": 0.04315351816046735,
"avg_irpp_on_avg_rfr_plf": 0.042790658429734174, "avg_irpp_on_avg_rfr_apres": 0.04315351816046735,
}, },
{ {
"sum_rfr": 179268861531.16403, "sum_rfr": 179011128573.3233,
"avg_rfr": 46768.67640349596, "avg_rfr": 46701.02290233606,
"poids": 3833096.7501524463, "poids": 3833130.7849014252,
"avant": 10304937076.58269, "avant": 10402662676.661081,
"sum_irpp_avant": 10304937076.58269, "sum_irpp_avant": 10402662676.661081,
"avg_irpp_avant": 2688.410376329086, "avg_irpp_avant": 2713.8814875916214,
"irpp_on_rfr_avant": 0.057483140064407016, "irpp_on_rfr_avant": 0.05811182108938066,
"avg_irpp_on_avg_rfr_avant": 0.057483140064407016, "avg_irpp_on_avg_rfr_avant": 0.05811182108938065,
"plf": 10963024639.57353, "apres": 11081534982.670897,
"sum_irpp_plf": 10963024639.57353, "sum_irpp_apres": 11081534982.670897,
"avg_irpp_plf": 2860.0959887427816, "avg_irpp_apres": 2890.98796897856,
"irpp_on_rfr_plf": 0.06115409305295177, "irpp_on_rfr_apres": 0.061904168031273424,
"avg_irpp_on_avg_rfr_plf": 0.06115409305295177, "avg_irpp_on_avg_rfr_apres": 0.061904168031273424,
}, },
{ {
"sum_rfr": 382413597748.7309, "sum_rfr": 379094672499.9683,
"avg_rfr": 99764.16990842286, "avg_rfr": 98903.84763576475,
"poids": 3833175.759391181, "poids": 3832961.8266832978,
"avant": 55478814629.45741, "avant": 55327039574.21336,
"sum_irpp_avant": 55478814629.45741, "sum_irpp_avant": 55327039574.21336,
"avg_irpp_avant": 14473.329195390656, "avg_irpp_avant": 14434.539678703562,
"irpp_on_rfr_avant": 0.14507542345790325, "irpp_on_rfr_avant": 0.14594517830956324,
"avg_irpp_on_avg_rfr_avant": 0.14507542345790325, "avg_irpp_on_avg_rfr_avant": 0.14594517830956327,
"plf": 59773735282.88043, "apres": 59557996094.47585,
"sum_irpp_plf": 59773735282.88043, "sum_irpp_apres": 59557996094.47585,
"avg_irpp_plf": 15593.789336802325, "avg_irpp_apres": 15538.374444499754,
"irpp_on_rfr_plf": 0.1563065111564245, "irpp_on_rfr_apres": 0.15710586408855648,
"avg_irpp_on_avg_rfr_plf": 0.15630651115642447, "avg_irpp_on_avg_rfr_apres": 0.15710586408855648,
} }
], ],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment