IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

New chart called "net worth".

Browse Source
This commit is contained in:
James Cole 2016-02-18 10:04:53 +01:00
parent f0f47530bf
commit 2e7c26c539
10 changed files with 129 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,32 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
return $data;
}
/**
* @param Collection $entries
*
* @return array
*/
public function netWorth(Collection $entries) : array
{
$format = (string)trans('config.month_and_day');
$data = [
'count' => 1,
'labels' => [],
'datasets' => [
[
'label' => trans('firefly.net-worth'),
'data' => [],
],
],
];
foreach ($entries as $entry) {
$data['labels'][] = trim($entry['date']->formatLocalized($format));
$data['datasets'][0]['data'][] = floatval($entry['net-worth']);
}
return $data;
}
/**
* @param Collection $entries
*

7
app/Generator/Chart/Report/ReportChartGeneratorInterface.php
View File

@ -36,6 +36,13 @@ interface ReportChartGeneratorInterface
*/
public function multiYearInOutSummarized(string $income, string $expense, int $count): array;
/**
* @param Collection $entries
*
* @return array
*/
public function netWorth(Collection $entries) : array;
/**
* @param Collection $entries
*

64
app/Http/Controllers/Chart/ReportController.php
View File

@ -10,6 +10,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
use Steam;
/**
* Class ReportController
@ -32,6 +33,53 @@ class ReportController extends Controller
$this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface');
}
/**
* This chart, by default, is shown on the multi-year and year report pages,
* which means that giving it a 2 week "period" should be enough granularity.
*
* @param ReportQueryInterface $query
* @param string $reportType
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return \Illuminate\Http\JsonResponse
*/
public function netWorth(ReportQueryInterface $query, string $reportType, Carbon $start, Carbon $end, Collection $accounts)
{
bcscale(2);
// chart properties for cache:
$cache = new CacheProperties;
$cache->addProperty('netWorth');
$cache->addProperty($start);
$cache->addProperty($reportType);
$cache->addProperty($accounts);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
}
$ids = $accounts->pluck('id')->toArray();
$current = clone $start;
$entries = new Collection;
while ($current < $end) {
$balances = Steam::balancesById($ids, $current);
$sum = $this->array_sum($balances);
$entries->push(
[
'date' => clone $current,
'net-worth' => $sum,
]
);
$current->addDays(7);
}
$data = $this->generator->netWorth($entries);
//$cache->store($data);
return Response::json($data);
}
/**
* Summarizes all income and expenses, per month, for a given year.
@ -250,4 +298,20 @@ class ReportController extends Controller
return $data;
}
/**
* @param $array
*
* @return string
*/
private function array_sum($array) : string
{
bcscale(2);
$sum = '0';
foreach ($array as $entry) {
$sum = bcadd($sum, $entry);
}
return $sum;
}
}

1
app/Http/routes.php
View File

@ -190,6 +190,7 @@ Route::group(
// reports:
Route::get('/chart/report/in-out/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@yearInOut']);
Route::get('/chart/report/in-out-sum/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@yearInOutSummarized']);
Route::get('/chart/report/net-worth/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\ReportController@netWorth']);
/**

1
app/Support/Steam.php
View File

@ -103,6 +103,7 @@ class Steam
}
/**
* This method always ignores the virtual balance.
*
* @param array $ids
* @param \Carbon\Carbon $date

2
public/js/charts.js
View File

@ -92,7 +92,7 @@ var defaultLineOptions = {
datasetFill: false,
scaleFontSize: 10,
responsive: false,
scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
scaleLabel: " <%= accounting.formatMoney(value) %>",
tooltipFillColor: "rgba(0,0,0,0.5)",
tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
multiTooltipTemplate: "<%=datasetLabel%>: <%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>"

1
public/js/reports/default/multi-year.js
View File

@ -17,6 +17,7 @@ function drawChart() {
"use strict";
// income and expense over multi year:
lineChart('chart/report/net-worth/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'net-worth');
columnChart('chart/report/in-out/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-chart');
columnChart('chart/report/in-out-sum/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-sum-chart');

1
public/js/reports/default/year.js
View File

@ -15,6 +15,7 @@ $(function () {
function drawChart() {
"use strict";
lineChart('chart/report/net-worth/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'net-worth');
columnChart('chart/report/in-out/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-chart');
columnChart('chart/report/in-out-sum/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-sum-chart');
stackedColumnChart('chart/budget/year/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'budgets');

13
resources/views/reports/default/multi-year.twig
View File

@ -60,6 +60,19 @@
</div>
{% endfor %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'net_worth'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="net-worth" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">

14
resources/views/reports/default/year.twig
View File

@ -42,6 +42,20 @@
{% include 'reports/partials/expenses.twig' %}
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'net_worth'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="net-worth" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">