fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with the email sent in the events

Browse Source
This commit is contained in:
Julio Cesar Laura
2012-08-10 19:33:47 -04:00
parent 45c13761e7
commit 2f726e6a17
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/classes/model/AppEvent.php
View File

@@ -188,10 +188,10 @@ class AppEvent extends BaseAppEvent {
$debug = 1; $debug = 1;
$oCase = new Cases(); $oCase = new Cases();
try { try {
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(AppEventPeer::APP_UID); $oCriteria->addSelectColumn(AppEventPeer::APP_UID);
$oCriteria->addSelectColumn(AppEventPeer::DEL_INDEX); $oCriteria->addSelectColumn(AppEventPeer::DEL_INDEX);
$oCriteria->addSelectColumn(AppEventPeer::EVN_UID); $oCriteria->addSelectColumn(AppEventPeer::EVN_UID);
@@ -204,13 +204,14 @@ class AppEvent extends BaseAppEvent {
$oCriteria->addSelectColumn(EventPeer::TRI_UID); $oCriteria->addSelectColumn(EventPeer::TRI_UID);
$oCriteria->addSelectColumn(EventPeer::EVN_ACTION_PARAMETERS); $oCriteria->addSelectColumn(EventPeer::EVN_ACTION_PARAMETERS);
$oCriteria->addSelectColumn(EventPeer::EVN_RELATED_TO); $oCriteria->addSelectColumn(EventPeer::EVN_RELATED_TO);
$oCriteria->addSelectColumn(AppDelegationPeer::TAS_UID);
$oCriteria->addSelectColumn(AppDelegationPeer::USR_UID); $oCriteria->addSelectColumn(AppDelegationPeer::USR_UID);
$oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE); $oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
$oCriteria->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE); $oCriteria->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
$oCriteria->addJoin(AppEventPeer::EVN_UID, EventPeer::EVN_UID, Criteria::JOIN); $oCriteria->addJoin(AppEventPeer::EVN_UID, EventPeer::EVN_UID, Criteria::JOIN);
$aConditions = array(); $aConditions = array();
array_push($aConditions, Array(AppEventPeer::APP_UID, AppDelegationPeer::APP_UID)); array_push($aConditions, Array(AppEventPeer::APP_UID, AppDelegationPeer::APP_UID));
array_push($aConditions, Array(AppEventPeer::DEL_INDEX, AppDelegationPeer::DEL_INDEX)); array_push($aConditions, Array(AppEventPeer::DEL_INDEX, AppDelegationPeer::DEL_INDEX));
@@ -249,7 +250,7 @@ class AppEvent extends BaseAppEvent {
println(" - ATTEMPTS...............".$aRow['APP_EVN_ATTEMPTS']); println(" - ATTEMPTS...............".$aRow['APP_EVN_ATTEMPTS']);
println(" - INTERVAL WITH TASKS....".$aRow['EVN_RELATED_TO']); println(" - INTERVAL WITH TASKS....".$aRow['EVN_RELATED_TO']);
} }
if ($aRow['TRI_UID'] == '') { if ($aRow['TRI_UID'] == '') {
//a rare case when the tri_uid is not set. //a rare case when the tri_uid is not set.
$log[] = " (!) Any trigger was set................................SKIPPED and will be CLOSED"; $log[] = " (!) Any trigger was set................................SKIPPED and will be CLOSED";
@@ -269,15 +270,21 @@ class AppEvent extends BaseAppEvent {
continue; continue;
} }
global $oPMScript;
$oPMScript = new PMScript(); $oPMScript = new PMScript();
$task = new Task();
$taskFields = $task->Load($aRow['TAS_UID']);
$aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER'];
$aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE'];
$aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE'];
$oPMScript->setFields($aFields['APP_DATA']); $oPMScript->setFields($aFields['APP_DATA']);
$oPMScript->setScript($oTrigger->getTriWebbot()); $oPMScript->setScript($oTrigger->getTriWebbot());
$oPMScript->execute(); $oPMScript->execute();
$oAppEvent->setAppEvnLastExecutionDate(date('Y-m-d H:i:s')); $oAppEvent->setAppEvnLastExecutionDate(date('Y-m-d H:i:s'));
if( sizeof($_SESSION['TRIGGER_DEBUG']['ERRORS']) == 0 ){ if( sizeof($_SESSION['TRIGGER_DEBUG']['ERRORS']) == 0 ){
$log[] = ' - The trigger ' . $oTrigger->getTriTitle() . ' was executed successfully!'; $log[] = ' - The trigger ' . $oTrigger->getTriTitle() . ' was executed successfully!';
if($debug) println(" - The trigger '{$oTrigger->getTriTitle()}' was executed successfully!"); if($debug) println(" - The trigger '{$oTrigger->getTriTitle()}' was executed successfully!");
@@ -307,7 +314,7 @@ class AppEvent extends BaseAppEvent {
return $oError->getMessage(); return $oError->getMessage();
} }
} }
function close($APP_UID, $DEL_INDEX){ function close($APP_UID, $DEL_INDEX){
$aRow = $this->load($APP_UID, $DEL_INDEX); $aRow = $this->load($APP_UID, $DEL_INDEX);
$aRow['APP_EVN_STATUS'] = 'CLOSE'; $aRow['APP_EVN_STATUS'] = 'CLOSE';