kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 08:11:20 +00:00
Code Issues Projects Releases Wiki Activity

New chart, earned in period.

Browse Source
This commit is contained in:
James Cole
2015-12-25 07:31:29 +01:00
parent 8dae8b1a7f
commit 75a478ad54
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -157,6 +157,39 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
} }
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInPeriod(Collection $categories, Collection $entries)
{
// 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 $entries * @param Collection $entries
* *

2
app/Http/routes.php
View File

@@ -414,8 +414,8 @@ Route::group(
Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']); Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']);
// these three charts are for reports: // these three charts are for reports:
Route::get('/chart/category/earned-in-period/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@earnedInPeriod']);
Route::get('/chart/category/spent-in-year/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@spentInYear']); Route::get('/chart/category/spent-in-year/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@spentInYear']);
Route::get('/chart/category/earned-in-year/{report_type}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@earnedInYear']);
Route::get( Route::get(
'/chart/category/multi-year/{report_type}/{start_date}/{end_date}/{accountList}/{categoryList}', ['uses' => 'Chart\CategoryController@multiYear'] '/chart/category/multi-year/{report_type}/{start_date}/{end_date}/{accountList}/{categoryList}', ['uses' => 'Chart\CategoryController@multiYear']
); );