fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
marcelo.cuiza
2015-07-14 12:43:25 -04:00
parent 8d109e2821 869f1cae08
commit e1f2194fbc
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ class pmDynaform
public $credentials = null;
public $lang = null;
public $langs = null;
private $dependent = null; //todo
public function __construct($fields = array())
{
@@ -184,6 +185,21 @@ class pmDynaform
if ($json->data["label"] === "") {
$json->data["label"] = $json->data["value"];
}
//synchronize data label
$withoutOptions = true;
foreach ($json->options as $io) {
if ($json->data["value"] === $io["value"]) {
if ($json->data["label"] != $io["label"]) {
$this->dependent = $json->variable; //todo
$json->data["label"] = $io["label"];
$withoutOptions = false;
}
}
}
if ($withoutOptions) {
$json->data["label"] = $json->data["value"];//todo
}
//end synchronize data label
}
if ($key === "type" && ($value === "checkbox")) {
$json->data = array(
@@ -253,6 +269,27 @@ class pmDynaform
}
}
public function jsond(&$json)
{
foreach ($json as $key => &$value) {
$sw1 = is_array($value);
$sw2 = is_object($value);
if ($sw1 || $sw2) {
$this->jsond($value);
}
if (!$sw1 && !$sw2) {
if (isset($json->dbConnection) && $json->dbConnection !== "" && $json->dbConnection !== "none" && isset($json->sql) && $json->sql != "") {
$prefix = array("@@", "@#", "@%", "@?", "@$", "@=");
foreach ($prefix as $val) {
if (strpos($json->sql, $val . $this->dependent) !== false) {
$json->data = array("value" => "", "label" => "");
}
}
}
}
}
}
public function isResponsive()
{
return $this->record != null && $this->record["DYN_VERSION"] == 2 ? true : false;
@@ -273,6 +310,7 @@ class pmDynaform
}
$this->jsonr($json);
$this->jsond($json); //todo
$javascript = "
<script type=\"text/javascript\">
@@ -329,6 +367,7 @@ class pmDynaform
ob_clean();
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->jsond($json); //todo
$javascrip = "" .
"<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" .
@@ -374,6 +413,7 @@ class pmDynaform
ob_clean();
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->jsond($json); //todo
if (!isset($this->fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["PREVIOUS_STEP"])) {
$this->fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["PREVIOUS_STEP"] = "";
}
@@ -421,6 +461,7 @@ class pmDynaform
ob_clean();
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->jsond($json); //todo
$javascrip = "" .
"<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" .
@@ -456,6 +497,7 @@ class pmDynaform
$this->record = $record;
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->jsond($json); //todo
$javascrip = "" .
"<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" .
@@ -487,6 +529,7 @@ class pmDynaform
{
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->jsond($json); //todo
$javascrip = "" .
"<script type='text/javascript'>" .
"var jsonData = " . G::json_encode($json) . ";" .
@@ -505,6 +548,7 @@ class pmDynaform
$this->record = $record;
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->jsond($json); //todo
$javascrip = "" .
"<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" .

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

@@ -75,7 +75,12 @@ class Variable
$variable->setVarDefault($arrayData["VAR_DEFAULT"]);
}
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$encodeAcceptedValues = json_encode($arrayData["VAR_ACCEPTED_VALUES"]);
$VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"];
foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE, 'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE, 'UTF-8');
}
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues);
}
$variable->save();
@@ -168,7 +173,12 @@ class Variable
$variable->setVarDefault($arrayData["VAR_DEFAULT"]);
}
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$encodeAcceptedValues = json_encode($arrayData["VAR_ACCEPTED_VALUES"]);
$VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"];
foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE,'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE,'UTF-8');
}
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues);
}
$variable->save();