From ba339167ac0a4fd88db8bf08b1145e7907ee2a6e Mon Sep 17 00:00:00 2001 From: frederikheremans Date: Thu, 24 Mar 2011 18:04:42 +0000 Subject: [PATCH] Completing task without a task form + cleaned up demo process --- .../explorer/ui/task/TaskDetailPanel.java | 22 ++++++++ .../demo/process/testProcess.bpmn20.xml | 51 +++++++++---------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/modules/activiti-webapp-explorer2/src/main/java/org/activiti/explorer/ui/task/TaskDetailPanel.java b/modules/activiti-webapp-explorer2/src/main/java/org/activiti/explorer/ui/task/TaskDetailPanel.java index 4a648e0b95..08e435b182 100644 --- a/modules/activiti-webapp-explorer2/src/main/java/org/activiti/explorer/ui/task/TaskDetailPanel.java +++ b/modules/activiti-webapp-explorer2/src/main/java/org/activiti/explorer/ui/task/TaskDetailPanel.java @@ -241,6 +241,28 @@ public class TaskDetailPanel extends HorizontalLayout { // Add component to page leftPanel.addComponent(taskForm); + } else { + // Just add a button to complete the task + // TODO: perhaps move to a better place + Button completeButton = new Button("Complete"); + + completeButton.addListener(new ClickListener() { + + private static final long serialVersionUID = 1L; + + public void buttonClick(ClickEvent event) { + taskService.complete(task.getId()); + ExplorerApplication.getCurrent().getMainWindow().showNotification("Task '" + + task.getName() + "' completed"); + parent.refreshCurrentTasks(); + } + }); + + Label emptySpace = new Label(" ", Label.CONTENT_XHTML); + emptySpace.setSizeUndefined(); + leftPanel.addComponent(emptySpace); + + leftPanel.addComponent(completeButton); } } } diff --git a/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/testProcess.bpmn20.xml b/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/testProcess.bpmn20.xml index df5eacafe4..329bf218ad 100644 --- a/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/testProcess.bpmn20.xml +++ b/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/testProcess.bpmn20.xml @@ -3,51 +3,46 @@ xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="Cool Processes"> - - This is a two task process + + + This is a simple approval process. + - - - - - - - - - - - - - + + + + - - + + + Approval request created by ${initiator}: ${instructions} - - - + + + + + - - Complete this task please + + + Task completed by ${approver}: ${(approved.equals('true')) ? 'Approved.' : 'Rejected!'} - + - - + + -- GitLab