kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Reinstated a chart.

Browse Source
This commit is contained in:
James Cole
2016-04-25 09:57:39 +02:00
parent 2cd593157f
commit 51d97cdca5
3 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php
View File

@@ -22,10 +22,11 @@ interface BudgetChartGeneratorInterface
/**
* @param Collection $entries
* @param string $dateFormat
*
* @return array
*/
public function budgetLimit(Collection $entries): array;
public function budgetLimit(Collection $entries, string $dateFormat): array;
/**
* @param Collection $entries

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

@@ -18,13 +18,14 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
/**
*
* @param Collection $entries
* @param string $dateFormat
*
* @return array
*/
public function budgetLimit(Collection $entries): array
public function budgetLimit(Collection $entries, string $dateFormat = 'monthAndDay'): array
{
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [
'labels' => [],