fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/MT-62 (pull request #3988)

Browse Source 
MT-62
This commit is contained in:
Gustavo Cruz
2016-03-29 21:46:53 -04:00
parent f7cf88c8e7 fa9cbd4217
commit d29e87b2cb
3 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
View File

@@ -6,6 +6,8 @@
namespace ProcessMaker\BusinessModel\Migrator;
use ProcessMaker\Project\Adapter;
class GranularImporter
{
@@ -17,6 +19,7 @@ class GranularImporter
public function __construct()
{
$this->factory = new MigratorFactory();
$this->bpmn = new Adapter\BpmnWorkflow();
}
/**
@@ -179,18 +182,52 @@ class GranularImporter
{
try {
if ($generateUid) {
foreach ($objectList as $rowObject) {
if ($rowObject['name'] === 'PROCESSDEFINITION' && $rowObject['value'] == "replace") {
return true;
}
}
if(count($objectList) !== 14){
$exception = new ImportException();
$exception->setNameException('To create a new process needs PROCESSDEFINITION');
throw($exception);
}
}
return true;
} catch (\Exception $e) {
throw $e;
}
}
/**
* @param $objectList
* @param array $data
* @return data
* @throws \Exception
*/
public function regenerateAllUids($data, $generateUid = true)
{
try {
$newData = array();
$arrayBpmnTables = $data["tables"]["bpmn"];
$arrayWorkflowTables = $data["tables"]["workflow"];
$arrayWorkflowFiles = $data["files"]["workflow"];
$result = $this->bpmn->createFromStruct($this->structureBpmnData($arrayBpmnTables), $generateUid);
$projectUidOld = $arrayBpmnTables["project"][0]["prj_uid"];
$projectUid = ($generateUid)? $result[0]["new_uid"] : $result;
if ($generateUid) {
$result[0]["object"] = "project";
$result[0]["old_uid"] = $projectUidOld;
$result[0]["new_uid"] = $projectUid;
$workflow = new \ProcessMaker\Project\Workflow();
list($arrayWorkflowTables, $arrayWorkflowFiles) = $workflow->updateDataUidByArrayUid($arrayWorkflowTables, $arrayWorkflowFiles, $result);
}
$newData['tables']['workflow'] = $arrayWorkflowTables;
$newData['files']['workflow'] = $arrayWorkflowFiles;
return array(
'data' => $newData,
'new_uid' => $projectUid);
} catch (\Exception $e) {
throw $e;
}
}
}

4
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php
View File

@@ -31,9 +31,9 @@ class ReportTablesMigrator implements Importable, Exportable
try {
$aReportTablesVars = array();
if ($replace) {
$this->processes->createReportTables($data, $aReportTablesVars);
//Todo Create
} else {
$this->processes->updateReportTables($data, $aReportTablesVars);
//Todo addOnlyNew
}
} catch (\Exception $e) {
$exception = new ImportException($e->getMessage());

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

@@ -220,13 +220,30 @@ abstract class Importer
try {
if ($objectsToImport !== '') {
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$objectList = $granularObj->loadObjectsListSelected($this->importData, $objectsToImport);
$processGranulate = $granularObj->validateImportData($objectList, $generateUid);
$newObjectArray = $objectsToImport;
$projectUid = $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
$processGranulate = $granularObj->validateImportData($objectsToImport, $generateUid);
if($generateUid){
$result = $granularObj->regenerateAllUids($this->importData, $generateUid);
$this->importData = $result['data'];
$projectUid = $result['new_uid'];
$newObjectArray = array();
$count = 0;
foreach ($objectsToImport as $key => $rowObject) {
if($rowObject->id != '1'){
$newObjectArray[++$count] = $rowObject;
}
}
}
if(sizeof($newObjectArray)){
$objectList = $granularObj->loadObjectsListSelected($this->importData, $newObjectArray);
if (sizeof($objectList) > 0 && $processGranulate) {
$granularObj->import($objectList);
return $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
}
}
return $projectUid;
}
} catch (\Exception $e) {
throw $e;
}