From 96c987870ec60a1f9455255e873f0d1cad03748f Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Fri, 30 Jun 2023 14:27:10 +0530 Subject: [PATCH 1/2] fix: support timespan filters for custom dashboard chart source --- frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 1 - frappe/public/js/frappe/widgets/chart_widget.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 6d23be79d7..5ed71e91a8 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -48,7 +48,6 @@ frappe.ui.form.on("Dashboard Chart", { frm.set_df_property("dynamic_filters_section", "hidden", 1); frm.trigger("set_parent_document_type"); - frm.trigger("set_time_series"); frm.set_query("document_type", function () { return { filters: { diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 18f7459a6c..ed40789173 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -103,7 +103,7 @@ export default class ChartWidget extends Widget { this.action_area.empty(); this.prepare_chart_actions(); - if (this.chart_doc.timeseries && this.chart_doc.chart_type !== "Custom") { + if (this.chart_doc.timeseries) { this.render_time_series_filters(); } } From b10a049adac6993d063f5c3a79fb56887bb9c41d Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Tue, 8 Aug 2023 13:56:06 +0530 Subject: [PATCH 2/2] fix: update time_series on refresh, but not for custom chart_type --- frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 5ed71e91a8..5d16a6d6d1 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -48,6 +48,7 @@ frappe.ui.form.on("Dashboard Chart", { frm.set_df_property("dynamic_filters_section", "hidden", 1); frm.trigger("set_parent_document_type"); + frm.trigger("set_time_series"); frm.set_query("document_type", function () { return { filters: { @@ -106,6 +107,8 @@ frappe.ui.form.on("Dashboard Chart", { // set timeseries based on chart type if (["Count", "Average", "Sum"].includes(frm.doc.chart_type)) { frm.set_value("timeseries", 1); + } else if (frm.doc.chart_type == "Custom") { + return; } else { frm.set_value("timeseries", 0); }