modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
| 20 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
| 39 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
| 7 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 2
6 files changed, 66 insertions(+), 10 deletions(-)
New commits:
commit d9c77b890c647450837fb876c74e2d66c01ff789
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Mar 30 19:48:33 2011 -0400
fix notificaton log tab
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
index f30c23b..58346f0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -1,6 +1,7 @@
package org.rhq.enterprise.gui.coregui.client;
import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.alert.notification.ResultState;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.event.EventSeverity;
import org.rhq.core.domain.measurement.AvailabilityType;
@@ -405,6 +406,25 @@ public class ImageManager {
return "subsystems/event/Events" + icon + "_16.png";
}
+ public static String getAlertNotificationResultIcon(ResultState status) {
+ if (status == null) {
+ status = ResultState.UNKNOWN;
+ }
+ switch (status) {
+ case SUCCESS:
+ return ImageManager.getAvailabilityIcon(Boolean.TRUE);
+ case FAILURE:
+ return ImageManager.getAvailabilityIcon(Boolean.FALSE);
+ case PARTIAL:
+ return ImageManager.getAvailabilityYellowIcon();
+ case DEFERRED:
+ return "[skin]/actions/redo.png"; // for lack of a better icon
+ case UNKNOWN:
+ default:
+ return ImageManager.getAvailabilityIcon(null);
+ }
+ }
+
/**
* This returns an icon of the badge (e.g. the red X or the blue I) without the
* event icon. This is used if you have a table of events and the user knows they
are
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index 71a698a..262f7d0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -398,7 +398,7 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
for (AlertNotificationLog log : from.getAlertNotificationLogs()) {
DataClass dc = new DataClass();
dc.setAttribute("sender", log.getSender());
- dc.setAttribute("status", log.getResultState());
+ dc.setAttribute("status", log.getResultState().name());
dc.setAttribute("message", log.getMessage());
notifications[i++] = dc;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
index 14cfc8a..17dbb52 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
@@ -32,6 +32,8 @@ import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -39,10 +41,12 @@ import com.smartgwt.client.widgets.tab.Tab;
import com.smartgwt.client.widgets.tab.TabSet;
import org.rhq.core.domain.alert.Alert;
+import org.rhq.core.domain.alert.notification.ResultState;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTab;
import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTabSet;
@@ -198,12 +202,43 @@ public class AlertDetailsView extends LocatableVLayout implements
BookmarkableVi
DataClass[] input =
record.getAttributeAsRecordArray("notificationLogs");
ListGrid grid = getListGrid();
grid.setData((Record[]) input);
+
ListGridField sender = new ListGridField("sender",
MSG.view_alert_common_tab_notifications_sender());
sender.setWidth("33%");
+
ListGridField status = new ListGridField("status",
MSG.view_alert_common_tab_notifications_status());
- status.setWidth("33%");
+ status.setWidth("50");
+ status.setAlign(Alignment.CENTER);
+ status.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int rowNum, int
colNum) {
+ String statusStr = record.getAttribute("status");
+ ResultState statusEnum = (statusStr == null) ? ResultState.UNKNOWN :
ResultState.valueOf(statusStr);
+ return
imgHTML(ImageManager.getAlertNotificationResultIcon(statusEnum));
+ }
+ });
+ status.setShowHover(true);
+ status.setHoverCustomizer(new HoverCustomizer() {
+ public String hoverHTML(Object value, ListGridRecord record, int rowNum,
int colNum) {
+ String statusStr = record.getAttribute("status");
+ ResultState statusEnum = (statusStr == null) ? ResultState.UNKNOWN :
ResultState.valueOf(statusStr);
+ switch (statusEnum) {
+ case SUCCESS:
+ return MSG.common_status_success();
+ case FAILURE:
+ return MSG.common_status_failed();
+ case PARTIAL:
+ return MSG.common_status_partial();
+ case DEFERRED:
+ return MSG.common_status_deferred();
+ case UNKNOWN:
+ default:
+ return MSG.common_status_unknown();
+ }
+ }
+ });
+
ListGridField message = new ListGridField("message",
MSG.view_alert_common_tab_notifications_message());
- message.setWidth("34%");
+ message.setWidth("*");
grid.setFields(sender, status, message);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 1838e14..c00a454 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -23,14 +23,12 @@
package org.rhq.enterprise.gui.coregui.client.bundle.deployment;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.AnimationEffect;
import com.smartgwt.client.types.AutoFitWidthApproach;
-import com.smartgwt.client.types.DateDisplayFormat;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
@@ -74,6 +72,7 @@ import
org.rhq.enterprise.gui.coregui.client.bundle.revert.BundleRevertWizard;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
+import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
@@ -164,8 +163,8 @@ public class BundleDeploymentView extends LocatableVLayout implements
Bookmarkab
bundleVersionName.setTarget("_self");
StaticTextItem deployed = new StaticTextItem("deployed",
MSG.view_bundle_deployed());
- deployed.setDateFormatter(DateDisplayFormat.TOLOCALESTRING);
- deployed.setValue(new Date(deployment.getCtime()));
+ deployed.setValue(TimestampCellFormatter.format(deployment.getCtime(),
+ TimestampCellFormatter.DATE_TIME_FORMAT_FULL));
StaticTextItem deployedBy = new StaticTextItem("deployedBy",
MSG.view_bundle_deploy_deployedBy());
deployedBy.setValue(deployment.getSubjectName());
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 c5f4d20..1867bf7 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
@@ -235,6 +235,8 @@ common_status_failed = Failed
common_status_inprogress = In Progress
common_status_canceled = Canceled
common_status_unknown = Unknown
+common_status_deferred = Deferred
+common_status_partial = Partial
# 1st, 2nd, 3rd, 4th, etc.
common_val_n1st = {0}st
commit caf6832295d8c0a44cfd77a251a530e28b53c0be
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Mar 30 17:18:11 2011 -0400
fix fields
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
index afcb435..c221bd4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
@@ -30,7 +30,6 @@ import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceImageField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.types.Alignment;
-import com.smartgwt.client.types.DateDisplayFormat;
import com.smartgwt.client.types.FieldType;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
@@ -42,6 +41,7 @@ import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -87,13 +87,13 @@ public abstract class AbstractAlertDefinitionsDataSource extends
ListGridField ctimeField = new ListGridField(FIELD_CTIME,
MSG.view_alerts_field_created_time());
ctimeField.setType(ListGridFieldType.DATE);
- ctimeField.setDateFormatter(DateDisplayFormat.TOLOCALESTRING);
+ TimestampCellFormatter.prepareDateField(ctimeField);
ctimeField.setWidth("15%");
fields.add(ctimeField);
ListGridField mtimeField = new ListGridField(FIELD_MTIME,
MSG.view_alerts_field_modified_time());
mtimeField.setType(ListGridFieldType.DATE);
- mtimeField.setDateFormatter(DateDisplayFormat.TOLOCALESTRING);
+ TimestampCellFormatter.prepareDateField(mtimeField);
mtimeField.setWidth("15%");
fields.add(mtimeField);