kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-03 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

File reformatting.

Browse Source
This commit is contained in:
James Cole
2015-12-18 16:38:50 +01:00
parent 813fb679a7
commit ac61dfae6b
24 changed files with 149 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Generator/Chart/Account/ChartJsAccountChartGenerator.php
View File

@@ -42,10 +42,10 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end)
{
$data = [
'count' => 1,
'labels' => [], 'datasets' => [[
'label' => trans('firefly.spent'),
'data' => []]]];
'count' => 1,
'labels' => [], 'datasets' => [[
'label' => trans('firefly.spent'),
'data' => []]]];
bcscale(2);
$start->subDay();

14
app/Generator/Chart/Budget/BudgetChartGenerator.php
View File

@@ -18,13 +18,6 @@ interface BudgetChartGenerator
*/
public function budget(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
/**
* @param Collection $entries
*
@@ -39,6 +32,13 @@ interface BudgetChartGenerator
*/
public function frontpage(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
/**
* @param Collection $budgets
* @param Collection $entries

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

@@ -20,11 +20,12 @@ interface CategoryChartGenerator
public function all(Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
public function earnedInYear(Collection $categories, Collection $entries);
/**
* @param Collection $entries
@@ -38,8 +39,14 @@ interface CategoryChartGenerator
*
* @return array
*/
public function period(Collection $entries);
public function multiYear(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function period(Collection $entries);
/**
* @param Collection $categories
@@ -48,12 +55,4 @@ interface CategoryChartGenerator
* @return array
*/
public function spentInYear(Collection $categories, Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInYear(Collection $categories, Collection $entries);
}

8
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@@ -107,9 +107,9 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
],
];
$data['datasets'][0]['data'][] = round($income, 2);
$data['datasets'][1]['data'][] = round( $expense, 2);
$data['datasets'][1]['data'][] = round($expense, 2);
$data['datasets'][0]['data'][] = round(($income / $count), 2);
$data['datasets'][1]['data'][] = round(( $expense / $count), 2);
$data['datasets'][1]['data'][] = round(($expense / $count), 2);
return $data;
}
@@ -138,9 +138,9 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
],
];
$data['datasets'][0]['data'][] = round($income, 2);
$data['datasets'][1]['data'][] = round( $expense, 2);
$data['datasets'][1]['data'][] = round($expense, 2);
$data['datasets'][0]['data'][] = round(($income / $count), 2);
$data['datasets'][1]['data'][] = round(( $expense / $count), 2);
$data['datasets'][1]['data'][] = round(($expense / $count), 2);
return $data;
}

18
app/Generator/Chart/Report/ReportChartGenerator.php
View File

@@ -12,13 +12,6 @@ use Illuminate\Support\Collection;
interface ReportChartGenerator
{
/**
* @param Collection $entries
*
* @return array
*/
public function yearInOut(Collection $entries);
/**
* @param Collection $entries
*
@@ -33,7 +26,14 @@ interface ReportChartGenerator
*
* @return array
*/
public function yearInOutSummarized($income, $expense, $count);
public function multiYearInOutSummarized($income, $expense, $count);
/**
* @param Collection $entries
*
* @return array
*/
public function yearInOut(Collection $entries);
/**
* @param string $income
@@ -42,6 +42,6 @@ interface ReportChartGenerator
*
* @return array
*/
public function multiYearInOutSummarized($income, $expense, $count);
public function yearInOutSummarized($income, $expense, $count);
}