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

Fixed some chart details.

Browse Source
This commit is contained in:
James Cole
2014-08-03 09:39:07 +02:00
parent f0b7e3342f
commit 2c7af6ab5f
5 changed files with 122 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/controllers/ChartController.php
View File

@@ -1,5 +1,6 @@
<?php
use Carbon\Carbon;
use Firefly\Helper\Controllers\ChartInterface;
use Firefly\Storage\Account\AccountRepositoryInterface;
@@ -22,6 +23,24 @@ class ChartController extends BaseController
$this->_accounts = $accounts;
}
public function categoryShowChart(Category $category)
{
$start = Session::get('start');
$end = Session::get('end');
$range = Session::get('range');
$serie = $this->_chart->categoryShowChart($category, $range, $start, $end);
$data = [
'chart_title' => $category->name,
'subtitle' => '<a href="' . route('categories.show', [$category->id]) . '">View more</a>',
'series' => $serie
];
return Response::json($data);
}
/**
* @param Account $account
*
@@ -70,28 +89,15 @@ class ChartController extends BaseController
return Response::json($data);
}
/**
* Return some beneficiary info for an account and a date.
*
* @param $name
* @param $day
* @param $month
* @param $year
*
* @return $this|\Illuminate\View\View
*/
public function homeAccountInfo($name, $day, $month, $year)
public function homeAccountInfo(Account $account, $day, $month, $year)
{
$account = $this->_accounts->findByName($name);
$date = Carbon::createFromDate($year, $month, $day);
if ($account) {
$result = $this->_chart->accountDailySummary($account, $date);
$result = $this->_chart->accountDailySummary($account, $date);
return View::make('charts.info')->with('rows', $result['rows'])->with('sum', $result['sum']);
} else {
return View::make('error')->with('message', 'No account!');
}
return View::make('charts.info')->with('rows', $result['rows'])->with('sum', $result['sum'])->with(
'account', $account
);
}
/**
@@ -115,23 +121,5 @@ class ChartController extends BaseController
return Response::json($this->_chart->categories($start, $end));
}
public function categoryShowChart(Category $category)
{
$start = Session::get('start');
$end = Session::get('end');
$range = Session::get('range');
$serie = $this->_chart->categoryShowChart($category, $range, $start, $end);
$data = [
'chart_title' => $category->name,
'subtitle' => '<a href="' . route('categories.show', [$category->id]) . '">View more</a>',
'series' => $serie
];
return Response::json($data);
}
}