Skip to content

Commit 98f5aac

Browse files
[#688] Fix farm economic efficiency calculation
1 parent 798d8c8 commit 98f5aac

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

frontend/src/pages/cases/visualizations/ChartFarmEconomicEfficiency.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,24 @@ const ChartFarmEconomicEfficiency = () => {
3131
(a) => a.caseCommodityId === primaryCaseCommodityID
3232
);
3333

34-
const totalIncomeAnswers = primaryAnswers?.filter(
35-
(a) => a?.question?.id === 1
36-
);
3734
const costAnswers = primaryAnswers?.filter((a) => a?.question?.id === 5);
3835
const landAnswers = primaryAnswers?.filter((a) => a?.question?.id === 2);
39-
// const volumeAnswers = primaryAnswers?.filter((a) => a?.question?.id === 3);
36+
const volumeAnswers = primaryAnswers?.filter((a) => a?.question?.id === 3);
4037

4138
// psudocode
4239
// for values in (current, feasible)
4340
// total_cost = primary-5 * primary-2
4441
// total_volume = primary-3 * primary-2
45-
// farm_economic_efficiency = total_cost/primary_1
42+
// farm_economic_efficiency = total_cost/total_volume
4643

4744
const data = ["current", "feasible"].map((it) => {
48-
const totalIncome = totalIncomeAnswers?.find(
49-
(val) => val.name === it
50-
)?.value;
5145
const cost = costAnswers?.find((val) => val.name === it)?.value || 0;
5246
const land = landAnswers?.find((val) => val.name === it)?.value || 0;
53-
// const volume = volumeAnswers?.find((val) => val.name === it)?.value || 0;
47+
const volume = volumeAnswers?.find((val) => val.name === it)?.value || 0;
5448

5549
const totalCost = cost * land;
56-
const farmEconomicEfficiency = totalIncome ? totalCost / totalIncome : 0;
50+
const totalVolume = volume * land;
51+
const farmEconomicEfficiency = totalVolume ? totalCost / totalVolume : 0;
5752

5853
return {
5954
name: it,

0 commit comments

Comments
 (0)