Added status icons for My requests panel on SeldDashboard page

Evolveum · Oct 8, 2015 · b3b2dc2 · b3b2dc2
1 parent 72c6101
commit b3b2dc2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 11 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/MyRequestsPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/MyRequestsPanel.java
@@ -1,16 +1,23 @@
 package com.evolveum.midpoint.web.page.self.component;
 
 import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
+import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.web.component.data.TablePanel;
+import com.evolveum.midpoint.web.component.data.column.IconColumn;
 import com.evolveum.midpoint.web.component.data.column.LinkColumn;
 import com.evolveum.midpoint.web.component.util.ListDataProvider;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceController;
+import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDto;
+import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceState;
+import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon;
 import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstance;
 import com.evolveum.midpoint.web.page.admin.workflow.dto.ProcessInstanceDto;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.wf.util.ApprovalUtils;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
 import org.apache.commons.lang.time.DurationFormatUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -70,25 +77,51 @@ public Object getObject() {
                 }
             });
         }
-        columns.add(new AbstractColumn<ProcessInstanceDto, String>(createStringResource("pageProcessInstances.item.result")) {
+        columns.add(new IconColumn<ProcessInstanceDto>(createStringResource("pageProcessInstances.item.result")) {
 
             @Override
-            public void populateItem(Item<ICellPopulator<ProcessInstanceDto>> item, String componentId,
-                                     final IModel<ProcessInstanceDto> rowModel) {
-                item.add(new Label(componentId, new AbstractReadOnlyModel<Object>() {
+            protected IModel<String> createIconModel(final IModel<ProcessInstanceDto> rowModel) {
+                return new AbstractReadOnlyModel<String>() {
 
                     @Override
-                    public Object getObject() {
-                        ProcessInstanceDto pi = rowModel.getObject();
-                        Boolean result = ApprovalUtils.approvalBooleanValue(pi.getAnswer());
+                    public String getObject() {
+                        ProcessInstanceDto dto = rowModel.getObject();
+                        Boolean result = ApprovalUtils.approvalBooleanValue(dto.getAnswer());
                         if (result == null) {
-                            return "";
+                            return OperationResultStatusIcon
+                                    .parseOperationalResultStatus(OperationResultStatusType.IN_PROGRESS).getIcon();
                         } else {
-                            return result ? "APPROVED" : "REJECTED";        // todo i18n
+                            return result ?
+                                    OperationResultStatusIcon
+                                            .parseOperationalResultStatus(OperationResultStatusType.SUCCESS).getIcon()
+                                    : OperationResultStatusIcon
+                                    .parseOperationalResultStatus(OperationResultStatusType.FATAL_ERROR).getIcon();
                         }
                     }
-                }));
+                };
             }
+
+            @Override
+            protected IModel<String> createTitleModel(final IModel<ProcessInstanceDto> rowModel) {
+                return new AbstractReadOnlyModel<String>() {
+
+                    @Override
+                    public String getObject() {
+                        ProcessInstanceDto dto = rowModel.getObject();
+                        Boolean result = ApprovalUtils.approvalBooleanValue(dto.getAnswer());
+                        if (result == null) {
+                            return MyRequestsPanel.this.getString(OperationResultStatus.class.getSimpleName() + "." +
+                                    OperationResultStatus.IN_PROGRESS);
+                        } else {
+                            return result ?
+                                    createStringResource("MyRequestsPanel.approved").getString()
+                                    : createStringResource("MyRequestsPanel.rejected").getString();
+                        }
+
+                    }
+                };
+            }
+
         });
 
         columns.add(new AbstractColumn<ProcessInstanceDto, String>(createStringResource("MyRequestsPanel.started")) {

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -2735,7 +2735,8 @@ CountToolbar.label.unknownCount=Displaying {0,number,integer} to {1,number,integ
 TableConfigurationPanel.pageSize=Page size
 TableConfigurationPanel.tableColumns=Table columnsCountToolbar.label.unknownCount=Displaying {0,number,integer} to {1,number,integer}, unknown number of matching results.
 MyRequestsPanel.started = Started
-MyRequestsPanel.waitingFor = Waiting for
+MyRequestsPanel.rejected = Rejected
+MyRequestsPanel.approved = Approved
 MyRequestsPanel.name = Name
 PageSelfDashboard.title=Home
 PageSelfDashboard.workItems=My work items