kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Sort chart [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-05-21 18:57:14 +02:00
parent e08a23948f
commit ff0379182e
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -79,6 +79,19 @@ class CategoryController extends Controller
$end = Session::get('end', Carbon::now()->endOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth());
$set = $repository->getCategoriesAndExpensesCorrected($start, $end); $set = $repository->getCategoriesAndExpensesCorrected($start, $end);
// sort by callback:
uasort(
$set,
function ($left, $right) {
if ($left['sum'] == $right['sum']) {
return 0;
}
return ($left['sum'] < $right['sum']) ? 1 : -1;
}
);
foreach ($set as $entry) { foreach ($set as $entry) {
$sum = floatval($entry['sum']); $sum = floatval($entry['sum']);
if ($sum != 0) { if ($sum != 0) {

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

@@ -113,14 +113,14 @@ class CategoryRepository implements CategoryRepositoryInterface
foreach ($set as $entry) { foreach ($set as $entry) {
$categoryId = intval($entry->category_id); $categoryId = intval($entry->category_id);
if (isset($result[$categoryId])) { if (isset($result[$categoryId])) {
$result[$categoryId]['sum'] += $entry->amount; $result[$categoryId]['sum'] += floatval($entry->amount);
} else { } else {
$isEncrypted = intval($entry->category_encrypted) == 1 ? true : false; $isEncrypted = intval($entry->category_encrypted) == 1 ? true : false;
$name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name; $name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name;
$name = $isEncrypted ? Crypt::decrypt($name) : $name; $name = $isEncrypted ? Crypt::decrypt($name) : $name;
$result[$categoryId] = [ $result[$categoryId] = [
'name' => $name, 'name' => $name,
'sum' => $entry->amount, 'sum' => floatval($entry->amount),
]; ];
} }