modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java
| 4 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
| 6 ++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
| 5 +++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
| 1 +
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
| 1 +
modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
| 4 +++-
12 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit b8aa7bda5a96691ca214715383d33bdbdf539635
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Jun 27 07:25:01 2013 -0700
For non-aggregate graphs where there is a single value, use 'Value' label
instead of aggregate label 'Avg'. And change color of label/value as well.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java
index d1284ac..f89ace2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java
@@ -131,6 +131,10 @@ public abstract class AbstractMetricGraph extends VLayout implements
HasD3Metric
return metricGraphData.getChartNoDataLabel();
}
+ public String getChartSingleValueLabel() {
+ return metricGraphData.getChartSingleValueLabel();
+ }
+
public String getChartHoverStartLabel() {
return metricGraphData.getChartHoverStartLabel();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
index a7abbd9..edf80cb 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
@@ -55,6 +55,7 @@ public class MetricGraphData implements JsonMetricProducer {
private final String chartDownLabel = MSG.chart_down_label();
private final String chartUnknownLabel = MSG.chart_unknown_label();
private final String chartNoDataLabel = MSG.chart_no_data_label();
+ private final String chartSingleValueLabel = MSG.chart_single_value_label();
private final String chartHoverStartLabel = MSG.chart_hover_start_label();
private final String chartHoverEndLabel = MSG.chart_hover_end_label();
private final String chartHoverPeriodLabel = MSG.chart_hover_period_label();
@@ -199,6 +200,9 @@ public class MetricGraphData implements JsonMetricProducer {
public String getChartNoDataLabel() {
return chartNoDataLabel;
}
+ public String getChartSingleValueLabel() {
+ return chartSingleValueLabel;
+ }
public String getChartHoverStartLabel() {
return chartHoverStartLabel;
@@ -455,4 +459,6 @@ public class MetricGraphData implements JsonMetricProducer {
sb.append('}');
return sb.toString();
}
+
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
index 0a2be03..14f17c8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
@@ -70,7 +70,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getChartHoverDateFormat()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::isPortalGraph()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getPortalId()(),
-
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getButtonBarDateTimeFormat()()
+
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getButtonBarDateTimeFormat()(),
+
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getChartSingleValueLabel()()
);
@@ -627,7 +628,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
hoverString =
'<div class="chartHoverEnclosingDiv"><span
class="chartHoverTimeLabel" >' + chartContext.timeLabel + ':
</span>' + timeFormatter(date) +
'<div
class="chartHoverAlignLeft"><span
class="chartHoverDateLabel">' + chartContext.dateLabel + ':
</span>' + dateFormatter(date) + '</div>' +
- '<div
class="chartHoverAlignRight"><span id="chartHoverAvgValue"
>' + chartContext.avgChartTitle + ': </span><span
style="width:50px;">' + avgValue + '</span></div>' +
+ '<div
class="chartHoverAlignRight"><span class="chartHoverDateLabel"
>' + chartContext.singleValueLabel + ': </span><span
style="width:50px;">' + avgValue + '</span></div>' +
'</div>';
} else {
// regular bar hover for duration
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index a7e6bca..0fa2206 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -21,6 +21,7 @@ chart_hover_start_label = Start
chart_hover_time_format = %I:%M:%S %p
chart_ie_not_supported = Charting is not available for this browser.
chart_no_data_label = No Data
+chart_single_value_label = Value
chart_slider_button_bar_day = Day
chart_slider_button_bar_hour = Hour
chart_slider_button_bar_minute = Min
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index abc64d3..59892f8 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -49,6 +49,7 @@ chart_hover_date_format = %d.%m.%y
chart_hover_time_format = %H:%M:%S
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
+##chart_single_value_label = Value
##chart_slider_button_bar_day = Day
##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_minute = Min
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index ef3917e..13fbc5b 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -24,6 +24,7 @@ chart_hover_start_label = Start
chart_hover_time_format = %H:%M:%S
chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt
chart_no_data_label = Keine Daten vorhanden
+##chart_single_value_label = Value
chart_slider_button_bar_day = Tag
chart_slider_button_bar_hour = Stunde
chart_slider_button_bar_minute = Minute
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 2132737..8e58f13 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -25,6 +25,7 @@
##chart_hover_time_format = %I:%M:%S %p
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
+##chart_single_value_label = Value
##chart_slider_button_bar_minute = Min
##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_day = Day
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index ee11386..6ecc530 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -23,6 +23,7 @@
##chart_hover_time_format = %I:%M:%S %p
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
+##chart_single_value_label = Value
##chart_slider_button_bar_minute = Min
##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_day = Day
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 26d8adc..e3dca6f 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -22,6 +22,7 @@
##chart_hover_time_format = %I:%M:%S %p
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
+##chart_single_value_label = Value
##chart_slider_button_bar_minute = Min
##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_day = Day
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index b57eebf..d266136 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -22,6 +22,7 @@
##chart_hover_time_format = %I:%M:%S %p
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
+##chart_single_value_label = Value
##chart_slider_button_bar_minute = Min
##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_day = Day
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index a09cc35..96c9a72 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -22,6 +22,7 @@
##chart_hover_time_format = %I:%M:%S %p
##chart_ie_not_supported = Charting is not available for this browser.
##chart_no_data_label = No Data
+##chart_single_value_label = Value
##chart_slider_button_bar_minute = Min
##chart_slider_button_bar_hour = Hour
##chart_slider_button_bar_day = Day
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
index 3956993..6939da6 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
@@ -34,9 +34,10 @@ if (!window.console.log) window.console.log = function () { };
* @param isPortalGraph
* @param portalId
* @param buttonBarDateTimeFormat
+ * @param singleValueLabel
* @constructor
*/
-var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle,
yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel,
unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel,
chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId,
buttonBarDateTimeFormat )
+var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle,
yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel,
unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel,
chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId,
buttonBarDateTimeFormat, singleValueLabel )
{
"use strict";
if(!(this instanceof ChartContext)){
@@ -55,6 +56,7 @@ var ChartContext = function (chartId, chartHeight, metricsData,
xAxisLabel, char
this.timeLabel = timeLabel;
this.downLabel = downLabel;
this.unknownLabel = unknownLabel;
+ this.singleValueLabel = singleValueLabel;
this.noDataLabel = noDataLabel;
this.hoverStartLabel = hoverStartLabel;
this.hoverEndLabel = hoverEndLabel;