Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

small enhancements #9

Open
wants to merge 1 commit into
base: 5.0-SNAPSHOT
Choose a base branch
from
Open

small enhancements #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 14 additions & 21 deletions wflow-core/src/main/java/org/joget/apps/app/lib/ProcessDataCollectorAuditTrail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.joget.apps.app.model.AppDefinition;
import org.joget.apps.app.model.AuditTrail;
import org.joget.apps.app.service.AppService;
Expand All @@ -27,7 +28,7 @@
import org.springframework.transaction.annotation.Transactional;

public class ProcessDataCollectorAuditTrail extends DefaultAuditTrailPlugin {

public String getName() {
return "Process Data Collector";
}
Expand Down Expand Up @@ -60,7 +61,7 @@ public Object execute(Map properties) {
} else {
String actId = null;
Object[] args = auditTrail.getArgs();

if (method.equals("getDefaultAssignments") && args.length == 3) {
users = (List<String>) auditTrail.getReturnObject();
actId = (String) args[1];
Expand All @@ -76,22 +77,22 @@ public Object execute(Map properties) {
} else {
actId = auditTrail.getMessage();
}

activity = workflowManager.getActivityById(actId);
trackActivity = workflowManager.getRunningActivityInfo(actId);
process = workflowManager.getRunningProcessById(activity.getProcessId());
trackProcess = workflowManager.getRunningProcessInfo(activity.getProcessId());

if (method.equals("executeTool")) {
trackActivity.setStartedTime(trackActivity.getCreatedTime());
} else if (method.equals("executeToolCompleted") || method.equals("executeActivity")) {
activity.setState("closed.completed");
trackActivity.setStatus("Completed");
trackActivity.setStartedTime(trackActivity.getCreatedTime());
trackActivity.setFinishTime(new Date());

long timeTakenInSeconds = (trackActivity.getFinishTime().getTime() - trackActivity.getCreatedTime().getTime()) / 1000;

trackActivity.setTimeConsumingFromDateCreatedInSeconds(timeTakenInSeconds);
trackActivity.setTimeConsumingFromDateStartedInSeconds(timeTakenInSeconds);
}
Expand Down Expand Up @@ -132,7 +133,7 @@ public boolean validation(AuditTrail auditTrail) {
|| auditTrail.getMethod().equals("executeToolCompleted")
|| auditTrail.getMethod().equals("executeActivity");
}

protected class ReportTask implements Runnable {
String profile;
String appId;
Expand All @@ -142,7 +143,7 @@ protected class ReportTask implements Runnable {
WorkflowActivity wfActivity;
WorkflowActivity wfTrackActivity;
List<String> users;

ReportTask(String profile, WorkflowActivity wfActivity, WorkflowActivity wfTrackActivity, WorkflowProcess wfProcess, WorkflowProcess wfTrackProcess, List<String> users, String appId, String appVersion) {
this.profile = profile;
this.wfActivity = wfActivity;
Expand All @@ -153,7 +154,7 @@ protected class ReportTask implements Runnable {
this.appId = appId;
this.appVersion = appVersion;
}

@Transactional
public void run() {
HostManager.setCurrentProfile(profile);
Expand All @@ -163,7 +164,7 @@ public void run() {
updateProcessData(wfProcess, wfTrackProcess, appId, appVersion);
}
}

protected ReportWorkflowProcessInstance updateProcessData(WorkflowProcess wfProcess, WorkflowProcess wfTrackProcess, String appId, String appVersion) {
String processInstanceId = wfProcess.getInstanceId();

Expand Down Expand Up @@ -198,19 +199,19 @@ protected ReportWorkflowProcessInstance updateProcessData(WorkflowProcess wfProc
pInstance.setTimeConsumingFromStartedTime(wfTrackProcess.getTimeConsumingFromDateStartedInSeconds());
pInstance.setReportWorkflowActivityInstanceList(null); //to fix session issue. mapping set to no update
reportManager.saveReportWorkflowProcessInstance(pInstance);

return reportManager.getReportWorkflowProcessInstance(processInstanceId);
}
return null;
}

protected ReportWorkflowActivityInstance updateActivityData(WorkflowActivity wfActivity, WorkflowActivity wfTrackActivity, WorkflowProcess wfProcess, WorkflowProcess wfTrackProcess, List<String> users, String appId, String appVersion) {
String activityInstanceId = wfActivity.getId();

WorkflowManager workflowManager = (WorkflowManager) AppUtil.getApplicationContext().getBean("workflowManager");
ReportManager reportManager = (ReportManager) AppUtil.getApplicationContext().getBean("reportManager");

if (wfActivity != null) {
String activityInstanceId = wfActivity.getId();
ReportWorkflowActivityInstance aInstance = reportManager.getReportWorkflowActivityInstance(activityInstanceId);
List<String> userList = new ArrayList<String>();
if (aInstance == null) {
Expand Down Expand Up @@ -259,15 +260,7 @@ protected ReportWorkflowActivityInstance updateActivityData(WorkflowActivity wfA
}
}

String assignmentUsers = "";
if (userList != null) {
for (String username : userList) {
assignmentUsers += username + ",";
}
}
if (assignmentUsers.endsWith(",")) {
assignmentUsers = assignmentUsers.substring(0, assignmentUsers.length() - 1);
}
String assignmentUsers = StringUtils.join(userList, ",");
aInstance.setAssignmentUsers(assignmentUsers);

aInstance.setPerformer(wfTrackActivity.getPerformer());
Expand Down