From e67812bf646da105b74847f5aa8f5a99a759e795 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 12 Aug 2019 18:17:15 +0200 Subject: [PATCH] Method is no longer used. --- .../Http/Controllers/ChartGeneration.php | 95 ------------------- 1 file changed, 95 deletions(-) diff --git a/app/Support/Http/Controllers/ChartGeneration.php b/app/Support/Http/Controllers/ChartGeneration.php index 516f7a330d..fd31d54706 100644 --- a/app/Support/Http/Controllers/ChartGeneration.php +++ b/app/Support/Http/Controllers/ChartGeneration.php @@ -26,11 +26,8 @@ namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\Category; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; -use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; @@ -169,96 +166,4 @@ trait ChartGeneration return $result; } - - /** - * Chart for a specific period (start and end). - * - * - * @param Category $category - * @param Carbon $start - * @param Carbon $end - * - * @return array - * - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - */ - protected function makePeriodChart(Category $category, Carbon $start, Carbon $end): array // chart helper method. - { - $cache = new CacheProperties; - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty($category->id); - $cache->addProperty('chart.category.period-chart'); - - - if ($cache->has()) { - return $cache->get(); // @codeCoverageIgnore - } - - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $repository = app(CategoryRepositoryInterface::class); - /** @var GeneratorInterface $generator */ - $generator = app(GeneratorInterface::class); - - // chart data - $chartData = [ - [ - 'label' => (string)trans('firefly.spent'), - 'entries' => [], - 'type' => 'bar', - 'backgroundColor' => 'rgba(219, 68, 55, 0.5)', // red - ], - [ - 'label' => (string)trans('firefly.earned'), - 'entries' => [], - 'type' => 'bar', - 'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green - ], - [ - 'label' => (string)trans('firefly.sum'), - 'entries' => [], - 'type' => 'line', - 'fill' => false, - ], - ]; - - $step = $this->calculateStep($start, $end); - - - while ($start <= $end) { - $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $start); - $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start); - $sum = bcadd($spent, $earned); - $label = trim(app('navigation')->periodShow($start, $step)); - $chartData[0]['entries'][$label] = round(bcmul($spent, '-1'), 12); - $chartData[1]['entries'][$label] = round($earned, 12); - $chartData[2]['entries'][$label] = round($sum, 12); - - // @codeCoverageIgnoreStart - switch ($step) { - default: - case '1D': - $start->addDay(); - break; - case '1W': - $start->addDays(7); - break; - case '1M': - $start->addMonth(); - break; - case '1Y': - $start->addYear(); - break; - } - // @codeCoverageIgnoreEnd - } - - $data = $generator->multiSet($chartData); - $cache->store($data); - - return $data; - } - }