kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-13 05:08:10 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup [skip-ci]

Browse Source
This commit is contained in:
James Cole
2014-07-15 22:16:29 +02:00
parent 473e0f81c9
commit d280767407
35 changed files with 469 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/controllers/ChartController.php
View File

@@ -4,36 +4,45 @@ use Firefly\Helper\Toolkit\Toolkit as tk;
use Firefly\Storage\Account\AccountRepositoryInterface as ARI;
use Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface as TJRI;
/**
* Class ChartController
*/
class ChartController extends BaseController
{
protected $accounts;
protected $journals;
protected $_accounts;
protected $_journals;
/**
* @param ARI $accounts
* @param TJRI $journals
*/
public function __construct(ARI $accounts, TJRI $journals)
{
$this->accounts = $accounts;
$this->journals = $journals;
$this->_accounts = $accounts;
$this->_journals = $journals;
}
/**
* Show home charts.
* @param null $accountId
*
* @return \Illuminate\Http\JsonResponse
*/
public function homeAccount($id = null)
public function homeAccount($accountId = null)
{
list($start, $end) = tk::getDateRange();
$current = clone $start;
$return = [];
$account = null;
if(!is_null($id)) {
$account = $this->accounts->find($id);
if (!is_null($accountId)) {
$account = $this->_accounts->find($accountId);
}
if (is_null($account)) {
$accounts = $this->accounts->getActiveDefault();
$accounts = $this->_accounts->getActiveDefault();
foreach ($accounts as $index => $account) {
foreach ($accounts as $account) {
$return[] = ['name' => $account->name, 'data' => []];
}
while ($current <= $end) {
@@ -69,7 +78,7 @@ class ChartController extends BaseController
'data' => []
];
$result = $this->journals->homeBudgetChart($start, $end);
$result = $this->_journals->homeBudgetChart($start, $end);
foreach ($result as $name => $amount) {
$data['data'][] = [$name, $amount];
@@ -85,7 +94,7 @@ class ChartController extends BaseController
{
list($start, $end) = tk::getDateRange();
$result = $this->journals->homeCategoryChart($start, $end);
$result = $this->_journals->homeCategoryChart($start, $end);
$data = [
'type' => 'pie',
'name' => 'Amount: ',
@@ -111,7 +120,7 @@ class ChartController extends BaseController
'data' => []
];
$result = $this->journals->homeBeneficiaryChart($start, $end);
$result = $this->_journals->homeBeneficiaryChart($start, $end);
foreach ($result as $name => $amount) {
$data['data'][] = [$name, $amount];