Showing completion on timeout in the GUI (MID-3799:4).

Evolveum · Mar 7, 2017 · 43fc708 · 43fc708
1 parent 545f0e4
commit 43fc708
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
@@ -108,6 +108,18 @@ public static DecisionDto create(WfProcessEventType e, @Nullable PageBase pageBa
 				rv.comment = result.getComment();
 				// TODO what about additional delta?
 			}
+			WorkItemEventCauseInformationType cause = completionEvent.getCause();
+			if (cause != null && cause.getType() == WorkItemEventCauseTypeType.TIMED_ACTION) {
+				rv.user = PageBase.createStringResourceStatic(null,
+							"DecisionDto." + (rv.outcome ? "approvedDueToTimeout" : "rejectedDueToTimeout")).getString();
+				if (rv.comment == null) {
+					if (cause.getDisplayName() != null) {
+						rv.comment = cause.getDisplayName();
+					} else if (cause.getName() != null) {
+						rv.comment = cause.getName();
+					}
+				}
+			}
 			rv.escalationLevelNumber = completionEvent.getEscalationLevelNumber();
 			if (completionEvent.getOriginalAssigneeRef() != null && pageBase != null) {
 				// TODO optimize repo access

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3521,7 +3521,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed.
 PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password
 ItemPathSegmentPanel.itemToSearch=Search for {0}
 DecisionDto.automaticallyApproved=(automatically approved)
-DecisionDto.automaticallyRejected=(automatically approved)
+DecisionDto.automaticallyRejected=(automatically rejected)
+DecisionDto.approvedDueToTimeout=(approved due to the timeout)
+DecisionDto.rejectedDueToTimeout=(rejected due to the timeout)
 DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition)
 DecisionDto.NO_APPROVERS_FOUND=(no approvers found)
 wf.object=Object

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3480,7 +3480,7 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed.
 PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password
 ItemPathSegmentPanel.itemToSearch=Search for {0}
 DecisionDto.automaticallyApproved=(automatically approved)
-DecisionDto.automaticallyRejected=(automatically approved)
+DecisionDto.automaticallyRejected=(automatically rejected)
 DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition)
 DecisionDto.NO_APPROVERS_FOUND=(no approvers found)
 wf.object=Object