IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added a better date for some budget charts [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-07-01 11:04:08 +02:00
parent e0d863a46f
commit fdd9eaab4b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@ -17,11 +17,16 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
/** /**
* @param Collection $entries * @param Collection $entries
* @param string $dateFormat
* *
* @return array * @return array
*/ */
public function budget(Collection $entries) public function budget(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' => [],
@ -35,7 +40,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
/** @var array $entry */ /** @var array $entry */
foreach ($entries as $entry) { foreach ($entries as $entry) {
$data['labels'][] = trans('firefly.spent'); $data['labels'][] = $entry[0]->formatLocalized($format);
$data['datasets'][0]['data'][] = $entry[1]; $data['datasets'][0]['data'][] = $entry[1];
} }
@ -52,7 +57,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
*/ */
public function budgetLimit(Collection $entries) public function budgetLimit(Collection $entries)
{ {
return $this->budget($entries); return $this->budget($entries, 'monthAndDay');
} }
/** /**