kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Refactor method to original name #524

Browse Source
This commit is contained in:
James Cole
2017-01-05 08:47:45 +01:00
parent 452c14bece
commit 7c5ee8a67d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/CategoryController.php
View File

@@ -345,7 +345,7 @@ class CategoryController extends Controller
while ($end >= $first) { while ($end >= $first) {
$end = Navigation::startOfPeriod($end, $range); $end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range);
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $end, $currentEnd); $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
$dateStr = $end->format('Y-m-d'); $dateStr = $end->format('Y-m-d');
$dateName = Navigation::periodShow($end, $range); $dateName = Navigation::periodShow($end, $range);

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

@@ -90,7 +90,7 @@ class CategoryController extends Controller
while ($start <= $end) { while ($start <= $end) {
$currentEnd = Navigation::endOfPeriod($start, $range); $currentEnd = Navigation::endOfPeriod($start, $range);
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $currentEnd); $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd); $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
$label = Navigation::periodShow($start, $range); $label = Navigation::periodShow($start, $range);
$chartData[0]['entries'][$label] = bcmul($spent, '-1'); $chartData[0]['entries'][$label] = bcmul($spent, '-1');
@@ -143,7 +143,7 @@ class CategoryController extends Controller
$accounts = $accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); $accounts = $accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
/** @var Category $category */ /** @var Category $category */
foreach ($categories as $category) { foreach ($categories as $category) {
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $end); $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $end);
if (bccomp($spent, '0') === -1) { if (bccomp($spent, '0') === -1) {
$chartData[$category->name] = bcmul($spent, '-1'); $chartData[$category->name] = bcmul($spent, '-1');
} }
@@ -315,7 +315,7 @@ class CategoryController extends Controller
]; ];
while ($start <= $end) { while ($start <= $end) {
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $start); $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $start);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start); $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start);
$label = Navigation::periodShow($start, '1D'); $label = Navigation::periodShow($start, '1D');

2
app/Http/Controllers/Report/CategoryController.php
View File

@@ -123,7 +123,7 @@ class CategoryController extends Controller
$report = []; $report = [];
/** @var Category $category */ /** @var Category $category */
foreach ($categories as $category) { foreach ($categories as $category) {
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $end); $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $end);
if (bccomp($spent, '0') !== 0) { if (bccomp($spent, '0') !== 0) {
$report[$category->id] = ['name' => $category->name, 'spent' => $spent]; $report[$category->id] = ['name' => $category->name, 'spent' => $spent];
} }

2
app/Repositories/Category/CategoryRepository.php
View File

@@ -392,7 +392,7 @@ class CategoryRepository implements CategoryRepositoryInterface
* *
* @return string * @return string
*/ */
public function spentInPeriodCollector(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string public function spentInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [$this->user]); $collector = app(JournalCollectorInterface::class, [$this->user]);

2
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@@ -129,7 +129,7 @@ interface CategoryRepositoryInterface
* *
* @return string * @return string
*/ */
public function spentInPeriodCollector(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string; public function spentInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string;
/** /**
* @param Collection $accounts * @param Collection $accounts