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

Implemented some more charts.

Browse Source
This commit is contained in:
James Cole
2015-06-27 20:39:50 +02:00
parent 48624d0a34
commit f137a08493
14 changed files with 887 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/twig/budgets/show.twig
View File

@@ -27,7 +27,12 @@
</div>
</div>
<div class="box-body">
<div id="budgetOverview"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="budgetOverview"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="budgetOverview" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>

14
resources/twig/categories/show.twig
View File

@@ -12,7 +12,12 @@
<h3 class="box-title">{{ 'overview'|_ }} (month)</h3>
</div>
<div class="box-body">
<div id="month"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="month"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="month" style="width:100%;height:350px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -22,7 +27,12 @@
<h3 class="box-title">{{ 'overview'|_ }} (all)</h3>
</div>
<div class="box-body">
<div id="all"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="all"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="all" style="width:100%;height:350px;"></canvas>
{% endif %}
</div>
</div>
</div>

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

@@ -13,7 +13,12 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<div id="income-expenses-chart"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="income-expenses-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="income-expenses-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -23,7 +28,12 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<div id="income-expenses-sum-chart"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="income-expenses-sum-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="income-expenses-sum-chart" style="width:300px;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -49,7 +59,12 @@
<h3 class="box-title">{{ 'categories'|_ }}</h3>
</div>
<div class="box-body">
<div id="categories"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="categories"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="categories" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -61,7 +76,12 @@
<h3 class="box-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="box-body">
<div id="budgets"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="budgets"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="budgets" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -76,12 +96,15 @@
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/Chart.StackedBar.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript">
var year = '{{start.year}}';
var shared = {% if shared %}'/shared'{% else %}''{% endif %};
var shared = {% if shared %}'/shared'
{% else %}''{% endif %};
var incomeTopLength = {{ incomeTopLength }};
var expenseTopLength = {{ expenseTopLength }};
var incomeRestShow = false; // starts hidden.