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

HOR-3687

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-08-14 16:04:57 -04:00
parent 7e9a6958f4
commit a10a59a273
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -9,6 +9,7 @@ use ProcessMaker\Plugins\PluginRegistry;
use Exception; use Exception;
use wsBase; use wsBase;
use RBAC; use RBAC;
use pmDynaform;
/** /**
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
@@ -1620,42 +1621,28 @@ class Cases
* @param array $form * @param array $form
* @param array $appData * @param array $appData
* @param array $caseVariable * @param array $caseVariable
* * @return array
* return array Return array
*/ */
private function __getFieldsAndValuesByDynaFormAndAppData(array $form, array $appData, array $caseVariable) private function __getFieldsAndValuesByDynaFormAndAppData(array $form, array $appData, array $caseVariable)
{ {
try { try {
$caseVariableAux = [];
foreach ($form['items'] as $value) { foreach ($form['items'] as $value) {
foreach ($value as $value2) { foreach ($value as $field) {
$field = $value2;
if (isset($field['type'])) { if (isset($field['type'])) {
if ($field['type'] != 'form') { if ($field['type'] != 'form') {
foreach ($field as &$val) { foreach ($field as $key => $val) {
if (is_string($val) && in_array(substr($val, 0, 2), \pmDynaform::$prefixs)) { if (is_string($val) && in_array(substr($val, 0, 2), pmDynaform::$prefixs)) {
$val = substr($val, 2); $field[$key] = substr($val, 2);
} }
} }
foreach ($appData as $key => $valueKey) { foreach ($appData as $key => $val) {
if (in_array($key, $field, true) != false) { if (in_array($key, $field, true) != false) {
$keyname = array_search($key, $field); $caseVariable[$key] = $appData[$key];
if (isset($field['dataType']) && $field['dataType'] != 'grid') { if (isset($appData[$key . '_label'])) {
$caseVariable[$field[$keyname]] = $appData[$field[$keyname]]; $caseVariable[$key . '_label'] = $appData[$key . '_label'];
if (isset($appData[$field[$keyname] . '_label'])) {
$caseVariable[$field[$keyname] . '_label'] = $appData[$field[$keyname] . '_label'];
} else {
$caseVariable[$field[$keyname] . '_label'] = '';
}
} else {
$caseVariable[$field[$keyname]] = $appData[$field[$keyname]];
} }
} }
} }
} else { } else {
$caseVariableAux = $this->__getFieldsAndValuesByDynaFormAndAppData($field, $appData, $caseVariable); $caseVariableAux = $this->__getFieldsAndValuesByDynaFormAndAppData($field, $appData, $caseVariable);
$caseVariable = array_merge($caseVariable, $caseVariableAux); $caseVariable = array_merge($caseVariable, $caseVariableAux);
@@ -1663,10 +1650,8 @@ class Cases
} }
} }
} }
//Return
return $caseVariable; return $caseVariable;
} catch (Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }
} }