kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Add date format to category charts [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-07-01 11:07:10 +02:00
parent fdd9eaab4b
commit 5d07c4a949
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,17 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
/** /**
* @param Collection $entries * @param Collection $entries
* @param string $dateFormat
* *
* @return array * @return array
*/ */
public function all(Collection $entries) public function all(Collection $entries, $dateFormat = 'month')
{ {
// language:
$language = Preferences::get('language', 'en')->data;
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [ $data = [
'count' => 1, 'count' => 1,
'labels' => [], 'labels' => [],
@@ -34,7 +40,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
]; ];
foreach ($entries as $entry) { foreach ($entries as $entry) {
$data['labels'][] = trans('firefly.spent'); $data['labels'][] = $entry[0]->formatLocalized($format);
$data['datasets'][0]['data'][] = round($entry[1], 2); $data['datasets'][0]['data'][] = round($entry[1], 2);
} }
@@ -76,7 +82,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
*/ */
public function month(Collection $entries) public function month(Collection $entries)
{ {
return $this->all($entries); return $this->all($entries, 'monthAndDay');
} }