Merged colosa/processmaker into master

workflow/engine/classes/class.derivation.php

@@ -195,11 +195,7 @@ class Derivation
 
                     $pmScript = new PMScript();
                     $pmScript->setFields($arrayApplicationData["APP_DATA"]);
-                    if(preg_match('/\b(or|and|xor)\b/i' , $arrayRouteData["ROU_CONDITION"])) {
-                        $pmScript->setScript("( ".$arrayRouteData["ROU_CONDITION"]." )");
-                    } else {
-                        $pmScript->setScript($arrayRouteData["ROU_CONDITION"]);
-                    } 
+                    $pmScript->setScript($arrayRouteData["ROU_CONDITION"]);
                     $flagContinue = $pmScript->evaluate();
                 }
 

workflow/engine/classes/class.pmDynaform.php

@@ -147,7 +147,7 @@ class pmDynaform
                         $items[$key]->data = $rows;
                     }
                     if ($items[$key]->type !== "grid") {
-                        $value = "";
+                        $value = $this->data[$items[$key]->name];
                         $label = "";
                         if (isset($this->data[$items[$key]->name . "_label"])) {
                             $value = $this->data[$items[$key]->name];

workflow/engine/classes/class.pmScript.php

@@ -491,6 +491,9 @@ class PMScript
             }
         }
         $sScript .= substr( $this->sScript, $iAux );
+        if(preg_match('/\b(or|and|xor)\b/i' , $sScript)) {
+            $sScript = "( ".$sScript." )";
+        } 
         $sScript = '$bResult = ' . $sScript . ';';
         // checks if the syntax is valid or if the variables in that condition has been previously defined
         if ($this->validSyntax( $sScript ) && $variableIsDefined) {

workflow/engine/classes/model/Process.php

@@ -182,7 +182,7 @@ class Process extends BaseProcess
             $this->setProCategory( $aData['PRO_CATEGORY'] );
             $this->setProSubCategory( '' );
             $this->setProIndustry( '' );
-            $this->setProCreateDate( 'now' );
+            $this->setProCreateDate( date("Y-m-d H:i:s") );
             $this->setProCreateUser( $aData['USR_UID'] );
             $this->setProHeight( 5000 );
             $this->setProWidth( 10000 );

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

@@ -44,15 +44,6 @@ $(window).load(function () {
         token: credentials,
         submitRest: false
     });
-    new PMDynaform.core.Proxy({
-        url: "http://" + window.project.keys.server + "/" + window.project.keys.apiName + "/" + window.project.keys.apiVersion + "/" + window.project.keys.workspace + "/cases/" + app_uid + "/variables",
-        method: 'GET',
-        data: {},
-        keys: window.project.token,
-        successCallback: function (xhr, response) {
-            window.project.setData2(response);
-        }
-    });
 
     var type = document.createElement("input");
     type.type = "hidden";

workflow/engine/methods/processes/processes_Ajax.php

@@ -119,7 +119,7 @@ try {
     
     if($proUid != "") {
         $valuesProcess['PRO_UID'] = $proUid;
-        $valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:m:i");
+        $valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:i:s");
         G::LoadClass('processes');
         $infoProcess = new Processes();
         $resultProcess = $infoProcess->updateProcessRow($valuesProcess);

workflow/engine/methods/processes/processes_Save.php

@@ -96,6 +96,7 @@ switch ($function) {
 $resultProcessNew = $infoProcess->load($_POST['form']['PRO_UID']);
 $oldFields = array_diff_assoc($resultProcessOld,$resultProcessNew);
 $newFields = array_diff_assoc($resultProcessNew,$resultProcessOld);
+$fields = array();
 
 if(array_key_exists('PRO_TITLE', $newFields)) {
     $fields[] = G::LoadTranslation('ID_TITLE');
@@ -142,4 +143,12 @@ if(array_key_exists('PRO_TRI_UNPAUSED', $newFields)) {
 if(array_key_exists('PRO_TYPE_PROCESS', $newFields)) {
     $fields[] = "Type of process (only owners can edit private processes)";
 }
-G::auditLog('EditProcess','Edit fields ('.implode(', ',$fields).') in process "'.$_POST['form']['PRO_TITLE'].'"');
+G::auditLog('EditProcess','Edit fields ('.implode(', ',$fields).') in process "'.$_POST['form']['PRO_TITLE'].'"');
+
+if(isset($_POST['form']['PRO_UID']) && !empty($_POST['form']['PRO_UID'])) {
+    $valuesProcess['PRO_UID'] = $_POST['form']['PRO_UID'];
+    $valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:i:s"); 
+    G::LoadClass('processes');
+    $infoProcess = new Processes();
+    $resultProcess = $infoProcess->updateProcessRow($valuesProcess);
+}

workflow/engine/methods/tasks/tasks_Ajax.php

@@ -120,13 +120,13 @@ try {
             $oTaskNewPattern = new Task();
             $taskInfo=$oTaskNewPattern->load($aData['TAS_UID']);
             $titleTask=$taskInfo['TAS_TITLE'];
-            $values='';
+            $taskProperties='';
             foreach ($aData as $key => $value){
                 if ($value!='') {
-                    $values.=$key.' -> '.$value.' ';
+                    $taskProperties.=$key.' -> '.$value.' ';
                 }
             }
-            G::auditLog("OptionsMenuTask","Update Task DETAILS : ".$values);
+            G::auditLog("SaveTaskProperties","Task Properties DETAILS : ".$taskProperties);
             $response["status"] = "OK";
 
             if ($result == 3) {

workflow/engine/templates/processes/main.js

@@ -67,7 +67,7 @@ Ext.onReady(function(){
         /*----------------------------------********---------------------------------*/
         ,{name : "PRO_TYPE_PROCESS", type: "string"}
         /*----------------------------------********---------------------------------*/
-        ,{name : "PRO_UPDATE_DATE"}
+        ,{name : "PRO_UPDATE_DATE"} 
       ]
     }),