Merge branch 'master' of bitbucket.org:colosa/processmaker

workflow/engine/js/cases/core/cases_Step_Pmdynaform.js

@@ -34,10 +34,12 @@ function validateNameField (form, type) {
     }
 }
 
-window.onload = function () {
+$(window).load(function () {
     var data = JSON.parse(jsondata);
-    var modelPMDynaform = new PMDynaform.Model.Form(data);
-    var viewPMDynaform = new PMDynaform.View.Form({tagName: "div", renderTo: $(".container"), model: modelPMDynaform});
+
+    window.dynaform = new PMDynaform.core.Project({
+        data: data
+    });
 
     if (pm_run_outside_main_app === 'true') {
         if (parent.showCaseNavigatorPanel) {
@@ -56,33 +58,33 @@ window.onload = function () {
 
     var type = document.createElement("input");
     type.type = "hidden";
-    type.value = "ASSIGN_TASK";
     type.name = "TYPE";
+    type.value = "ASSIGN_TASK";
 
     var uid = document.createElement("input");
     uid.type = "hidden";
-    uid.value = dyn_uid;
     uid.name = "UID";
+    uid.value = dyn_uid;
 
     var position = document.createElement("input");
     position.type = "hidden";
-    position.value = "10000";
     position.name = "POSITION";
+    position.value = "10000";
 
     var action = document.createElement("input");
     action.type = "hidden";
-    action.value = "ASSIGN";
     action.name = "ACTION";
+    action.value = "ASSIGN";
 
     var dynaformname = document.createElement("input");
     dynaformname.type = "hidden";
-    dynaformname.value = __DynaformName__;
     dynaformname.name = "__DynaformName__";
+    dynaformname.value = __DynaformName__;
 
     var appuid = document.createElement("input");
     appuid.type = "hidden";
-    appuid.value = app_uid;
     appuid.name = "APP_UID";
+    appuid.value = app_uid;
 
     form.action = "cases_SaveData?UID=" + dyn_uid + "&APP_UID=" + app_uid;
     form.method = "post";
@@ -92,5 +94,7 @@ window.onload = function () {
     form.appendChild(action);
     form.appendChild(dynaformname);
     form.appendChild(appuid);
-
-};
+    
+    var dyn_forward = document.getElementById("dyn_forward");
+    dyn_forward.href = "cases_Step?TYPE=" + type.value + "&UID=" + dyn_uid + "&POSITION=" + position.value + "&ACTION=" + action.value + "";
+});

workflow/engine/methods/cases/cases_SaveData.php

@@ -40,6 +40,23 @@ try {
     if ($_GET['APP_UID'] !== $_SESSION['APPLICATION']) {
         throw new Exception( G::LoadTranslation( 'ID_INVALID_APPLICATION_ID_MSG', array ('<a href=\'' . $_SERVER['HTTP_REFERER'] . '\'>{1}</a>',G::LoadTranslation( 'ID_REOPEN' ) ) ) );
     }
+    
+    /*
+     * PMDynaform
+     * DYN_VERSION is 1: classic Dynaform, 
+     * DYN_VERSION is 2: responsive form, Pmdynaform.
+     */
+    $a = new Criteria("workflow");
+    $a->addSelectColumn(DynaformPeer::DYN_VERSION);
+    $a->add(DynaformPeer::DYN_UID, $_GET['UID'], Criteria::EQUAL);
+    $a = ProcessPeer::doSelectRS($a);
+    $a->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+    $a->next();
+    $row = $a->getRow();
+    $swpmdynaform = isset($row) && $row["DYN_VERSION"] == 2;
+    if ($swpmdynaform) {
+        $pmdynaform = $_POST["form"];
+    }
 
     $oForm = new Form( $_SESSION["PROCESS"] . "/" . $_GET["UID"], PATH_DYNAFORM );
     $oForm->validatePost();
@@ -166,6 +183,10 @@ try {
     $aData['USER_UID'] = $_SESSION['USER_LOGGED'];
     //$aData['APP_STATUS'] = $Fields['APP_STATUS'];
     $aData['PRO_UID'] = $_SESSION['PROCESS'];
+    
+    if ($swpmdynaform) {
+        $aData['APP_DATA'] = array_merge($aData['APP_DATA'], $pmdynaform);
+    }
 
     $oCase->updateCase( $_SESSION['APPLICATION'], $aData );
 

workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php

@@ -162,6 +162,7 @@ class ProcessSupervisor
         try {
             require_once (PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Roles.php");
             $aRespLi = array();
+            $aRespLiGroups = array();
             $userRole = new \ProcessMaker\BusinessModel\User();
             // Groups
             $oCriteria = new \Criteria('workflow');

workflow/engine/templates/cases/cases_Step_Pmdynaform.html

@@ -33,7 +33,19 @@
                 <td width="100%" align="center">{CASE} #: {APP_NUMBER}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{TITLE}: {APP_TITLE}</td>
             </tr>
         </table>
-        <a style="float: left; margin: 10px 2px 2px 10px; cursor: pointer; opacity: 1;"><img src="/lib/img/pager-previous-icon.png" style="padding-right:5px;width:25px;height:20px;">Previous Step</a>
-        <a style="float: right; margin: 10px 10px 2px 2px; cursor: pointer; opacity: 1;">Next step<img src="/lib/img/pager-next-icon.png" style="padding-left:5px;width:25px;height:20px;"></a>
+
+        <div style="width:100%;padding: 0px 10px 0px 10px">
+            <img src="/images/bulletButtonLeft.gif" style="float:left;">&nbsp;
+            <a id="dyn_backward" href="" style="float:left;">
+            </a>
+
+
+            <img src="/images/bulletButton.gif" style="float:right;">&nbsp;
+            <a id="dyn_forward" href="" style="float:right;font-size:12px;line-height:1;margin:0px 5px 1px 0px;">
+                Next Step
+            </a>
+
+        </div>
+
     </body>
 </html>

workflow/engine/templates/cases/cases_Step_Pmdynaform_Preview.html

@@ -19,7 +19,5 @@
         <div id="container"></div>
         ###TEMPLATES###
         <script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script>
-        <a style="float: left; margin: 10px 2px 2px 10px; cursor: pointer; opacity: 1;"><img src="/lib/img/pager-previous-icon.png" style="padding-right:5px;width:25px;height:20px;">Previous Step</a>
-        <a style="float: right; margin: 10px 10px 2px 2px; cursor: pointer; opacity: 1;">Next step<img src="/lib/img/pager-next-icon.png" style="padding-left:5px;width:25px;height:20px;"></a>
     </body>
 </html>