kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #1328

Browse Source
This commit is contained in:
James Cole
2018-04-15 19:20:04 +02:00
parent ce1614f4e7
commit f4f3c8798e
1 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -22,12 +22,14 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart; namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
/** /**
* Class PiggyBankController. * Class PiggyBankController.
@@ -64,16 +66,44 @@ class PiggyBankController extends Controller
if ($cache->has()) { if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore return response()->json($cache->get()); // @codeCoverageIgnore
} }
$set = $repository->getEvents($piggyBank);
$set = $set->reverse();
// get first event or start date of piggy bank or today
$startDate = $piggyBank->start_date ?? new Carbon;
/** @var PiggyBankEvent $first */
$firstEvent = $set->first();
$firstDate = null === $firstEvent ? new Carbon : $firstEvent->date;
// which ever is older:
$oldest = $startDate->lt($firstDate) ? $startDate : $firstDate;
$today = new Carbon;
// depending on diff, do something with range of chart.
$step = '1D';
$months = $oldest->diffInMonths($today);
if ($months > 3) {
$step = '1W'; // @codeCoverageIgnore
}
if ($months > 24) {
$step = '1M'; // @codeCoverageIgnore
}
if ($months > 100) {
$step = '1Y'; // @codeCoverageIgnore
}
$set = $repository->getEvents($piggyBank);
$set = $set->reverse();
$chartData = []; $chartData = [];
$sum = '0'; while ($oldest <= $today) {
/** @var PiggyBankEvent $entry */ /** @var Collection $filtered */
foreach ($set as $entry) { $filtered = $set->filter(
$label = $entry->date->formatLocalized((string)trans('config.month_and_day')); function (PiggyBankEvent $event) use ($oldest) {
$sum = bcadd($sum, $entry->amount); return $event->date->lte($oldest);
$chartData[$label] = $sum; }
);
$currentSum = $filtered->sum('amount');
$label = $oldest->formatLocalized((string)trans('config.month_and_day'));
$chartData[$label] = $currentSum;
$oldest = app('navigation')->addPeriod($oldest, $step, 0);
} }
$data = $this->generator->singleSet($piggyBank->name, $chartData); $data = $this->generator->singleSet($piggyBank->name, $chartData);