From ba49102dd3cd4b64db6d133622dc95b9dfeb7b72 Mon Sep 17 00:00:00 2001
From: safan <safan@colosa.com>
Date: Tue, 28 Dec 2010 14:36:01 +0000
Subject: [PATCH] added condition for case tracker object

---
 workflow/engine/classes/class.processMap.php  |  3 +-
 .../classes/model/CaseTrackerObject.php       |  2 +-
 .../engine/methods/tracker/tracker_Ajax.php   |  3 +-
 .../templates/bpmn/ProcessMapContext.js       | 46 +++++++++----------
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 62015ae52..bece65aca 100644
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -3592,7 +3592,8 @@ class processMap {
     $oCriteria->add(CaseTrackerObjectPeer::PRO_UID, $sProcessUID);
     $iPosition = CaseTrackerObjectPeer::doCount($oCriteria) + 1;
     $oCaseTrackerObject = new CaseTrackerObject ( );
-    $oCaseTrackerObject->create(array('PRO_UID' => $sProcessUID, 'CTO_TYPE_OBJ' => $sObjType, 'CTO_UID_OBJ' => $sObjUID, 'CTO_POSITION' => $iPosition));
+    $ctoUID = $oCaseTrackerObject->create(array('PRO_UID' => $sProcessUID, 'CTO_TYPE_OBJ' => $sObjType, 'CTO_UID_OBJ' => $sObjUID, 'CTO_POSITION' => $iPosition));
+    return $ctoUID;
   }
 
   /**
diff --git a/workflow/engine/classes/model/CaseTrackerObject.php b/workflow/engine/classes/model/CaseTrackerObject.php
index 92fa50373..7c78f299e 100644
--- a/workflow/engine/classes/model/CaseTrackerObject.php
+++ b/workflow/engine/classes/model/CaseTrackerObject.php
@@ -46,7 +46,7 @@ class CaseTrackerObject extends BaseCaseTrackerObject {
         $oConnection->begin();
         $iResult = $oCaseTrackerObject->save();
         $oConnection->commit();
-        return true;
+        return $aData['CTO_UID'];
       }
       else {
         $sMessage = '';
diff --git a/workflow/engine/methods/tracker/tracker_Ajax.php b/workflow/engine/methods/tracker/tracker_Ajax.php
index 6b699a788..fb8a5ce3b 100644
--- a/workflow/engine/methods/tracker/tracker_Ajax.php
+++ b/workflow/engine/methods/tracker/tracker_Ajax.php
@@ -35,8 +35,9 @@ try {
     case 'assignCaseTrackerObject':
       G::LoadClass('processMap');
       $oProcessMap = new ProcessMap();
-      $oProcessMap->assignCaseTrackerObject($_POST['PRO_UID'], $_POST['OBJECT_TYPE'], $_POST['OBJECT_UID']);
+      $cto_UID = $oProcessMap->assignCaseTrackerObject($_POST['PRO_UID'], $_POST['OBJECT_TYPE'], $_POST['OBJECT_UID']);
       $oProcessMap->getCaseTrackerObjectsCriteria($_POST['PRO_UID']);
+      echo $cto_UID;
     break;
     case 'removeCaseTrackerObject':
       G::LoadClass('processMap');
diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js
index 29cad79d5..c24a68d08 100755
--- a/workflow/engine/templates/bpmn/ProcessMapContext.js
+++ b/workflow/engine/templates/bpmn/ProcessMapContext.js
@@ -1891,34 +1891,30 @@ ProcessMapContext.prototype.caseTrackerObjects= function()
         Ext.Ajax.request({
           url   : '../tracker/tracker_Ajax.php',
           method: 'POST',
-          params:
-            {
-            PRO_UID     : pro_uid,
-            OBJECT_TYPE : objType,
-            OBJECT_UID  : objUID,
-            action      :'assignCaseTrackerObject'
+          params:{
+                PRO_UID     : pro_uid,
+                OBJECT_TYPE : objType,
+                OBJECT_UID  : objUID,
+                action      :'assignCaseTrackerObject'
             },
           success: function (response)
-            {      // When saving data success
-            Ext.MessageBox.alert ('Status','Objects has been successfully assigned');
-            availableStore.reload();
-            assignedStore.reload();
-            if (condition !='')
-                {
-            Ext.Ajax.request({
-
-          url   : '../tracker/tracker_ConditionsSave.php',
-          method: 'POST',
-          params:
             {
-            PRO_UID         : pro_uid,
-            CTO_UID         : objUID,
-            CTO_CONDITION   : condition
-            //action          :'assignCaseTrackerObject'
-            }
-          
-        })
-                }
+                cto_uid = response.responseText;
+                    Ext.Ajax.request({
+                      url   : '../tracker/tracker_ConditionsSave.php',
+                      method: 'POST',
+                      params:
+                        {
+                            PRO_UID         : pro_uid,
+                            CTO_UID         : cto_uid,
+                            CTO_CONDITION   : condition
+                        },
+                      success: function (response){
+                        Ext.MessageBox.alert ('Status','Objects has been successfully assigned');
+                        availableStore.reload();
+                        assignedStore.reload();
+                      }
+                    })
             },
           failure: function () {      // when saving data failed
             Ext.MessageBox.alert ('Status','Failed to assign Objects');