From a596e2d668534a75afef99a74734da317cf6214a Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 19 Feb 2015 13:11:01 -0400 Subject: [PATCH 1/3] 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. --- .../engine/methods/patterns/patterns_Ajax.php | 132 ++++++++++++++---- .../methods/processes/processes_Ajax.php | 78 ++++++++++- workflow/engine/methods/tasks/tasks_Ajax.php | 5 +- 3 files changed, 188 insertions(+), 27 deletions(-) diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php index a4dd11346..e30d1828d 100755 --- a/workflow/engine/methods/patterns/patterns_Ajax.php +++ b/workflow/engine/methods/patterns/patterns_Ajax.php @@ -34,31 +34,35 @@ $oTasks = new Tasks(); $rou_id = 0; switch ($aData['action']) { case 'savePattern': - //if ($aData['ROU_TYPE'] != $aData['ROU_TYPE_OLD']) - //{ + //if ($aData['ROU_TYPE'] != $aData['ROU_TYPE_OLD']) + //{ $oTasks->deleteAllRoutesOfTask( $aData['PROCESS'], $aData['TASK'] ); - //} + //} require_once 'classes/model/Route.php'; $oRoute = new Route(); switch ($aData['ROU_TYPE']) { case 'SEQUENTIAL': - case 'SEC-JOIN': - /*if ($aData['ROU_UID'] != '') - { - $aFields['ROU_UID'] = $aData['ROU_UID']; - }*/ + case 'SEC-JOIN': + /*if ($aData['ROU_UID'] != '') + { + $aFields['ROU_UID'] = $aData['ROU_UID']; + }*/ $aFields['PRO_UID'] = $aData['PROCESS']; $aFields['TAS_UID'] = $aData['TASK']; $aFields['ROU_NEXT_TASK'] = $aData['ROU_NEXT_TASK']; $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; - //$aFields['ROU_TO_LAST_USER'] = $aData['ROU_TO_LAST_USER']; + //$aFields['ROU_TO_LAST_USER'] = $aData['ROU_TO_LAST_USER']; $rou_id = $oRoute->create( $aFields ); break; case 'SELECT': + $tasksAffected=''; + $oTaskSavePattern = new Task(); + $oTaskSavePattern->load($aData['TASK']); + $titleTask=$oTaskSavePattern->getTasTitle(); foreach ($aData['GRID_SELECT_TYPE'] as $iKey => $aRow) { - /*if ($aRow['ROU_UID'] != '') - { - $aFields['ROU_UID'] = $aRow['ROU_UID']; + /*if ($aRow['ROU_UID'] != '') + { + $aFields['ROU_UID'] = $aRow['ROU_UID']; }*/ $aFields['PRO_UID'] = $aData['PROCESS']; $aFields['TAS_UID'] = $aData['TASK']; @@ -66,16 +70,40 @@ switch ($aData['action']) { $aFields['ROU_CASE'] = $iKey; $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION']; - //$aFields['ROU_TO_LAST_USER'] = $aRow['ROU_TO_LAST_USER']; + //$aFields['ROU_TO_LAST_USER'] = $aRow['ROU_TO_LAST_USER']; $rou_id = $oRoute->create( $aFields ); + if ($aRow['ROU_NEXT_TASK']=='-1') { + if ($aRow['ROU_CONDITION']=='') { + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> Empty; '; + }else{ + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + } + }else{ + $oTaskSaveNextPattern = new Task(); + $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + if ($aRow['ROU_CONDITION']=='') { + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> Empty ; '; + }else{ + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> '.$aFields['ROU_CONDITION'].' ; '; + } + } unset( $aFields ); } + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess=$oProcessNewPattern->getProTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'EVALUATE': + $tasksAffected=''; + $oTaskSavePattern = new Task(); + $oTaskSavePattern->load($aData['TASK']); + $titleTask=$oTaskSavePattern->getTasTitle(); foreach ($aData['GRID_EVALUATE_TYPE'] as $iKey => $aRow) { - /*if ($aRow['ROU_UID'] != '') - { - $aFields['ROU_UID'] = $aRow['ROU_UID']; + /*if ($aRow['ROU_UID'] != '') + { + $aFields['ROU_UID'] = $aRow['ROU_UID']; }*/ $aFields['PRO_UID'] = $aData['PROCESS']; $aFields['TAS_UID'] = $aData['TASK']; @@ -83,16 +111,40 @@ switch ($aData['action']) { $aFields['ROU_CASE'] = $iKey; $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION']; - //$aFields['ROU_TO_LAST_USER'] = $aRow['ROU_TO_LAST_USER']; + //$aFields['ROU_TO_LAST_USER'] = $aRow['ROU_TO_LAST_USER']; $rou_id = $oRoute->create( $aFields ); + if ($aRow['ROU_NEXT_TASK']=='-1') { + if ($aRow['ROU_CONDITION']=='') { + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End OfProcces Condition -> Empty; '; + }else{ + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + } + }else{ + $oTaskSaveNextPattern = new Task(); + $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + if ($aRow['ROU_CONDITION']=='') { + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> Empty ; '; + }else{ + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> '.$aFields['ROU_CONDITION'].' ; '; + } + } unset( $aFields ); } + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess=$oProcessNewPattern->getProTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'PARALLEL': + $tasksAffected=''; + $oTaskSavePattern = new Task(); + $oTaskSavePattern->load($aData['TASK']); + $titleTask=$oTaskSavePattern->getTasTitle(); foreach ($aData['GRID_PARALLEL_TYPE'] as $iKey => $aRow) { - /*if ($aRow['ROU_UID'] != '') - { - $aFields['ROU_UID'] = $aRow['ROU_UID']; + /*if ($aRow['ROU_UID'] != '') + { + $aFields['ROU_UID'] = $aRow['ROU_UID']; }*/ $aFields['PRO_UID'] = $aData['PROCESS']; $aFields['TAS_UID'] = $aData['TASK']; @@ -100,14 +152,26 @@ switch ($aData['action']) { $aFields['ROU_CASE'] = $iKey; $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $rou_id = $oRoute->create( $aFields ); + $oTaskSaveNextPattern = new Task(); + $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' ; '; unset( $aFields ); } + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess=$oProcessNewPattern->getProTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'PARALLEL-BY-EVALUATION': + $tasksAffected=''; + $oTaskSavePattern = new Task(); + $oTaskSavePattern->load($aData['TASK']); + $titleTask=$oTaskSavePattern->getTasTitle(); foreach ($aData['GRID_PARALLEL_EVALUATION_TYPE'] as $iKey => $aRow) { - /*if ($aRow['ROU_UID'] != '') - { - $aFields['ROU_UID'] = $aRow['ROU_UID']; + /*if ($aRow['ROU_UID'] != '') + { + $aFields['ROU_UID'] = $aRow['ROU_UID']; }*/ $aFields['PRO_UID'] = $aData['PROCESS']; @@ -119,10 +183,30 @@ switch ($aData['action']) { if (isset( $aRow['ROU_OPTIONAL'] ) && trim( $aRow['ROU_OPTIONAL'] ) != '' && ($aRow['ROU_OPTIONAL'] === 'TRUE' || $aRow['ROU_OPTIONAL'] === 'FALSE')) $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL']; $rou_id = $oRoute->create( $aFields ); + if ($aRow['ROU_NEXT_TASK']=='-1') { + if ($aRow['ROU_CONDITION']=='') { + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> Empty; '; + }else{ + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + } + }else{ + $oTaskSaveNextPattern = new Task(); + $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + if ($aRow['ROU_CONDITION']=='') { + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> Empty ; '; + }else{ + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> '.$aFields['ROU_CONDITION'].' ; '; + } + } unset( $aFields ); } + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess=$oProcessNewPattern->getProTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; - case 'DISCRIMINATOR': //Girish ->Added to save changes, while editing the route + case 'DISCRIMINATOR': //Girish ->Added to save changes, while editing the route foreach ($aData['GRID_DISCRIMINATOR_TYPE'] as $iKey => $aRow) { $aFields['PRO_UID'] = $aData['PROCESS']; $aFields['TAS_UID'] = $aData['TASK']; diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 13f9324d2..4dd5e2745 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -341,7 +341,7 @@ try { } else { switch ($oData->type) { case 0: - $oData->type = 'SEQUENTIAL'; + $oData->type = 'SEQUENTIAL'; break; case 1: $oData->type = 'SELECT'; @@ -359,7 +359,7 @@ try { $oData->type = 'SEC-JOIN'; break; case 8: - $oData->type = 'DISCRIMINATOR'; + $oData->type = 'DISCRIMINATOR'; break; } $oProcessMap->newPattern($oData->pro_uid, $oData->tas_uid, $oData->next_task, $oData->type); @@ -369,24 +369,98 @@ try { switch ($oData->type) { case 0: $sType = 'SEQUENTIAL'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + if ($titleNextTask=='') { + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : END OF PROCESS Task Name -> '.$titleTask.' : '.$oData->tas_uid); + }else{ + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + } break; case 1: $sType = 'SELECT'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 2: $sType = 'EVALUATE'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 3: $sType = 'PARALLEL'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 4: $sType = 'PARALLEL-BY-EVALUATION'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 5: $sType = 'SEC-JOIN'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 8: $sType = 'DISCRIMINATOR'; + $oProcessNewPattern = new Process(); + $oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$oProcessNewPattern->getProTitle(); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + $oTaskNextNewPattern = new Task(); + $oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; } if (($oData->type != 0) && ($oData->type != 5) && ($oData->type != 8)) { diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php index 1215d5410..1b39b1883 100755 --- a/workflow/engine/methods/tasks/tasks_Ajax.php +++ b/workflow/engine/methods/tasks/tasks_Ajax.php @@ -117,7 +117,10 @@ try { } $result = $oTask->update( $aData ); - + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($aData['TAS_UID']); + $titleTask=$oTaskNewPattern->getTasTitle(); + G::auditLog("DerivationRule","ASSIGN STARTING TASK : Task Name -> ".$titleTask.' : '.$aData['TAS_UID']); $response["status"] = "OK"; if ($result == 3) { From 78149eab86f0ed1365b71e6cf8e08b0e49c1a16b Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 19 Feb 2015 13:23:18 -0400 Subject: [PATCH 2/3] 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. --- .../engine/methods/patterns/patterns_Ajax.php | 8 ++++---- .../engine/methods/processes/processes_Ajax.php | 16 ++++++++-------- workflow/engine/methods/tasks/tasks_Ajax.php | 4 +++- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php index e30d1828d..d0ce46ddf 100755 --- a/workflow/engine/methods/patterns/patterns_Ajax.php +++ b/workflow/engine/methods/patterns/patterns_Ajax.php @@ -93,7 +93,7 @@ switch ($aData['action']) { $oProcessNewPattern = new Process(); $oProcessNewPattern->load($aData['PROCESS']); $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'EVALUATE': $tasksAffected=''; @@ -134,7 +134,7 @@ switch ($aData['action']) { $oProcessNewPattern = new Process(); $oProcessNewPattern->load($aData['PROCESS']); $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'PARALLEL': $tasksAffected=''; @@ -161,7 +161,7 @@ switch ($aData['action']) { $oProcessNewPattern = new Process(); $oProcessNewPattern->load($aData['PROCESS']); $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'PARALLEL-BY-EVALUATION': $tasksAffected=''; @@ -204,7 +204,7 @@ switch ($aData['action']) { $oProcessNewPattern = new Process(); $oProcessNewPattern->load($aData['PROCESS']); $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Routing rule : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'DISCRIMINATOR': //Girish ->Added to save changes, while editing the route foreach ($aData['GRID_DISCRIMINATOR_TYPE'] as $iKey => $aRow) { diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 4dd5e2745..aef1818c0 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -379,9 +379,9 @@ try { $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); if ($titleNextTask=='') { - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : END OF PROCESS Task Name -> '.$titleTask.' : '.$oData->tas_uid); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : END OF PROCESS Task Name -> '.$titleTask.' : '.$oData->tas_uid); }else{ - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); } break; case 1: @@ -395,7 +395,7 @@ try { $oTaskNextNewPattern = new Task(); $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 2: $sType = 'EVALUATE'; @@ -408,7 +408,7 @@ try { $oTaskNextNewPattern = new Task(); $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 3: $sType = 'PARALLEL'; @@ -421,7 +421,7 @@ try { $oTaskNextNewPattern = new Task(); $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 4: $sType = 'PARALLEL-BY-EVALUATION'; @@ -434,7 +434,7 @@ try { $oTaskNextNewPattern = new Task(); $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 5: $sType = 'SEC-JOIN'; @@ -447,7 +447,7 @@ try { $oTaskNextNewPattern = new Task(); $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 8: $sType = 'DISCRIMINATOR'; @@ -460,7 +460,7 @@ try { $oTaskNextNewPattern = new Task(); $oTaskNextNewPattern->load($oData->next_task); $titleNextTask=$oTaskNextNewPattern->getTasTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' ACTION : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; } if (($oData->type != 0) && ($oData->type != 5) && ($oData->type != 8)) { diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php index 1b39b1883..55802e969 100755 --- a/workflow/engine/methods/tasks/tasks_Ajax.php +++ b/workflow/engine/methods/tasks/tasks_Ajax.php @@ -120,7 +120,9 @@ try { $oTaskNewPattern = new Task(); $oTaskNewPattern->load($aData['TAS_UID']); $titleTask=$oTaskNewPattern->getTasTitle(); - G::auditLog("DerivationRule","ASSIGN STARTING TASK : Task Name -> ".$titleTask.' : '.$aData['TAS_UID']); + if (count($aData)==5) { + G::auditLog("DerivationRule",'ASSIGN STARTING TASK : Task Name -> '.$titleTask.' : '.$aData['TAS_UID']); + } $response["status"] = "OK"; if ($result == 3) { From bf6b5af99473b87b9efc84be5cc4e31116de6649 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 19 Feb 2015 14:49:07 -0400 Subject: [PATCH 3/3] 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. --- .../engine/methods/patterns/patterns_Ajax.php | 68 +++++++-------- .../methods/processes/processes_Ajax.php | 86 +++++++++---------- workflow/engine/methods/tasks/tasks_Ajax.php | 12 ++- 3 files changed, 84 insertions(+), 82 deletions(-) diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php index d0ce46ddf..3bef04210 100755 --- a/workflow/engine/methods/patterns/patterns_Ajax.php +++ b/workflow/engine/methods/patterns/patterns_Ajax.php @@ -57,8 +57,8 @@ switch ($aData['action']) { case 'SELECT': $tasksAffected=''; $oTaskSavePattern = new Task(); - $oTaskSavePattern->load($aData['TASK']); - $titleTask=$oTaskSavePattern->getTasTitle(); + $taskInfo=$oTaskSavePattern->load($aData['TASK']); + $titleTask=$taskInfo['TAS_TITLE']; foreach ($aData['GRID_SELECT_TYPE'] as $iKey => $aRow) { /*if ($aRow['ROU_UID'] != '') { @@ -74,14 +74,14 @@ switch ($aData['action']) { $rou_id = $oRoute->create( $aFields ); if ($aRow['ROU_NEXT_TASK']=='-1') { if ($aRow['ROU_CONDITION']=='') { - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> Empty; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Process Condition -> Empty; '; }else{ - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Process Condition -> '.$aFields['ROU_CONDITION'].' ; '; } }else{ $oTaskSaveNextPattern = new Task(); - $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); - $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + $taskNextInfo=$oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$taskNextInfo['TAS_TITLE']; if ($aRow['ROU_CONDITION']=='') { $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> Empty ; '; }else{ @@ -91,15 +91,15 @@ switch ($aData['action']) { unset( $aFields ); } $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($aData['PROCESS']); - $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + $processInfo = $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess = $processInfo['PRO_TITLE']; + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Details : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'EVALUATE': $tasksAffected=''; $oTaskSavePattern = new Task(); - $oTaskSavePattern->load($aData['TASK']); - $titleTask=$oTaskSavePattern->getTasTitle(); + $taskInfo=$oTaskSavePattern->load($aData['TASK']); + $titleTask=$taskInfo['TAS_TITLE']; foreach ($aData['GRID_EVALUATE_TYPE'] as $iKey => $aRow) { /*if ($aRow['ROU_UID'] != '') { @@ -115,14 +115,14 @@ switch ($aData['action']) { $rou_id = $oRoute->create( $aFields ); if ($aRow['ROU_NEXT_TASK']=='-1') { if ($aRow['ROU_CONDITION']=='') { - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End OfProcces Condition -> Empty; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Process Condition -> Empty; '; }else{ - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Process Condition -> '.$aFields['ROU_CONDITION'].' ; '; } }else{ $oTaskSaveNextPattern = new Task(); - $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); - $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + $taskNextInfo=$oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$taskNextInfo['TAS_TITLE']; if ($aRow['ROU_CONDITION']=='') { $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> Empty ; '; }else{ @@ -132,15 +132,15 @@ switch ($aData['action']) { unset( $aFields ); } $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($aData['PROCESS']); - $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + $processInfo = $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess = $processInfo['PRO_TITLE']; + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Details : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'PARALLEL': $tasksAffected=''; $oTaskSavePattern = new Task(); - $oTaskSavePattern->load($aData['TASK']); - $titleTask=$oTaskSavePattern->getTasTitle(); + $taskInfo=$oTaskSavePattern->load($aData['TASK']); + $titleTask=$taskInfo['TAS_TITLE']; foreach ($aData['GRID_PARALLEL_TYPE'] as $iKey => $aRow) { /*if ($aRow['ROU_UID'] != '') { @@ -153,21 +153,21 @@ switch ($aData['action']) { $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $rou_id = $oRoute->create( $aFields ); $oTaskSaveNextPattern = new Task(); - $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); - $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + $taskNextInfo=$oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$taskNextInfo['TAS_TITLE']; $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' ; '; unset( $aFields ); } $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($aData['PROCESS']); - $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + $processInfo = $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess = $processInfo['PRO_TITLE']; + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Details : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'PARALLEL-BY-EVALUATION': $tasksAffected=''; $oTaskSavePattern = new Task(); - $oTaskSavePattern->load($aData['TASK']); - $titleTask=$oTaskSavePattern->getTasTitle(); + $taskInfo=$oTaskSavePattern->load($aData['TASK']); + $titleTask=$taskInfo['TAS_TITLE']; foreach ($aData['GRID_PARALLEL_EVALUATION_TYPE'] as $iKey => $aRow) { /*if ($aRow['ROU_UID'] != '') { @@ -185,14 +185,14 @@ switch ($aData['action']) { $rou_id = $oRoute->create( $aFields ); if ($aRow['ROU_NEXT_TASK']=='-1') { if ($aRow['ROU_CONDITION']=='') { - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> Empty; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Process Condition -> Empty; '; }else{ - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Process Condition -> '.$aFields['ROU_CONDITION'].' ; '; } }else{ $oTaskSaveNextPattern = new Task(); - $oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); - $titleNextTask=$oTaskSaveNextPattern->getTasTitle(); + $taskNextInfo=$oTaskSaveNextPattern->load($aRow['ROU_NEXT_TASK']); + $titleNextTask=$taskNextInfo['TAS_TITLE']; if ($aRow['ROU_CONDITION']=='') { $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To -> '.$titleNextTask.' : '.$aRow['ROU_NEXT_TASK'].' Condition -> Empty ; '; }else{ @@ -202,9 +202,9 @@ switch ($aData['action']) { unset( $aFields ); } $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($aData['PROCESS']); - $titleProcess=$oProcessNewPattern->getProTitle(); - G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Change Routing Rule From : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + $processInfo = $oProcessNewPattern->load($aData['PROCESS']); + $titleProcess = $processInfo['PRO_TITLE']; + G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$aData['PROCESS'].' Change Routing Rule From : '.$aData['ROU_TYPE'].' Details : ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); break; case 'DISCRIMINATOR': //Girish ->Added to save changes, while editing the route foreach ($aData['GRID_DISCRIMINATOR_TYPE'] as $iKey => $aRow) { diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index aef1818c0..2781def1a 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -370,14 +370,14 @@ try { case 0: $sType = 'SEQUENTIAL'; $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; if ($titleNextTask=='') { G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : END OF PROCESS Task Name -> '.$titleTask.' : '.$oData->tas_uid); }else{ @@ -387,79 +387,77 @@ try { case 1: $sType = 'SELECT'; $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 2: $sType = 'EVALUATE'; $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 3: $sType = 'PARALLEL'; $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 4: $sType = 'PARALLEL-BY-EVALUATION'; $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 5: $sType = 'SEC-JOIN'; - $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; case 8: $sType = 'DISCRIMINATOR'; - $oProcessNewPattern = new Process(); - $oProcessNewPattern->load($oData->pro_uid); - $titleProcess=$oProcessNewPattern->getProTitle(); + $taskProcess=$oProcessNewPattern->load($oData->pro_uid); + $titleProcess=$taskProcess['PRO_TITLE']; $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($oData->tas_uid); - $titleTask=$oTaskNewPattern->getTasTitle(); + $taskInfo=$oTaskNewPattern->load($oData->tas_uid); + $titleTask=$taskInfo['TAS_TITLE']; $oTaskNextNewPattern = new Task(); - $oTaskNextNewPattern->load($oData->next_task); - $titleNextTask=$oTaskNextNewPattern->getTasTitle(); + $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task); + $titleNextTask=$$taskNextInfo['TAS_TITLE']; G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task); break; } diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php index 55802e969..5d492c7ab 100755 --- a/workflow/engine/methods/tasks/tasks_Ajax.php +++ b/workflow/engine/methods/tasks/tasks_Ajax.php @@ -118,11 +118,15 @@ try { $result = $oTask->update( $aData ); $oTaskNewPattern = new Task(); - $oTaskNewPattern->load($aData['TAS_UID']); - $titleTask=$oTaskNewPattern->getTasTitle(); - if (count($aData)==5) { - G::auditLog("DerivationRule",'ASSIGN STARTING TASK : Task Name -> '.$titleTask.' : '.$aData['TAS_UID']); + $taskInfo=$oTaskNewPattern->load($aData['TAS_UID']); + $titleTask=$taskInfo['TAS_TITLE']; + $values=''; + foreach ($aData as $key => $value){ + if ($value!='') { + $values.=$key.' -> '.$value.' '; + } } + G::auditLog("OptionsMenuTask","Update Task DETAILS : ".$values); $response["status"] = "OK"; if ($result == 3) {