vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #21537 from vorasmit/support-timespan

Browse source
This commit is contained in:
Shariq Ansari 2023-08-08 23:45:33 +05:30 • committed by GitHub
commit bc1d2bd20b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/doctype/dashboard_chart/dashboard_chart.js
View file

@ -107,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);
}

2
frappe/public/js/frappe/widgets/chart_widget.js
View file

@ -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();
}
}