From d1a5583b38abadbe62ee0ffec7fa492b1f9ee32a Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Fri, 18 May 2007 17:55:06 +0000
Subject: [PATCH] WCM Submit Process - support for review / approve cycles.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../workflow/submit_processdefinition.xml     | 55 +++++++++++++++----
 .../workflow/wcm-workflow-messages.properties |  5 ++
 config/alfresco/workflow/wcmWorkflowModel.xml | 10 ++++
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/config/alfresco/workflow/submit_processdefinition.xml b/config/alfresco/workflow/submit_processdefinition.xml
index 4e8c752b48..940ef357a3 100644
--- a/config/alfresco/workflow/submit_processdefinition.xml
+++ b/config/alfresco/workflow/submit_processdefinition.xml
@@ -13,9 +13,20 @@
 
     <start-state name="start">
         <task name="wcmwf:submitReviewTask" swimlane="initiator"/>
-        <transition name="" to="serialorparallel"/>
+        <transition name="" to="initialise"/>
     </start-state>
 
+    <node name="initialise">
+        <event type="node-enter">
+            <script>
+                <variable name="wcmwf_reviewCycle" access="write"/>
+                <expression>
+                   wcmwf_reviewCycle = 1;
+                </expression>
+            </script>
+        </event>
+        <transition name="" to="serialorparallel"/>
+    </node>
 
     <!--                                      -->
     <!-- Split into Serial or Parallel Review -->
@@ -58,6 +69,12 @@
            <assignment class="org.alfresco.repo.workflow.jbpm.AlfrescoAssignment">
               <actor>#{bpm_assignees.get(wcmwf_approveCnt)}</actor>
            </assignment>
+           <event type="task-assign">
+              <script>
+                 if (wcmwf_reviewCycle > 1)
+                    taskInstance.description = taskInstance.description + " (" + wcmwf_reviewCycle + ")";
+              </script>
+           </event>           
         </task>
 
         <transition name="reject" to="endreview" />
@@ -89,6 +106,12 @@
            <assignment class="org.alfresco.repo.workflow.jbpm.AlfrescoAssignment">
               <actor>#{reviewer}</actor>
            </assignment>
+           <event type="task-assign">
+              <script>
+                 if (wcmwf_reviewCycle > 1)
+                    taskInstance.description = taskInstance.description + " (" + wcmwf_reviewCycle + ")";
+              </script>
+           </event>           
         </task>
         <transition name="reject" to="joinparallelreview" />
         <transition name="approve" to="joinparallelreview">
@@ -96,7 +119,7 @@
                 <variable name="wcmwf_approveCnt" access="read,write" />
                 <expression>
                     wcmwf_approveCnt = wcmwf_approveCnt +1;
-                 </expression>
+                </expression>
             </script>
         </transition>
     </task-node>
@@ -117,6 +140,26 @@
        </transition>
     </decision>   
 
+    <task-node name="rejected">
+        <task name="wcmwf:rejectedTask" swimlane="initiator" >
+            <event type="task-assign">
+                <script>
+                    if (wcmwf_reviewCycle > 1)
+                        taskInstance.description = taskInstance.description + " (" + wcmwf_reviewCycle + ")";
+                </script>
+            </event>
+        </task>
+        <transition name="abort" to="end" />
+        <transition name="resubmit" to="serialorparallel">        <!-- restart review process (next cycle) -->
+           <script>
+               <variable name="wcmwf_reviewCycle" access="read,write" />
+               <expression>
+                   wcmwf_reviewCycle = wcmwf_reviewCycle +1;
+               </expression>
+           </script>
+        </transition>
+    </task-node>
+
     <decision name="onapprove">
        <transition name="launchnow" to="submitted" />
        <transition name="launchpending" to="submitpending">
@@ -124,14 +167,6 @@
        </transition>
     </decision>
 
-    <task-node name="rejected">
-        <event type="node-enter">
-           <action class="org.alfresco.repo.avm.wf.AVMClearSubmittedHandler"/>
-        </event>
-        <task name="wcmwf:rejectedTask" swimlane="initiator" />
-        <transition name="" to="end" />
-    </task-node>
-
     <task-node name="submitpending">
         <task name="wcmwf:submitpendingTask" swimlane="initiator">
            <event type="task-create">
diff --git a/config/alfresco/workflow/wcm-workflow-messages.properties b/config/alfresco/workflow/wcm-workflow-messages.properties
index 54f07190ac..72cbf815de 100644
--- a/config/alfresco/workflow/wcm-workflow-messages.properties
+++ b/config/alfresco/workflow/wcm-workflow-messages.properties
@@ -14,11 +14,16 @@ wcmwf_submit.node.parallelreview.transition.reject.title=Reject
 wcmwf_submit.node.parallelreview.transition.reject.description=Reject
 wcmwf_submit.node.parallelreview.transition.approve.title=Approve
 wcmwf_submit.node.parallelreview.transition.approve.description=Approve
+wcmwf_submit.node.rejected.transition.abort.title=Abort Review
+wcmwf_submit.node.rejected.transition.abort.description=Abort Review
+wcmwf_submit.node.rejected.transition.resubmit.title=Resubmit for Review
+wcmwf_submit.node.rejected.transition.resubmit.description=Resubmit for Review
 wcmwf_submit.node.submitpending.transition.cancel.title=Abort Submission
 wcmwf_submit.node.submitpending.transition.cancel.description=Abort Submission
 wcmwf_submit.node.submitpending.transition.launch.title=Submit Now
 wcmwf_submit.node.submitpending.transition.launch.description=Submit Now
 
+
 # Submit Task Definitions
 
 wcmwf_workflowmodel.type.wcmwf_submitReviewTask.title=Web Site Submission
diff --git a/config/alfresco/workflow/wcmWorkflowModel.xml b/config/alfresco/workflow/wcmWorkflowModel.xml
index 52b8e1bc9f..ecb15544c6 100644
--- a/config/alfresco/workflow/wcmWorkflowModel.xml
+++ b/config/alfresco/workflow/wcmWorkflowModel.xml
@@ -89,6 +89,11 @@
 
     <type name="wcmwf:rejectedTask">
       <parent>wcmwf:workflowTask</parent>
+      <overrides>
+        <property name="bpm:packageItemActionGroup">
+          <default>edit_and_remove_wcm_package_item_actions</default>
+        </property>
+      </overrides>
       <mandatory-aspects>
         <aspect>bpm:assignees</aspect>
         <aspect>wcmwf:reviewType</aspect>
@@ -224,6 +229,11 @@
           <type>d:int</type>
           <mandatory>true</mandatory>
         </property>
+        <property name="wcmwf:reviewCycle">
+          <title>Reviewer Cycle</title>
+          <type>d:int</type>
+          <mandatory>true</mandatory>
+        </property>
       </properties>
     </aspect>