From 9f043582f19e018df9ccbe8c0376e4389c381f98 Mon Sep 17 00:00:00 2001
From: girish <Girish.Joshi@bistasolutions.com>
Date: Wed, 23 Feb 2011 10:48:33 +0000
Subject: [PATCH] saving Annotation with route from flowmenu

---
 workflow/engine/methods/bpmn/openProcess.php    | 17 ++++++++++++++++-
 workflow/engine/methods/bpmn/patterns_Ajax.php  |  2 +-
 workflow/engine/methods/bpmn/processes_Ajax.php |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/methods/bpmn/openProcess.php b/workflow/engine/methods/bpmn/openProcess.php
index bb395c814..9b623b413 100755
--- a/workflow/engine/methods/bpmn/openProcess.php
+++ b/workflow/engine/methods/bpmn/openProcess.php
@@ -90,6 +90,7 @@
    $lanes              = $oProcess->createLanesNewPM($oData->lanes);
    $fields             = $oProcess->createTransitionsPM($oData->tasks,$oData->routes,$arrayEvents,$count,$arrayRoutes,$countRoutes);
 
+
    //Get Standalone Events and routes
    $countEvent = count($fields['EVENTS']);
    $countRoutes = count($fields['TRANSITION']);
@@ -121,7 +122,7 @@
          $fields['TRANSITION'][$countRoutes]['4']= '1';
          $countRoutes              = $countRoutes + 1;
        }
-       else if($value['TAS_UID'] == '' && $value['EVN_TAS_UID_TO'] != '' && ! preg_match("/Start/", $value['EVN_TYPE'])){  //Check for Intermediate Events
+       else if($value['TAS_UID'] == '' && $value['EVN_TAS_UID_TO'] != '' && ! preg_match("/Start/", $value['EVN_TYPE'])){
          $evn_uid = $value['EVN_UID'];
          $idTask = $value['EVN_TAS_UID_TO'];
 
@@ -238,6 +239,20 @@
        $countGateway += 1;
      }
    }
+
+   //Create Annotation route
+   foreach($oData->lanes as $id => $value)
+   {
+       if($value['SWI_NEXT_UID'] != '') {
+         $fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID();
+         $fields['TRANSITION'][$countTransitions]['1'] = $value['SWI_NEXT_UID'];
+         $fields['TRANSITION'][$countTransitions]['2'] = $value['SWI_UID'];
+         $fields['TRANSITION'][$countTransitions]['3'] = '1';
+         $fields['TRANSITION'][$countTransitions]['4'] = '2';
+         $countTransitions += 1;
+       }
+   }
+
    //$subProcess         = $oProcess->createSubProcessesPM($oData->subProcess);
    $arrayEvents        = $fields['EVENTS'];
    $arrayGateways      = $fields['GATEWAYS'];
diff --git a/workflow/engine/methods/bpmn/patterns_Ajax.php b/workflow/engine/methods/bpmn/patterns_Ajax.php
index 235809959..3fee2926b 100755
--- a/workflow/engine/methods/bpmn/patterns_Ajax.php
+++ b/workflow/engine/methods/bpmn/patterns_Ajax.php
@@ -72,7 +72,7 @@ switch ($aData['action']) {
 	  	  $aFields['TAS_UID']          = $aData['TASK'][0];
 	  	  $aFields['ROU_NEXT_TASK']    = $aData['ROU_NEXT_TASK'][0];
 	  	  $aFields['ROU_TYPE']         = $aData['ROU_TYPE'];
-                  if(isset($aData['ROU_EVN_UID'])){
+                  if(isset($aData['ROU_EVN_UID']) && $aData['ROU_EVN_UID'] != ''){
                     $aFields['ROU_EVN_UID']    = $aData['ROU_EVN_UID'];
                     $aDataEvent = array();
                     $aDataEvent['EVN_UID']          = $aData['ROU_EVN_UID'];
diff --git a/workflow/engine/methods/bpmn/processes_Ajax.php b/workflow/engine/methods/bpmn/processes_Ajax.php
index 98f0ae540..f4e42fbbe 100755
--- a/workflow/engine/methods/bpmn/processes_Ajax.php
+++ b/workflow/engine/methods/bpmn/processes_Ajax.php
@@ -105,7 +105,7 @@ if ( isset ($_REQUEST['action']) ) {
   	  $sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid);
   	break;
         case 'addText':
-  	  $sOutput = $oProcessMap->addText($oData->uid, $oData->label, $oData->position->x, $oData->position->y);
+  	  $sOutput = $oProcessMap->addText($oData->uid, $oData->label, $oData->position->x, $oData->position->y,$oData->task_uid);
           echo $sOutput;
   	break;
         case 'updateText':