From 103de5e18aec0db8d6071e108359b43babcb31b8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 29 Sep 2015 09:20:50 +0200 Subject: [PATCH 1/3] New code. Debug. --- app/Http/Controllers/Chart/ReportController.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 5906517934..9f8669b1d1 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -9,6 +9,7 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; use Response; +use Log; /** * Class ReportController @@ -110,8 +111,18 @@ class ReportController extends Controller $month = clone $start; $month->endOfMonth(); // total income and total expenses: - $income = bcadd($income, $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount')); - $expense = bcadd($expense, $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount')); + $currentIncome = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'); + $currentExpense = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'); + + Log::debug('Date ['.$month->format('M Y').']: income = ['.$income.' + '.$currentIncome.'], out = ['.$expense.' + '.$currentExpense.']'); + + $income = bcadd($income, $currentIncome); + $expense = bcadd($expense, $currentExpense); + + + + + $count++; $start->addMonth(); } From da50f9e41964a10a3a3eac095a19856837745356 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 29 Sep 2015 09:28:16 +0200 Subject: [PATCH 2/3] Trying to fix chart. --- app/Generator/Chart/Report/ChartJsReportChartGenerator.php | 2 +- app/Http/Controllers/Chart/ReportController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php index 3ed3d4204b..6869c4c18d 100644 --- a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php +++ b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php @@ -43,7 +43,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator foreach ($entries as $entry) { $data['labels'][] = $entry[0]->formatLocalized($format); $data['datasets'][0]['data'][] = round($entry[1], 2); - $data['datasets'][1]['data'][] = round(($entry[2] * -1), 2); + $data['datasets'][1]['data'][] = round($entry[2], 2); } return $data; diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 9f8669b1d1..0331981df8 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -63,8 +63,8 @@ class ReportController extends Controller $month = clone $start; $month->endOfMonth(); // total income and total expenses: - $incomeSum = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'); - $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'); + $incomeSum = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount_positive'); + $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount_positive'); $entries->push([clone $start, $incomeSum, $expenseSum]); $start->addMonth(); From d691fa9b4db7c9cadd5cd76b1984361b27ba3047 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 29 Sep 2015 09:29:28 +0200 Subject: [PATCH 3/3] Fixed the other chart too. --- app/Generator/Chart/Report/ChartJsReportChartGenerator.php | 4 ++-- app/Http/Controllers/Chart/ReportController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php index 6869c4c18d..0a49d2354a 100644 --- a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php +++ b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php @@ -74,9 +74,9 @@ class ChartJsReportChartGenerator implements ReportChartGenerator ], ]; $data['datasets'][0]['data'][] = round($income, 2); - $data['datasets'][1]['data'][] = round( ($expense * -1), 2); + $data['datasets'][1]['data'][] = round( $expense, 2); $data['datasets'][0]['data'][] = round(($income / $count), 2); - $data['datasets'][1]['data'][] = round(( ($expense*-1) / $count), 2); + $data['datasets'][1]['data'][] = round(( $expense / $count), 2); return $data; } diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 0331981df8..6522f8b2a7 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -111,8 +111,8 @@ class ReportController extends Controller $month = clone $start; $month->endOfMonth(); // total income and total expenses: - $currentIncome = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'); - $currentExpense = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'); + $currentIncome = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount_positive'); + $currentExpense = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount_positive'); Log::debug('Date ['.$month->format('M Y').']: income = ['.$income.' + '.$currentIncome.'], out = ['.$expense.' + '.$currentExpense.']');