kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-01 19:47:11 +00:00
Code Issues Projects Releases Wiki Activity

Some bug fixes and cleanup.

Browse Source
This commit is contained in:
James Cole
2015-06-05 16:49:16 +02:00
parent 834b1afb38
commit 40e49ffc37
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -55,17 +55,25 @@ class BudgetController extends Controller
while ($first < $last) {
$end = Navigation::addPeriod($first, $range, 0);
$end->subDay();
// start date for chart.
$chartDate = clone $end;
$chartDate->startOfMonth();
$spent = $repository->spentInPeriodCorrected($budget, $first, $end);
$chart->addRow($end, $spent);
$chart->addRow($chartDate, $spent);
$first = Navigation::addPeriod($first, $range, 0);
}
$chart->generate();
$data = $chart->getData();
$cache->store($data);
return Response::json($data);
@@ -242,7 +250,7 @@ class BudgetController extends Controller
}
$chart->addRowArray($row);
$start->addMonth();
$start->endOfMonth()->addDay();
}
$chart->generate();