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

Reorganized the category charts in the year report to properly reflect income and expenses. Necessary to facilitate the changes needed for bug #99

Browse Source
This commit is contained in:
James Cole
2015-07-31 14:20:18 +02:00
parent 4d09235aef
commit 96ddbe7227
12 changed files with 192 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,5 +40,13 @@ interface CategoryChartGenerator
*
* @return array
*/
public function year(Collection $categories, Collection $entries);
public function spentInYear(Collection $categories, Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInYear(Collection $categories, Collection $entries);
}

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

@@ -93,7 +93,41 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
*
* @return array
*/
public function year(Collection $categories, Collection $entries)
public function spentInYear(Collection $categories, Collection $entries)
{
// language:
$language = Preferences::get('language', 'en')->data;
$format = Config::get('firefly.month.' . $language);
$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:

26
app/Generator/Chart/Category/GoogleCategoryChartGenerator.php
View File

@@ -86,7 +86,31 @@ class GoogleCategoryChartGenerator implements CategoryChartGenerator
*
* @return array
*/
public function year(Collection $categories, Collection $entries)
public function spentInYear(Collection $categories, Collection $entries)
{
$chart = new GChart;
$chart->addColumn(trans('firefly.month'), 'date');
foreach ($categories as $category) {
$chart->addColumn($category->name, 'number');
}
/** @var array $entry */
foreach ($entries as $entry) {
$chart->addRowArray($entry);
}
$chart->generate();
return $chart->getData();
}
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInYear(Collection $categories, Collection $entries)
{
$chart = new GChart;