gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand some layouts to accept chartJS charts.

Browse Source
This commit is contained in:
James Cole
2015-06-27 16:00:50 +02:00
parent c581080f3f
commit 2194c4e0a9
13 changed files with 217 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/twig/reports/month.twig
View File

@@ -13,7 +13,12 @@
<h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body">
<div id="account-balances-chart"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="account-balances-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="account-balances-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -72,6 +77,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript">
var year = {{ start.year }};

4
resources/twig/reports/year.twig
View File

@@ -74,6 +74,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript">
var year = '{{start.year}}';