kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 16:00:13 +00:00
Code Issues Projects Releases Wiki Activity

Make sure "no category" is added to API as well.

Browse Source
This commit is contained in:
James Cole
2019-01-27 10:51:14 +01:00
parent ad9405887a
commit ef6f00fcf5
1 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/Api/V1/Controllers/Chart/CategoryController.php
View File

@@ -60,20 +60,19 @@ class CategoryController extends Controller
$earned = $this->categoryRepository->earnedInPeriodPerCurrency(new Collection, new Collection, $start, $end); $earned = $this->categoryRepository->earnedInPeriodPerCurrency(new Collection, new Collection, $start, $end);
$categories = []; $categories = [];
// earned:
foreach ($earned as $categoryId => $row) { foreach ($earned as $categoryId => $row) {
$categoryName = $row['name']; $categoryName = $row['name'];
foreach ($row['earned'] as $currencyId => $income) {
// create a new set if necessary, "spent (EUR)":
foreach ($row['earned'] as $currencyId => $expense) {
// find or make set for currency: // find or make set for currency:
$key = sprintf('%s-e', $currencyId); $key = sprintf('%s-e', $currencyId);
$decimalPlaces = $expense['currency_decimal_places']; $decimalPlaces = $income['currency_decimal_places'];
if (!isset($tempData[$key])) { if (!isset($tempData[$key])) {
$tempData[$key] = [ $tempData[$key] = [
'label' => (string)trans('firefly.box_earned_in_currency', ['currency' => $expense['currency_symbol']]), 'label' => (string)trans('firefly.box_earned_in_currency', ['currency' => $income['currency_symbol']]),
'currency_id' => $expense['currency_id'], 'currency_id' => $income['currency_id'],
'currency_code' => $expense['currency_code'], 'currency_code' => $income['currency_code'],
'currency_symbol' => $expense['currency_symbol'], 'currency_symbol' => $income['currency_symbol'],
'currency_decimal_places' => $decimalPlaces, 'currency_decimal_places' => $decimalPlaces,
'type' => 'bar', // line, area or bar 'type' => 'bar', // line, area or bar
'yAxisID' => 0, // 0, 1, 2 'yAxisID' => 0, // 0, 1, 2
@@ -82,7 +81,7 @@ class CategoryController extends Controller
'entries' => [], 'entries' => [],
]; ];
} }
$amount = round($expense['earned'], $decimalPlaces); $amount = round($income['earned'], $decimalPlaces);
$categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount; $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
$tempData[$key]['entries'][$categoryName] $tempData[$key]['entries'][$categoryName]
= $amount; = $amount;
@@ -90,6 +89,35 @@ class CategoryController extends Controller
} }
} }
// earned with no category:
$noCategory = $this->categoryRepository->earnedInPeriodPcWoCategory(new Collection, $start, $end);
foreach ($noCategory as $currencyId => $income) {
$categoryName = (string)trans('firefly.no_category');
// find or make set for currency:
$key = sprintf('%s-e', $currencyId);
$decimalPlaces = $income['currency_decimal_places'];
if (!isset($tempData[$key])) {
$tempData[$key] = [
'label' => (string)trans('firefly.box_earned_in_currency', ['currency' => $income['currency_symbol']]),
'currency_id' => $income['currency_id'],
'currency_code' => $income['currency_code'],
'currency_symbol' => $income['currency_symbol'],
'currency_decimal_places' => $decimalPlaces,
'type' => 'bar', // line, area or bar
'yAxisID' => 0, // 0, 1, 2
'fill' => null, // true, false, null
'backgroundColor' => null, // null or hex
'entries' => [],
];
}
$amount = round($income['spent'], $decimalPlaces);
$categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
$tempData[$key]['entries'][$categoryName]
= $amount;
}
// spent
foreach ($spent as $categoryId => $row) { foreach ($spent as $categoryId => $row) {
$categoryName = $row['name']; $categoryName = $row['name'];
// create a new set if necessary, "spent (EUR)": // create a new set if necessary, "spent (EUR)":
@@ -119,6 +147,33 @@ class CategoryController extends Controller
} }
} }
// spent with no category
$noCategory = $this->categoryRepository->spentInPeriodPcWoCategory(new Collection, $start, $end);
foreach ($noCategory as $currencyId => $expense) {
$categoryName = (string)trans('firefly.no_category');
// find or make set for currency:
$key = sprintf('%s-s', $currencyId);
$decimalPlaces = $expense['currency_decimal_places'];
if (!isset($tempData[$key])) {
$tempData[$key] = [
'label' => (string)trans('firefly.box_spent_in_currency', ['currency' => $expense['currency_symbol']]),
'currency_id' => $expense['currency_id'],
'currency_code' => $expense['currency_code'],
'currency_symbol' => $expense['currency_symbol'],
'currency_decimal_places' => $decimalPlaces,
'type' => 'bar', // line, area or bar
'yAxisID' => 0, // 0, 1, 2
'fill' => null, // true, false, null
'backgroundColor' => null, // null or hex
'entries' => [],
];
}
$amount = round($expense['spent'], $decimalPlaces);
$categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
$tempData[$key]['entries'][$categoryName]
= $amount;
}
asort($categories); asort($categories);
$keys = array_keys($categories); $keys = array_keys($categories);