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

Merged in darojas/processmaker/PM-1279 (pull request #1341)

Browse Source 
PM-1279 "Al importar un proceso que contiene pools o lanes, no se importa correctamente" SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-01-19 17:02:07 -04:00
parent c30af12df7 b690cf6565
commit 6d5816cb43
3 changed files with 161 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/Exporter/Exporter.php Normal file → Executable file
View File

@@ -105,8 +105,8 @@ abstract class Exporter
$bpmnStruct["EXTENSION"] = array(); $bpmnStruct["EXTENSION"] = array();
$bpmnStruct["FLOW"] = \BpmnFlow::getAll($this->prjUid, null, null, "", CASE_UPPER, false); $bpmnStruct["FLOW"] = \BpmnFlow::getAll($this->prjUid, null, null, "", CASE_UPPER, false);
$bpmnStruct["GATEWAY"] = \BpmnGateway::getAll($this->prjUid); $bpmnStruct["GATEWAY"] = \BpmnGateway::getAll($this->prjUid);
$bpmnStruct["LANE"] = array(); $bpmnStruct["LANE"] = \BpmnLane::getAll($this->prjUid);
$bpmnStruct["LANESET"] = array(); $bpmnStruct["LANESET"] = \BpmnLaneset::getAll($this->prjUid);
$bpmnStruct["PARTICIPANT"] = \BpmnParticipant::getAll($this->prjUid); $bpmnStruct["PARTICIPANT"] = \BpmnParticipant::getAll($this->prjUid);
$bpmnStruct["PROCESS"] = \BpmnProcess::getAll($this->prjUid); $bpmnStruct["PROCESS"] = \BpmnProcess::getAll($this->prjUid);
$bpmnStruct["PROJECT"] = array(\BpmnProjectPeer::retrieveByPK($this->prjUid)->toArray()); $bpmnStruct["PROJECT"] = array(\BpmnProjectPeer::retrieveByPK($this->prjUid)->toArray());

4
workflow/engine/src/ProcessMaker/Importer/Importer.php Normal file → Executable file
View File

@@ -317,8 +317,8 @@ abstract class Importer
$diagram["gateways"] = $tables["gateway"]; $diagram["gateways"] = $tables["gateway"];
$diagram["data"] = (isset($tables["data"]))? $tables["data"] : array(); $diagram["data"] = (isset($tables["data"]))? $tables["data"] : array();
$diagram["participants"] = (isset($tables["participant"]))? $tables["participant"] : array(); $diagram["participants"] = (isset($tables["participant"]))? $tables["participant"] : array();
$diagram["lanes"] = array(); $diagram["laneset"] = (isset($tables["laneset"]))? $tables["laneset"] : array();
$diagram["laneset"] = array(); $diagram["lanes"] = (isset($tables["lane"]))? $tables["lane"] : array();
$project["diagrams"] = array($diagram); $project["diagrams"] = array($diagram);
$project["prj_author"] = isset($this->data["usr_uid"])? $this->data["usr_uid"]: "00000000000000000000000000000001"; $project["prj_author"] = isset($this->data["usr_uid"])? $this->data["usr_uid"]: "00000000000000000000000000000001";
$project["process"] = $tables["process"][0]; $project["process"] = $tables["process"][0];

248
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php Normal file → Executable file
View File

@@ -763,6 +763,103 @@ class BpmnWorkflow extends Project\Bpmn
$projectRecord = array_change_key_case($projectData, CASE_UPPER); $projectRecord = array_change_key_case($projectData, CASE_UPPER);
$bwp->update($projectRecord); $bwp->update($projectRecord);
////
/*
* Diagram's Laneset Handling
*/
$whiteList = array();
foreach ($diagram["laneset"] as $i => $lanesetData) {
$lanesetData = array_change_key_case($lanesetData, CASE_UPPER);
$dataObject = $bwp->getLaneset($lanesetData["LNS_UID"]);
if ($forceInsert || is_null($dataObject)) {
if ($generateUid) {
//Laneset
unset($lanesetData["BOU_UID"]);
$uidOld = $lanesetData["LNS_UID"];
$lanesetData["LNS_UID"] = Util\Common::generateUID();
$result[] = array(
"object" => "laneset",
"old_uid" => $uidOld,
"new_uid" => $lanesetData["LNS_UID"]
);
}
$bwp->addLaneset($lanesetData);
} elseif (! $bwp->isEquals($dataObject, $lanesetData)) {
$bwp->updateLaneset($lanesetData["LNS_UID"], $lanesetData);
} else {
Util\Logger::log("Update Laneset ({$lanesetData["LNS_UID"]}) Skipped - No changes required");
}
$diagram["laneset"][$i] = $lanesetData;
$whiteList[] = $lanesetData["LNS_UID"];
}
$dataCollection = $bwp->getLanesets();
// looking for removed elements
foreach ($dataCollection as $lanesetData) {
if (! in_array($lanesetData["LNS_UID"], $whiteList)) {
// If it is not in the white list, then remove them
$bwp->removeLaneset($lanesetData["LNS_UID"]);
}
}
////
/*
* Diagram's Lane Handling
*/
$whiteList = array();
foreach ($diagram["lanes"] as $i => $laneData) {
$laneData = array_change_key_case($laneData, CASE_UPPER);
//Update UIDs
foreach ($result as $value) {
if ($laneData["LNS_UID"] == $value["old_uid"]) {
$laneData["LNS_UID"] = $value["new_uid"];
}
}
$dataObject = $bwp->getLane($laneData["LAN_UID"]);
if ($forceInsert || is_null($dataObject)) {
if ($generateUid) {
//Laneset
unset($laneData["BOU_UID"]);
$uidOld = $laneData["LAN_UID"];
$laneData["LAN_UID"] = Util\Common::generateUID();
$result[] = array(
"object" => "lane",
"old_uid" => $uidOld,
"new_uid" => $laneData["LAN_UID"]
);
}
$bwp->addLane($laneData);
} elseif (! $bwp->isEquals($dataObject, $laneData)) {
$bwp->updateLane($laneData["LAN_UID"], $laneData);
} else {
Util\Logger::log("Update Lane ({$laneData["LAN_UID"]}) Skipped - No changes required");
}
$diagram["lanes"][$i] = $laneData;
$whiteList[] = $laneData["LAN_UID"];
}
$dataCollection = $bwp->getLanes();
// looking for removed elements
foreach ($dataCollection as $laneData) {
if (! in_array($laneData["LAN_UID"], $whiteList)) {
// If it is not in the white list, then remove them
$bwp->removeLane($laneData["LAN_UID"]);
}
}
/* /*
* Diagram's Activities Handling * Diagram's Activities Handling
*/ */
@@ -777,8 +874,17 @@ class BpmnWorkflow extends Project\Bpmn
if ($forceInsert || is_null($activity)) { if ($forceInsert || is_null($activity)) {
if ($generateUid) { if ($generateUid) {
//Activity //Activity
unset($activityData["BOU_UID"]);
//Update UIDs
if ($activityData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") {
foreach ($result as $value) {
if ($activityData["BOU_ELEMENT"] == $value["old_uid"]) {
$activityData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
unset($activityData["BOU_UID"]);
$uidOld = $activityData["ACT_UID"]; $uidOld = $activityData["ACT_UID"];
$activityData["ACT_UID"] = Util\Common::generateUID(); $activityData["ACT_UID"] = Util\Common::generateUID();
@@ -822,6 +928,16 @@ class BpmnWorkflow extends Project\Bpmn
if ($forceInsert || is_null($artifact)) { if ($forceInsert || is_null($artifact)) {
if ($generateUid) { if ($generateUid) {
//Artifact //Artifact
//Update UIDs
if ($artifactData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") {
foreach ($result as $value) {
if ($artifactData["BOU_ELEMENT"] == $value["old_uid"]) {
$artifactData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
unset($artifactData["BOU_UID"]); unset($artifactData["BOU_UID"]);
$uidOld = $artifactData["ART_UID"]; $uidOld = $artifactData["ART_UID"];
@@ -872,6 +988,16 @@ class BpmnWorkflow extends Project\Bpmn
if ($forceInsert || is_null($gateway)) { if ($forceInsert || is_null($gateway)) {
if ($generateUid) { if ($generateUid) {
//Gateway //Gateway
//Update UIDs
if ($gatewayData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") {
foreach ($result as $value) {
if ($gatewayData["BOU_ELEMENT"] == $value["old_uid"]) {
$gatewayData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
unset($gatewayData["BOU_UID"]); unset($gatewayData["BOU_UID"]);
$uidOld = $gatewayData["GAT_UID"]; $uidOld = $gatewayData["GAT_UID"];
@@ -936,6 +1062,16 @@ class BpmnWorkflow extends Project\Bpmn
if ($forceInsert || is_null($event)) { if ($forceInsert || is_null($event)) {
if ($generateUid) { if ($generateUid) {
//Event //Event
//Update UIDs
if ($eventData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") {
foreach ($result as $value) {
if ($eventData["BOU_ELEMENT"] == $value["old_uid"]) {
$eventData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
unset($eventData["BOU_UID"]); unset($eventData["BOU_UID"]);
$uidOld = $eventData["EVN_UID"]; $uidOld = $eventData["EVN_UID"];
@@ -982,6 +1118,16 @@ class BpmnWorkflow extends Project\Bpmn
if ($forceInsert || is_null($dataObject)) { if ($forceInsert || is_null($dataObject)) {
if ($generateUid) { if ($generateUid) {
//Data //Data
//Update UIDs
if ($dataObjectData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") {
foreach ($result as $value) {
if ($dataObjectData["BOU_ELEMENT"] == $value["old_uid"]) {
$dataObjectData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
unset($dataObjectData["BOU_UID"]); unset($dataObjectData["BOU_UID"]);
$uidOld = $dataObjectData["DAT_UID"]; $uidOld = $dataObjectData["DAT_UID"];
@@ -1029,6 +1175,16 @@ class BpmnWorkflow extends Project\Bpmn
if ($forceInsert || is_null($dataObject)) { if ($forceInsert || is_null($dataObject)) {
if ($generateUid) { if ($generateUid) {
//Participant //Participant
//Update UIDs
if ($participantData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") {
foreach ($result as $value) {
if ($participantData["BOU_ELEMENT"] == $value["old_uid"]) {
$participantData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
unset($participantData["BOU_UID"]); unset($participantData["BOU_UID"]);
$uidOld = $participantData["PAR_UID"]; $uidOld = $participantData["PAR_UID"];
@@ -1062,96 +1218,6 @@ class BpmnWorkflow extends Project\Bpmn
} }
} }
////
/*
* Diagram's Laneset Handling
*/
$whiteList = array();
foreach ($diagram["laneset"] as $i => $lanesetData) {
$lanesetData = array_change_key_case($lanesetData, CASE_UPPER);
$dataObject = $bwp->getLaneset($lanesetData["LNS_UID"]);
if ($forceInsert || is_null($dataObject)) {
if ($generateUid) {
//Laneset
unset($lanesetData["BOU_UID"]);
$uidOld = $lanesetData["LNS_UID"];
$lanesetData["LNS_UID"] = Util\Common::generateUID();
$result[] = array(
"object" => "laneset",
"old_uid" => $uidOld,
"new_uid" => $lanesetData["LNS_UID"]
);
}
$bwp->addLaneset($lanesetData);
} elseif (! $bwp->isEquals($dataObject, $lanesetData)) {
$bwp->updateLaneset($lanesetData["LNS_UID"], $lanesetData);
} else {
Util\Logger::log("Update Laneset ({$lanesetData["LNS_UID"]}) Skipped - No changes required");
}
$diagram["laneset"][$i] = $lanesetData;
$whiteList[] = $lanesetData["LNS_UID"];
}
$dataCollection = $bwp->getLanesets();
// looking for removed elements
foreach ($dataCollection as $lanesetData) {
if (! in_array($lanesetData["LNS_UID"], $whiteList)) {
// If it is not in the white list, then remove them
$bwp->removeLaneset($lanesetData["LNS_UID"]);
}
}
////
/*
* Diagram's Lane Handling
*/
$whiteList = array();
foreach ($diagram["lanes"] as $i => $laneData) {
$laneData = array_change_key_case($laneData, CASE_UPPER);
$dataObject = $bwp->getLane($laneData["LAN_UID"]);
if ($forceInsert || is_null($dataObject)) {
if ($generateUid) {
//Laneset
unset($laneData["BOU_UID"]);
$uidOld = $laneData["LAN_UID"];
$laneData["LAN_UID"] = Util\Common::generateUID();
$result[] = array(
"object" => "lane",
"old_uid" => $uidOld,
"new_uid" => $laneData["LAN_UID"]
);
}
$bwp->addLane($laneData);
} elseif (! $bwp->isEquals($dataObject, $laneData)) {
$bwp->updateLane($laneData["LAN_UID"], $laneData);
} else {
Util\Logger::log("Update Lane ({$laneData["LAN_UID"]}) Skipped - No changes required");
}
$diagram["lanes"][$i] = $laneData;
$whiteList[] = $laneData["LAN_UID"];
}
$dataCollection = $bwp->getLanes();
// looking for removed elements
foreach ($dataCollection as $laneData) {
if (! in_array($laneData["LAN_UID"], $whiteList)) {
// If it is not in the white list, then remove them
$bwp->removeLane($laneData["LAN_UID"]);
}
}
/* /*
* Diagram's Flows Handling * Diagram's Flows Handling