fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in zeitmaster/processmaker/MT-10 (pull request #3991)

Browse Source 
MT-61
This commit is contained in:
Gustavo Cruz
2016-03-30 10:57:33 -04:00
parent d29e87b2cb ae1523b3be
commit 08cd320fde
7 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/classes/class.processes.php
View File

@@ -2636,6 +2636,28 @@ class Processes
}
}
/**
* Get Step Rows from a Process
*
* @param $sProUid array.
* @return array $aStep.
*/
public function getStepRowsByElement($sProUid, $element)
{
try {
$elementSteps = array();
$steps = $this->getStepRows($sProUid);
foreach ($steps as $step) {
if ($step['STEP_TYPE_OBJ'] === $element) {
$elementSteps[] = $step;
}
}
return $elementSteps;
} catch (Exception $oError) {
throw ($oError);
}
}
/**
* Create Step Rows from a Process
*

1
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/DynaformsMigrator.php
View File

@@ -60,6 +60,7 @@ class DynaformsMigrator implements Importable, Exportable
{
try {
$oData = new \StdClass();
$oData->steps = $this->processes->getStepRowsByElement($prj_uid,'DYNAFORM');
$oData->dynaforms = $this->processes->getDynaformRows($prj_uid);
$result = array(
'workflow-definition' => (array)$oData

1
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/InputDocumentsMigrator.php
View File

@@ -60,6 +60,7 @@ class InputDocumentsMigrator implements Importable, Exportable
{
try {
$oData = new \StdClass();
$oData->steps = $this->processes->getStepRowsByElement($prj_uid,'INPUT_DOCUMENT');
$oData->inputs = $this->processes->getInputRows($prj_uid);
$result = array(

1
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/OutputDocumentsMigrator.php
View File

@@ -60,6 +60,7 @@ class OutputDocumentsMigrator implements Importable, Exportable
{
try {
$oData = new \StdClass();
$oData->steps = $this->processes->getStepRowsByElement($prj_uid,'OUTPUT_DOCUMENT');
$oData->outputs = $this->processes->getOutputRows($prj_uid);
$result = array(

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

@@ -108,8 +108,6 @@ class ProcessDefinitionMigrator implements Importable, Exportable
$oData->routes = $this->processes->getRouteRows($prj_uid);
$oData->lanes = $this->processes->getLaneRows($prj_uid);
$oData->gateways = $this->processes->getGatewayRows($prj_uid);
$oData->steps = $this->processes->getStepRows($prj_uid);
$oData->steptriggers = $this->processes->getStepTriggerRows($oData->tasks);
$oData->subProcess = $this->processes->getSubProcessRow($prj_uid);
$oData->caseTracker = $this->processes->getCaseTrackerRow($prj_uid);
$oData->caseTrackerObject = $this->processes->getCaseTrackerObjectRow($prj_uid);

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

@@ -62,6 +62,8 @@ class TriggersMigrator implements Importable, Exportable
{
try {
$oData = new \StdClass();
$tasks = $this->processes->getTaskRows($prj_uid);
$oData->steptriggers = $this->processes->getStepTriggerRows($tasks);
$oData->triggers = $this->processes->getTriggerRows($prj_uid);
$result = array(

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

@@ -175,8 +175,8 @@ abstract class Importer
} else {
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$objectList = $granularObj->loadObjectsListSelected($this->importData, $objectsToImport);
foreach ($objectList as $rowObject) {
if($rowObject['name'] === 'PROCESSDEFINITION'){
foreach($objectList as $rowObject) {
if($rowObject['name'] === 'PROCESSDEFINITION') {
$this->removeProject();
}
}