From d7b7ec3bff4cd04792a91a4c3cf231f77a596879 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 8 May 2015 16:45:32 -0400
Subject: [PATCH] IMPROVEMENT

---
 workflow/engine/classes/class.pmDynaform.php | 16 ++---
 workflow/engine/js/cases/core/pmDynaform.js  | 73 ++++++++++----------
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 46a5e5a63..a2a446301 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -35,10 +35,10 @@ class pmDynaform
 
     public function getDynaformTitle($idDynaform)
     {
-         $d = new Dynaform();
-         $d->setDynUid($idDynaform);
-         $titleDynaform = $d->getDynTitle();
-         return $titleDynaform;
+        $d = new Dynaform();
+        $d->setDynUid($idDynaform);
+        $titleDynaform = $d->getDynTitle();
+        return $titleDynaform;
     }
 
     public function getDynaform()
@@ -122,7 +122,7 @@ class pmDynaform
                     }
                 }
                 //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)) {
                         $json->data = array(
                             "value" => "",
@@ -162,7 +162,7 @@ class pmDynaform
                                 array_push($json->options, $option);
                             }
                         } catch (Exception $e) {
-
+                            
                         }
                     }
                     if (isset($json->options[0])) {
@@ -176,7 +176,7 @@ class pmDynaform
                     }
                 }
                 //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(
                         "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)
@@ -219,7 +219,7 @@ class pmDynaform
                             $cells = array();
                             foreach ($json->columns as $column) {
                                 //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(
                                         "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] : "")
diff --git a/workflow/engine/js/cases/core/pmDynaform.js b/workflow/engine/js/cases/core/pmDynaform.js
index 022bfbc63..06e987550 100644
--- a/workflow/engine/js/cases/core/pmDynaform.js
+++ b/workflow/engine/js/cases/core/pmDynaform.js
@@ -28,41 +28,42 @@ $(window).load(function () {
             workspace: workspace
         },
         token: credentials,
-        submitRest: false
-    });
-    var dyn_content_history = document.createElement("input");
-    dyn_content_history.type = "hidden";
-    dyn_content_history.name = "form[DYN_CONTENT_HISTORY]";
-    dyn_content_history.value = JSON.stringify(jsondata);
-    var dynaformname = document.createElement("input");
-    dynaformname.type = "hidden";
-    dynaformname.name = "__DynaformName__";
-    dynaformname.value = __DynaformName__;
-    var appuid = document.createElement("input");
-    appuid.type = "hidden";
-    appuid.name = "APP_UID";
-    appuid.value = app_uid;
-    var arrayRequired = document.createElement("input");
-    arrayRequired.type = "hidden";
-    arrayRequired.name = "DynaformRequiredFields";
-    arrayRequired.value = fieldsRequired;
-    var form = document.getElementsByTagName("form")[0];
-    form.action = filePost ? filePost : "cases_SaveData?UID=" + dyn_uid + "&APP_UID=" + app_uid;
-    form.method = "post";
-    //form.enctype = "multipart/form-data";
-    form.setAttribute("encType","multipart/form-data");
-    form.appendChild(dyn_content_history);
-    form.appendChild(dynaformname);
-    form.appendChild(appuid);
-    form.appendChild(arrayRequired);
-    var dyn_forward = document.getElementById("dyn_forward");
-    dyn_forward.onclick = function () {
-        if (window.project.getForms()[0].isValid()) {
-            form.submit();
+        submitRest: false,
+        onLoad: function () {
+            var dyn_content_history = document.createElement("input");
+            dyn_content_history.type = "hidden";
+            dyn_content_history.name = "form[DYN_CONTENT_HISTORY]";
+            dyn_content_history.value = JSON.stringify(jsondata);
+            var dynaformname = document.createElement("input");
+            dynaformname.type = "hidden";
+            dynaformname.name = "__DynaformName__";
+            dynaformname.value = __DynaformName__;
+            var appuid = document.createElement("input");
+            appuid.type = "hidden";
+            appuid.name = "APP_UID";
+            appuid.value = app_uid;
+            var arrayRequired = document.createElement("input");
+            arrayRequired.type = "hidden";
+            arrayRequired.name = "DynaformRequiredFields";
+            arrayRequired.value = fieldsRequired;
+            var form = document.getElementsByTagName("form")[0];
+            form.action = filePost ? filePost : "cases_SaveData?UID=" + dyn_uid + "&APP_UID=" + app_uid;
+            form.method = "post";
+            form.setAttribute("encType", "multipart/form-data");
+            form.appendChild(dyn_content_history);
+            form.appendChild(dynaformname);
+            form.appendChild(appuid);
+            form.appendChild(arrayRequired);
+            var dyn_forward = document.getElementById("dyn_forward");
+            dyn_forward.onclick = function () {
+                if (window.project.getForms()[0].isValid()) {
+                    form.submit();
+                }
+                return false;
+            };
+            if (triggerDebug === true) {
+                showdebug();
+            }
         }
-        return false;
-    };
-    if (triggerDebug === true) {
-        showdebug();
-    }
+    });
 });
\ No newline at end of file