fernando/luos
1
0
Fork 0
Code Releases Activity

Fix. Adicion de funcionalidad de lanes y lanesets para project

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-10-03 13:36:14 -04:00
parent e48b2c6ccd
commit 2802cc51f1
8 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,16 +39,14 @@ class BpmnActivity extends BaseBpmnActivity
$process = BpmnProcessPeer::retrieveByPK($this->getProUid()); $process = BpmnProcessPeer::retrieveByPK($this->getProUid());
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() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement()); $this->bound->setBouElement($this->getLnsUid());
} else {
$this->bound->setBouContainer('bpmnDiagram');
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

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

@@ -39,16 +39,14 @@ class BpmnArtifact extends BaseBpmnArtifact
$process = BpmnProcessPeer::retrieveByPK($this->getProUid()); $process = BpmnProcessPeer::retrieveByPK($this->getProUid());
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() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement()); $this->bound->setBouElement($this->getLnsUid());
} else {
$this->bound->setBouContainer('bpmnDiagram');
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

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

@@ -39,16 +39,14 @@ class BpmnData extends BaseBpmnData
$process = BpmnProcessPeer::retrieveByPK($this->getProUid()); $process = BpmnProcessPeer::retrieveByPK($this->getProUid());
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() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement()); $this->bound->setBouElement($this->getLnsUid());
} else {
$this->bound->setBouContainer('bpmnDiagram');
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

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

@@ -39,16 +39,14 @@ class BpmnEvent extends BaseBpmnEvent
$process = BpmnProcessPeer::retrieveByPK($this->getProUid()); $process = BpmnProcessPeer::retrieveByPK($this->getProUid());
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() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement()); $this->bound->setBouElement($this->getLnsUid());
} else {
$this->bound->setBouContainer('bpmnDiagram');
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

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

@@ -39,16 +39,14 @@ class BpmnGateway extends BaseBpmnGateway
$process = BpmnProcessPeer::retrieveByPK($this->getProUid()); $process = BpmnProcessPeer::retrieveByPK($this->getProUid());
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() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement()); $this->bound->setBouElement($this->getLnsUid());
} else {
$this->bound->setBouContainer('bpmnDiagram');
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }

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

@@ -39,6 +39,7 @@ class BpmnLane extends BaseBpmnLane {
$project = BpmnProjectPeer::retrieveByPK($this->getPrjUid()); $project = BpmnProjectPeer::retrieveByPK($this->getPrjUid());
if (is_object($project)) { if (is_object($project)) {
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(BpmnProcessPeer::DIA_UID); $criteria->addSelectColumn(BpmnProcessPeer::DIA_UID);
$criteria->add(BpmnProcessPeer::PRJ_UID, $this->getPrjUid(), \Criteria::EQUAL); $criteria->add(BpmnProcessPeer::PRJ_UID, $this->getPrjUid(), \Criteria::EQUAL);
@@ -47,8 +48,8 @@ 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('bpmnDiagram'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($row["DIA_UID"]); $this->bound->setBouElement($this->getLnsUid());
} }
} }

6
workflow/engine/classes/model/BpmnLaneset.php
View File

@@ -40,14 +40,8 @@ class BpmnLaneset extends BaseBpmnLaneset {
if (is_object($process)) { if (is_object($process)) {
$this->bound->setDiaUid($process->getDiaUid()); $this->bound->setDiaUid($process->getDiaUid());
if ($this->bound->getBouElement() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram'); $this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid()); $this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement());
}
} }
} }

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

@@ -39,16 +39,14 @@ class BpmnParticipant extends BaseBpmnParticipant
$process = BpmnProcessPeer::retrieveByPK($this->getProUid()); $process = BpmnProcessPeer::retrieveByPK($this->getProUid());
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() == null && $this->bound->getBouElement() == '' && $this->bound->getBouElement() == $process->getDiaUid()) {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
} else {
$this->bound->setBouContainer('bpmnLane'); $this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->bound->getBouElement()); $this->bound->setBouElement($this->getLnsUid());
} else {
$this->bound->setBouContainer('bpmnDiagram');
} }
$this->bound->setBouElement($process->getDiaUid());
} }
} }