From 73cfbbd2ba623e48ae86562a7750cc0d8b692565 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 25 Sep 2015 19:28:39 +0200 Subject: [PATCH] Fix some things so the date range has a better display. --- .../Chart/Category/ChartJsCategoryChartGenerator.php | 11 ++++++----- app/Http/Controllers/Chart/CategoryController.php | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php b/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php index 6d26478e21..c5ff681ca1 100644 --- a/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php +++ b/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php @@ -25,8 +25,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator { // language: - $language = Preferences::get('language', 'en')->data; - $format = Config::get('firefly.' . $dateFormat . '.' . $language); + //$language = Preferences::get('language', 'en')->data; + + //$format = Config::get('firefly.' . $dateFormat . '.' . $language); $data = [ 'count' => 2, @@ -44,9 +45,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator ]; foreach ($entries as $entry) { - $data['labels'][] = $entry[0]->formatLocalized($format); - $spent = round($entry[1], 2); - $earned = round($entry[2], 2); + $data['labels'][] = $entry[1];//$entry[0]->formatLocalized($format); + $spent = round($entry[2], 2); + $earned = round($entry[3], 2); $data['datasets'][0]['data'][] = $spent == 0 ? null : $spent * -1; $data['datasets'][1]['data'][] = $earned == 0 ? null : $earned; diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 09d120183a..52e9d1fa4b 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -67,7 +67,8 @@ class CategoryController extends Controller $currentEnd = Navigation::endOfPeriod($start, $range); $spent = $repository->spentInPeriod($category, $start, $currentEnd); $earned = $repository->earnedInPeriod($category, $start, $currentEnd); - $entries->push([clone $start, $spent, $earned]); + $date = Navigation::periodShow($start, $range); + $entries->push([clone $start, $date, $spent, $earned]); $start = Navigation::addPeriod($start, $range, 0); } @@ -148,7 +149,8 @@ class CategoryController extends Controller while ($start <= $end) { $spent = $repository->spentOnDaySumCorrected($category, $start); $earned = $repository->earnedOnDaySumCorrected($category, $start); - $entries->push([clone $start, $spent, $earned]); + $date = Navigation::periodShow($start, '1D'); + $entries->push([clone $start, $date, $spent, $earned]); $start->addDay(); }