Fixed: Task History - Hash variable not parsed (#136)

Fixed: Monitor Processes - Column for Run Process Performer (Requestor) (#135) git-svn-id: http://dev.joget.org/svn/joget/trunk@665 7ed575d9-8c1d-4629-9338-9e3bd68e044c
jogetworkflow · Sep 6, 2010 · d57048c · d57048c
1 parent 9d11ea7
commit d57048c
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 16 deletions.
diff --git a/wflow-wfengine/src/main/java/org/joget/workflow/model/WorkflowProcess.java b/wflow-wfengine/src/main/java/org/joget/workflow/model/WorkflowProcess.java
@@ -24,6 +24,8 @@ public class WorkflowProcess implements Serializable {
     private String timeConsumingFromDateCreated;
     private String timeConsumingFromDateStarted;
     private String state;
+    private String requesterId;
+
     boolean latest;
 
     public String getEncodedId() {
@@ -181,4 +183,12 @@ public String getTimeConsumingFromDateStarted() {
     public void setTimeConsumingFromDateStarted(String timeConsumingFromDateStarted) {
         this.timeConsumingFromDateStarted = timeConsumingFromDateStarted;
     }
+
+    public String getRequesterId() {
+        return requesterId;
+    }
+
+    public void setRequesterId(String requesterId) {
+        this.requesterId = requesterId;
+    }
 }
diff --git a/wflow-wfengine/src/main/java/org/joget/workflow/model/service/WorkflowManagerImpl.java b/wflow-wfengine/src/main/java/org/joget/workflow/model/service/WorkflowManagerImpl.java
@@ -1326,6 +1326,7 @@ public Collection<WorkflowProcess> getRunningProcessList(String packageId, Strin
                 workflowProcess.setState(wfProcess.state());
                 workflowProcess.setPackageId(MiscUtilities.getProcessMgrPkgId(manager.name()));
                 workflowProcess.setVersion(manager.version());
+                workflowProcess.setRequesterId(getUserByProcessIdAndActivityDefId(workflowProcess.getId(), workflowProcess.getInstanceId(), "runProcess"));
 
                 WorkflowProcess trackWflowProcess = getRunningProcessInfo(wfProcess.key());
                 workflowProcess.setStartedTime(trackWflowProcess.getStartedTime());
@@ -1469,6 +1470,7 @@ public Collection<WorkflowProcess> getCompletedProcessList(String packageId, Str
                 workflowProcess.setState(wfProcess.state());
                 workflowProcess.setPackageId(MiscUtilities.getProcessMgrPkgId(manager.name()));
                 workflowProcess.setVersion(manager.version());
+                workflowProcess.setRequesterId(getUserByProcessIdAndActivityDefId(workflowProcess.getId(), workflowProcess.getInstanceId(), "runProcess"));
 
                 WorkflowProcess trackWflowProcess = getRunningProcessInfo(wfProcess.key());
                 workflowProcess.setStartedTime(trackWflowProcess.getStartedTime());
@@ -1662,14 +1664,8 @@ public Collection<WorkflowActivity> getActivityList(String processId, Integer st
             WfActivity[] wfActivityList = ai.get_next_n_sequence(0);
 
             for (int i = 0; i < wfActivityList.length; ++i) {
-                WfActivity wfActivity = wfActivityList[i];
-                WMEntity entity = admin.getActivityDefinitionInfo(sessionHandle, wfActivity.container().key(), wfActivity.key());
-
-                WorkflowActivity workflowActivity = new WorkflowActivity();
-                workflowActivity.setId(wfActivity.key());
-                workflowActivity.setActivityDefId(entity.getId());
-                workflowActivity.setName(wfActivity.name());
-                workflowActivity.setState(wfActivity.state());
+                WfActivity wfActivity = wfActivityList[i];               
+                WorkflowActivity workflowActivity = getActivityById(wfActivity.key());
 
                 WorkflowActivity trackWflowActivity = getRunningActivityInfo(sc, wfActivity, false);
                 if (trackWflowActivity != null) {
@@ -1782,6 +1778,24 @@ public WorkflowActivity getActivityById(String activityId) {
                 workflowActivity.setProcessVersion(manager.version());
                 workflowActivity.setPriority(String.valueOf(wfActivity.priority()));
                 workflowActivity.setProcessStatus(process.state());
+                // check for hash variable
+                if (WorkflowUtil.containsHashVariable(wfActivity.name())) {
+                    WorkflowAssignment ass = new WorkflowAssignment();
+                    ass.setProcessId(workflowActivity.getProcessId());
+                    ass.setProcessDefId(workflowActivity.getProcessDefId());
+                    ass.setProcessName(workflowActivity.getProcessName());
+                    ass.setProcessVersion(workflowActivity.getProcessVersion());
+                    ass.setProcessRequesterId(getUserByProcessIdAndActivityDefId(workflowActivity.getProcessDefId(), workflowActivity.getProcessId(), "runProcess"));
+                    ass.setDescription(workflowActivity.getDescription());
+                    ass.setActivityId(activityId);
+                    ass.setActivityName(workflowActivity.getName());
+                    ass.setActivityDefId(workflowActivity.getActivityDefId());
+                    ass.setAssigneeId(workflowActivity.getPerformer());
+
+                    ass.setProcessVariableList(new ArrayList(getProcessVariableList(workflowActivity.getProcessId())));
+                    //process activity name variable
+                    workflowActivity.setName(WorkflowUtil.processVariable(wfActivity.name(), null, ass));
+                }
             }
 
         } catch (Exception ex) {

diff --git a/wflow-wfweb/src/main/java/org/joget/workflow/controller/WorkflowJsonController.java b/wflow-wfweb/src/main/java/org/joget/workflow/controller/WorkflowJsonController.java
@@ -250,6 +250,7 @@ public void runningProcessList(Writer writer, @RequestParam(value = "packageId",
             data.put("state", workflowProcess.getState());
             data.put("version", workflowProcess.getVersion());
             data.put("startedTime", workflowProcess.getStartedTime());
+            data.put("requesterId", workflowProcess.getRequesterId());
             data.put("due", workflowProcess.getDue() != null ? workflowProcess.getDue() : "-");
 
             if (serviceLevelMonitor > 0) {
@@ -298,6 +299,7 @@ public void completedProcessList(Writer writer, @RequestParam(value = "packageId
             data.put("version", workflowProcess.getVersion());
             data.put("state", workflowProcess.getState());
             data.put("startedTime", workflowProcess.getStartedTime());
+            data.put("requesterId", workflowProcess.getRequesterId());
             data.put("due", workflowProcess.getDue() != null ? workflowProcess.getDue() : "-");
 
             if (serviceLevelMonitor > 0) {

diff --git a/wflow-wfweb/src/main/resources/general.properties b/wflow-wfweb/src/main/resources/general.properties
@@ -701,6 +701,7 @@ wflowAdmin.running.process.view.label.finishTime=Finish Time
 wflowAdmin.running.process.view.label.limit=Limit
 wflowAdmin.running.process.view.label.due=Due
 wflowAdmin.running.process.view.label.delay=Delay
+wflowAdmin.running.process.list.label.requester=Requester
 wflowAdmin.running.process.view.label.time.consuming=Time consuming
 wflowAdmin.running.process.view.label.running.process.instance.removed=Running process instance removed
 wflowAdmin.running.process.view.label.running.process.instance.reevaluated=Running process instance re-evaluated
@@ -721,6 +722,7 @@ wflowAdmin.completed.process.list.label.state=State
 wflowAdmin.completed.process.list.label.startedTime=Started Time
 wflowAdmin.completed.process.list.label.due=Due Date
 wflowAdmin.completed.process.list.label.serviceLevelMonitor=Service Level Monitor
+wflowAdmin.completed.process.list.label.requester=Requester
 
 
 ## /WEB-INF/jsp/workflow/admin/completedProcessView.jsp

diff --git a/wflow-wfweb/src/main/webapp/WEB-INF/jsp/workflow/completedProcessList.jsp b/wflow-wfweb/src/main/webapp/WEB-INF/jsp/workflow/completedProcessList.jsp
@@ -44,10 +44,11 @@
                        column1="{key: 'id', label: 'wflowAdmin.completed.process.list.label.id', sortable: true}"
                        column2="{key: 'startedTime', label: 'wflowAdmin.completed.process.list.label.startedTime', sortable: true}"
                        column3="{key: 'name', label: 'wflowAdmin.completed.process.list.label.name', sortable: true}"
-                       column4="{key: 'version', label: 'wflowAdmin.completed.process.list.label.version', sortable: false}"
-                       column5="{key: 'state', label: 'wflowAdmin.completed.process.list.label.state', sortable: false}"
-                       column6="{key: 'due', label: 'wflowAdmin.completed.process.list.label.due', sortable: false}"
-                       column7="{key: 'serviceLevelMonitor', label: 'wflowAdmin.completed.process.list.label.serviceLevelMonitor', sortable: false}"
+                       column4="{key: 'requesterId', label: 'wflowAdmin.completed.process.list.label.requester', sortable: false}"
+                       column5="{key: 'version', label: 'wflowAdmin.completed.process.list.label.version', sortable: false}"
+                       column6="{key: 'state', label: 'wflowAdmin.completed.process.list.label.state', sortable: false}"
+                       column7="{key: 'due', label: 'wflowAdmin.completed.process.list.label.due', sortable: false}"
+                       column8="{key: 'serviceLevelMonitor', label: 'wflowAdmin.completed.process.list.label.serviceLevelMonitor', sortable: false}"
                        />
     </div>
 

diff --git a/wflow-wfweb/src/main/webapp/WEB-INF/jsp/workflow/runningProcessList.jsp b/wflow-wfweb/src/main/webapp/WEB-INF/jsp/workflow/runningProcessList.jsp
@@ -44,10 +44,11 @@
                        column1="{key: 'id', label: 'wflowAdmin.running.process.list.label.id', sortable: true}"
                        column2="{key: 'startedTime', label: 'wflowAdmin.running.process.list.label.startedTime', sortable: true}"
                        column3="{key: 'name', label: 'wflowAdmin.running.process.list.label.name', sortable: true}"
-                       column4="{key: 'version', label: 'wflowAdmin.running.process.list.label.version', sortable: false}"
-                       column5="{key: 'state', label: 'wflowAdmin.running.process.list.label.state', sortable: false}"
-                       column6="{key: 'due', label: 'wflowAdmin.running.process.list.label.due', sortable: false}"
-                       column7="{key: 'serviceLevelMonitor', label: 'wflowAdmin.running.process.list.label.serviceLevelMonitor', sortable: false}"
+                       column4="{key: 'requesterId', label: 'wflowAdmin.running.process.list.label.requester', sortable: false}"
+                       column5="{key: 'version', label: 'wflowAdmin.running.process.list.label.version', sortable: false}"
+                       column6="{key: 'state', label: 'wflowAdmin.running.process.list.label.state', sortable: false}"
+                       column7="{key: 'due', label: 'wflowAdmin.running.process.list.label.due', sortable: false}"
+                       column8="{key: 'serviceLevelMonitor', label: 'wflowAdmin.running.process.list.label.serviceLevelMonitor', sortable: false}"
                        />
     </div>