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

More routes and pages fixed.

Browse Source
This commit is contained in:
James Cole
2016-12-06 08:15:53 +01:00
parent d8f291be6e
commit f4887bbbf7
15 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Http/Controllers/Chart/ReportController.php
View File

@@ -49,13 +49,12 @@ class ReportController extends Controller
* This chart, by default, is shown on the multi-year and year report pages,
* which means that giving it a 2 week "period" should be enough granularity.
*
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @param Carbon $start
* @param Carbon $end
* @return \Illuminate\Http\JsonResponse
*/
public function netWorth(Carbon $start, Carbon $end, Collection $accounts)
public function netWorth(Collection $accounts, Carbon $start, Carbon $end)
{
// chart properties for cache:
$cache = new CacheProperties;
@@ -90,13 +89,16 @@ class ReportController extends Controller
/**
* Shows income and expense, debet/credit: operations
*
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
*
* @return \Illuminate\Http\JsonResponse
*/
public function yearInOut(Carbon $start, Carbon $end, Collection $accounts)
public function operations(Collection $accounts, Carbon $start, Carbon $end)
{
// chart properties for cache:
$cache = new CacheProperties;
@@ -112,14 +114,14 @@ class ReportController extends Controller
if ($start->diffInMonths($end) > 12) {
// data = method X
$data = $this->multiYearInOut($chartSource['earned'], $chartSource['spent'], $start, $end);
$data = $this->multiYearOperations($chartSource['earned'], $chartSource['spent'], $start, $end);
$cache->store($data);
return Response::json($data);
}
// data = method Y
$data = $this->singleYearInOut($chartSource['earned'], $chartSource['spent'], $start, $end);
$data = $this->singleYearOperations($chartSource['earned'], $chartSource['spent'], $start, $end);
$cache->store($data);
return Response::json($data);
@@ -128,14 +130,14 @@ class ReportController extends Controller
}
/**
* Shows sum income and expense, debet/credit: operations
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return \Illuminate\Http\JsonResponse
* @internal param AccountRepositoryInterface $repository
*/
public function yearInOutSummarized(Carbon $start, Carbon $end, Collection $accounts)
public function sum(Collection $accounts, Carbon $start, Carbon $end)
{
// chart properties for cache:
@@ -151,13 +153,13 @@ class ReportController extends Controller
if ($start->diffInMonths($end) > 12) {
// per year
$data = $this->multiYearInOutSummarized($chartSource['earned'], $chartSource['spent'], $start, $end);
$data = $this->multiYearSum($chartSource['earned'], $chartSource['spent'], $start, $end);
$cache->store($data);
return Response::json($data);
}
// per month!
$data = $this->singleYearInOutSummarized($chartSource['earned'], $chartSource['spent'], $start, $end);
$data = $this->singleYearSum($chartSource['earned'], $chartSource['spent'], $start, $end);
$cache->store($data);
return Response::json($data);
@@ -172,7 +174,7 @@ class ReportController extends Controller
*
* @return array
*/
protected function multiYearInOut(array $earned, array $spent, Carbon $start, Carbon $end)
protected function multiYearOperations(array $earned, array $spent, Carbon $start, Carbon $end)
{
$entries = new Collection;
while ($start < $end) {
@@ -184,7 +186,7 @@ class ReportController extends Controller
$start->addYear();
}
$data = $this->generator->multiYearInOut($entries);
$data = $this->generator->multiYearOperations($entries);
return $data;
}
@@ -197,7 +199,7 @@ class ReportController extends Controller
*
* @return array
*/
protected function multiYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end)
protected function multiYearSum(array $earned, array $spent, Carbon $start, Carbon $end)
{
$income = '0';
$expense = '0';
@@ -213,7 +215,7 @@ class ReportController extends Controller
$start->addYear();
}
$data = $this->generator->multiYearInOutSummarized($income, $expense, $count);
$data = $this->generator->multiYearSum($income, $expense, $count);
return $data;
}
@@ -245,7 +247,7 @@ class ReportController extends Controller
*
* @return array
*/
protected function singleYearInOut(array $earned, array $spent, Carbon $start, Carbon $end)
protected function singleYearOperations(array $earned, array $spent, Carbon $start, Carbon $end)
{
// per month? simply use each month.
@@ -260,7 +262,7 @@ class ReportController extends Controller
$start->addMonth();
}
$data = $this->generator->yearInOut($entries);
$data = $this->generator->yearOperations($entries);
return $data;
}
@@ -273,7 +275,7 @@ class ReportController extends Controller
*
* @return array
*/
protected function singleYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end)
protected function singleYearSum(array $earned, array $spent, Carbon $start, Carbon $end)
{
$income = '0';
$expense = '0';
@@ -289,7 +291,7 @@ class ReportController extends Controller
$start->addMonth();
}
$data = $this->generator->yearInOutSummarized($income, $expense, $count);
$data = $this->generator->yearSum($income, $expense, $count);
return $data;
}

1
app/Http/Controllers/JsonController.php
View File

@@ -102,7 +102,6 @@ class JsonController extends Controller
*
* @return \Illuminate\Http\JsonResponse
*
* @internal param ARI $accountRepository
*/
public function boxIn(AccountTaskerInterface $accountTasker, AccountRepositoryInterface $repository)
{

1
app/Http/Controllers/RuleController.php
View File

@@ -104,7 +104,6 @@ class RuleController extends Controller
* @param Rule $rule
*
* @return View
* @internal param RuleRepositoryInterface $repository
*/
public function delete(Rule $rule)
{