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

Some cleanup and translations.

Browse Source
This commit is contained in:
James Cole
2015-05-16 07:28:58 +02:00
parent f159beee0d
commit 06b747c221
5 changed files with 124 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/ReportController.php
View File

@@ -260,12 +260,14 @@ class ReportController extends Controller
*/
public function year($year, $shared = false)
{
$date = new Carbon('01-01-' . $year);
$end = clone $date;
$subTitle = trans('firefly.reportForYear', ['year' => $year]);
$subTitleIcon = 'fa-bar-chart';
$totalExpense = 0;
$totalIncome = 0;
$date = new Carbon('01-01-' . $year);
$end = clone $date;
$subTitle = trans('firefly.reportForYear', ['year' => $year]);
$subTitleIcon = 'fa-bar-chart';
$totalExpense = 0;
$totalIncome = 0;
$incomeTopLength = 5;
$expenseTopLength = 10;
if ($shared == 'shared') {
$shared = true;
@@ -305,9 +307,20 @@ class ReportController extends Controller
'amount' => floatval($entry->queryAmount),
'name' => $entry->name,
'count' => 1,
'id' => $id,
];
}
}
// sort with callback:
uasort(
$incomes, function ($a, $b) {
if ($a['amount'] == $b['amount']) {
return 0;
}
return ($a['amount'] < $b['amount']) ? 1 : -1;
}
);
unset($set, $id);
/**
@@ -328,7 +341,9 @@ class ReportController extends Controller
'accounts', // all accounts
'accountsSums', // sums for all accounts
'incomes', 'expenses', // expenses and incomes.
'subTitle', 'subTitleIcon' // subtitle and subtitle icon.
'subTitle', 'subTitleIcon', // subtitle and subtitle icon.
'incomeTopLength', // length of income top X
'expenseTopLength' // length of expense top X.
)
);
}