IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-03 20:20:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup for #2999

Browse Source
This commit is contained in:
James Cole 2020-03-21 05:47:49 +01:00
parent d5b315e3c8
commit affc198b03
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 4 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
app/Support/Chart/Category/FrontpageChartGenerator.php
View File

@ -28,6 +28,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
use FireflyIII\Support\Http\Controllers\AugumentData;
use Illuminate\Support\Collection;
/**
@ -35,6 +36,7 @@ use Illuminate\Support\Collection;
*/
class FrontpageChartGenerator
{
use AugumentData;
/** @var AccountRepositoryInterface */
private $accountRepos;
/** @var array */
@ -73,9 +75,6 @@ class FrontpageChartGenerator
*/
public function generate(): array
{
// TODO collect currencies.
$chartData = [];
$tempData = [];
$categories = $this->repository->getCategories();
$accounts = $this->accountRepos->getAccountsByType(
[AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::ASSET, AccountType::DEFAULT]
@ -101,98 +100,8 @@ class FrontpageChartGenerator
array_multisort($amounts, SORT_DESC, $tempData);
$currencyData = $this->createCurrencyGroups($tempData);
$mergedData = $this->insertValues($currencyData, $tempData);
return $mergedData;
var_dump($currencyData);
var_dump($this->currencies);
var_dump($tempData);
exit;
// // get income:
// $income = $this->opsRepos->sumIncome($start, $end, $accounts, $collection);
// foreach ($income as $currency) {
// $currencyId = $currency['currency_id'];
// $currencies[$currencyId] = $currencies[$currencyId] ?? [
// 'currency_id' => $currencyId,
// 'currency_name' => $currency['currency_name'],
// 'currency_symbol' => $currency['currency_symbol'],
// 'currency_code' => $currency['currency_code'],
// 'currency_decimal_places' => $currency['currency_decimal_places'],
// ];
// $tempData[] = [
// 'name' => $category->name,
// 'sum' => $currency['sum'],
// 'sum_float' => round($currency['sum'], $currency['currency_decimal_places']),
// 'currency_id' => $currencyId,
// ];
// }
//
// // income + expense no category per currency:
// $noCatExp
// = $this->noCatRepos->sumExpenses($start, $end);
// $noCatInc
// = $this->noCatRepos->sumIncome($start, $end);
// foreach ($noCatExp as $currency)
// {
// $currencyId
// = $currency['currency_id'];
// $currencies[$currencyId]
// = $currencies[$currencyId] ?? ['currency_id' => $currency['currency_id'],
// 'currency_name' => $currency['currency_name'],
// 'currency_symbol' => $currency['currency_symbol'],
// 'currency_code' => $currency['currency_code'],
// 'currency_decimal_places' => $currency['currency_decimal_places'],];
// $tempData[]
// = ['name' => trans('firefly.no_category'),
// 'sum' => $currency['sum'],
// 'sum_float' => round($currency['sum'], $currency['currency_decimal_places'] ?? 2),
// 'currency_id' => $currency['currency_id'],];
// }
//
// // sort temp array by amount.
// $amounts = array_column($tempData, 'sum_float');
// array_multisort($amounts, SORT_DESC, $tempData);
//
// // loop all found currencies and build the data array for the chart.
// /** @var array $currency */
// foreach ($currencies as $currency) {
// $dataSet = [
// 'label' => sprintf('%s (%s)', (string) trans('firefly.spent'), $currency['currency_name']),
// 'type' => 'bar',
// 'currency_symbol' => $currency['currency_symbol'],
// 'entries' => $this->expandNames($tempData),
// ];
// $chartData[$currency['currency_id']] = $dataSet;
// }
//
// // loop temp data and place data in correct array:
// foreach ($tempData as $entry) {
// $currencyId = $entry['currency_id'];
// $name = $entry['name'];
// $chartData[$currencyId]['entries'][$name] = bcmul($entry['sum'], '-1');
// }
//
// return $chartData;
// }
}
/**
* Small helper function for the revenue and expense account charts.
* TODO double function.
*
* @param array $names
*
* @return array
*/
protected function expandNames(array $names): array
{
$result = [];
foreach ($names as $entry) {
$result[$entry['name']] = 0;
}
return $result;
return $this->insertValues($currencyData, $tempData);
}
/**
@ -332,6 +241,7 @@ class FrontpageChartGenerator
return $return;
}
/**
* @param array $currencyData
* @param array $monetaryData