Skip to content

Firefly III: a personal finances manager

Add spent + earned info to category chart.

James Cole7a1021dffcbf
diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php
index 2ed6299222..25803be107 100644
--- a/app/Api/V1/Controllers/Chart/CategoryController.php
+++ b/app/Api/V1/Controllers/Chart/CategoryController.php
@@ -83,7 +83,7 @@ class CategoryController extends Controller
public function overview(SameDateRequest $request): JsonResponse
{
/** @var Carbon $start */
- $start = $this->parameters->get('start');
+ $start = $this->parameters->get('start');
/** @var Carbon $end */
$end = $this->parameters->get('end');
@@ -94,25 +94,26 @@ class CategoryController extends Controller
// get journals for entire period:
/** @var GroupCollectorInterface $collector */
- $collector = app(GroupCollectorInterface::class);
+ $collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)->withAccountInformation();
$collector->setXorAccounts($accounts)->withCategoryInformation();
- $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::RECONCILIATION->value]);
- $journals = $collector->getExtractedJournals();
+ $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value]);
+ $journals = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($journals as $journal) {
// find journal:
- $journalCurrencyId = (int)$journal['currency_id'];
- $currency = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
- $currencies[$journalCurrencyId] = $currency;
- $currencyId = (int)$currency->id;
- $currencyName = (string)$currency->name;
- $currencyCode = (string)$currency->code;
- $currencySymbol = (string)$currency->symbol;
- $currencyDecimalPlaces = (int)$currency->decimal_places;
- $amount = Steam::positive($journal['amount']);
- $pcAmount = null;
+ $journalCurrencyId = (int)$journal['currency_id'];
+ $type = $journal['transaction_type_type'];
+ $currency = $currencies[$journalCurrencyId] ?? $this->currencyRepos->find($journalCurrencyId);
+ $currencies[$journalCurrencyId] = $currency;
+ $currencyId = (int)$currency->id;
+ $currencyName = (string)$currency->name;
+ $currencyCode = (string)$currency->code;
+ $currencySymbol = (string)$currency->symbol;
+ $currencyDecimalPlaces = (int)$currency->decimal_places;
+ $amount = Steam::positive((string)$journal['amount']);
+ $pcAmount = null;
// overrule if necessary:
if ($this->convertToPrimary && $journalCurrencyId === $this->primaryCurrency->id) {
@@ -129,8 +130,8 @@ class CategoryController extends Controller
}
- $categoryName = $journal['category_name'] ?? (string)trans('firefly.no_category');
- $key = sprintf('%s-%s', $categoryName, $currencyCode);
+ $categoryName = $journal['category_name'] ?? (string)trans('firefly.no_category');
+ $key = sprintf('%s-%s', $categoryName, $currencyCode);
// create arrays
$return[$key] ??= [
'label' => $categoryName,
@@ -150,23 +151,36 @@ class CategoryController extends Controller
'yAxisID' => 0,
'type' => 'bar',
'entries' => [
- 'spent' => '0',
+ 'spent' => '0',
+ 'earned' => '0',
],
'pc_entries' => [
- 'spent' => '0',
+ 'spent' => '0',
+ 'earned' => '0',
],
];
// add monies
- $return[$key]['entries']['spent'] = bcadd($return[$key]['entries']['spent'], (string)$amount);
- if (null !== $pcAmount) {
- $return[$key]['pc_entries']['spent'] = bcadd($return[$key]['pc_entries']['spent'], (string)$pcAmount);
+ // expenses to spent
+ if (TransactionTypeEnum::WITHDRAWAL->value === $type) {
+ $return[$key]['entries']['spent'] = bcadd($return[$key]['entries']['spent'], $amount);
+ if (null !== $pcAmount) {
+ $return[$key]['pc_entries']['spent'] = bcadd($return[$key]['pc_entries']['spent'], $pcAmount);
+ }
+ continue;
+ }
+ // positive amount = earned
+ if (TransactionTypeEnum::DEPOSIT->value === $type) {
+ $return[$key]['entries']['earned'] = bcadd($return[$key]['entries']['earned'], $amount);
+ if (null !== $pcAmount) {
+ $return[$key]['pc_entries']['earned'] = bcadd($return[$key]['pc_entries']['earned'], $pcAmount);
+ }
}
}
- $return = array_values($return);
+ $return = array_values($return);
// order by amount
- usort($return, static fn (array $a, array $b) => (float)$a['entries']['spent'] < (float)$b['entries']['spent'] ? 1 : -1);
+ usort($return, static fn(array $a, array $b) => ((float)$a['entries']['spent'] + (float)$a['entries']['earned']) < ((float)$b['entries']['spent'] + (float)$b['entries']['earned']) ? 1 : -1);
return response()->json($this->clean($return));
}