From 25747fbcf202d3b58c76ad3120e1ce3eb767bcaf Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 31 Dec 2015 08:31:28 +0100 Subject: [PATCH] And optimised another chart. Amounts are slightly different. Will investigate --- app/Helpers/Report/ReportQuery.php | 2 +- app/Http/Controllers/Chart/ReportController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index f6a7119217..8015b2e150 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -313,7 +313,7 @@ class ReportQuery implements ReportQueryInterface ->get( [ DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'), - DB::Raw('SUM(`t_from`.`amount`) AS `sum`') + DB::Raw('SUM(`t_to`.`amount`) AS `sum`') ] ); $array = []; diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 08492fd4e1..aaa03f3446 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -66,7 +66,7 @@ class ReportController extends Controller while ($start < $end) { $incomeSum = $this->pluckFromArray($start->year, $earnedArray); - $expenseSum = $this->pluckFromArray($start->year, $spentArray); + $expenseSum = $this->pluckFromArray($start->year, $spentArray) * -1; $entries->push([clone $start, $incomeSum, $expenseSum]); $start->addYear(); @@ -82,7 +82,7 @@ class ReportController extends Controller // total income and total expenses: $date = $start->format('Y-m'); $incomeSum = isset($earnedArray[$date]) ? $earnedArray[$date] : 0; - $expenseSum = isset($spentArray[$date]) ? $spentArray[$date] : 0; + $expenseSum = isset($spentArray[$date]) ? ($spentArray[$date]*-1) : 0; $entries->push([clone $start, $incomeSum, $expenseSum]); $start->addMonth();