From 04c4ce353cfc0062715200997a35a920922c1bcc Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 20 Dec 2017 10:51:25 +0530 Subject: [PATCH] Add leaderboard to desktop --- erpnext/config/desktop.py | 8 +++++++ .../utilities/page/leaderboard/leaderboard.js | 24 +++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index 59268381884..bfb4c6fa789 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -134,6 +134,14 @@ def get_data(): "link": "pos", "label": _("POS") }, + { + "module_name": "Leaderboard", + "color": "#589494", + "icon": "octicon octicon-graph", + "type": "page", + "link": "leaderboard", + "label": _("Leaderboard") + }, { "module_name": "Projects", "color": "#8e44ad", diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index 0d16ab0ad0a..7e70f76fa04 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -132,21 +132,21 @@ frappe.Leaderboard = Class.extend({ me.$graph_area.show().empty(); let args = { - parent: me.$graph_area, - y: [ - { - color: 'light-green', - values: graph_items.map(d=>d.value), - formatted: graph_items.map(d=>d[me.options.selected_filter_item]) - } - ], - x: { - values: graph_items.map(d=>d.name) + parent: '.leaderboard-graph', + data: { + datasets: [ + { + values: graph_items.map(d=>d.value) + } + ], + labels: graph_items.map(d=>d.name) }, - mode: 'bar', + colors: ['light-green'], + format_tooltip_x: d=>d[me.options.selected_filter_item], + type: 'bar', height: 140 }; - new frappe.ui.Graph(args); + new Chart(args); notify(me, r, $container); }