kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

And optimised another chart. Amounts are slightly different. Will investigate

Browse Source
This commit is contained in:
James Cole
2015-12-31 08:31:28 +01:00
parent aac5c2b13c
commit 25747fbcf2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Report/ReportQuery.php
View File

@@ -313,7 +313,7 @@ class ReportQuery implements ReportQueryInterface
->get( ->get(
[ [
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'), 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 = []; $array = [];

4
app/Http/Controllers/Chart/ReportController.php
View File

@@ -66,7 +66,7 @@ class ReportController extends Controller
while ($start < $end) { while ($start < $end) {
$incomeSum = $this->pluckFromArray($start->year, $earnedArray); $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]); $entries->push([clone $start, $incomeSum, $expenseSum]);
$start->addYear(); $start->addYear();
@@ -82,7 +82,7 @@ class ReportController extends Controller
// total income and total expenses: // total income and total expenses:
$date = $start->format('Y-m'); $date = $start->format('Y-m');
$incomeSum = isset($earnedArray[$date]) ? $earnedArray[$date] : 0; $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]); $entries->push([clone $start, $incomeSum, $expenseSum]);
$start->addMonth(); $start->addMonth();