kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 07:53:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix some things so the date range has a better display.

Browse Source
This commit is contained in:
James Cole
2015-09-25 19:28:39 +02:00
parent 38bc38bf26
commit 73cfbbd2ba
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{ {
// language: // language:
$language = Preferences::get('language', 'en')->data; //$language = Preferences::get('language', 'en')->data;
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
//$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [ $data = [
'count' => 2, 'count' => 2,
@@ -44,9 +45,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
]; ];
foreach ($entries as $entry) { foreach ($entries as $entry) {
$data['labels'][] = $entry[0]->formatLocalized($format); $data['labels'][] = $entry[1];//$entry[0]->formatLocalized($format);
$spent = round($entry[1], 2); $spent = round($entry[2], 2);
$earned = round($entry[2], 2); $earned = round($entry[3], 2);
$data['datasets'][0]['data'][] = $spent == 0 ? null : $spent * -1; $data['datasets'][0]['data'][] = $spent == 0 ? null : $spent * -1;
$data['datasets'][1]['data'][] = $earned == 0 ? null : $earned; $data['datasets'][1]['data'][] = $earned == 0 ? null : $earned;

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

@@ -67,7 +67,8 @@ class CategoryController extends Controller
$currentEnd = Navigation::endOfPeriod($start, $range); $currentEnd = Navigation::endOfPeriod($start, $range);
$spent = $repository->spentInPeriod($category, $start, $currentEnd); $spent = $repository->spentInPeriod($category, $start, $currentEnd);
$earned = $repository->earnedInPeriod($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); $start = Navigation::addPeriod($start, $range, 0);
} }
@@ -148,7 +149,8 @@ class CategoryController extends Controller
while ($start <= $end) { while ($start <= $end) {
$spent = $repository->spentOnDaySumCorrected($category, $start); $spent = $repository->spentOnDaySumCorrected($category, $start);
$earned = $repository->earnedOnDaySumCorrected($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(); $start->addDay();
} }