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

Fixed the account overview chart

Browse Source
This commit is contained in:
James Cole
2016-12-09 18:52:27 +01:00
parent cf34713518
commit 663be30117
5 changed files with 15 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/accounts/show-by-date.twig
View File

@@ -26,7 +26,7 @@
</div>
<div class="box-body">
<canvas id="period-specific-account" style="width:100%;height:350px;" height="350"></canvas>
<canvas id="overview-chart" style="width:100%;height:350px;" height="350"></canvas>
</div>
</div>
</div>
@@ -94,7 +94,7 @@
var dateString = "{{ date|escape }}";
// uri's for charts:
var periodUri = '{{ route('chart.account.single', [account.id, date]) }}';
var chartUri = '{{ route('chart.account.period', [account.id, date]) }}';
var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
@@ -105,6 +105,6 @@
<script type="text/javascript" src="js/ff/charts.js"></script>
<script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
<script src="js/lib/jquery.color-2.1.2.min.js" type="text/javascript"></script>
<script src="js/ff/accounts/show-by-date.js" type="text/javascript"></script>
<script src="js/ff/accounts/show.js" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
{% endblock %}

2
resources/views/accounts/show.twig
View File

@@ -123,7 +123,7 @@
<script type="text/javascript">
var accountID = {{ account.id }};
// uri's for charts:
var singleUri = '{{ route('chart.account.single', [account.id]) }}';
var chartUri = '{{ route('chart.account.single', [account.id]) }}';
var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';