From 160ecf1003c5c07924438cf5dd867acaeffd262e Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 4 Nov 2019 12:56:54 +0530 Subject: [PATCH] fix(Dashboards): Fix dashboard date range --- frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 6 +++--- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 200e191ae1..7e99b86eae 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -175,19 +175,19 @@ "label": "Number of Groups" }, { - "depends_on": "eval:doc.timespan === 'Choose Time Span'", + "depends_on": "eval:doc.timespan === 'Select Date Range'", "fieldname": "from_date", "fieldtype": "Date", "label": "From Date" }, { - "depends_on": "eval:doc.timespan === 'Choose Time Span'", + "depends_on": "eval:doc.timespan === 'Select Date Range'", "fieldname": "to_date", "fieldtype": "Date", "label": "To Date" } ], - "modified": "2019-10-29 02:26:14.838057", + "modified": "2019-11-04 12:32:14.525409", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 845eaa9055..e7ec3f8bab 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -19,8 +19,11 @@ def get(chart_name = None, chart = None, no_cache = None, from_date = None, to_d chart = frappe._dict(frappe.parse_json(chart)) timespan = chart.timespan - from_date = chart.from_date - to_date = chart.to_date + + if chart.timespan == 'Select Date Range': + from_date = chart.from_date + to_date = chart.to_date + timegrain = chart.time_interval filters = frappe.parse_json(chart.filters_json)