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

Expand chart generation.

Browse Source
This commit is contained in:
James Cole
2015-12-14 21:11:57 +01:00
parent 29dc122ad3
commit 006d68e279
1 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,21 +55,47 @@ class ReportController extends Controller
return Response::json($cache->get()); // @codeCoverageIgnore return Response::json($cache->get()); // @codeCoverageIgnore
} }
$entries = new Collection;
while ($start < $end) {
$month = clone $start;
$month->endOfMonth();
// total income and total expenses:
$incomeSum = $query->incomeInPeriod($start, $month, $accounts)->sum('amount_positive');
$expenseSum = $query->expenseInPeriod($start, $month, $accounts)->sum('amount_positive');
$entries->push([clone $start, $incomeSum, $expenseSum]); // per year?
$start->addMonth(); if ($start->diffInMonths($end) > 12) {
$entries = new Collection;
while ($start < $end) {
$startOfYear = clone $start;
$startOfYear->startOfYear();
$endOfYear = clone $startOfYear;
$endOfYear->endOfYear();
// total income and total expenses:
$incomeSum = $query->incomeInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
$expenseSum = $query->expenseInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
$entries->push([clone $start, $incomeSum, $expenseSum]);
$start->addYear();
}
$data = $this->generator->multiYearInOut($entries);
$cache->store($data);
} else {
// per month:
$entries = new Collection;
while ($start < $end) {
$month = clone $start;
$month->endOfMonth();
// total income and total expenses:
$incomeSum = $query->incomeInPeriod($start, $month, $accounts)->sum('amount_positive');
$expenseSum = $query->expenseInPeriod($start, $month, $accounts)->sum('amount_positive');
$entries->push([clone $start, $incomeSum, $expenseSum]);
$start->addMonth();
}
$data = $this->generator->yearInOut($entries);
$cache->store($data);
} }
$data = $this->generator->yearInOut($entries);
$cache->store($data);
return Response::json($data); return Response::json($data);
@@ -105,21 +131,45 @@ class ReportController extends Controller
bcscale(2); bcscale(2);
while ($start < $end) { if ($start->diffInMonths($end) > 12) {
$month = clone $start; // per year
$month->endOfMonth(); while ($start < $end) {
// total income and total expenses: $startOfYear = clone $start;
$currentIncome = $query->incomeInPeriod($start, $month, $accounts)->sum('amount_positive'); $startOfYear->startOfYear();
$currentExpense = $query->expenseInPeriod($start, $month, $accounts)->sum('amount_positive'); $endOfYear = clone $startOfYear;
$income = bcadd($income, $currentIncome); $endOfYear->endOfYear();
$expense = bcadd($expense, $currentExpense);
$count++; // total income and total expenses:
$start->addMonth(); $currentIncome = $query->incomeInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
$currentExpense = $query->expenseInPeriod($startOfYear, $endOfYear, $accounts)->sum('amount_positive');
$income = bcadd($income, $currentIncome);
$expense = bcadd($expense, $currentExpense);
$count++;
$start->addYear();
}
$data = $this->generator->multiYearInOutSummarized($income, $expense, $count);
$cache->store($data);
} else {
// per month!
while ($start < $end) {
$month = clone $start;
$month->endOfMonth();
// total income and total expenses:
$currentIncome = $query->incomeInPeriod($start, $month, $accounts)->sum('amount_positive');
$currentExpense = $query->expenseInPeriod($start, $month, $accounts)->sum('amount_positive');
$income = bcadd($income, $currentIncome);
$expense = bcadd($expense, $currentExpense);
$count++;
$start->addMonth();
}
$data = $this->generator->yearInOutSummarized($income, $expense, $count);
$cache->store($data);
} }
$data = $this->generator->yearInOutSummarized($income, $expense, $count);
$cache->store($data);
return Response::json($data); return Response::json($data);