diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php index 72aa99dcc..0bec52afc 100755 --- a/workflow/engine/methods/patterns/patterns_Ajax.php +++ b/workflow/engine/methods/patterns/patterns_Ajax.php @@ -74,9 +74,9 @@ 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 Procces Condition -> Empty; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> Empty; '; }else{ - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; } }else{ $oTaskSaveNextPattern = new Task(); @@ -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'].' ACTION : '.$aData['ROU_TYPE'].' Save Pattern DETAILS: ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + 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=''; @@ -115,9 +115,9 @@ 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 Procces Condition -> Empty; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End OfProcces Condition -> Empty; '; }else{ - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; } }else{ $oTaskSaveNextPattern = new Task(); @@ -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'].' ACTION : '.$aData['ROU_TYPE'].' Save Pattern DETAILS: ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + 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=''; @@ -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'].' ACTION : '.$aData['ROU_TYPE'].' Save Pattern DETAILS: ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + 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=''; @@ -185,9 +185,9 @@ 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 Procces Condition -> Empty; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> Empty; '; }else{ - $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; + $tasksAffected.='From -> '.$titleTask.' : '.$aData['TASK'].' To End Of Procces Condition -> '.$aFields['ROU_CONDITION'].' ; '; } }else{ $oTaskSaveNextPattern = new Task(); @@ -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'].' ACTION : '.$aData['ROU_TYPE'].' Save Pattern DETAILS: ROU_TYPE_OLD -> '.$aData['ROU_TYPE_OLD']. ' ROU_TYPE ->'.$aData['ROU_TYPE']. ' '.$tasksAffected); + 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 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 3ac58f87f..dc830166e 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -176,6 +176,10 @@ try { $sOutput = $oProcessMap->saveTaskPosition($oData->uid, $oData->position->x, $oData->position->y); break; case 'deleteTask': + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + G::auditlog("OptionsMenuTask",'ACTION : Delete Stak -> '.$titleTask.' : '.$oData->tas_uid); $sOutput = $oProcessMap->deleteTask($oData->tas_uid); break; case 'addGuide': @@ -374,6 +378,10 @@ try { break; case 'deleteAllRoutes': G::LoadClass('tasks'); + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + G::auditlog("OptionsMenuTask",'ACTION : Delete All Routes -> '.$titleTask.' : '.$oData->tas_uid); $oTasks = new Tasks(); $oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid); break; @@ -411,6 +419,10 @@ try { $oProcessMap->downloadFile($oData->pro_uid, $oData->main_directory, $oData->directory, $oData->file); break; case 'deleteSubProcess': + $oTaskNewPattern = new Task(); + $oTaskNewPattern->load($oData->tas_uid); + $titleTask=$oTaskNewPattern->getTasTitle(); + G::auditlog("OptionsMenuTask",'ACTION : Delete Sub Process -> '.$titleTask.' : '.$oData->tas_uid); $sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid); break; case 'subProcess_Properties':