From bf6b5af99473b87b9efc84be5cc4e31116de6649 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 19 Feb 2015 14:49:07 -0400 Subject: [PATCH] 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) {