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

Some basic fixes for the transaction controller [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-08-02 07:34:38 +02:00
parent af856a135f
commit d756324432
31 changed files with 726 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/ChartController.php
View File

@@ -35,8 +35,8 @@ class ChartController extends BaseController
$end = Session::get('end');
\Log::debug('Draw home account chart.');
\Log::debug('From: '.$start.' ('.$start->timezone.')');
\Log::debug('Until: '.$end);
\Log::debug('From: ' . $start . ' (' . $start->timezone . ')');
\Log::debug('Until: ' . $end);
if (is_null($account)) {
// get, depending on preferences:
@@ -116,7 +116,9 @@ class ChartController extends BaseController
}
public function categoryShowChart(Category $category) {
public function categoryShowChart(Category $category)
{
$start = Session::get('start');
$end = Session::get('end');
$range = Session::get('range');
@@ -124,11 +126,11 @@ class ChartController extends BaseController
$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
'subtitle' => '<a href="' . route('categories.show', [$category->id]) . '">View more</a>',
'series' => $serie
];
return Response::json($data);
return Response::json($data);
}