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

Fixed some more reports and charts. [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-05-20 07:07:46 +02:00
parent 7a0ad5a587
commit 95ef691077
9 changed files with 109 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,13 +78,10 @@ class CategoryController extends Controller
$start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->endOfMonth());
$set = $repository->getCategoriesAndExpenses($start, $end);
$set = $repository->getCategoriesAndExpensesCorrected($start, $end);
foreach ($set as $entry) {
$isEncrypted = intval($entry->encrypted) == 1 ? true : false;
$name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name;
$name = $isEncrypted ? Crypt::decrypt($name) : $name;
$chart->addRow($name, floatval($entry->sum));
$chart->addRow($entry['name'], floatval($entry['sum']));
}
$chart->generate();