modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
New commits: commit a43e7ad867958b4626497ac9f02c1a9a61c048ff Author: Mike Thompson mithomps@redhat.com Date: Wed Mar 6 14:37:17 2013 -0800
Charting - Fix hovers after fixing the undefined javascript condition for avg line that was throwing errors because the avg line was not contiguous. Using the condition of high,low,avg all == 0 as a proxy for undefined data so values of 0 are substituted for undefined to get around this condition.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java index 86c1891..dea4039 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java @@ -517,12 +517,13 @@ public final class MetricStackedBarGraph extends AbstractGraph { barDuration = d.barDuration, timeFormatter = $wnd.d3.time.format("%I:%M:%S %p"), dateFormatter = $wnd.d3.time.format("%m/%d/%y"), - highValue = (d.high == undefined) ? 0 : d.high.toFixed(2), - lowValue = (d.low == undefined) ? 0 : d.low.toFixed(2), - avgValue = (d.y == undefined) ? 0 : d.y.toFixed(2); + highValue = d.high.toFixed(2), + lowValue = d.low.toFixed(2), + avgValue = d.y.toFixed(2);
- if (d.y == undefined) { + // our special condition to indicate no data because avg lines dont like discontinuous data + if (d.y === 0 && d.high === 0 && d.low === 0 ) { // no data hoverString = '<div class="chartHoverEnclosingDiv"><span class="chartHoverTimeLabel" >' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' +