[Engine-patches] Change in ovirt-engine[master]: webadmin: progress monitor for import vm

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: webadmin: progress monitor for import vm
......................................................................

webadmin: progress monitor for import vm

Change-Id: I080950e6484c9612e26bd26dfc5367b45b7e854c
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
A 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
2 files changed, 41 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/42124/1

diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
index b25934d..f033fac 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
@@ -37,6 +37,7 @@
 import 
org.ovirt.engine.ui.webadmin.widget.table.column.AbstractLineChartProgressBarColumn;
 import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractUptimeColumn;
 import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn;
+import org.ovirt.engine.ui.webadmin.widget.table.column.ImportProgressColumn;
 import 
org.ovirt.engine.ui.webadmin.widget.table.column.MigrationProgressColumn;
 import org.ovirt.engine.ui.webadmin.widget.table.column.ReasonColumn;
 import org.ovirt.engine.ui.webadmin.widget.table.column.VmStatusColumn;
@@ -194,11 +195,17 @@
                     return null;
                 }
 
+                if (vm.getBackgroundOperationDescription() != null) {
+                    // will be rendered by progress column
+                    return null;
+                }
+
                 return super.getValue(vm);
             }
         };
 
         MigrationProgressColumn migrationProgressColumn = new 
MigrationProgressColumn();
+        ImportProgressColumn importProgressColumn = new ImportProgressColumn();
 
         ReasonColumn<VM> reasonColumn = new ReasonColumn<VM>() {
 
@@ -213,6 +220,7 @@
         list.add(statusColumn);
         list.add(reasonColumn);
         list.add(migrationProgressColumn);
+        list.add(importProgressColumn);
 
         Cell<VM> compositeCell = new StatusCompositeCell<VM>(list);
 
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
new file mode 100644
index 0000000..b08ee87
--- /dev/null
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
@@ -0,0 +1,33 @@
+package org.ovirt.engine.ui.webadmin.widget.table.column;
+
+import org.ovirt.engine.core.common.businessentities.VM;
+
+import com.google.gwt.safehtml.shared.SafeHtml;
+
+public class ImportProgressColumn extends AbstractOneColorPercentColumn<VM> {
+
+    public ImportProgressColumn() {
+        super(ProgressBarColors.GREEN);
+    }
+
+    @Override
+    protected Integer getProgressValue(VM vm) {
+        return vm.getBackgroundOperationDescription() != null ? 
vm.getBackgroundOperationProgress() : null;
+    }
+
+    @Override
+    public SafeHtml getValue(VM object) {
+        return object.getBackgroundOperationDescription() != null ? 
super.getValue(object) : null;
+    }
+
+    @Override
+    protected String getStyle() {
+        return "engine-progress-box-migration";//$NON-NLS-1$
+    }
+
+    @Override
+    protected String getProgressText(VM vm) {
+        String description = vm.getBackgroundOperationDescription();
+        return description != null ? description : super.getProgressText(vm);
+    }
+}


-- 
To view, visit https://gerrit.ovirt.org/42124
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I080950e6484c9612e26bd26dfc5367b45b7e854c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches