From 657116d361bfe1d68aea817bec732e752af6bfab Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 25 Dec 2015 07:32:03 +0100 Subject: [PATCH] Display new chart. --- public/js/reports/default/year.js | 2 +- resources/twig/reports/default/year.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/reports/default/year.js b/public/js/reports/default/year.js index 026b30ba63..44461e38ec 100644 --- a/public/js/reports/default/year.js +++ b/public/js/reports/default/year.js @@ -19,7 +19,7 @@ function drawChart() { columnChart('chart/report/in-out-sum/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'income-expenses-sum-chart'); stackedColumnChart('chart/budget/year/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'budgets'); stackedColumnChart('chart/category/spent-in-year/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'categories-spent-in-year'); - stackedColumnChart('chart/category/earned-in-year/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'categories-earned-in-year'); + stackedColumnChart('chart/category/earned-in-period/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'categories-earned-in-period'); } diff --git a/resources/twig/reports/default/year.twig b/resources/twig/reports/default/year.twig index 34d7d31efc..7754eeee1b 100644 --- a/resources/twig/reports/default/year.twig +++ b/resources/twig/reports/default/year.twig @@ -71,7 +71,7 @@
{% endif %} {% if Config.get('firefly.chart') == 'chartjs' %} - + {% endif %}