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

HOR-1030

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2016-05-19 14:42:05 -04:00
parent dc0658e90a
commit 527efbe871
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -805,15 +805,12 @@ class Light extends Api
$dynaForm->setFormatFieldNameInUppercase(false); $dynaForm->setFormatFieldNameInUppercase(false);
$oMobile = new \ProcessMaker\BusinessModel\Light(); $oMobile = new \ProcessMaker\BusinessModel\Light();
$step = new \ProcessMaker\Services\Api\Project\Activity\Step(); $step = new \ProcessMaker\Services\Api\Project\Activity\Step();
\G::LoadClass("pmDynaform");
$pmDynaForm = new \pmDynaform();
$response = array(); $response = array();
for ($i = 0; $i < count($activitySteps); $i++) { for ($i = 0; $i < count($activitySteps); $i++) {
if ($activitySteps[$i]['step_type_obj'] == "DYNAFORM") { if ($activitySteps[$i]['step_type_obj'] == "DYNAFORM") {
$dataForm = $dynaForm->getDynaForm($activitySteps[$i]['step_uid_obj']); $dataForm = $dynaForm->getDynaForm($activitySteps[$i]['step_uid_obj']);
$result = $this->parserDataDynaForm($dataForm); $result = $this->parserDataDynaForm($dataForm);
$result['formContent'] = (isset($result['formContent']) && $result['formContent'] != null)?json_decode($result['formContent']):""; $result["formUpdateDate"] = \ProcessMaker\Util\DateTime::convertUtcToIso8601($result["formUpdateDate"]);
$pmDynaForm->jsonr($result['formContent']);
$result['index'] = $i; $result['index'] = $i;
$result['stepId'] = $activitySteps[$i]["step_uid"]; $result['stepId'] = $activitySteps[$i]["step_uid"];
$result['stepUidObj'] = $activitySteps[$i]["step_uid_obj"]; $result['stepUidObj'] = $activitySteps[$i]["step_uid_obj"];
@@ -821,6 +818,7 @@ class Light extends Api
$result['stepPosition'] = $activitySteps[$i]['step_position']; $result['stepPosition'] = $activitySteps[$i]['step_position'];
$trigger = $oMobile->statusTriggers($step->doGetActivityStepTriggers($activitySteps[$i]["step_uid"], $act_uid, $prj_uid)); $trigger = $oMobile->statusTriggers($step->doGetActivityStepTriggers($activitySteps[$i]["step_uid"], $act_uid, $prj_uid));
$result["triggers"] = $trigger; $result["triggers"] = $trigger;
unset($result["formContent"]);
$response[] = $result; $response[] = $result;
} }
} }
@@ -948,8 +946,8 @@ class Light extends Api
'dyn_uid' => 'formId', 'dyn_uid' => 'formId',
'dyn_title' => 'formTitle', 'dyn_title' => 'formTitle',
'dyn_description' => 'formDescription', 'dyn_description' => 'formDescription',
//'dyn_type' => 'formType', 'dyn_content' => 'formContent',
'dyn_content' => 'formContent' 'dyn_update_date' => 'formUpdateDate'
); );
$response = $this->replaceFields($data, $structure); $response = $this->replaceFields($data, $structure);