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

Fixed the overview chart for categories, so it will properly reflect income and expenses. See bug #99

Browse Source
This commit is contained in:
James Cole 2015-07-31 14:26:22 +02:00
parent 96ddbe7227
commit ab22d2cbaa
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@ -29,19 +29,30 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [
'count' => 1,
'count' => 2,
'labels' => [],
'datasets' => [
[
'label' => trans('firefly.spent'),
'data' => []
],
[
'label' => trans('firefly.earned'),
'data' => []
]
],
];
foreach ($entries as $entry) {
$data['labels'][] = $entry[0]->formatLocalized($format);
$data['datasets'][0]['data'][] = round($entry[1], 2);
$data['labels'][] = $entry[0]->formatLocalized($format);
$amount = round($entry[1], 2);
if ($amount > 0) {
$data['datasets'][0]['data'][] = null;
$data['datasets'][1]['data'][] = $amount;
} else {
$data['datasets'][0]['data'][] = $amount * -1;
$data['datasets'][1]['data'][] = null;
}
}
return $data;

2
app/Repositories/Category/CategoryRepository.php
View File

@ -198,7 +198,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
*/
public function spentOnDaySumCorrected(Category $category, Carbon $date)
{
return $category->transactionjournals()->onDate($date)->get(['transaction_journals.*'])->sum('amount');
return $category->transactionjournals()->onDate($date)->get(['transaction_journals.*'])->sum('correct_amount');
}
/**

1
resources/lang/en/firefly.php
View File

@ -404,6 +404,7 @@ return [
'month' => 'Month',
'budget' => 'Budget',
'spent' => 'Spent',
'earned' => 'Earned',
'overspent' => 'Overspent',
'left' => 'Left',
'noBudget' => '(no budget)',

1
resources/lang/nl/firefly.php
View File

@ -412,6 +412,7 @@ return [
'month' => 'Maand',
'budget' => 'Budget',
'spent' => 'Uitgegeven',
'earned' => 'Verdiend',
'overspent' => 'Teveel uitgegeven',
'left' => 'Over',
'noBudget' => '(geen budget)',