From bf31eb7ec5639a1bd5d51c1662c2fef4c0409eaf Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 18 Aug 2020 21:40:54 -0700 Subject: [PATCH] LPS-119210 Sort --- ...etrics-instance-count-init-script.painless | 19 ++++++++++--------- ...ow-metrics-task-count-init-script.painless | 14 +++++++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-instance-count-init-script.painless b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-instance-count-init-script.painless index d03509db018dcf..fc6e1b4f61384f 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-instance-count-init-script.painless +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-instance-count-init-script.painless @@ -1,4 +1,13 @@ state.assigneeIdInstanceIds = new HashSet(); + +if (params.containsKey("assigneeIds")) { + state.assigneeIds = new HashSet(); + + for (assigneeId in params.assigneeIds) { + state.assigneeIds.add(Long.parseLong(assigneeId)); + } +} + state.assigneeType = params.assigneeType; state.completedInstanceIds = new HashSet(); state.completed = params.completed; @@ -7,12 +16,4 @@ state.slaStatuses = params.slaStatuses; state.slaStatusMap = new HashMap(); state.startDate = params.startDate; state.taskNameInstanceIds = new HashSet(); -state.taskNames = params.taskNames; - -if (params.containsKey("assigneeIds")) { - state.assigneeIds = new HashSet(); - - for (assigneeId in params.assigneeIds) { - state.assigneeIds.add(Long.parseLong(assigneeId)); - } -} \ No newline at end of file +state.taskNames = params.taskNames; \ No newline at end of file diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-task-count-init-script.painless b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-task-count-init-script.painless index 33c1d5c228d0d0..0fcd27f421d17a 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-task-count-init-script.painless +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/resources/com/liferay/portal/workflow/metrics/rest/internal/resource/helper/dependencies/workflow-metrics-task-count-init-script.painless @@ -1,13 +1,13 @@ -state.assigneeType = params.assigneeType; -state.slaStatuses = params.slaStatuses; -state.slaStatusMap = new HashMap(); -state.taskIds = new HashSet(); -state.taskNames = params.taskNames; - if (params.containsKey("assigneeIds")) { state.assigneeIds = new HashSet(); for (assigneeId in params.assigneeIds) { state.assigneeIds.add(Long.parseLong(assigneeId)); } -} \ No newline at end of file +} + +state.assigneeType = params.assigneeType; +state.slaStatuses = params.slaStatuses; +state.slaStatusMap = new HashMap(); +state.taskIds = new HashSet(); +state.taskNames = params.taskNames; \ No newline at end of file