fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'MT-10' of bitbucket.org:colosa/processmaker into MT-10

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2016-03-21 09:15:57 -04:00
parent 31b116042e d97e8a048f
commit 51ab334525
4 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php
View File

@@ -7,7 +7,7 @@ class ExportObjects
* @var array * @var array
*/ */
protected $objectsList = array( protected $objectsList = array(
'Process Definition / Diagram', 'Process Definition',
'Assignment Rules', 'Assignment Rules',
'Variables', 'Variables',
'Dynaforms', 'Dynaforms',
@@ -26,7 +26,6 @@ class ExportObjects
/** /**
* @param string $pro_uid * @param string $pro_uid
* @return mixed|string * @return mixed|string
* @throws Exception
* @throws \Exception * @throws \Exception
*/ */
public function objectList($pro_uid = '') public function objectList($pro_uid = '')
@@ -41,7 +40,30 @@ class ExportObjects
$r->data = $grid; $r->data = $grid;
return \G::json_encode($r); return \G::json_encode($r);
} catch (Exception $e) { } catch (\Exception $e) {
throw $e;
}
}
/**
* @param $objects
* @return array
* @throws \Exception
*/
public function mapObjectList($objects)
{
try {
$mapObjectList = array();
foreach ($this->objectsList as $key => $val) {
if(isset($objects[$key])){
if(($key+1) === $objects[$key]){
array_push($mapObjectList, strtoupper(str_replace(' ', '', $val)));
}
}
$key++;
}
return $mapObjectList;
} catch (\Exception $e) {
throw $e; throw $e;
} }
} }

3
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
View File

@@ -29,13 +29,14 @@ class GranularExporter
public function export($objectList) public function export($objectList)
{ {
$this->beforeExport(); $this->beforeExport();
$exportObject = new ExportObjects();
$objectList = $exportObject->mapObjectList($objectList);
foreach ($objectList as $data) { foreach ($objectList as $data) {
$migrator = $this->factory->create($data); $migrator = $this->factory->create($data);
$migratorData = $migrator->export($this->prjuid); $migratorData = $migrator->export($this->prjuid);
$this->mergeData($migratorData); $this->mergeData($migratorData);
} }
return $this->publish(); return $this->publish();
} }
protected function beforeExport() protected function beforeExport()

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

@@ -49,21 +49,21 @@ class ProcessDefinitionMigrator implements Importable, Exportable
public function export($prj_uid) public function export($prj_uid)
{ {
$bpmnStruct["ACTIVITY"] = \BpmnActivity::getAll($this->$prj_uid); $bpmnStruct["ACTIVITY"] = \BpmnActivity::getAll($prj_uid);
$bpmnStruct["ARTIFACT"] = \BpmnArtifact::getAll($this->$prj_uid); $bpmnStruct["ARTIFACT"] = \BpmnArtifact::getAll($prj_uid);
$bpmnStruct["BOUND"] = \BpmnBound::getAll($this->$prj_uid); $bpmnStruct["BOUND"] = \BpmnBound::getAll($prj_uid);
$bpmnStruct["DATA"] = \BpmnData::getAll($this->$prj_uid); $bpmnStruct["DATA"] = \BpmnData::getAll($prj_uid);
$bpmnStruct["DIAGRAM"] = \BpmnDiagram::getAll($this->$prj_uid); $bpmnStruct["DIAGRAM"] = \BpmnDiagram::getAll($prj_uid);
$bpmnStruct["DOCUMENTATION"] = array(); $bpmnStruct["DOCUMENTATION"] = array();
$bpmnStruct["EVENT"] = \BpmnEvent::getAll($this->$prj_uid); $bpmnStruct["EVENT"] = \BpmnEvent::getAll($prj_uid);
$bpmnStruct["EXTENSION"] = array(); $bpmnStruct["EXTENSION"] = array();
$bpmnStruct["FLOW"] = \BpmnFlow::getAll($this->$prj_uid, null, null, "", CASE_UPPER, false); $bpmnStruct["FLOW"] = \BpmnFlow::getAll($prj_uid, null, null, "", CASE_UPPER, false);
$bpmnStruct["GATEWAY"] = \BpmnGateway::getAll($this->$prj_uid); $bpmnStruct["GATEWAY"] = \BpmnGateway::getAll($prj_uid);
$bpmnStruct["LANE"] = \BpmnLane::getAll($this->$prj_uid); $bpmnStruct["LANE"] = \BpmnLane::getAll($prj_uid);
$bpmnStruct["LANESET"] = \BpmnLaneset::getAll($this->$prj_uid); $bpmnStruct["LANESET"] = \BpmnLaneset::getAll($prj_uid);
$bpmnStruct["PARTICIPANT"] = \BpmnParticipant::getAll($this->$prj_uid); $bpmnStruct["PARTICIPANT"] = \BpmnParticipant::getAll($prj_uid);
$bpmnStruct["PROCESS"] = \BpmnProcess::getAll($this->$prj_uid); $bpmnStruct["PROCESS"] = \BpmnProcess::getAll($prj_uid);
$bpmnStruct["PROJECT"] = array(\BpmnProjectPeer::retrieveByPK($this->$prj_uid)->toArray()); $bpmnStruct["PROJECT"] = array(\BpmnProjectPeer::retrieveByPK($prj_uid)->toArray());
$oProcess = new \Processes(); $oProcess = new \Processes();
$oData = new \StdClass(); $oData = new \StdClass();

3
workflow/engine/src/ProcessMaker/Services/Api/Project.php
View File

@@ -143,8 +143,9 @@ class Project extends Api
*/ */
public function exportGranular($prj_uid, $objects) public function exportGranular($prj_uid, $objects)
{ {
$objects = \G::json_decode($objects);
$granularExporter = new GranularExporter($prj_uid); $granularExporter = new GranularExporter($prj_uid);
$outputFilename = $granularExporter->export($objects); $outputFilename = $granularExporter->export($objects->objectList);
$httpStream = new HttpStream(); $httpStream = new HttpStream();
$fileExtension = pathinfo($outputFilename, PATHINFO_EXTENSION); $fileExtension = pathinfo($outputFilename, PATHINFO_EXTENSION);