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)) {
$this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->getLnsUid());
if ($this->bound->getBouElement()) {
$lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else {
$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)) {
$this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->getLnsUid());
if ($this->bound->getBouElement()) {
$lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else {
$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)) {
$this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->getLnsUid());
if ($this->bound->getBouElement()) {
$lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else {
$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)) {
$this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->getLnsUid());
if ($this->bound->getBouElement()) {
$lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else {
$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)) {
$this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->getLnsUid());
if ($this->bound->getBouElement()) {
$lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else {
$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();
$row = $rsCriteria->getRow();
$this->bound->setDiaUid($row["DIA_UID"]);
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouContainer('bpmnPool');
$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)) {
$this->bound->setDiaUid($process->getDiaUid());
if (isset($this->getLnsUid)) {
$this->bound->setBouContainer('bpmnLane');
$this->bound->setBouElement($this->getLnsUid());
if ($this->bound->getBouElement()) {
$lane = BpmnLanePeer::retrieveByPK($this->bound->getBouElement());
$laneset = BpmnLanesetPeer::retrieveByPK($this->bound->getBouElement());
if (is_object($lane)) {
$this->bound->setBouContainer('bpmnLane');
} elseif (is_object($laneset)) {
$this->bound->setBouContainer('bpmnPool');
}
} else {
$this->bound->setBouContainer('bpmnDiagram');
$this->bound->setBouElement($process->getDiaUid());
}
$this->bound->setBouElement($process->getDiaUid());
}
}