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

HOR-2710

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-02-17 16:51:27 -04:00
parent 3c64e63d27
commit c8763b4205
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/engine/classes/class.pmDynaform.php
View File

@@ -181,6 +181,7 @@ class pmDynaform
if (empty($json)) {
return;
}
$dataGridEnvironment = [];
foreach ($json as $key => &$value) {
$sw1 = is_array($value);
$sw2 = is_object($value);
@@ -259,6 +260,9 @@ class pmDynaform
$dt = $parsed["SELECT"];
$isWhere = empty($where);
if ($isWhere === false) {
$where = substr_replace($where, " (", 5, 0) . ")";
}
if (!isset($json->queryField) && isset($dt[0]["base_expr"])) {
$col = $dt[0]["base_expr"];
$dv = str_replace("'", "''", $json->defaultValue);
@@ -628,6 +632,26 @@ class pmDynaform
}
//grid
if ($key === "type" && ($value === "grid")) {
//todo compatibility 'columnWidth'
foreach ($json->columns as $column) {
if (!isset($column->columnWidth) && $column->type !== "hidden") {
$json->layout = "static";
$column->columnWidth = "";
}
$column->parentIsGrid = true;
}
//data grid environment
$json->dataGridEnvironment = "onDataGridEnvironment";
if (isset($this->fields["APP_DATA"])) {
$dataGridEnvironment = $this->fields["APP_DATA"];
$this->fields["APP_DATA"] = [];
}
}
if ($key === "dataGridEnvironment" && ($value === "onDataGridEnvironment")) {
if (isset($this->fields["APP_DATA"])) {
$this->fields["APP_DATA"] = $dataGridEnvironment;
$dataGridEnvironment = [];
}
if (isset($this->fields["APP_DATA"][$json->name])) {
//rows
$rows = $this->fields["APP_DATA"][$json->name];
@@ -648,13 +672,6 @@ class pmDynaform
$json->rows = count($rows);
$json->data = $rows;
}
//todo compatibility 'columnWidth'
foreach ($json->columns as $column) {
if (!isset($column->columnWidth) && $column->type !== "hidden") {
$json->layout = "static";
$column->columnWidth = "";
}
}
}
//languages
if ($this->lang === null && $key === "language" && isset($json->language)) {