Merge pull request #1817 from anth-volk/fix/decile_lsr_subtitle

Fix Decile LSR subtitles
PolicyEngine · May 24, 2024 · 7c2bcca · 7c2bcca
2 parents 3fa2265 + 918924f
commit 7c2bcca
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/src/pages/policy/output/ImpactTypes.jsx b/src/pages/policy/output/ImpactTypes.jsx
@@ -15,7 +15,7 @@ import relativeImpactByDecile from "./decile/RelativeImpactByDecile";
 import relativeImpactByWealthDecile from "./decile/RelativeImpactByWealthDecile";
 import laborSupplyImpact from "./LaborSupplyResponse";
 import lsrHoursImpact from "./LaborSupplyHoursImpact";
-import LabourSupplyDecileAverageImpact from "./LabourSupplyDecileAverageImpact";
+import LabourSupplyDecileAbsoluteImpact from "./LabourSupplyDecileAbsoluteImpact";
 import LabourSupplyDecileRelativeImpact from "./LabourSupplyDecileRelativeImpact";
 import Analysis from "./Analysis";
 
@@ -37,7 +37,7 @@ const map = {
   inequalityImpact: inequalityImpact,
   // cliffImpact: cliffImpact,
   "laborSupplyImpact.byDecile.relative": LabourSupplyDecileRelativeImpact,
-  "laborSupplyImpact.byDecile.average": LabourSupplyDecileAverageImpact,
+  "laborSupplyImpact.byDecile.absolute": LabourSupplyDecileAbsoluteImpact,
   "laborSupplyImpact.hours": lsrHoursImpact,
   analysis: Analysis,
 };

diff --git a/src/pages/policy/output/LaborSupplyHoursImpact.jsx b/src/pages/policy/output/LaborSupplyHoursImpact.jsx
@@ -136,18 +136,18 @@ export default function lsrHoursImpact(props) {
         {overallEffect > 0 ? "increasing" : "decreasing"} full time-equivalent
         hours from {fmt(baselineFTE)} to {fmt(reformFTE)}.
       </p>
-      <p>
-        The income effect is the change in earnings from individuals responding
-        to the policy&apos;s effect on their net income. The substitution effect
-        is the response due the policy&apos;s effect on effective marginal
-        wages.
-      </p>
       <ImpactPlot
         values={values}
         labels={labels}
         metadata={metadata}
         mobile={mobile}
       />
+      <p>
+        The income effect is the change in earnings from individuals responding
+        to the policy&apos;s effect on their net income. The substitution effect
+        is the response due the policy&apos;s effect on effective marginal
+        wages.
+      </p>
     </ImpactChart>
   );
   const csv = () => {

diff --git a/src/pages/policy/output/LaborSupplyResponse.jsx b/src/pages/policy/output/LaborSupplyResponse.jsx
@@ -157,18 +157,18 @@ export default function lsrImpact(props) {
         {relChangeStr}% {budgetaryImpactLSRChange > 0 ? "increase" : "decrease"}
         ).
       </p>
-      <p>
-        The income effect is the change in earnings from individuals responding
-        to the policy&apos;s effect on their net income. The substitution effect
-        is the response due the policy&apos;s effect on effective marginal
-        wages.
-      </p>
       <ImpactPlot
         values={values}
         labels={labels}
         metadata={metadata}
         mobile={mobile}
       />
+      <p>
+        The income effect is the change in earnings from individuals responding
+        to the policy&apos;s effect on their net income. The substitution effect
+        is the response due the policy&apos;s effect on effective marginal
+        wages.
+      </p>
     </ImpactChart>
   );
   const csv = () => {

diff --git a/...utput/LabourSupplyDecileAverageImpact.jsx → ...tput/LabourSupplyDecileAbsoluteImpact.jsx b/...utput/LabourSupplyDecileAverageImpact.jsx → ...tput/LabourSupplyDecileAbsoluteImpact.jsx
@@ -5,7 +5,7 @@ import { formatCurrencyAbbr, localeCode } from "../../../lang/format";
 import { ChartLogo } from "../../../api/charts";
 import { plotLayoutFont } from "pages/policy/output/utils";
 
-export default function LabourSupplyDecileAverageImpact(props) {
+export default function LabourSupplyDecileAbsoluteImpact(props) {
   const { policyLabel, metadata, impact, countryId } = props;
 
   const decileImpact = impact.labour_supply_response;
@@ -21,13 +21,8 @@ export default function LabourSupplyDecileAverageImpact(props) {
 
   const chart = (
     <ImpactChart
-      title={`${policyLabel}'s average labor supply impact by decile`}
+      title={`${policyLabel}'s absolute labor supply impact by decile`}
     >
-      <p>
-        This chart shows the estimated average change in earnings (as a
-        percentage of market income) for each disposable income decile, and
-        split by the substitution and income effects.
-      </p>
       {
         <Plot
           data={[
@@ -133,6 +128,11 @@ export default function LabourSupplyDecileAverageImpact(props) {
           }}
         />
       }
+      <p>
+        This chart shows the estimated absolute change in earnings (in
+        {`${countryId === "uk" ? " pounds" : " dollars"}`}) for each disposable
+        income decile, and split by the substitution and income effects.
+      </p>
     </ImpactChart>
   );
 

diff --git a/src/pages/policy/output/LabourSupplyDecileRelativeImpact.jsx b/src/pages/policy/output/LabourSupplyDecileRelativeImpact.jsx
@@ -23,11 +23,6 @@ export default function LabourSupplyDecileRelativeImpact(props) {
     <ImpactChart
       title={`${policyLabel}'s relative labor supply impact by decile`}
     >
-      <p>
-        This chart shows the estimated relative change in earnings (as a
-        percentage of market income) for each disposable income decile, and
-        split by the substitution and income effects.
-      </p>
       {
         <Plot
           data={[
@@ -133,6 +128,11 @@ export default function LabourSupplyDecileRelativeImpact(props) {
           }}
         />
       }
+      <p>
+        This chart shows the estimated relative change in earnings (as a
+        percentage of total earnings) for each disposable income decile, and
+        split by the substitution and income effects.
+      </p>
     </ImpactChart>
   );
 

diff --git a/src/pages/policy/output/tree.js b/src/pages/policy/output/tree.js
@@ -18,8 +18,8 @@ export const policyOutputs = {
   laborSupplyImpact: "Labor supply impact (experimental)",
   laborSupplyDecileRelativeImpact:
     "Labor supply relative impact by decile (experimental)",
-  laborSupplyDecileAverageImpact:
-    "Labor supply average impact by decile (experimental)",
+  laborSupplyDecileAbsoluteImpact:
+    "Labor supply absolute impact by decile (experimental)",
   analysis: "AI summary (experimental)",
   codeReproducibility: "Reproduce in Python",
 };
@@ -162,8 +162,8 @@ export function getPolicyOutputTree(countryId) {
                   label: "Relative",
                 },
                 {
-                  name: "policyOutput.laborSupplyImpact.byDecile.average",
-                  label: "Average",
+                  name: "policyOutput.laborSupplyImpact.byDecile.absolute",
+                  label: "Absolute",
                 },
               ],
             },