IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small chart improvements for #1865

Browse Source
This commit is contained in:
James Cole 2018-11-12 19:31:00 +01:00
parent d1c7a9767a
commit 5011531066
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Chart/CategoryController.php
View File

@ -383,8 +383,12 @@ class CategoryController extends Controller
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('preferences')->get('viewRange', '1M')->data;
$start = app('navigation')->startOfPeriod($date, $range); $start = app('navigation')->startOfPeriod($date, $range);
$end = app('navigation')->endOfPeriod($date, $range); $end = session()->get('end');
$data = $this->makePeriodChart($category, $start, $end); if ($end < $start) {
$end = app('navigation')->endOfPeriod($date, $range);
}
$data = $this->makePeriodChart($category, $start, $end);
return response()->json($data); return response()->json($data);
} }
@ -411,7 +415,7 @@ class CategoryController extends Controller
if ($cache->has()) { if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore //return $cache->get(); // @codeCoverageIgnore
} }
/** @var AccountRepositoryInterface $accountRepository */ /** @var AccountRepositoryInterface $accountRepository */