mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-18 20:38:57 +00:00
Improve report boxes one by one #2428
This commit is contained in:
James Cole
@@ -78,10 +78,10 @@ class OperationsController extends Controller
|
||||
if ($cache->has()) {
|
||||
return $cache->get(); // @codeCoverageIgnore
|
||||
}
|
||||
$entries = $this->tasker->getExpenseReport($start, $end, $accounts);
|
||||
$type = 'expense-entry';
|
||||
$report = $this->tasker->getExpenseReport($start, $end, $accounts);
|
||||
$type = 'expense-entry';
|
||||
try {
|
||||
$result = view('reports.partials.income-expenses', compact('entries', 'type'))->render();
|
||||
$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
|
||||
@@ -113,17 +113,16 @@ class OperationsController extends Controller
|
||||
if ($cache->has()) {
|
||||
return $cache->get(); // @codeCoverageIgnore
|
||||
}
|
||||
$entries = $this->tasker->getIncomeReport($start, $end, $accounts);
|
||||
$type = 'income-entry';
|
||||
$report = $this->tasker->getIncomeReport($start, $end, $accounts);
|
||||
$type = 'income-entry';
|
||||
try {
|
||||
$result = view('reports.partials.income-expenses', compact('entries', 'type'))->render();
|
||||
$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
|
||||
$result = 'Could not render view.';
|
||||
}
|
||||
// @codeCoverageIgnoreEnd
|
||||
|
||||
$cache->store($result);
|
||||
|
||||
return $result;
|
||||
@@ -150,32 +149,34 @@ class OperationsController extends Controller
|
||||
return $cache->get(); // @codeCoverageIgnore
|
||||
}
|
||||
|
||||
$incomes = $this->tasker->getIncomeReport($start, $end, $accounts);
|
||||
$expenses = $this->tasker->getExpenseReport($start, $end, $accounts);
|
||||
$incomeSum = array_sum(
|
||||
array_map(
|
||||
static function ($item) {
|
||||
return $item['sum'];
|
||||
},
|
||||
$incomes
|
||||
)
|
||||
);
|
||||
$incomes = $this->tasker->getIncomeReport($start, $end, $accounts);
|
||||
$expenses = $this->tasker->getExpenseReport($start, $end, $accounts);
|
||||
$sums = [];
|
||||
$keys = array_unique(array_merge(array_keys($incomes['sums']), array_keys($expenses['sums'])));
|
||||
|
||||
$expensesSum = array_sum(
|
||||
array_map(
|
||||
static function ($item) {
|
||||
return $item['sum'];
|
||||
},
|
||||
$expenses
|
||||
)
|
||||
);
|
||||
try {
|
||||
$result = view('reports.partials.operations', compact('incomeSum', 'expensesSum'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
|
||||
$result = 'Could not render view.';
|
||||
/** @var int $currencyId */
|
||||
foreach ($keys as $currencyId) {
|
||||
$currencyInfo = $incomes['sums'][$currencyId] ?? $expenses['sums'][$currencyId];
|
||||
$sums[$currencyId] = $sums[$currencyId] ?? [
|
||||
'currency_id' => $currencyId,
|
||||
'currency_name' => $currencyInfo['currency_name'],
|
||||
'currency_code' => $currencyInfo['currency_code'],
|
||||
'currency_symbol' => $currencyInfo['currency_symbol'],
|
||||
'currency_decimal_places' => $currencyInfo['currency_decimal_places'],
|
||||
'in' => $incomes['sums'][$currencyId]['sum'] ?? '0',
|
||||
'out' => $expenses['sums'][$currencyId]['sum'] ?? '0',
|
||||
'sum' => '0',
|
||||
];
|
||||
$sums[$currencyId]['sum'] = bcadd($sums[$currencyId]['in'], $sums[$currencyId]['out']);
|
||||
}
|
||||
|
||||
//try {
|
||||
$result = view('reports.partials.operations', compact('sums'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
// } catch (Throwable $e) {
|
||||
// Log::debug(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
|
||||
// $result = 'Could not render view.';
|
||||
// }
|
||||
// @codeCoverageIgnoreEnd
|
||||
$cache->store($result);
|
||||
|
||||
|
||||
@@ -304,7 +304,7 @@ class CreateRecurringTransactions implements ShouldQueue
|
||||
Log::debug(sprintf('Now at date %s.', $date->format('Y-m-d')));
|
||||
$date->startOfDay();
|
||||
if ($date->ne($this->date)) {
|
||||
Log::debug(sprintf('%s is not not today (%s)', $date->format('Y-m-d'), $this->date->format('Y-m-d')));
|
||||
Log::debug(sprintf('%s is not today (%s)', $date->format('Y-m-d'), $this->date->format('Y-m-d')));
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -55,7 +55,6 @@ class AccountTasker implements AccountTaskerInterface
|
||||
* @param Carbon $end
|
||||
*
|
||||
* @return array
|
||||
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
|
||||
*/
|
||||
public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array
|
||||
{
|
||||
@@ -63,36 +62,42 @@ class AccountTasker implements AccountTaskerInterface
|
||||
$yesterday->subDay();
|
||||
$startSet = app('steam')->balancesByAccounts($accounts, $yesterday);
|
||||
$endSet = app('steam')->balancesByAccounts($accounts, $end);
|
||||
|
||||
Log::debug('Start of accountreport');
|
||||
|
||||
/** @var AccountRepositoryInterface $repository */
|
||||
$repository = app(AccountRepositoryInterface::class);
|
||||
|
||||
/** @var CurrencyRepositoryInterface $currencyRepository */
|
||||
$currencyRepository = app(CurrencyRepositoryInterface::class);
|
||||
$defaultCurrency = app('amount')->getDefaultCurrencyByUser($this->user);
|
||||
$repository = app(AccountRepositoryInterface::class);
|
||||
$defaultCurrency = app('amount')->getDefaultCurrencyByUser($this->user);
|
||||
|
||||
$return = [
|
||||
'currencies' => [],
|
||||
'start' => '0',
|
||||
'end' => '0',
|
||||
'difference' => '0',
|
||||
'accounts' => [],
|
||||
'accounts' => [],
|
||||
'sums' => [],
|
||||
];
|
||||
|
||||
/** @var Account $account */
|
||||
foreach ($accounts as $account) {
|
||||
$id = $account->id;
|
||||
$currencyId = (int)$repository->getMetaValue($account, 'currency_id');
|
||||
$currency = $currencyRepository->findNull($currencyId);
|
||||
$return['currencies'][] = $currencyId;
|
||||
$entry = [
|
||||
'name' => $account->name,
|
||||
'id' => $account->id,
|
||||
'currency' => $currency ?? $defaultCurrency,
|
||||
'start_balance' => '0',
|
||||
'end_balance' => '0',
|
||||
$id = $account->id;
|
||||
$currency = $repository->getAccountCurrency($account) ?? $defaultCurrency;
|
||||
$return['sums'][$currency->id] = $return['sums'][$currency->id] ?? [
|
||||
'start' => '0',
|
||||
'end' => '0',
|
||||
'difference' => '0',
|
||||
'currency_id' => $currency->id,
|
||||
'currency_code' => $currency->code,
|
||||
'currency_symbol' => $currency->symbol,
|
||||
'currency_name' => $currency->name,
|
||||
'currency_decimal_places' => $currency->decimal_places,];
|
||||
|
||||
|
||||
$entry = [
|
||||
'name' => $account->name,
|
||||
'id' => $account->id,
|
||||
'currency_id' => $currency->id,
|
||||
'currency_code' => $currency->code,
|
||||
'currency_symbol' => $currency->symbol,
|
||||
'currency_name' => $currency->name,
|
||||
'currency_decimal_places' => $currency->decimal_places,
|
||||
'start_balance' => '0',
|
||||
'end_balance' => '0',
|
||||
];
|
||||
|
||||
// get first journal date:
|
||||
@@ -106,13 +111,14 @@ class AccountTasker implements AccountTaskerInterface
|
||||
$entry['start_balance'] = $first->transactions()->where('account_id', $account->id)->first()->amount;
|
||||
Log::debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $start->format('Y-m-d'), $entry['start_balance']));
|
||||
}
|
||||
$return['start'] = bcadd($return['start'], $entry['start_balance']);
|
||||
$return['end'] = bcadd($return['end'], $entry['end_balance']);
|
||||
|
||||
$return['accounts'][$id] = $entry;
|
||||
$return['sums'][$currency->id]['start'] = bcadd($return['sums'][$currency->id]['start'], $entry['start_balance']);
|
||||
$return['sums'][$currency->id]['end'] = bcadd($return['sums'][$currency->id]['end'], $entry['end_balance']);
|
||||
$return['accounts'][$id] = $entry;
|
||||
}
|
||||
|
||||
foreach (array_keys($return['sums']) as $index) {
|
||||
$return['sums'][$index]['difference'] = bcsub($return['sums'][$index]['end'], $return['sums'][$index]['start']);
|
||||
}
|
||||
$return['currencies'] = count(array_unique($return['currencies']));
|
||||
$return['difference'] = bcsub($return['end'], $return['start']);
|
||||
|
||||
return $return;
|
||||
}
|
||||
@@ -135,21 +141,21 @@ class AccountTasker implements AccountTaskerInterface
|
||||
|
||||
$collector->setSourceAccounts($accounts)->setRange($start, $end);
|
||||
$collector->excludeDestinationAccounts($accounts);
|
||||
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
|
||||
->withAccountInformation();
|
||||
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])->withAccountInformation();
|
||||
$journals = $collector->getExtractedJournals();
|
||||
$expenses = $this->groupExpenseByDestination($journals);
|
||||
$report = $this->groupExpenseByDestination($journals);
|
||||
|
||||
// sort the result
|
||||
// Obtain a list of columns
|
||||
$sum = [];
|
||||
foreach ($expenses as $accountId => $row) {
|
||||
$sum[$accountId] = (float)$row['sum'];
|
||||
}
|
||||
// TODO sorting
|
||||
// // sort the result
|
||||
// // Obtain a list of columns
|
||||
// $sum = [];
|
||||
// foreach ($expenses as $accountId => $row) {
|
||||
// $sum[$accountId] = (float)$row['sum'];
|
||||
// }
|
||||
//
|
||||
// array_multisort($sum, SORT_ASC, $expenses);
|
||||
|
||||
array_multisort($sum, SORT_ASC, $expenses);
|
||||
|
||||
return $expenses;
|
||||
return $report;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -169,20 +175,20 @@ class AccountTasker implements AccountTaskerInterface
|
||||
$collector = app(GroupCollectorInterface::class);
|
||||
$collector->setDestinationAccounts($accounts)->setRange($start, $end);
|
||||
$collector->excludeSourceAccounts($accounts);
|
||||
$collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
|
||||
->withAccountInformation();
|
||||
$income = $this->groupIncomeBySource($collector->getExtractedJournals());
|
||||
$collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])->withAccountInformation();
|
||||
$report = $this->groupIncomeBySource($collector->getExtractedJournals());
|
||||
|
||||
// sort the result
|
||||
// Obtain a list of columns
|
||||
$sum = [];
|
||||
foreach ($income as $accountId => $row) {
|
||||
$sum[$accountId] = (float)$row['sum'];
|
||||
}
|
||||
// $sum = [];
|
||||
// foreach ($report['income'] as $accountId => $row) {
|
||||
// $sum[$accountId] = (float)$row['sum'];
|
||||
// }
|
||||
// TODO proper sorting.
|
||||
//array_multisort($sum, SORT_DESC, $report);
|
||||
// var_dump($report);exit;
|
||||
|
||||
array_multisort($sum, SORT_DESC, $income);
|
||||
|
||||
return $income;
|
||||
return $report;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -204,51 +210,52 @@ class AccountTasker implements AccountTaskerInterface
|
||||
/** @var CurrencyRepositoryInterface $currencyRepos */
|
||||
$currencyRepos = app(CurrencyRepositoryInterface::class);
|
||||
$currencies = [$defaultCurrency->id => $defaultCurrency,];
|
||||
$expenses = [];
|
||||
$countAccounts = []; // if count remains 0 use original name, not the name with the currency.
|
||||
$report = [
|
||||
'accounts' => [],
|
||||
'sums' => [],
|
||||
];
|
||||
|
||||
/** @var array $journal */
|
||||
foreach ($array as $journal) {
|
||||
$destinationId = (int)$journal['destination_account_id'];
|
||||
$currencyId = (int)$journal['currency_id'];
|
||||
$key = sprintf('%s-%s', $destinationId, $currencyId);
|
||||
$name = sprintf('%s (%s)', $journal['destination_account_name'], $journal['currency_name']);
|
||||
$countAccounts[$destinationId] = isset($countAccounts[$destinationId]) ? $countAccounts[$destinationId] + 1 : 1;
|
||||
|
||||
if (!isset($expenses[$key])) {
|
||||
$currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepos->findNull($currencyId);
|
||||
$expenses[$key] = [
|
||||
'id' => $destinationId,
|
||||
'name' => $name,
|
||||
'original' => $journal['destination_account_name'],
|
||||
'sum' => '0',
|
||||
'average' => '0',
|
||||
'currencies' => [],
|
||||
'single_currency' => $currencies[$currencyId],
|
||||
'count' => 0,
|
||||
$sourceId = (int)$journal['destination_account_id'];
|
||||
$currencyId = (int)$journal['currency_id'];
|
||||
$key = sprintf('%s-%s', $sourceId, $currencyId);
|
||||
if (!isset($report['accounts'][$key])) {
|
||||
$currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepos->findNull($currencyId);
|
||||
$report['accounts'][$key] = [
|
||||
'id' => $sourceId,
|
||||
'name' => $journal['destination_account_name'],
|
||||
'sum' => '0',
|
||||
'average' => '0',
|
||||
'count' => 0,
|
||||
'currency_id' => $currencies[$currencyId]->id,
|
||||
'currency_name' => $currencies[$currencyId]->name,
|
||||
'currency_symbol' => $currencies[$currencyId]->symbol,
|
||||
'currency_code' => $currencies[$currencyId]->code,
|
||||
'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
|
||||
];
|
||||
}
|
||||
$expenses[$key]['currencies'][] = (int)$journal['currency_id'];
|
||||
$expenses[$key]['sum'] = bcadd($expenses[$key]['sum'], $journal['amount']);
|
||||
++$expenses[$key]['count'];
|
||||
$report['accounts'][$key]['sum'] = bcadd($report['accounts'][$key]['sum'], $journal['amount']);
|
||||
++$report['accounts'][$key]['count'];
|
||||
}
|
||||
|
||||
// do averages:
|
||||
$keys = array_keys($expenses);
|
||||
foreach ($keys as $key) {
|
||||
$opposingId = $expenses[$key]['id'];
|
||||
if (1 === $countAccounts[$opposingId]) {
|
||||
$expenses[$key]['name'] = $expenses[$key]['original'];
|
||||
// do averages and sums.
|
||||
foreach (array_keys($report['accounts']) as $key) {
|
||||
if ($report['accounts'][$key]['count'] > 1) {
|
||||
$report['accounts'][$key]['average'] = bcdiv($report['accounts'][$key]['sum'], (string)$report['accounts'][$key]['count']);
|
||||
}
|
||||
|
||||
if ($expenses[$key]['count'] > 1) {
|
||||
$expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], (string)$expenses[$key]['count']);
|
||||
}
|
||||
$expenses[$key]['currencies'] = count(array_unique($expenses[$key]['currencies']));
|
||||
$expenses[$key]['all_currencies'] = count($currencies);
|
||||
$currencyId = $report['accounts'][$key]['currency_id'];
|
||||
$report['sums'][$currencyId] = $report['sums'][$currencyId] ?? [
|
||||
'sum' => '0',
|
||||
'currency_id' => $report['accounts'][$key]['currency_id'],
|
||||
'currency_name' => $report['accounts'][$key]['currency_name'],
|
||||
'currency_symbol' => $report['accounts'][$key]['currency_symbol'],
|
||||
'currency_code' => $report['accounts'][$key]['currency_code'],
|
||||
'currency_decimal_places' => $report['accounts'][$key]['currency_decimal_places'],
|
||||
];
|
||||
$report['sums'][$currencyId]['sum'] = bcadd($report['sums'][$currencyId]['sum'], $report['accounts'][$key]['sum']);
|
||||
}
|
||||
|
||||
return $expenses;
|
||||
return $report;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -262,50 +269,52 @@ class AccountTasker implements AccountTaskerInterface
|
||||
/** @var CurrencyRepositoryInterface $currencyRepos */
|
||||
$currencyRepos = app(CurrencyRepositoryInterface::class);
|
||||
$currencies = [$defaultCurrency->id => $defaultCurrency,];
|
||||
$income = [];
|
||||
$countAccounts = []; // if count remains 0 use original name, not the name with the currency.
|
||||
$report = [
|
||||
'accounts' => [],
|
||||
'sums' => [],
|
||||
];
|
||||
|
||||
/** @var array $journal */
|
||||
foreach ($array as $journal) {
|
||||
$sourceId = (int)$journal['source_account_id'];
|
||||
$currencyId = (int)$journal['currency_id'];
|
||||
$key = sprintf('%s-%s', $sourceId, $currencyId);
|
||||
$name = sprintf('%s (%s)', $journal['source_account_name'], $journal['currency_name']);
|
||||
$countAccounts[$sourceId] = isset($countAccounts[$sourceId]) ? $countAccounts[$sourceId] + 1 : 1;
|
||||
|
||||
if (!isset($income[$key])) {
|
||||
$currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepos->findNull($currencyId);
|
||||
$income[$key] = [
|
||||
'id' => $sourceId,
|
||||
'name' => $name,
|
||||
'original' => $journal['source_account_name'],
|
||||
'sum' => '0',
|
||||
'average' => '0',
|
||||
'currencies' => [],
|
||||
'single_currency' => $currencies[$currencyId],
|
||||
'count' => 0,
|
||||
if (!isset($report['accounts'][$key])) {
|
||||
$currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepos->findNull($currencyId);
|
||||
$report['accounts'][$key] = [
|
||||
'id' => $sourceId,
|
||||
'name' => $journal['source_account_name'],
|
||||
'sum' => '0',
|
||||
'average' => '0',
|
||||
'count' => 0,
|
||||
'currency_id' => $currencies[$currencyId]->id,
|
||||
'currency_name' => $currencies[$currencyId]->name,
|
||||
'currency_symbol' => $currencies[$currencyId]->symbol,
|
||||
'currency_code' => $currencies[$currencyId]->code,
|
||||
'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
|
||||
];
|
||||
}
|
||||
$income[$key]['currencies'][] = (int)$journal['currency_id'];
|
||||
$income[$key]['sum'] = bcadd($income[$key]['sum'], bcmul($journal['amount'], '-1'));
|
||||
++$income[$key]['count'];
|
||||
$report['accounts'][$key]['sum'] = bcadd($report['accounts'][$key]['sum'], bcmul($journal['amount'], '-1'));
|
||||
++$report['accounts'][$key]['count'];
|
||||
}
|
||||
|
||||
// do averages:
|
||||
$keys = array_keys($income);
|
||||
foreach ($keys as $key) {
|
||||
$opposingId = $income[$key]['id'];
|
||||
if (1 === $countAccounts[$opposingId]) {
|
||||
$income[$key]['name'] = $income[$key]['original'];
|
||||
// do averages and sums.
|
||||
foreach (array_keys($report['accounts']) as $key) {
|
||||
if ($report['accounts'][$key]['count'] > 1) {
|
||||
$report['accounts'][$key]['average'] = bcdiv($report['accounts'][$key]['sum'], (string)$report['accounts'][$key]['count']);
|
||||
}
|
||||
|
||||
if ($income[$key]['count'] > 1) {
|
||||
$income[$key]['average'] = bcdiv($income[$key]['sum'], (string)$income[$key]['count']);
|
||||
}
|
||||
$income[$key]['currencies'] = count(array_unique($income[$key]['currencies']));
|
||||
$income[$key]['all_currencies'] = count($currencies);
|
||||
$currencyId = $report['accounts'][$key]['currency_id'];
|
||||
$report['sums'][$currencyId] = $report['sums'][$currencyId] ?? [
|
||||
'sum' => '0',
|
||||
'currency_id' => $report['accounts'][$key]['currency_id'],
|
||||
'currency_name' => $report['accounts'][$key]['currency_name'],
|
||||
'currency_symbol' => $report['accounts'][$key]['currency_symbol'],
|
||||
'currency_code' => $report['accounts'][$key]['currency_code'],
|
||||
'currency_decimal_places' => $report['accounts'][$key]['currency_decimal_places'],
|
||||
];
|
||||
$report['sums'][$currencyId]['sum'] = bcadd($report['sums'][$currencyId]['sum'], $report['accounts'][$key]['sum']);
|
||||
}
|
||||
|
||||
return $income;
|
||||
return $report;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user