anmolbabu has uploaded a new change for review. Change subject: webadmin : gluster volume rebalance status and start time formatting ......................................................................
webadmin : gluster volume rebalance status and start time formatting Earlier the start and status time of volume rebalance was not shown in a correct format.Now,it is displayed in the appropriate format. Change-Id: I8897a9aa141120fe5e9011167e7a1d14a24c4852 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1011878 Signed-off-by: Anmol Babu <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.ui.xml 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/19629/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java index a14a81b..2ffa939 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.gluster; import java.util.ArrayList; +import java.util.Date; import java.util.List; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; @@ -38,6 +39,8 @@ private Timer refresh; + private Date startTimeLabel; + public VolumeRebalanceStatusModel(final GlusterVolumeEntity volumeEntity) { setStatus(new EntityModel()); setVolume(new EntityModel()); @@ -46,6 +49,7 @@ setStatusTime(new EntityModel()); setRebalanceSessions(new ListModel()); setEntity(volumeEntity); + setStartTimeLabel(new Date()); refresh = new Timer() { @Override @@ -114,6 +118,7 @@ .getConstants() .notAvailableLabel() : rebalanceStatusEntity.getStatusTime()); + setStartTimeLabel(rebalanceStatusEntity.getStartTime()); getRebalanceSessions().setItems(sessionList); if(rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.FINISHED) { setStatusAvailable(true); @@ -168,4 +173,12 @@ onPropertyChanged(new PropertyChangedEventArgs("IS_STATUS_APPLICABLE"));//$NON-NLS-1$ } } + + public Date getStartTimeLabel() { + return startTimeLabel; + } + + public void setStartTimeLabel(Date startTimeLabel) { + this.startTimeLabel = startTimeLabel; + } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java index 7c2e374..c274656 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java @@ -7,6 +7,7 @@ import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.common.widget.editor.EntityModelLabelEditor; +import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; import org.ovirt.engine.ui.common.widget.table.column.EntityModelTextColumn; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -19,6 +20,7 @@ import org.ovirt.engine.ui.webadmin.ApplicationMessages; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.gluster.VolumeRebalanceStatusPopupPresenterWidget; +import org.ovirt.engine.ui.webadmin.widget.label.FullDateTimeLabel; import org.ovirt.engine.ui.webadmin.widget.table.column.RebalanceFileSizeColumn; import com.google.gwt.core.client.GWT; @@ -26,6 +28,7 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.inject.Inject; @@ -63,6 +66,9 @@ @WithElementId EntityModelLabelEditor startedTimeEditor; + @UiField(provided = true) + HorizontalPanel startTimePanel; + @UiField @Path("statusTime.entity") @WithElementId @@ -86,6 +92,8 @@ @UiField @Ignore Label messageLabel; + + FullDateTimeLabel startTimeLabel; ApplicationMessages messages; @@ -116,6 +124,11 @@ void initEditors(ApplicationConstants constants) { rebalanceHostsTable = new EntityModelCellTable<ListModel>(false, true); + + startTimeLabel = new FullDateTimeLabel(); + startTimePanel = new HorizontalPanel(); + startTimePanel.add(new TextBoxLabel(constants.rebalanceStartTime())); + startTimePanel.add(startTimeLabel); rebalanceHostsTable.addEntityModelColumn(new EntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override @@ -179,6 +192,7 @@ @Override public void edit(final VolumeRebalanceStatusModel object) { driver.edit(object); + rebalanceHostsTable.asEditor().edit(object.getRebalanceSessions()); object.getPropertyChangedEvent().addListener(new IEventListener() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.ui.xml index f72b812..a667f87 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.ui.xml @@ -26,6 +26,7 @@ <g:VerticalPanel> <g:HorizontalPanel> <g:VerticalPanel> + <g:HorizontalPanel ui:field="startTimePanel"/> <e:EntityModelLabelEditor ui:field="volumeEditor" /> <e:EntityModelLabelEditor ui:field="startedTimeEditor" /> </g:VerticalPanel> -- To view, visit http://gerrit.ovirt.org/19629 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8897a9aa141120fe5e9011167e7a1d14a24c4852 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
