From 0f4bbe185eeed5006e2f1b8872b0297c6d626f16 Mon Sep 17 00:00:00 2001 From: Shreya Date: Tue, 31 Oct 2017 10:18:55 +0530 Subject: [PATCH 1/2] fixed heatmap --- frappe/desk/page/activity/activity.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/desk/page/activity/activity.js b/frappe/desk/page/activity/activity.js index 97e81c86d4..9f6f57d2ca 100644 --- a/frappe/desk/page/activity/activity.js +++ b/frappe/desk/page/activity/activity.js @@ -180,8 +180,9 @@ frappe.activity.render_heatmap = function(page) { method: "frappe.desk.page.activity.activity.get_heatmap_data", callback: function(r) { if(r.message) { - var heatmap = new frappe.ui.HeatMap({ - parent: $(".heatmap"), + var heatmap = new frappe.chart.HeatMap({ + parent: ".heatmap", + type: 'heatmap', height: 100, start: new Date(moment().subtract(1, 'year').toDate()), count_label: "actions", From 3e27e061c1a127fd8535d63dd17acdb3d7c1bf2c Mon Sep 17 00:00:00 2001 From: Shreya Date: Tue, 31 Oct 2017 13:22:58 +0530 Subject: [PATCH 2/2] revised according to latest merge --- frappe/desk/page/activity/activity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/page/activity/activity.js b/frappe/desk/page/activity/activity.js index 9f6f57d2ca..66807b3eb9 100644 --- a/frappe/desk/page/activity/activity.js +++ b/frappe/desk/page/activity/activity.js @@ -180,7 +180,7 @@ frappe.activity.render_heatmap = function(page) { method: "frappe.desk.page.activity.activity.get_heatmap_data", callback: function(r) { if(r.message) { - var heatmap = new frappe.chart.HeatMap({ + var heatmap = new Chart({ parent: ".heatmap", type: 'heatmap', height: 100,