Added stage info to various places in GUI.

Evolveum · Jan 24, 2017 · 83999b3 · 83999b3
1 parent fef96a7
commit 83999b3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
@@ -52,6 +52,7 @@
 import static com.evolveum.midpoint.gui.api.util.WebComponentUtil.dispatchToObjectDetailsPage;
 import static com.evolveum.midpoint.web.component.wf.WorkItemsPanel.View.FULL_LIST;
 import static com.evolveum.midpoint.web.component.wf.WorkItemsPanel.View.ITEMS_FOR_PROCESS;
+import static com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto.F_STAGE_INFO;
 
 /**
  * @author lazyman
@@ -85,6 +86,7 @@ private void initLayout(UserProfileStorage.TableId tableId, int pageSize, View v
 				columns.add(new CheckBoxHeaderColumn<WorkItemDto>());
 			}
 			columns.add(createNameColumn());
+			columns.add(createStageColumn());
 			columns.add(createTypeIconColumn(true));
 			columns.add(createObjectNameColumn("WorkItemsPanel.object"));
 			columns.add(createTypeIconColumn(false));
@@ -120,6 +122,7 @@ public Date getObject() {
 			}
 		} else {
 			columns.add(createNameColumn());
+			columns.add(createStageColumn());
 			columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.actors"), WorkItemDto.F_ASSIGNEE_OR_CANDIDATES));
             columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.created"), WorkItemDto.F_CREATED_FORMATTED));
 		}
@@ -160,6 +163,12 @@ public Object getObject() {
 		return nameColumn;
 	}
 
+	@NotNull
+	private PropertyColumn<WorkItemDto, String> createStageColumn() {
+		return new PropertyColumn<>(createStringResource("WorkItemPanel.stage"), F_STAGE_INFO);
+	}
+
+
 	private BoxedTablePanel getWorkItemTable() {
         return (BoxedTablePanel) get(ID_WORK_ITEMS_TABLE);
     }

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
@@ -20,6 +20,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
+import com.evolveum.midpoint.schema.util.WfContextUtil;
 import com.evolveum.midpoint.task.api.TaskExecutionStatus;
 import com.evolveum.midpoint.web.component.DateLabelComponent;
 import com.evolveum.midpoint.web.component.ObjectSummaryPanel;
@@ -168,6 +169,14 @@ protected String getTagBoxCssClass() {
 		return "summary-tag-box-wide";
 	}
 
+	private String getStageInfo() {
+		return WfContextUtil.getStageInfo(parentPage.getTaskDto().getWorkflowContext());
+	}
+
+	public String getRequestedOn() {
+		return WebComponentUtil.getLocalizedDate(parentPage.getTaskDto().getRequestedOn(), DateLabelComponent.MEDIUM_MEDIUM_STYLE);
+	}
+
 	@Override
 	protected IModel<String> getTitleModel() {
 		return new AbstractReadOnlyModel<String>() {
@@ -176,6 +185,8 @@ public String getObject() {
 				TaskDto taskDto = parentPage.getTaskDto();
 				if (taskDto.isWorkflow()) {
 					return getString("TaskSummaryPanel.requestedBy", parentPage.getTaskDto().getRequestedBy());
+//						return getString("TaskSummaryPanel.requestedByAndOn",
+//								parentPage.getTaskDto().getRequestedBy(), getRequestedOn());
 				} else {
 					TaskType taskType = getModelObject();
 					String rv;
@@ -206,8 +217,7 @@ protected IModel<String> getTitle2Model() {
 			@Override
 			public String getObject() {
 				if (parentPage.getTaskDto().isWorkflow()) {
-					return getString("TaskSummaryPanel.requestedOn",
-							WebComponentUtil.getLocalizedDate(parentPage.getTaskDto().getRequestedOn(), DateLabelComponent.MEDIUM_MEDIUM_STYLE));
+					return getString("TaskSummaryPanel.requestedOn", getRequestedOn());
 				} else {
 					TaskType taskType = getModelObject();
 					if (taskType.getOperationStats() != null && taskType.getOperationStats().getIterativeTaskInformation() != null &&
@@ -228,7 +238,12 @@ protected IModel<String> getTitle3Model() {
 			@Override
 			public String getObject() {
 				if (parentPage.getTaskDto().isWorkflow()) {
-					return "";
+					String stageInfo = getStageInfo();
+					if (stageInfo != null) {
+						return getString("TaskSummaryPanel.stage", stageInfo);
+					} else {
+						return null;
+					}
 				}
 
 				TaskType taskType = getModel().getObject();

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -2944,6 +2944,7 @@ WorkItemsPanel.actors=Actor(s)
 WorkItemsPanel.object=Object
 WorkItemsPanel.target=Target
 WorkItemsPanel.name=Name
+WorkItemsPanel.stage=Stage
 WorkItemsPanel.started=Process started
 WorkItemsPanel.created=Created
 PageAdmin.menu.dashboard=Dashboard
@@ -3110,6 +3111,8 @@ taskOtherChangesPanel.state.SECONDARY=Changes are waiting to be applied
 taskWfChildPanel.showParent=Show request in a context of the whole operation.
 TaskSummaryPanel.requestedBy=Requested by: {0}
 TaskSummaryPanel.requestedOn=Requested on: {0}
+TaskSummaryPanel.requestedByAndOn=Requested by {0} on {1}
+TaskSummaryPanel.stage=Stage: {0}
 TaskSummaryPanel.rejected=Rejected
 TaskSummaryPanel.approved=Approved
 operation.com.evolveum.midpoint.web.page.admin.resources.PageResource.refreshSchema=Refresh schema (GUI)

diff --git a/...va/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java b/...va/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
@@ -63,7 +63,7 @@ public void prepareStartInstruction(WfTaskCreationInstruction instruction) {
 			LOGGER.debug("About to start approval process instance '{}'", instr.getProcessInstanceName());
 			if (instr.getProcessContent() instanceof ItemApprovalSpecificContent) {
 				ItemApprovalSpecificContent iasc = (ItemApprovalSpecificContent) instr.getProcessContent();
-				LOGGER.debug("Approval schema: {}\n", DebugUtil.debugDump(iasc.getApprovalSchema()));
+				LOGGER.debug("Approval schema:\n{}", DebugUtil.debugDump(iasc.getApprovalSchema()));
 			}
 		}
     }

diff --git a/...n/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java b/...n/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
@@ -190,7 +190,7 @@ private void addDefaultPolicyActionIfNeeded(List<TriggeredApprovalAction> trigge
 
 	private void logApprovalActions(EvaluatedAssignment<?> newAssignment,
 			List<TriggeredApprovalAction> triggeredApprovalActions) {
-		if (LOGGER.isDebugEnabled()) {
+		if (LOGGER.isDebugEnabled() && !triggeredApprovalActions.isEmpty()) {
 			LOGGER.debug("Assignment to be added: {}: {} this target policy rules, {} triggered approval actions:",
 					newAssignment, newAssignment.getThisTargetPolicyRules().size(), triggeredApprovalActions.size());
 			for (TriggeredApprovalAction t : triggeredApprovalActions) {