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

Make report budget charts multi-currency

Browse Source
This commit is contained in:
James Cole
2019-09-01 16:52:49 +02:00
parent ce06fb73b1
commit 5c099008e8
15 changed files with 211 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
{# charts #}
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box" id="year-inc-exp">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
@@ -18,16 +18,6 @@
</div>
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-12">
<div class="box" id="year-inc-exp-sum">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="income-expenses-sum-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
</div>
</div>
</div>
{# balances and income vs. expense. #}
@@ -214,7 +204,6 @@
// report uri's
var opChartUri = '{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var sumChartUri = '{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var netWorthUri = '{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
// data uri's

13
resources/views/v1/reports/default/year.twig
View File

@@ -8,7 +8,7 @@
{# charts #}
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box" id="year-inc-exp">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
@@ -18,16 +18,6 @@
</div>
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-12">
<div class="box" id="year-inc-exp-sum">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="income-expenses-sum-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
</div>
</div>
</div>
{# balances and inc vs exp #}
@@ -208,7 +198,6 @@
// report uri's
var opChartUri = '{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var sumChartUri = '{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var netWorthUri = '{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
// data uri's