From b45ca55d6b64cc0bc34dd73f0068a40da707f990 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 11 Aug 2017 11:07:29 +0800
Subject: [PATCH 1/1] MDL-59790 core: fix tooltip for pie chart

---
 lib/amd/build/chart_output_chartjs.min.js | Bin 3710 -> 3821 bytes
 lib/amd/src/chart_output_chartjs.js       |  12 ++++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/amd/build/chart_output_chartjs.min.js b/lib/amd/build/chart_output_chartjs.min.js
index 69b06cdab4f262af5678f1e0b4c3864ce1d00dfd..1a27a5414e42690c4036580fca96cbd2a4f61509 100644
GIT binary patch
delta 127
zcmew-^Hz341CK^@taWCZhLV!4ZK7U<PhwJPj+z>TR|)26R+l9fDP-DCUdJYH0v0LO
z(A2cf&?_h{&d|t=PSnfHOG&MW)vPT_Eh#O^Q^+gL$x*bmO|^$AnY@lihQkWRY2cCE
Je3EA?BLJ)@D<S{@

delta 42
ycmaDW`%h*=1J7i6UP)2wqSTVoqCADX(wrPcTiaAMHH{40$-jAIHe2#;VFUn4EDnJH

diff --git a/lib/amd/src/chart_output_chartjs.js b/lib/amd/src/chart_output_chartjs.js
index 99656e8a0ad..ef345477f64 100644
--- a/lib/amd/src/chart_output_chartjs.js
+++ b/lib/amd/src/chart_output_chartjs.js
@@ -293,11 +293,19 @@ define([
         var tooltipData = chartData[tooltipItem.index];
 
         // Build default tooltip.
-        var tooltip = this._cleanData(serieLabel) + ': ' + tooltipData;
+        var tooltip = [];
+
+        // Pie and doughnut charts does not have axis.
+        if (tooltipItem.xLabel == '' && tooltipItem.yLabel == '') {
+            var chartLabels = this._cleanData(this._chart.getLabels());
+            tooltip.push(chartLabels[tooltipItem.index]);
+        }
 
         // Add series labels to the tooltip if any.
         if (serieLabels !== null) {
-            tooltip = this._cleanData(serieLabels[tooltipItem.index]);
+            tooltip.push(this._cleanData(serieLabels[tooltipItem.index]));
+        } else {
+            tooltip.push(this._cleanData(serieLabel) + ': ' + tooltipData);
         }
 
         return tooltip;
-- 
2.17.1