fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in darojas/processmaker/master-d (pull request #1123)

Browse Source 
Fix Funcionalidad de lanes y lanesets para project
This commit is contained in:
Erik Amaru Ortiz
2014-11-07 17:36:09 -04:00
parent 25776ac06e 1bedf48b68
commit 43112e0d6c
9 changed files with 92 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/model/BpmnActivity.php
View File

@@ -40,13 +40,18 @@ class BpmnActivity extends BaseBpmnActivity
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) { if ($this->bound->getBouElement()) {
$this->bound->setBouContainer('bpmnLane'); $lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$this->bound->setBouElement($this->getLnsUid()); $laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else { } else {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

13
workflow/engine/classes/model/BpmnArtifact.php
View File

@@ -40,13 +40,18 @@ class BpmnArtifact extends BaseBpmnArtifact
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) { if ($this->bound->getBouElement()) {
$this->bound->setBouContainer('bpmnLane'); $lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$this->bound->setBouElement($this->getLnsUid()); $laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else { } else {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

13
workflow/engine/classes/model/BpmnData.php
View File

@@ -40,13 +40,18 @@ class BpmnData extends BaseBpmnData
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) { if ($this->bound->getBouElement()) {
$this->bound->setBouContainer('bpmnLane'); $lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$this->bound->setBouElement($this->getLnsUid()); $laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else { } else {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

13
workflow/engine/classes/model/BpmnEvent.php
View File

@@ -40,13 +40,18 @@ class BpmnEvent extends BaseBpmnEvent
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) { if ($this->bound->getBouElement()) {
$this->bound->setBouContainer('bpmnLane'); $lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$this->bound->setBouElement($this->getLnsUid()); $laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else { } else {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

13
workflow/engine/classes/model/BpmnGateway.php
View File

@@ -40,13 +40,18 @@ class BpmnGateway extends BaseBpmnGateway
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) { if ($this->bound->getBouElement()) {
$this->bound->setBouContainer('bpmnLane'); $lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$this->bound->setBouElement($this->getLnsUid()); $laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else { } else {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

2
workflow/engine/classes/model/BpmnLane.php
View File

@@ -48,7 +48,7 @@ class BpmnLane extends BaseBpmnLane {
$rsCriteria->next(); $rsCriteria->next();
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$this->bound->setDiaUid($row["DIA_UID"]); $this->bound->setDiaUid($row["DIA_UID"]);
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnPool');
$this->bound->setBouElement($this->getLnsUid()); $this->bound->setBouElement($this->getLnsUid());
} }
} }

13
workflow/engine/classes/model/BpmnParticipant.php
View File

@@ -40,13 +40,18 @@ class BpmnParticipant extends BaseBpmnParticipant
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) { if ($this->bound->getBouElement()) {
$this->bound->setBouContainer('bpmnLane'); $lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$this->bound->setBouElement($this->getLnsUid()); $laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else { } else {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

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

@@ -671,8 +671,6 @@ class BpmnWorkflow extends Project\Bpmn
$diagram["lanes"] = $bwp->getLanes($configList); $diagram["lanes"] = $bwp->getLanes($configList);
$diagram["data"] = $bwp->getDataCollection($configList); $diagram["data"] = $bwp->getDataCollection($configList);
$diagram["participants"] = $bwp->getParticipants($configList); $diagram["participants"] = $bwp->getParticipants($configList);
$diagram["lanesets"] = $bwp->getLanesets($configList);
$diagram["lanes"] = $bwp->getLanes($configList);
$project["diagrams"][] = $diagram; $project["diagrams"][] = $diagram;
} }
@@ -728,7 +726,7 @@ class BpmnWorkflow extends Project\Bpmn
$diagram["events"] = isset($diagram["events"])? $diagram["events"]: array(); $diagram["events"] = isset($diagram["events"])? $diagram["events"]: array();
$diagram["data"] = isset($diagram["data"])? $diagram["data"]: array(); $diagram["data"] = isset($diagram["data"])? $diagram["data"]: array();
$diagram["participants"] = isset($diagram["participants"])? $diagram["participants"]: array(); $diagram["participants"] = isset($diagram["participants"])? $diagram["participants"]: array();
$diagram["lanesets"] = isset($diagram["lanesets"])? $diagram["lanesets"]: array(); $diagram["laneset"] = isset($diagram["laneset"])? $diagram["laneset"]: array();
$diagram["lanes"] = isset($diagram["lanes"])? $diagram["lanes"]: array(); $diagram["lanes"] = isset($diagram["lanes"])? $diagram["lanes"]: array();
$result = array(); $result = array();
@@ -1062,7 +1060,7 @@ class BpmnWorkflow extends Project\Bpmn
} }
$bwp->addLaneset($lanesetData); $bwp->addLaneset($lanesetData);
} elseif (! $bwp->isEquals($dataObject, $lanesetData)) { } elseif (! $bwp->isEquals($dataObject, $lanesetData)) {
$bwp->updateLanseset($lanesetData["LNS_UID"], $lanesetData); $bwp->updateLaneset($lanesetData["LNS_UID"], $lanesetData);
} else { } else {
Util\Logger::log("Update Laneset ({$lanesetData["LNS_UID"]}) Skipped - No changes required"); Util\Logger::log("Update Laneset ({$lanesetData["LNS_UID"]}) Skipped - No changes required");
} }
@@ -1107,12 +1105,12 @@ class BpmnWorkflow extends Project\Bpmn
} }
$bwp->addLane($laneData); $bwp->addLane($laneData);
} elseif (! $bwp->isEquals($dataObject, $laneData)) { } elseif (! $bwp->isEquals($dataObject, $laneData)) {
$bwp->updateLanse($laneData["LAN_UID"], $laneData); $bwp->updateLane($laneData["LAN_UID"], $laneData);
} else { } else {
Util\Logger::log("Update Lane ({$laneData["LAN_UID"]}) Skipped - No changes required"); Util\Logger::log("Update Lane ({$laneData["LAN_UID"]}) Skipped - No changes required");
} }
$diagram["lane"][$i] = $laneData; $diagram["lanes"][$i] = $laneData;
$whiteList[] = $laneData["LAN_UID"]; $whiteList[] = $laneData["LAN_UID"];
} }

33
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -1083,6 +1083,22 @@ class Bpmn extends Handler
} }
} }
public function updateLane($lanUid, $data)
{
try {
self::log("Update Lane: $lanUid", "With data: ", $data);
$lane = LanePeer::retrieveByPk($lanUid);
$lane->fromArray($data);
$lane->save();
self::log("Update Lane Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
public function addLaneset($data) public function addLaneset($data)
{ {
// setting defaults // setting defaults
@@ -1148,6 +1164,23 @@ class Bpmn extends Handler
} }
} }
public function updateLaneset($lnsUid, $data)
{
try {
self::log("Update Laneset: $lnsUid", "With data: ", $data);
$laneset = LanesetPeer::retrieveByPk($lnsUid);
$laneset->fromArray($data);
$laneset->save();
self::log("Update Laneset Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
public function isModified($element, $uid, $newData) public function isModified($element, $uid, $newData)
{ {
$data = array(); $data = array();