kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove old chart.

Browse Source
This commit is contained in:
James Cole
2015-12-25 07:32:56 +01:00
parent 657116d361
commit edde18aeef
3 changed files with 2 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Generator/Chart/Category/CategoryChartGenerator.php
View File

@@ -19,14 +19,6 @@ interface CategoryChartGenerator
*/
public function all(Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInYear(Collection $categories, Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries

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

@@ -2,9 +2,7 @@
namespace FireflyIII\Generator\Chart\Category;
use Config;
use Illuminate\Support\Collection;
use Preferences;
/**
@@ -101,40 +99,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{
// language:
$format = trans('config.month');
$data = [
'count' => 0,
'labels' => [],
'datasets' => [],
];
foreach ($categories as $category) {
$data['labels'][] = $category->name;
}
foreach ($entries as $entry) {
$date = $entry[0]->formatLocalized($format);
array_shift($entry);
$data['count']++;
$data['datasets'][] = ['label' => $date, 'data' => $entry];
}
return $data;
}
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInYear(Collection $categories, Collection $entries)
{
// language:
$format = trans('config.month');
$format = trans('config.month');
$data = [
'count' => 0,
@@ -167,7 +132,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{
// language:
$format = trans('config.month');
$format = trans('config.month');
$data = [
'count' => 0,