kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-21 03:39:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix charts to match report.

Browse Source
This commit is contained in:
James Cole
2015-03-10 20:26:52 +01:00
parent e69545fd95
commit 678e504c48
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/GoogleChartController.php
View File

@@ -560,6 +560,9 @@ class GoogleChartController extends Controller
$chart->addColumn('Income', 'number'); $chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number'); $chart->addColumn('Expenses', 'number');
$pref = Preferences::get('showSharedReports', false);
$showSharedReports = $pref->data;
// get report query interface. // get report query interface.
$end = clone $start; $end = clone $start;
@@ -568,14 +571,14 @@ class GoogleChartController extends Controller
$currentEnd = clone $start; $currentEnd = clone $start;
$currentEnd->endOfMonth(); $currentEnd->endOfMonth();
// total income: // total income:
$income = $query->incomeByPeriod($start, $currentEnd); $income = $query->incomeByPeriod($start, $currentEnd, $showSharedReports);
$incomeSum = 0; $incomeSum = 0;
foreach ($income as $entry) { foreach ($income as $entry) {
$incomeSum += floatval($entry->amount); $incomeSum += floatval($entry->amount);
} }
// total expenses: // total expenses:
$expense = $query->journalsByExpenseAccount($start, $currentEnd); $expense = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports);
$expenseSum = 0; $expenseSum = 0;
foreach ($expense as $entry) { foreach ($expense as $entry) {
$expenseSum += floatval($entry->amount); $expenseSum += floatval($entry->amount);
@@ -609,6 +612,9 @@ class GoogleChartController extends Controller
$chart->addColumn('Income', 'number'); $chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number'); $chart->addColumn('Expenses', 'number');
$pref = Preferences::get('showSharedReports', false);
$showSharedReports = $pref->data;
$income = 0; $income = 0;
$expense = 0; $expense = 0;
$count = 0; $count = 0;
@@ -619,14 +625,14 @@ class GoogleChartController extends Controller
$currentEnd = clone $start; $currentEnd = clone $start;
$currentEnd->endOfMonth(); $currentEnd->endOfMonth();
// total income: // total income:
$incomeResult = $query->incomeByPeriod($start, $currentEnd); $incomeResult = $query->incomeByPeriod($start, $currentEnd, $showSharedReports);
$incomeSum = 0; $incomeSum = 0;
foreach ($incomeResult as $entry) { foreach ($incomeResult as $entry) {
$incomeSum += floatval($entry->amount); $incomeSum += floatval($entry->amount);
} }
// total expenses: // total expenses:
$expenseResult = $query->journalsByExpenseAccount($start, $currentEnd); $expenseResult = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports);
$expenseSum = 0; $expenseSum = 0;
foreach ($expenseResult as $entry) { foreach ($expenseResult as $entry) {
$expenseSum += floatval($entry->amount); $expenseSum += floatval($entry->amount);