Skip to content

Commit

Permalink
changed originalAssigneeRef to assigneeRef for cert work items
Browse files Browse the repository at this point in the history 
fixing merge conflicts
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Mar 23, 2020
1 parent 469ffc5 commit 1af24f8
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 19 deletions.
31 changes: 28 additions & 3 deletions .../src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
View file
Expand Up @@ -17,28 +17,35 @@
package com.evolveum.midpoint.web.page.admin.certification;

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.web.component.data.column.IconColumn;
import com.evolveum.midpoint.web.component.data.column.LinkColumn;
import com.evolveum.midpoint.web.component.data.column.LinkPanel;
import com.evolveum.midpoint.web.page.admin.certification.dto.CertCaseOrWorkItemDto;
import com.evolveum.midpoint.web.page.admin.certification.dto.CertWorkItemDto;
import com.evolveum.midpoint.web.page.admin.certification.dto.SearchingUtils;
import com.evolveum.midpoint.web.page.admin.certification.handlers.CertGuiHandler;
import com.evolveum.midpoint.web.page.admin.certification.handlers.CertGuiHandlerRegistry;
import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
import com.evolveum.midpoint.web.util.TooltipBehavior;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import org.apache.commons.collections.CollectionUtils;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;

import javax.xml.namespace.QName;
import java.io.Serializable;
import java.util.List;

import static com.evolveum.midpoint.gui.api.util.WebComponentUtil.dispatchToObjectDetailsPage;

Expand Down Expand Up @@ -112,15 +119,33 @@ public void onClick(AjaxRequestTarget target, IModel<CertCaseOrWorkItemDto> rowM

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) {
column = new AbstractColumn<T, String>(page.createStringResource(headerKey)) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target, IModel<CertCaseOrWorkItemDto> rowModel) {
public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId,
final IModel<T> rowModel) {
CertCaseOrWorkItemDto dto = rowModel.getObject();
RepeatingView reviewersPanel = new RepeatingView(componentId);
if (dto instanceof CertWorkItemDto) {
dispatchToObjectDetailsPage(((CertWorkItemDto) dto).getReviewerRef(), page, false);
List<ObjectReferenceType> reviewersList = ((CertWorkItemDto) dto).getReviewerRefList();
if (CollectionUtils.isNotEmpty(reviewersList)){
for (ObjectReferenceType reviewer : reviewersList){
reviewersPanel.add(new LinkPanel(reviewersPanel.newChildId(),
Model.of(WebComponentUtil.getDisplayNameOrName(reviewer))) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
dispatchToObjectDetailsPage(reviewer, page, false);
}
});
}
}
}
cellItem.add(reviewersPanel);
}

};
return column;
}
Expand Down
37 changes: 21 additions & 16 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDto.java
View file
Expand Up @@ -27,6 +27,9 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import org.jetbrains.annotations.NotNull;

import java.util.ArrayList;
import java.util.List;

/**
* DTO representing a particular workItem.
*
Expand All @@ -42,15 +45,15 @@ public class CertWorkItemDto extends CertCaseOrWorkItemDto {
public static final String F_REVIEWER_NAME = "reviewerName";

@NotNull private final AccessCertificationWorkItemType workItem;
private ObjectReferenceType reviewerRef;
private String reviewerName;
private List<ObjectReferenceType> reviewerRefList;
private List<String> reviewerNameList = new ArrayList<>();

CertWorkItemDto(@NotNull AccessCertificationWorkItemType workItem, @NotNull PageBase page) {
//noinspection ConstantConditions
super(CertCampaignTypeUtil.getCase(workItem), page);
this.workItem = workItem;
this.reviewerRef = workItem.getOriginalAssigneeRef();
this.reviewerName = computeReviewerName();
this.reviewerRefList = workItem.getAssigneeRef();
computeReviewerNameList();
}

public String getComment() {
Expand Down Expand Up @@ -82,26 +85,28 @@ public String getEscalationLevelInfo() {
return WfContextUtil.getEscalationLevelInfo(workItem);
}

public String computeReviewerName(){
if (reviewerRef == null){
return null;
public void computeReviewerNameList(){
if (reviewerRefList == null){
return;
}
return WebComponentUtil.getDisplayNameOrName(reviewerRef);
reviewerRefList.forEach(reviewerRef -> {
reviewerNameList.add(WebComponentUtil.getDisplayNameOrName(reviewerRef));
});
}

public String getReviewerName() {
return reviewerName;
public List<String> getReviewerNameList() {
return reviewerNameList;
}

public void setReviewerName(String reviewerName) {
this.reviewerName = reviewerName;
public void setReviewerName(List<String> reviewerNameList) {
this.reviewerNameList = reviewerNameList;
}

public ObjectReferenceType getReviewerRef() {
return reviewerRef;
public List<ObjectReferenceType> getReviewerRefList() {
return reviewerRefList;
}

public void setReviewerRef(ObjectReferenceType reviewerRef) {
this.reviewerRef = reviewerRef;
public void setReviewerRefList(List<ObjectReferenceType> reviewerRefList) {
this.reviewerRefList = reviewerRefList;
}
}

0 comments on commit 1af24f8

Please sign in to comment.