From 0b61895f573ce8bbd243f515b795e4ba0c66247a Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 20 Feb 2015 11:49:32 -0400 Subject: [PATCH 1/5] PM-936 Agregar columna en lista de procesos Se agrego la columna que indica la fecha de la ultima modificacion, de cualquier evento o cambio en el proceso Add a column in the list of processes with the last updated date --- workflow/engine/classes/model/Process.php | 2 +- workflow/engine/methods/processes/processes_Ajax.php | 2 +- workflow/engine/methods/processes/processes_Save.php | 12 +++++++++++- workflow/engine/templates/processes/main.js | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php index 0cf034466..738f20c0b 100755 --- a/workflow/engine/classes/model/Process.php +++ b/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 ); diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 2781def1a..161e681cf 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/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); diff --git a/workflow/engine/methods/processes/processes_Save.php b/workflow/engine/methods/processes/processes_Save.php index ed4eed37f..97f330e61 100755 --- a/workflow/engine/methods/processes/processes_Save.php +++ b/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,13 @@ 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'].'"'); \ No newline at end of file +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); + $resultProcess = $infoProcess->getProcessRow($_POST['form']['PRO_UID']); +} \ No newline at end of file diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 68362bea2..ce212781e 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -231,7 +231,7 @@ Ext.onReady(function(){ ] }), store: store, - tbar:[ + tbar:[ { xtype: 'tbsplit', text: _('ID_NEW'), From 605c22c1017114ff5b24dd88a151be0839ee123b Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 20 Feb 2015 13:10:58 -0400 Subject: [PATCH 2/5] PM-1492 Las condiciones no funcionan correctamente, si es que no estan dentro de parentesis (). Se encapsulo en parentesis toda condicion dada que contenga un operador logico. --- workflow/engine/classes/class.derivation.php | 6 +----- workflow/engine/classes/class.pmScript.php | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index e562cc92b..31568ac60 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/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(); } diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php index 1e9d16d70..326f7d8d5 100644 --- a/workflow/engine/classes/class.pmScript.php +++ b/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) { From f6877ba27dd03690178e6d6a0cc3d771e3ca0d7c Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Fri, 20 Feb 2015 14:26:57 -0400 Subject: [PATCH 3/5] PM-936 Agregar columna en lista de procesos Se agrego la columna que indica la fecha de la ultima modificacion, de cualquier evento o cambio en el proceso --- workflow/engine/classes/model/Process.php | 2 +- workflow/engine/methods/processes/processes_Save.php | 1 - workflow/engine/templates/processes/main.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php index 738f20c0b..e30e0ed97 100755 --- a/workflow/engine/classes/model/Process.php +++ b/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( date('Y-m-d H:i:s') ); + $this->setProCreateDate( date("Y-m-d H:i:s") ); $this->setProCreateUser( $aData['USR_UID'] ); $this->setProHeight( 5000 ); $this->setProWidth( 10000 ); diff --git a/workflow/engine/methods/processes/processes_Save.php b/workflow/engine/methods/processes/processes_Save.php index 97f330e61..472756449 100755 --- a/workflow/engine/methods/processes/processes_Save.php +++ b/workflow/engine/methods/processes/processes_Save.php @@ -151,5 +151,4 @@ if(isset($_POST['form']['PRO_UID']) && !empty($_POST['form']['PRO_UID'])) { G::LoadClass('processes'); $infoProcess = new Processes(); $resultProcess = $infoProcess->updateProcessRow($valuesProcess); - $resultProcess = $infoProcess->getProcessRow($_POST['form']['PRO_UID']); } \ No newline at end of file diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index ce212781e..e57dd8892 100755 --- a/workflow/engine/templates/processes/main.js +++ b/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"} ] }), @@ -231,7 +231,7 @@ Ext.onReady(function(){ ] }), store: store, - tbar:[ + tbar:[ { xtype: 'tbsplit', text: _('ID_NEW'), From b5c2b2705e013d68cde6eec067d5ba890ccafe8b Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 20 Feb 2015 14:43:05 -0400 Subject: [PATCH 4/5] PM-1583A Audit Log para Routing Rules, Start Event, End Event. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Causa: Solo se tiene un auditLog para la seccion ADMIN. SolucióSe utiliza el metodo auditLog(), misma que es utilizado en la seccion ADMIN, mas especificamente se crea un auditlog para la seccion "Routing Rules" del Diseñr. --- workflow/engine/methods/tasks/tasks_Ajax.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php index 5d492c7ab..795a13a82 100755 --- a/workflow/engine/methods/tasks/tasks_Ajax.php +++ b/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) { From a80999e98800cbdf40579410902400107beebb2c Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 20 Feb 2015 14:45:45 -0400 Subject: [PATCH 5/5] PM-1340 IMPROVEMENT --- workflow/engine/classes/class.pmDynaform.php | 2 +- workflow/engine/js/cases/core/cases_Step_Pmdynaform.js | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index fe25aab0b..f36345274 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/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]; diff --git a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js index 7c3d77aaa..3e0ed137a 100644 --- a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js +++ b/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";