modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
| 9 +++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
| 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 84ba5be81a6128f6131918f96419b6e41eb9a0be
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Jun 24 10:14:57 2013 -0700
BZ 977470 Graph buttons confusing should just be relative date - last x. Also updated
graph refresh to change date range to new current range.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
index 29428ae..d9f27b1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.common;
+import java.util.Date;
import java.util.List;
import com.google.gwt.user.client.Timer;
@@ -27,6 +28,7 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import
org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor;
@@ -86,6 +88,13 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout
implements
@Override
public void refresh() {
if (isVisible() && !isRefreshing()) {
+ Date now = new Date();
+ AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences
= measurementUserPrefs.getMetricRangePreferences();
+ long timeRange = metricRangePreferences.end - metricRangePreferences.begin;
+ Date newStartDate = new Date(now.getTime() - timeRange);
+ buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now);
+ buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(),
now.getTime());
+
redrawGraphs();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
index d416222..2075783 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
@@ -201,7 +201,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
public void onClick(ClickEvent clickEvent) {
IButton button = (IButton) clickEvent.getSource();
String selectedDateTimeRange = button.getTitle();
- Date calculatedStartDateTime = calculateStartDate(new Date(getEndTime()),
selectedDateTimeRange);
+ Date calculatedStartDateTime = calculateStartDate(new Date(),
selectedDateTimeRange);
saveDateRange(calculatedStartDateTime.getTime(), new Date().getTime());
redrawGraphs();
updateDateTimeRangeDisplay(calculatedStartDateTime, new Date());
Show replies by date