fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-3185

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-09-15 17:52:26 -04:00
parent d5c8707fcf
commit e2d419fca9
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
workflow/engine/classes/PmDynaform.php
View File

@@ -2,6 +2,7 @@
use ProcessMaker\Core\System;
use ProcessMaker\BusinessModel\DynaForm\SuggestTrait;
use ProcessMaker\BusinessModel\Cases;
/**
* Implementing pmDynaform library in the running case.
@@ -250,11 +251,6 @@ class PmDynaform
$dtFields = $json->queryInputData;
} else {
$dtFields = $this->getValuesDependentFields($json);
foreach ($dtFields as $keyF => $valueF) {
if (isset($this->fields["APP_DATA"][$keyF])) {
$dtFields[$keyF] = $this->fields["APP_DATA"][$keyF];
}
}
}
$sql = G::replaceDataField($json->sql, $dtFields);
if ($value === "suggest") {
@@ -610,7 +606,8 @@ class PmDynaform
$json->dataGridEnvironment = "onDataGridEnvironment";
if (isset($this->fields["APP_DATA"])) {
$dataGridEnvironment = $this->fields["APP_DATA"];
$this->fields["APP_DATA"] = [];
//Grids only access the global variables of 'ProcessMaker', other variables are removed.
$this->fields["APP_DATA"] = Cases::getGlobalVariables($this->fields["APP_DATA"]);
//restore AppData with dataVariable definition, only for columns control
foreach ($columnsDataVariable as $dge) {
if (isset($dataGridEnvironment[$dge])) {
@@ -691,7 +688,14 @@ class PmDynaform
if (!isset($this->record["DYN_CONTENT"])) {
return array();
}
$data = array();
$data = [];
if (isset($this->fields["APP_DATA"])) {
foreach ($this->fields["APP_DATA"] as $keyF => $valueF) {
if (!isset($data[$keyF]) && !is_array($valueF)) {
$data[$keyF] = $valueF;
}
}
}
if (isset($json->dbConnection) && isset($json->sql)) {
$result = array();
preg_match_all('/\@(?:([\@\%\#\=\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $json->sql, $result, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
@@ -708,18 +712,12 @@ class PmDynaform
}
}
if ($json->dbConnection !== "" && $json->dbConnection !== "none" && $json->sql !== "") {
if (isset($this->fields["APP_DATA"])) {
foreach ($this->fields["APP_DATA"] as $keyA => $valueA) {
if (!isset($data[$keyA]) && !is_array($valueA)) {
$data[$keyA] = $valueA;
}
}
}
$sql = G::replaceDataField($json->sql, $data);
$dt = $this->getCacheQueryData($json->dbConnection, $sql, $json->type);
$row = isset($dt[0]) ? $dt[0] : [];
if (isset($row[0]) && $json->type !== "suggest" && $json->type !== "radio") {
$data[$json->variable === "" ? $json->id : $json->variable] = $row[0];
$index = $json->variable === "" ? $json->id : $json->variable;
if (!isset($data[$index]) && isset($row[0]) && $json->type !== "suggest" && $json->type !== "radio") {
$data[$index] = $row[0];
}
}
}

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

@@ -1680,6 +1680,7 @@ class Cases
if (!is_null($dynaFormUid)) {
$data["APP_DATA"] = $fields['APP_DATA'];
$data["CURRENT_DYNAFORM"] = $dynaFormUid;
$pmDynaForm = new PmDynaform($data);
$arrayDynaFormData = $pmDynaForm->getDynaform();

7
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -5,6 +5,7 @@ use G;
use Exception;
use AdditionalTables;
use PmDynaform;
use ProcessMaker\BusinessModel\Cases;
class Variable
{
@@ -778,6 +779,7 @@ class Variable
$fields = $case->loadCase($appUid, $delIndex);
$appData = $fields["APP_DATA"];
$appData = array_merge($appData, \ProcessMaker\BusinessModel\Cases::getGlobalVariables($appData));
$paramsWithoutAppData = $params;
$params = array_merge($appData, $params);
}
@@ -795,6 +797,11 @@ class Variable
$field->queryFilter = $filter;
$field->queryStart = $start;
$field->queryLimit = $limit;
//Grids only access the global variables of 'ProcessMaker', other variables are removed.
if (isset($field->columnWidth)) {
$pmDynaform->fields["APP_DATA"] = Cases::getGlobalVariables($appData);
$field->queryInputData = $paramsWithoutAppData;
}
//Populate control data
$pmDynaform->jsonr($field);