From 43a17ac76b458bba45d00a6031d3debb41ac2329 Mon Sep 17 00:00:00 2001 From: Laura Shapiro Date: Wed, 31 Oct 2018 17:02:56 -0400 Subject: [PATCH] updates heatmap mouseover to deal with magnitude --- src/assets/mocks/d3/dateHeatmapMock.json | 6 +----- src/components/visualizations/d3/HeatMap.vue | 5 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/assets/mocks/d3/dateHeatmapMock.json b/src/assets/mocks/d3/dateHeatmapMock.json index c8b96f0d..7c01f995 100644 --- a/src/assets/mocks/d3/dateHeatmapMock.json +++ b/src/assets/mocks/d3/dateHeatmapMock.json @@ -7,10 +7,6 @@ "x": "2017-11-29", "magnitude": 0 }, - { - "x": "2017-11-30", - "magnitude": 0 - }, { "x": "2017-11-28", "magnitude": 1 @@ -1099,4 +1095,4 @@ "x": "2017-02-08", "magnitude": 1 } - ] \ No newline at end of file + ] diff --git a/src/components/visualizations/d3/HeatMap.vue b/src/components/visualizations/d3/HeatMap.vue index df907a44..3e793c35 100644 --- a/src/components/visualizations/d3/HeatMap.vue +++ b/src/components/visualizations/d3/HeatMap.vue @@ -63,6 +63,7 @@ * Possible values are * "calendar" - date time string * "other" - any number, string, etc. + * if calendar type, dataModel must be pre-processed so there is only one data point for each date mapped */ dataType: { type: String, @@ -385,9 +386,9 @@ let item = this.dataModel.filter(function(item) { return item.x === d.x; - }); + })[0]; - let tooltipText = "Occurrences: " + "" + item.length + "" + "
X: " + "" + d.x + "
"; + let tooltipText = "Occurrences: " + "" + item.magnitude + "" + "
X: " + "" + d.x + "
"; if (d.y) { tooltipText += "Y: " + d.y + "";