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

PM-4299

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-12-04 17:31:37 -04:00
parent bd91599b53
commit 51ef39ef5c
1 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ class pmDynaform
$this->fields = $fields; $this->fields = $fields;
$this->getDynaform(); $this->getDynaform();
$this->getDynaforms(); $this->getDynaforms();
$this->synchronizeSubDynaform();
$this->getCredentials(); $this->getCredentials();
if (!isset($this->fields["APP_UID"])) { if (!isset($this->fields["APP_UID"])) {
$this->fields["APP_UID"] = null; $this->fields["APP_UID"] = null;
@@ -292,7 +293,16 @@ class pmDynaform
$json->data->label = ""; $json->data->label = "";
if (isset($this->fields["APP_DATA"][$json->name])) { if (isset($this->fields["APP_DATA"][$json->name])) {
$json->data->value = $this->fields["APP_DATA"][$json->name]; $json->data->value = $this->fields["APP_DATA"][$json->name];
$json->data->label = $this->fields["APP_DATA"][$json->name]; foreach ($json->options as $os) {
if (($json->data->value === true || $json->data->value === 1 || $json->data->value === "1") &&
($os->value === true || $os->value === 1 || $os->value === "1")) {
$json->data->label = $os->label;
}
if (($json->data->value === false || $json->data->value === 0 || $json->data->value === "0") &&
($os->value === false || $os->value === 0 || $os->value === "0")) {
$json->data->label = $os->label;
}
}
} }
} }
if ($key === "type" && ($value === "checkgroup")) { if ($key === "type" && ($value === "checkgroup")) {
@@ -494,7 +504,7 @@ class pmDynaform
if ($key === "type" && ($value === "form") && $this->records != null) { if ($key === "type" && ($value === "form") && $this->records != null) {
foreach ($this->records as $ri) { foreach ($this->records as $ri) {
if ($json->id === $ri["DYN_UID"] && !isset($json->jsonUpdate)) { if ($json->id === $ri["DYN_UID"] && !isset($json->jsonUpdate)) {
$jsonUpdate = json_decode($ri["DYN_CONTENT"]); $jsonUpdate = G::json_decode($ri["DYN_CONTENT"]);
$jsonUpdate = $jsonUpdate->items[0]; $jsonUpdate = $jsonUpdate->items[0];
$jsonUpdate->colSpan = $json->colSpan; $jsonUpdate->colSpan = $json->colSpan;
$jsonUpdate->jsonUpdate = true; $jsonUpdate->jsonUpdate = true;
@@ -544,7 +554,7 @@ class pmDynaform
$data[$json->variable === "" ? $json->id : $json->variable] = $json->options[0]->value; $data[$json->variable === "" ? $json->id : $json->variable] = $json->options[0]->value;
} }
if (isset($json->placeholder) && $json->placeholder !== "") { if (isset($json->placeholder) && $json->placeholder !== "") {
$data[$json->variable === "" ? $json->id : $json->variable] = $json->placeholder; $data[$json->variable === "" ? $json->id : $json->variable] = "";
} }
if (isset($json->defaultValue) && $json->defaultValue !== "") { if (isset($json->defaultValue) && $json->defaultValue !== "") {
$data[$json->variable === "" ? $json->id : $json->variable] = $json->defaultValue; $data[$json->variable === "" ? $json->id : $json->variable] = $json->defaultValue;
@@ -903,6 +913,41 @@ class pmDynaform
return $file; return $file;
} }
public function synchronizeSubDynaform()
{
if (!isset($this->record["DYN_CONTENT"])) {
return;
}
$json = G::json_decode($this->record["DYN_CONTENT"]);
foreach ($this->records as $ri) {
$jsonSearch = $this->jsonsf($json, $ri["DYN_UID"], "id");
if ($jsonSearch === null) {
continue;
}
$jsonUpdate = G::json_decode($ri["DYN_CONTENT"]);
$jsonUpdate = $jsonUpdate->items[0];
$jsonUpdate->colSpan = $jsonSearch->colSpan;
$this->jsonReplace($json, $ri["DYN_UID"], "id", $jsonUpdate);
}
$this->record["DYN_CONTENT"] = G::json_encode($json);
}
private function jsonReplace(&$json, $id, $for = "id", $update)
{
foreach ($json as $key => &$value) {
$sw1 = is_array($value);
$sw2 = is_object($value);
if ($sw1 || $sw2) {
$this->jsonReplace($value, $id, $for, $update);
}
if (!$sw1 && !$sw2) {
if ($key === $for && $id === $value) {
$json = $update;
}
}
}
}
public function synchronizeVariable($processUid, $newVariable, $oldVariable) public function synchronizeVariable($processUid, $newVariable, $oldVariable)
{ {
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");