MID-5917 added Reviewer column to CertWorkitems table

fixing merge conflicts
Evolveum · Mar 22, 2020 · 469ffc5 · 469ffc5
1 parent 408eb57
commit 469ffc5
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 0 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java b/.../src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
@@ -110,6 +110,21 @@ public void onClick(AjaxRequestTarget target, IModel<CertCaseOrWorkItemDto> rowM
         return column;
     }
 
+    public <T extends CertCaseOrWorkItemDto> IColumn<T, String> createReviewerNameColumn(final PageBase page, final String headerKey) {
+        IColumn column;
+        column = new LinkColumn<CertCaseOrWorkItemDto>(page.createStringResource(headerKey), CertWorkItemDto.F_REVIEWER_NAME) {
+
+            @Override
+            public void onClick(AjaxRequestTarget target, IModel<CertCaseOrWorkItemDto> rowModel) {
+                CertCaseOrWorkItemDto dto = rowModel.getObject();
+                if (dto instanceof CertWorkItemDto) {
+                    dispatchToObjectDetailsPage(((CertWorkItemDto) dto).getReviewerRef(), page, false);
+                }
+            }
+        };
+        return column;
+    }
+
     <T extends CertCaseOrWorkItemDto> IColumn<T, String> createConflictingNameColumn(final PageBase page, final String headerKey) {
         return new PropertyColumn<>(page.createStringResource(headerKey), CertCaseOrWorkItemDto.F_CONFLICTING_TARGETS);
     }

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
@@ -198,6 +198,11 @@ private List<IColumn<CertWorkItemDto, String>> initColumns() {
         column = helper.createTargetNameColumn(this, "PageCertDecisions.table.targetName");
         columns.add(column);
 
+        if (isDisplayingAllItems()) {
+            column = helper.createReviewerNameColumn(this, "PageCertDecisions.table.reviewer");
+            columns.add(column);
+        }
+
         column = helper.createDetailedInfoColumn(this);
         columns.add(column);
 

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDto.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDto.java
@@ -18,11 +18,13 @@
 
 import com.evolveum.midpoint.certification.api.OutcomeUtils;
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.schema.util.CertCampaignTypeUtil;
 import com.evolveum.midpoint.schema.util.WfContextUtil;
 import com.evolveum.midpoint.schema.util.WorkItemTypeUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationResponseType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationWorkItemType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -37,13 +39,18 @@ public class CertWorkItemDto extends CertCaseOrWorkItemDto {
     public static final String F_COMMENT = "comment";
     @SuppressWarnings("unused")
 	public static final String F_RESPONSE = "response";
+    public static final String F_REVIEWER_NAME = "reviewerName";
 
     @NotNull private final AccessCertificationWorkItemType workItem;
+    private ObjectReferenceType reviewerRef;
+    private String reviewerName;
 
     CertWorkItemDto(@NotNull AccessCertificationWorkItemType workItem, @NotNull PageBase page) {
         //noinspection ConstantConditions
         super(CertCampaignTypeUtil.getCase(workItem), page);
         this.workItem = workItem;
+        this.reviewerRef = workItem.getOriginalAssigneeRef();
+        this.reviewerName = computeReviewerName();
     }
 
     public String getComment() {
@@ -74,4 +81,27 @@ public Integer getEscalationLevelNumber() {
     public String getEscalationLevelInfo() {
         return WfContextUtil.getEscalationLevelInfo(workItem);
     }
+
+    public String computeReviewerName(){
+        if (reviewerRef == null){
+            return null;
+        }
+        return WebComponentUtil.getDisplayNameOrName(reviewerRef);
+    }
+
+    public String getReviewerName() {
+        return reviewerName;
+    }
+
+    public void setReviewerName(String reviewerName) {
+        this.reviewerName = reviewerName;
+    }
+
+    public ObjectReferenceType getReviewerRef() {
+        return reviewerRef;
+    }
+
+    public void setReviewerRef(ObjectReferenceType reviewerRef) {
+        this.reviewerRef = reviewerRef;
+    }
 }