kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Expand new charts.

Browse Source
This commit is contained in:
James Cole
2016-04-26 22:30:53 +02:00
parent 66f2df9677
commit 1591b61b77
4 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/CategoryController.php
View File

@@ -181,8 +181,8 @@ class CategoryController extends Controller
// get all spent and earned data:
// get amount earned in period, grouped by day.
$spentArray = $repository->spentPerDay($category, $start, $end);
$earnedArray = $repository->earnedPerDay($category, $start, $end);
$spentArray = $repository->spentPerDay($category, $start, $end, new Collection);
$earnedArray = $repository->earnedPerDay($category, $start, $end, new Collection);
if ($cache->has()) {
$entries = $cache->get();

12
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -68,8 +68,8 @@ class CategoryController extends Controller
if ($cache->has()) {
return Response::json($cache->get());
}
$spentArray = $repository->spentPerDay($category, $start, $end);
$earnedArray = $repository->earnedPerDay($category, $start, $end);
$spentArray = $repository->spentPerDay($category, $start, $end, new Collection);
$earnedArray = $repository->earnedPerDay($category, $start, $end, new Collection);
while ($start <= $end) {
$currentEnd = Navigation::endOfPeriod($start, $range);
@@ -417,8 +417,8 @@ class CategoryController extends Controller
// get amount earned in period, grouped by day.
// get amount spent in period, grouped by day.
$spentArray = $repository->spentPerDay($category, $start, $end);
$earnedArray = $repository->earnedPerDay($category, $start, $end);
$spentArray = $repository->spentPerDay($category, $start, $end, new Collection);
$earnedArray = $repository->earnedPerDay($category, $start, $end, new Collection);
while ($start <= $end) {
$str = $start->format('Y-m-d');
@@ -470,8 +470,8 @@ class CategoryController extends Controller
$currentStart = clone $current;
$currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
$spent = strval(array_sum($repository->spentPerDay($category, $currentStart, $currentEnd)));
$earned = strval(array_sum($repository->earnedPerDay($category, $currentStart, $currentEnd)));
$spent = strval(array_sum($repository->spentPerDay($category, $currentStart, $currentEnd, new Collection)));
$earned = strval(array_sum($repository->earnedPerDay($category, $currentStart, $currentEnd, new Collection)));
$entry = [
$category->name,