From 955e04710530371f1bc257520bfb231f1d987a8d Mon Sep 17 00:00:00 2001 From: v-lerie Date: Mon, 14 Jul 2025 19:09:55 -0400 Subject: [PATCH 1/4] Fixed: Set benefit increases to negative values in net revenue impact table --- .../output/budget/MultiYearBudgetaryImpact.jsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/policy/output/budget/MultiYearBudgetaryImpact.jsx b/src/pages/policy/output/budget/MultiYearBudgetaryImpact.jsx index 8f9bf6443..21fdf0c09 100644 --- a/src/pages/policy/output/budget/MultiYearBudgetaryImpact.jsx +++ b/src/pages/policy/output/budget/MultiYearBudgetaryImpact.jsx @@ -114,10 +114,13 @@ export default function MultiYearBudgetaryImpact(props) { item.budgetKey ? item.budgetKey : null, item.formula ? item.formula : null, ), + yearRange: roundToBillions( - item.budgetKey - ? impact.budget[item.budgetKey] - : item.formula(impact.budget), + item.budgetKey === "benefit_spending_impact" + ? -Math.abs(impact.budget[item.budgetKey]) + : item.budgetKey + ? impact.budget[item.budgetKey] + : item.formula(impact.budget), roundingPrecisionByCountry[metadata.countryId] || roundingPrecisionByCountry.default, ), @@ -198,6 +201,10 @@ export function getYearlyImpacts( impact = item.result.budget[budgetKey]; } + if (budgetKey === "benefit_spending_impact") { + impact = -Math.abs(impact); + } + yearlyImpacts[year] = roundToBillions( impact, roundingPrecisionByCountry[countryId] || From 7ab449114c8c2f210eb52ba359fa82cad352739b Mon Sep 17 00:00:00 2001 From: v-lerie Date: Mon, 14 Jul 2025 20:00:21 -0400 Subject: [PATCH 2/4] updated MultiYearBudgetaryImpact.test.js to expect negative benefit values --- .../policy/output/budget/MultiYearBudgetaryImpact.test.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js b/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js index f33644670..c96f1ef34 100644 --- a/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js +++ b/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js @@ -209,8 +209,12 @@ describe("MultiYearBudgetaryImpact", () => { expect( screen.getByText(mockImpact.budget.budgetary_impact / 1e9), ).toBeInTheDocument(); + // expect( + // screen.getByText(mockImpact.budget.benefit_spending_impact / 1e9), + // ).toBeInTheDocument(); + const expectedBenefitImpact = -Math.abs(mockImpact.budget.benefit_spending_impact / 1e9); expect( - screen.getByText(mockImpact.budget.benefit_spending_impact / 1e9), + screen.getByText(expectedBenefitImpact.toString()) ).toBeInTheDocument(); expect( screen.getByText( From ce6734d74129707b124bebc6e00c485a459309c7 Mon Sep 17 00:00:00 2001 From: v-lerie Date: Mon, 14 Jul 2025 20:05:01 -0400 Subject: [PATCH 3/4] updated MultiYearBudgetaryImpact.test.js to expect negative benefit values --- .../policy/output/budget/MultiYearBudgetaryImpact.test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js b/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js index c96f1ef34..504eddae2 100644 --- a/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js +++ b/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js @@ -212,9 +212,11 @@ describe("MultiYearBudgetaryImpact", () => { // expect( // screen.getByText(mockImpact.budget.benefit_spending_impact / 1e9), // ).toBeInTheDocument(); - const expectedBenefitImpact = -Math.abs(mockImpact.budget.benefit_spending_impact / 1e9); + const expectedBenefitImpact = -Math.abs( + mockImpact.budget.benefit_spending_impact / 1e9, + ); expect( - screen.getByText(expectedBenefitImpact.toString()) + screen.getByText(expectedBenefitImpact.toString()), ).toBeInTheDocument(); expect( screen.getByText( From b55053608f8dd7845c1853a777f6119068f741e3 Mon Sep 17 00:00:00 2001 From: v-lerie Date: Mon, 14 Jul 2025 20:10:53 -0400 Subject: [PATCH 4/4] updated MultiYearBudgetaryImpact.test.js to expect negative benefit values --- .../policy/output/budget/MultiYearBudgetaryImpact.test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js b/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js index 504eddae2..61bc63b12 100644 --- a/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js +++ b/src/__tests__/pages/policy/output/budget/MultiYearBudgetaryImpact.test.js @@ -209,9 +209,6 @@ describe("MultiYearBudgetaryImpact", () => { expect( screen.getByText(mockImpact.budget.budgetary_impact / 1e9), ).toBeInTheDocument(); - // expect( - // screen.getByText(mockImpact.budget.benefit_spending_impact / 1e9), - // ).toBeInTheDocument(); const expectedBenefitImpact = -Math.abs( mockImpact.budget.benefit_spending_impact / 1e9, );