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

Reinstate chart.

Browse Source
This commit is contained in:
James Cole 2016-05-11 09:17:47 +02:00
parent ed9acbdfde
commit e1c146a5c1
2 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ use FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI; use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -264,6 +265,7 @@ class CategoryController extends Controller
* $entries->push($entry); * $entries->push($entry);
* } * }
* // generate chart with data: * // generate chart with data:
*
* $data = $this->generator->multiYear($entries); * $data = $this->generator->multiYear($entries);
* $cache->store($data); * $cache->store($data);
* *
@ -275,60 +277,55 @@ class CategoryController extends Controller
/** /**
* @param Category $category * @param Category $category
* @param string $reportType
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* @param Collection $accounts * @param Collection $accounts
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function period(Category $category, string $reportType, Carbon $start, Carbon $end, Collection $accounts) public function period(Category $category, Carbon $start, Carbon $end, Collection $accounts)
{ {
/** // chart properties for cache:
* // chart properties for cache: $cache = new CacheProperties();
* $cache = new CacheProperties(); $cache->addProperty($start);
* $cache->addProperty($start); $cache->addProperty($end);
* $cache->addProperty($end); $cache->addProperty($accounts);
* $cache->addProperty($reportType); $cache->addProperty($category->id);
* $cache->addProperty($accounts); $cache->addProperty('category');
* $cache->addProperty($category->id); $cache->addProperty('period');
* $cache->addProperty('category'); if ($cache->has()) {
* $cache->addProperty('period'); // return Response::json($cache->get());
* if ($cache->has()) { }
* return Response::json($cache->get());
* }
*
* /** @var CategoryRepositoryInterface $repository
* $repository = app(CategoryRepositoryInterface::class);
* // loop over period, add by users range:
* $current = clone $start;
* $viewRange = Preferences::get('viewRange', '1M')->data;
* $format = strval(trans('config.month'));
* $set = new Collection;
* while ($current < $end) {
* $currentStart = clone $current;
* $currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
*
* $spent = strval(array_sum($repository->spentPerDay($category, $currentStart, $currentEnd, $accounts)));
* $earned = strval(array_sum($repository->earnedPerDay($category, $currentStart, $currentEnd, $accounts)));
*
* $entry = [
* $category->name,
* $currentStart->formatLocalized($format),
* $spent,
* $earned,
*
* ];
* $set->push($entry);
* $currentEnd->addDay();
* $current = clone $currentEnd;
* }
* $data = $this->generator->period($set);
* $cache->store($data);
*
* return Response::json($data);
* **/
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$categoryCollection = new Collection([$category]);
// loop over period, add by users range:
$current = clone $start;
$viewRange = Preferences::get('viewRange', '1M')->data;
$format = strval(trans('config.month'));
$set = new Collection;
while ($current < $end) {
$currentStart = clone $current;
$currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
$spent = $repository->spentInPeriod($categoryCollection, $accounts, $currentStart, $currentEnd);
$earned = $repository->earnedInPeriod($categoryCollection, $accounts, $currentStart, $currentEnd);
$entry = [
$category->name,
$currentStart->formatLocalized($format),
$spent,
$earned,
];
$set->push($entry);
$currentEnd->addDay();
$current = clone $currentEnd;
}
$data = $this->generator->period($set);
$cache->store($data);
return Response::json($data);
} }
/** /**

2
app/Http/routes.php
View File

@ -208,7 +208,7 @@ Route::group(
// categories: // categories:
Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']); Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']);
Route::get('/chart/category/period/{category}/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@period']); Route::get('/chart/category/period/{category}/default/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@period']);
// these three charts are for reports: // these three charts are for reports:
Route::get('/chart/category/earned-in-period/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@earnedInPeriod']); Route::get('/chart/category/earned-in-period/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@earnedInPeriod']);