kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-03 19:41:54 +00:00
Code Issues Projects Releases Wiki Activity

New budget charts for year report.

Browse Source
This commit is contained in:
James Cole
2015-01-24 08:54:33 +01:00
parent f231263085
commit 83f5b5e293
5 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/GoogleChartController.php
View File

@@ -281,7 +281,7 @@ class GoogleChartController extends BaseController
*
* @return \Illuminate\Http\JsonResponse
*/
public function budgetsAndSpending(Budget $budget)
public function budgetsAndSpending(Budget $budget, $year = 0)
{
/** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
$budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
@@ -289,21 +289,26 @@ class GoogleChartController extends BaseController
$this->_chart->addColumn('Month', 'date');
$this->_chart->addColumn('Budgeted', 'number');
$this->_chart->addColumn('Spent', 'number');
if ($year == 0) {
// grab the first budgetlimit ever:
$firstLimit = $budget->budgetlimits()->orderBy('startdate', 'ASC')->first();
if ($firstLimit) {
$start = new Carbon($firstLimit->startdate);
} else {
$start = Carbon::now()->startOfYear();
}
// grab the first budgetlimit ever:
$firstLimit = $budget->budgetlimits()->orderBy('startdate', 'ASC')->first();
if ($firstLimit) {
$start = new Carbon($firstLimit->startdate);
// grab the last budget limit ever:
$lastLimit = $budget->budgetlimits()->orderBy('startdate', 'DESC')->first();
if ($lastLimit) {
$end = new Carbon($lastLimit->startdate);
} else {
$end = Carbon::now()->endOfYear();
}
} else {
$start = Carbon::now()->startOfYear();
}
// grab the last budget limit ever:
$lastLimit = $budget->budgetlimits()->orderBy('startdate', 'DESC')->first();
if ($lastLimit) {
$end = new Carbon($lastLimit->startdate);
} else {
$end = Carbon::now()->endOfYear();
$start = Carbon::createFromDate(intval($year), 1, 1);
$end = clone $start;
$end->endOfYear();
}