From 63828ed1114196963caeb424c8e2cdb431d02e30 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 11 Jun 2019 17:11:12 +0530 Subject: [PATCH] refactor: added donut chart and made height implicit --- .../public/js/frappe/views/reports/query_report.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index d5ab5ea68a..2bf42b9117 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -486,11 +486,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { return options; } - render_chart(options, height=200) { - Object.assign(options, { - height: height - }); - + render_chart(options) { this.$chart.empty(); this.chart = new Chart(this.$chart[0], options); this.$chart.show(); @@ -543,10 +539,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { const values = dialog.get_values(true); let options = make_chart_options(values); - Object.assign(options, { - height: 150 - }); - wrapper.empty(); new Chart(wrapper[0], options); wrapper.find('.chart-container .title, .chart-container .sub-title').hide(); @@ -587,7 +579,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { fieldname: 'chart_type', label: 'Type of Chart', fieldtype: 'Select', - options: ['Bar', 'Line', 'Percentage', 'Pie'], + options: ['Bar', 'Line', 'Percentage', 'Pie', 'Donut'], default: 'Bar', onchange: preview_chart },