fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/HOR-2440 (pull request #5485)

Browse Source 
Feature/HOR-2440

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2017-03-08 21:50:48 +00:00
committed by Julio Cesar Laura Avendaño
parent 219d2d034e 889960ccf6
commit de0b24fea2
76 changed files with 5419 additions and 2005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
View File

@@ -201,7 +201,7 @@ class Lists {
}
if ($total) {
$total = $list->countTotal($userUid, $filters);
$total = $list->getCountList($userUid, $filters);
return $total;
}
@@ -249,7 +249,7 @@ class Lists {
$response['filters'] = $filtersData;
$response['data'] = $result;
$filtersData['action'] = $filters["action"];
$response['totalCount'] = $list->countTotal($userUid, $filtersData);
$response['totalCount'] = $list->getCountList($userUid, $filtersData);
} else {
$response = $result;
}
@@ -267,8 +267,8 @@ class Lists {
$response = array();
foreach ($list as $listObject => $item) {
switch ($listObject) {
case 'ListInbox':
$total = $this->$listObject->getCountList($userId, 'TO_DO');
case 'ListDraft':
$total = $this->$listObject->getCountList($userId, array('action'=>'draft'));
array_push($response, (array('count' => $total, 'item' => $item)));
break;
/*----------------------------------********---------------------------------*/

2
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php
View File

@@ -36,7 +36,7 @@ class ProcessDefinitionMigrator implements Importable, Exportable
{
try {
//Bpmn elements
$pjrUid = $this->bpmn->createFromStruct($data['bpmn'], false);
$pjrUid = $this->bpmn->createFromStruct($data['bpmn'], false, $data);
//Import workflow elements
} catch (\Exception $e) {
$exception = new ImportException($e->getMessage());

7
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -235,6 +235,9 @@ abstract class Importer
$this->importData["tables"]["bpmn"]["project"][0]["prj_name"] = $name;
$this->importData["tables"]["bpmn"]["diagram"][0]["dia_name"] = $name;
$this->importData["tables"]["bpmn"]["process"][0]["pro_name"] = $name;
if (!empty($this->importData["tables"]["workflow"]["process"][0]['PRO_ID'])) {
$this->importData["tables"]["bpmn"]["process"][0]["pro_id"] = $this->importData["tables"]["workflow"]["process"][0]['PRO_ID'];
}
$this->importData["tables"]["workflow"]["process"][0]["PRO_TITLE"] = $name;
if ($this->importData["tables"]["workflow"]["process"][0]["PRO_UPDATE_DATE"] . "" == "") {
@@ -363,6 +366,10 @@ abstract class Importer
public function removeProject($onlyDiagram = false)
{
/* @var $process \Process */
$processes = new \Processes();
$this->importData["tables"]["workflow"] = $processes
->loadIdsFromData($this->importData["tables"]["workflow"]);
$process = new \Process();
$process->load($this->metadata["uid"]);
$this->currentProcessTitle = $process->getProTitle();

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

@@ -86,6 +86,10 @@ class BpmnWorkflow extends Project\Bpmn
$wpData["PRO_CATEGORY"] = $data["PRJ_CATEGORY"];
}
if (array_key_exists("PRO_ID", $data)) {
$wpData["PRO_ID"] = $data["PRO_ID"];
}
$this->wp = new Project\Workflow();
$this->wp->create($wpData);
@@ -131,7 +135,6 @@ class BpmnWorkflow extends Project\Bpmn
}
$arrayData["PRO_UPDATE_DATE"] = date("Y-m-d H:i:s");
$this->wp->update($arrayData);
}
@@ -185,6 +188,9 @@ class BpmnWorkflow extends Project\Bpmn
$actUid = parent::addActivity($data);
$taskData["TAS_UID"] = $actUid;
if (!empty($data["TAS_ID"])) {
$taskData["TAS_ID"] = $data["TAS_ID"];
}
if (array_key_exists("ACT_NAME", $data)) {
$taskData["TAS_TITLE"] = $data["ACT_NAME"];
@@ -1254,7 +1260,7 @@ class BpmnWorkflow extends Project\Bpmn
$this->wp->remove($flagRemoveCases, $onlyDiagram);
}
public static function createFromStruct(array $projectData, $generateUid = true)
public static function createFromStruct(array $projectData, $generateUid = true, $allData = null)
{
$projectData["prj_name"] = trim($projectData["prj_name"]);
if ($projectData["prj_name"] == '') {
@@ -1300,6 +1306,10 @@ class BpmnWorkflow extends Project\Bpmn
$data["PRJ_CATEGORY"] = $projectData["prj_category"];
}
if (isset($projectData["process"]["pro_id"])) {
$data["PRO_ID"] = $projectData["process"]["pro_id"];
}
$bwp->create($data);
$diagramData = $processData = array();
@@ -1329,7 +1339,7 @@ class BpmnWorkflow extends Project\Bpmn
$bwp->addProcess($processData);
$mappedUid = array_merge($result, self::updateFromStruct($bwp->prjUid, $projectData, $generateUid, true));
$mappedUid = array_merge($result, self::updateFromStruct($bwp->prjUid, $projectData, $generateUid, true, $allData));
return $generateUid ? $mappedUid : $bwp->getUid();
}
@@ -1456,10 +1466,15 @@ class BpmnWorkflow extends Project\Bpmn
*
* @param $prjUid
* @param $projectData
* @param $allData All data from import file
* @return array
*/
public static function updateFromStruct($prjUid, $projectData, $generateUid = true, $forceInsert = false)
{
public static function updateFromStruct(
$prjUid, $projectData,
$generateUid = true,
$forceInsert = false,
$allData = null
) {
$diagram = isset($projectData["diagrams"]) && isset($projectData["diagrams"][0]) ? $projectData["diagrams"][0] : array();
$diagram["activities"] = isset($diagram["activities"])? $diagram["activities"]: array();
$diagram["artifacts"] = isset($diagram["artifacts"])? $diagram["artifacts"]: array();
@@ -1614,6 +1629,13 @@ class BpmnWorkflow extends Project\Bpmn
"old_uid" => $uidOld,
"new_uid" => $activityData["ACT_UID"]
);
} elseif (!empty($allData['workflow']['tasks']) && is_array($allData['workflow']['tasks'])) {
foreach ($allData['workflow']['tasks'] as $task) {
if (!empty($task['TAS_ID']) && $activityData["ACT_UID"] === $task['TAS_UID']) {
$activityData["TAS_ID"] = $task['TAS_ID'];
break;
}
}
}
$bwp->addActivity($activityData);