fix cumulative income graph

src/app/api/cashflow/index.ts

@@ -29,6 +29,7 @@ export interface CashFlowByMonthChartResult {
   incomeList: any[];
   expenditureList: any[];
   beforeCurrentYearExpenditure: any[];
+  beforeCurrentYearIncome: any[];
 }
 
 export interface CashFlowReceivableAndExpenditure {

src/components/ProjectCashFlow/ProjectCashFlow.tsx

@@ -102,11 +102,11 @@ const ProjectCashFlow: React.FC = () => {
           leftMax = Math.max(cashFlowMonthlyChartData[0].incomeList[i].income,cashFlowMonthlyChartData[0].expenditureList[i].expenditure)
         }
         monthlyIncome.push(cashFlowMonthlyChartData[0].incomeList[i].income)
-        cumulativeIncome.push(cashFlowMonthlyChartData[0].incomeList[i].cumulativeIncome)
+        cumulativeIncome.push(cashFlowMonthlyChartData[0].beforeCurrentYearIncome[0].beforeCurrentYearCumulativeIncome + cashFlowMonthlyChartData[0].incomeList[i].cumulativeIncome)
       }
       for (var i = 0; i < cashFlowMonthlyChartData[0].expenditureList.length; i++) {
-        if (rightMax < cashFlowMonthlyChartData[0].incomeList[i].cumulativeIncome || rightMax < cashFlowMonthlyChartData[0].beforeCurrentYearExpenditure[0].beforeCurrentYearCumulativeExpenditure +cashFlowMonthlyChartData[0].expenditureList[i].cumulativeExpenditure){
-          rightMax = Math.max(cashFlowMonthlyChartData[0].incomeList[i].cumulativeIncome,cashFlowMonthlyChartData[0].beforeCurrentYearExpenditure[0].beforeCurrentYearCumulativeExpenditure + cashFlowMonthlyChartData[0].expenditureList[i].cumulativeExpenditure)
+        if (rightMax < cashFlowMonthlyChartData[0].beforeCurrentYearIncome[0].beforeCurrentYearCumulativeIncome + cashFlowMonthlyChartData[0].incomeList[i].cumulativeIncome || rightMax < cashFlowMonthlyChartData[0].beforeCurrentYearExpenditure[0].beforeCurrentYearCumulativeExpenditure +cashFlowMonthlyChartData[0].expenditureList[i].cumulativeExpenditure){
+          rightMax = Math.max(cashFlowMonthlyChartData[0].beforeCurrentYearIncome[0].beforeCurrentYearCumulativeIncome + cashFlowMonthlyChartData[0].incomeList[i].cumulativeIncome,cashFlowMonthlyChartData[0].beforeCurrentYearExpenditure[0].beforeCurrentYearCumulativeExpenditure + cashFlowMonthlyChartData[0].expenditureList[i].cumulativeExpenditure)
         }
         monthlyExpenditure.push(cashFlowMonthlyChartData[0].expenditureList[i].expenditure)
         cumulativeExpenditure.push(cashFlowMonthlyChartData[0].beforeCurrentYearExpenditure[0].beforeCurrentYearCumulativeExpenditure + cashFlowMonthlyChartData[0].expenditureList[i].cumulativeExpenditure)