fernando/luos
1
0
Fork 0
Code Releases Activity

Se modifica update start event de Case Scheduler y Web Entry

Browse Source
This commit is contained in:
Daniel Rojas
2014-04-29 11:06:16 -04:00
parent 0336b34dd4
commit 06810f7ff0
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -229,14 +229,14 @@ class BpmnWorkflow extends Project\Bpmn
// update case scheduler // update case scheduler
if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") { if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
$aData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"], 'SCH_UID'=>$data["FLO_ELEMENT_ORIGIN"]); $caseSchedulerData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"]);
$this->wp->updateCaseScheduler($aData); $this->wp->updateCaseScheduler($data["FLO_ELEMENT_ORIGIN"], $caseSchedulerData);
} }
// update web entry // update web entry
if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") { if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
$aData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"], 'WE_UID'=>$data["FLO_ELEMENT_ORIGIN"]); $webEntryData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"]);
$this->wp->updateWebEntry($aData); $this->wp->updateWebEntry($data["FLO_ELEMENT_ORIGIN"], $webEntryData);
} }
break; break;
} }
@@ -286,20 +286,14 @@ class BpmnWorkflow extends Project\Bpmn
// update case scheduler // update case scheduler
if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") { if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
$aData = array( $caseSchedulerData = array( 'TAS_UID'=>'' );
'TAS_UID'=>'', $this->wp->updateCaseScheduler($flow->getFloElementOrigin(), $caseSchedulerData);
'SCH_UID'=>$flow->getFloElementOrigin()
);
$this->wp->updateCaseScheduler($aData);
} }
// update web entry // update web entry
if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") { if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
$aData = array( $webEntryData = array( 'TAS_UID'=>'' );
'TAS_UID'=>'', $this->wp->updateWebEntry($flow->getFloElementOrigin(), $webEntryData);
'WE_UID'=>$flow->getFloElementOrigin()
);
$this->wp->updateWebEntry($aData);
} }
} elseif ($flow->getFloElementOriginType() == "bpmnActivity" && } elseif ($flow->getFloElementOriginType() == "bpmnActivity" &&

6
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -829,9 +829,10 @@ class Workflow extends Handler
} }
} }
public function updateCaseScheduler($data) public function updateCaseScheduler($schUid, $data)
{ {
try { try {
$data = array_merge(array("SCH_UID" => $schUid), $data);
$caseScheduler = new \CaseScheduler(); $caseScheduler = new \CaseScheduler();
$caseScheduler->update($data); $caseScheduler->update($data);
self::log("Update Case Scheduler Success!"); self::log("Update Case Scheduler Success!");
@@ -873,10 +874,9 @@ class Workflow extends Handler
} }
} }
public function updateWebEntry($data) public function updateWebEntry($webEntryUid, $data)
{ {
try { try {
$webEntryUid = $data['WE_UID'];
$webEntry = \WebEntryPeer::retrieveByPK($webEntryUid); $webEntry = \WebEntryPeer::retrieveByPK($webEntryUid);
$webEntry->fromArray($data, \BasePeer::TYPE_FIELDNAME); $webEntry->fromArray($data, \BasePeer::TYPE_FIELDNAME);
$webEntry->save(); $webEntry->save();