diff --git a/public/js/reports/default/multi-year.js b/public/js/reports/default/multi-year.js index 8e35176219..95cff4f05e 100644 --- a/public/js/reports/default/multi-year.js +++ b/public/js/reports/default/multi-year.js @@ -12,4 +12,15 @@ $(function () { function drawChart() { "use strict"; + // income and expense over multi year: + 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'); + + + $.each($('.account-chart'), function(i,v) { + var holder = $(v); + console.log(holder.data('id')); + }); + + } \ No newline at end of file diff --git a/resources/twig/reports/default/multi-year.twig b/resources/twig/reports/default/multi-year.twig index 8ff32098d3..5a7939b048 100644 --- a/resources/twig/reports/default/multi-year.twig +++ b/resources/twig/reports/default/multi-year.twig @@ -7,36 +7,41 @@ {% block content %}
-
+

{{ 'incomeVsExpenses'|_ }}

- {% if Config.get('firefly.chart') == 'google' %} -
- {% endif %} - {% if Config.get('firefly.chart') == 'chartjs' %} - - {% endif %} + +
+
+
+
+
+
+

{{ 'incomeVsExpenses'|_ }}

+
+
+
{% for account in accounts %} -
-
-
-
-

{{ 'Asset account'|_ }}: {{ account.name }}

-
-
- +
+
+
+
+

{{ 'Asset account'|_ }}: {{ account.name }}

+
+
+ +
-
{% endfor %}
diff --git a/resources/twig/reports/default/year.twig b/resources/twig/reports/default/year.twig index a27a0f13a5..a8ed93ff81 100644 --- a/resources/twig/reports/default/year.twig +++ b/resources/twig/reports/default/year.twig @@ -13,12 +13,7 @@

{{ 'incomeVsExpenses'|_ }}

- {% if Config.get('firefly.chart') == 'google' %} -
- {% endif %} - {% if Config.get('firefly.chart') == 'chartjs' %} - - {% endif %} +
@@ -28,12 +23,7 @@

{{ 'incomeVsExpenses'|_ }}

- {% if Config.get('firefly.chart') == 'google' %} -
- {% endif %} - {% if Config.get('firefly.chart') == 'chartjs' %} - - {% endif %} +