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

Clean up code

Browse Source
This commit is contained in:
James Cole 2023-08-01 09:47:06 +02:00
parent 8162b22d43
commit 8d55f7f2e5
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V2/Controllers/Chart/AccountController.php
View File

@ -143,7 +143,6 @@ class AccountController extends Controller
$currentSet['entries'][$label] = $balance; $currentSet['entries'][$label] = $balance;
$currentSet['converted_entries'][$label] = $balanceConverted; $currentSet['converted_entries'][$label] = $balanceConverted;
} }
$currentSet = $this->cerChartSet($currentSet);
$chartData[] = $currentSet; $chartData[] = $currentSet;
} }

15
app/Api/V2/Controllers/Chart/BalanceController.php
View File

@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates; use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use FireflyIII\Support\Http\Api\ExchangeRateConverter; use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
@ -66,9 +67,9 @@ class BalanceController extends Controller
* *
* @param BalanceChartRequest $request * @param BalanceChartRequest $request
* *
* @return string * @return JsonResponse
*/ */
public function balance(BalanceChartRequest $request): string public function balance(BalanceChartRequest $request): JsonResponse
{ {
$params = $request->getAll(); $params = $request->getAll();
/** @var Carbon $start */ /** @var Carbon $start */
@ -78,7 +79,6 @@ class BalanceController extends Controller
/** @var Collection $accounts */ /** @var Collection $accounts */
$accounts = $params['accounts']; $accounts = $params['accounts'];
$preferredRange = $params['period']; $preferredRange = $params['period'];
$convert = $params['convert'];
// set some formats, based on input parameters. // set some formats, based on input parameters.
$format = app('navigation')->preferredCarbonFormatByPeriod($preferredRange); $format = app('navigation')->preferredCarbonFormatByPeriod($preferredRange);
@ -188,7 +188,7 @@ class BalanceController extends Controller
foreach ($data as $currency) { foreach ($data as $currency) {
// income and expense array prepped: // income and expense array prepped:
$income = [ $income = [
'label' => 'earned', 'label' => sprintf('earned-%s', $currency['currency_code']),
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'], 'currency_symbol' => $currency['currency_symbol'],
'currency_code' => $currency['currency_code'], 'currency_code' => $currency['currency_code'],
@ -201,7 +201,7 @@ class BalanceController extends Controller
'converted_entries' => [], 'converted_entries' => [],
]; ];
$expense = [ $expense = [
'label' => 'spent', 'label' => sprintf('spent-%s', $currency['currency_code']),
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'], 'currency_symbol' => $currency['currency_symbol'],
'currency_code' => $currency['currency_code'], 'currency_code' => $currency['currency_code'],
@ -234,12 +234,9 @@ class BalanceController extends Controller
$chartData[] = $income; $chartData[] = $income;
$chartData[] = $expense; $chartData[] = $expense;
} }
var_dump($chartData);
exit;
//$data = $this->generator->multiSet($chartData); //$data = $this->generator->multiSet($chartData);
return response()->json($data); return response()->json($chartData);
} }
} }

2
app/Api/V2/Request/Chart/BalanceChartRequest.php
View File

@ -42,7 +42,6 @@ class BalanceChartRequest extends FormRequest
'start' => $this->getCarbonDate('start'), 'start' => $this->getCarbonDate('start'),
'end' => $this->getCarbonDate('end'), 'end' => $this->getCarbonDate('end'),
'accounts' => $this->getAccountList(), 'accounts' => $this->getAccountList(),
'convert' => $this->boolean('convert'),
'period' => $this->string('period'), 'period' => $this->string('period'),
]; ];
} }
@ -57,7 +56,6 @@ class BalanceChartRequest extends FormRequest
return [ return [
'start' => 'required|date|after:1900-01-01|before:2099-12-31', 'start' => 'required|date|after:1900-01-01|before:2099-12-31',
'end' => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01', 'end' => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
'convert' => 'nullable|between:0,1|numeric',
'accounts.*' => 'required|exists:accounts,id', 'accounts.*' => 'required|exists:accounts,id',
'period' => sprintf('required|in:%s', join(',', config('firefly.valid_view_ranges'))), 'period' => sprintf('required|in:%s', join(',', config('firefly.valid_view_ranges'))),
]; ];