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

IMPROVEMENT

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-05-08 16:45:32 -04:00
parent c518d45b1f
commit d7b7ec3bff
2 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,10 @@ class pmDynaform
public function getDynaformTitle($idDynaform) public function getDynaformTitle($idDynaform)
{ {
$d = new Dynaform(); $d = new Dynaform();
$d->setDynUid($idDynaform); $d->setDynUid($idDynaform);
$titleDynaform = $d->getDynTitle(); $titleDynaform = $d->getDynTitle();
return $titleDynaform; return $titleDynaform;
} }
public function getDynaform() public function getDynaform()
@@ -122,7 +122,7 @@ class pmDynaform
} }
} }
//query & options //query & options
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest" || $value === "checkbox" || $value === "radio" || $value === "datetime")) { if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest" || $value === "checkbox" || $value === "radio" || $value === "datetime" || $value === "hidden")) {
if (!isset($json->data)) { if (!isset($json->data)) {
$json->data = array( $json->data = array(
"value" => "", "value" => "",
@@ -162,7 +162,7 @@ class pmDynaform
array_push($json->options, $option); array_push($json->options, $option);
} }
} catch (Exception $e) { } catch (Exception $e) {
} }
} }
if (isset($json->options[0])) { if (isset($json->options[0])) {
@@ -176,7 +176,7 @@ class pmDynaform
} }
} }
//data //data
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "suggest" || $value === "dropdown" || $value === "checkbox" || $value === "radio" || $value === "datetime")) { if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "suggest" || $value === "dropdown" || $value === "checkbox" || $value === "radio" || $value === "datetime" || $value === "hidden")) {
$json->data = array( $json->data = array(
"value" => isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : (is_array($json->data) ? $json->data["value"] : $json->data->value), "value" => isset($this->fields["APP_DATA"][$json->name]) ? $this->fields["APP_DATA"][$json->name] : (is_array($json->data) ? $json->data["value"] : $json->data->value),
"label" => isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (is_array($json->data) ? $json->data["label"] : $json->data->label) "label" => isset($this->fields["APP_DATA"][$json->name . "_label"]) ? $this->fields["APP_DATA"][$json->name . "_label"] : (is_array($json->data) ? $json->data["label"] : $json->data->label)
@@ -219,7 +219,7 @@ class pmDynaform
$cells = array(); $cells = array();
foreach ($json->columns as $column) { foreach ($json->columns as $column) {
//data //data
if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link") { if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $value === "hidden") {
array_push($cells, array( array_push($cells, array(
"value" => isset($row[$column->name]) ? $row[$column->name] : "", "value" => isset($row[$column->name]) ? $row[$column->name] : "",
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "") "label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "")

73
workflow/engine/js/cases/core/pmDynaform.js
View File

@@ -28,41 +28,42 @@ $(window).load(function () {
workspace: workspace workspace: workspace
}, },
token: credentials, token: credentials,
submitRest: false submitRest: false,
}); onLoad: function () {
var dyn_content_history = document.createElement("input"); var dyn_content_history = document.createElement("input");
dyn_content_history.type = "hidden"; dyn_content_history.type = "hidden";
dyn_content_history.name = "form[DYN_CONTENT_HISTORY]"; dyn_content_history.name = "form[DYN_CONTENT_HISTORY]";
dyn_content_history.value = JSON.stringify(jsondata); dyn_content_history.value = JSON.stringify(jsondata);
var dynaformname = document.createElement("input"); var dynaformname = document.createElement("input");
dynaformname.type = "hidden"; dynaformname.type = "hidden";
dynaformname.name = "__DynaformName__"; dynaformname.name = "__DynaformName__";
dynaformname.value = __DynaformName__; dynaformname.value = __DynaformName__;
var appuid = document.createElement("input"); var appuid = document.createElement("input");
appuid.type = "hidden"; appuid.type = "hidden";
appuid.name = "APP_UID"; appuid.name = "APP_UID";
appuid.value = app_uid; appuid.value = app_uid;
var arrayRequired = document.createElement("input"); var arrayRequired = document.createElement("input");
arrayRequired.type = "hidden"; arrayRequired.type = "hidden";
arrayRequired.name = "DynaformRequiredFields"; arrayRequired.name = "DynaformRequiredFields";
arrayRequired.value = fieldsRequired; arrayRequired.value = fieldsRequired;
var form = document.getElementsByTagName("form")[0]; var form = document.getElementsByTagName("form")[0];
form.action = filePost ? filePost : "cases_SaveData?UID=" + dyn_uid + "&APP_UID=" + app_uid; form.action = filePost ? filePost : "cases_SaveData?UID=" + dyn_uid + "&APP_UID=" + app_uid;
form.method = "post"; form.method = "post";
//form.enctype = "multipart/form-data"; form.setAttribute("encType", "multipart/form-data");
form.setAttribute("encType","multipart/form-data"); form.appendChild(dyn_content_history);
form.appendChild(dyn_content_history); form.appendChild(dynaformname);
form.appendChild(dynaformname); form.appendChild(appuid);
form.appendChild(appuid); form.appendChild(arrayRequired);
form.appendChild(arrayRequired); var dyn_forward = document.getElementById("dyn_forward");
var dyn_forward = document.getElementById("dyn_forward"); dyn_forward.onclick = function () {
dyn_forward.onclick = function () { if (window.project.getForms()[0].isValid()) {
if (window.project.getForms()[0].isValid()) { form.submit();
form.submit(); }
return false;
};
if (triggerDebug === true) {
showdebug();
}
} }
return false; });
};
if (triggerDebug === true) {
showdebug();
}
}); });