gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed budget controller. [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-28 21:33:32 +02:00
parent b0ddc04a0d
commit 1b919b1dab
20 changed files with 540 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/ChartController.php
View File

@@ -21,11 +21,11 @@ class ChartController extends BaseController
/**
* @param ARI $accounts
* @param ARI $accounts
* @param TJRI $journals
* @param PHI $preferences
* @param tk $toolkit
* @param BRI $budgets
* @param PHI $preferences
* @param tk $toolkit
* @param BRI $budgets
*/
public function __construct(ARI $accounts, TJRI $journals, PHI $preferences, tk $toolkit, BRI $budgets)
{
@@ -85,6 +85,7 @@ class ChartController extends BaseController
$current->addDay();
}
}
return Response::json($return);
}
@@ -118,6 +119,7 @@ class ChartController extends BaseController
}
}
}
return View::make('charts.info')->with('rows', $result)->with('sum', $sum);
}
@@ -179,14 +181,9 @@ class ChartController extends BaseController
$repeatFreq = Config::get('firefly.range_to_repeat_freq.' . Session::get('range'));
$dateFormats = Config::get('firefly.date_formats_by_period.' . $repeatFreq);
if (is_null($dateFormats)) {
throw new FireflyException('No date formats for ' . \Session::get('range'));
}
$limitInPeriod = 'Envelope for ' . $start->format($dateFormats['display_date']);
$spentInPeriod = 'Spent in ' . $start->format($dateFormats['display_date']);
$limitInPeriod = 'Envelope for XXX';
$spentInPeriod = 'Spent in XXX';
$data['series'] = [
[
@@ -217,6 +214,7 @@ class ChartController extends BaseController
}
return Response::json($data);
}
}