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

HOR-1617 "ActionsByEmail problemas con el "previous user" con tareas paralelas" SOLVED

Browse Source 
Issue:
    ActionsByEmail problemas con el "previous user" con tareas paralelas
Cause:
    Para determinar el "previous user" se esta considerando/utilizando el campo "APP_DELEGATION.DEL_LAST_INDEX"
Solution:
    Se refactoriza y se contruye el metodo "AppDelegation::getPreviousDelegationValidTask()" para
    determinar el "previous delegation"
This commit is contained in:
Victor Saisa Lopez
2016-08-15 16:54:43 -04:00
parent b27124caae
commit 2c50dff8e3
3 changed files with 83 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
workflow/engine/classes/class.derivation.php
View File

@@ -805,47 +805,6 @@ class Derivation
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
} }
/**
* Get valid origin Task
*
* @param string $applicationUid Unique id of Case
* @param int $delIndex Delegation index
*
* @return string Returns valid origin Task
*/
private function __getTaskUidOrigin($applicationUid, $delIndex)
{
$taskUidOrigin = '';
do {
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
$criteria->addSelectColumn(TaskPeer::TAS_UID);
$criteria->addSelectColumn(TaskPeer::TAS_TYPE);
$criteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::INNER_JOIN);
$criteria->add(AppDelegationPeer::APP_UID, $applicationUid, Criteria::EQUAL);
$criteria->add(AppDelegationPeer::DEL_INDEX, $delIndex, Criteria::EQUAL);
$rsCriteria = AppDelegationPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) {
$record = $rsCriteria->getRow();
if (preg_match('/^(?:' . 'NORMAL|SCRIPT\-TASK|WEBENTRYEVENT|START\-MESSAGE\-EVENT|START\-TIMER\-EVENT' . ')$/', $record['TAS_TYPE'])) {
$taskUidOrigin = $record['TAS_UID'];
}
$delIndex = $record['DEL_PREVIOUS'];
}
} while ($taskUidOrigin == '');
//Return
return $taskUidOrigin;
}
/** Derivate /** Derivate
* *
* @param array $currentDelegation * @param array $currentDelegation
@@ -1274,15 +1233,18 @@ class Derivation
$case = new \ProcessMaker\BusinessModel\Cases(); $case = new \ProcessMaker\BusinessModel\Cases();
$arrayApplicationData = $case->getApplicationRecordByPk($currentDelegation['APP_UID'], [], false); $arrayApplicationData = $case->getApplicationRecordByPk($currentDelegation['APP_UID'], [], false);
$arrayRoutingData = (!is_null($arrayApplicationData['APP_ROUTING_DATA']) && $arrayApplicationData['APP_ROUTING_DATA'] != '')? unserialize($arrayApplicationData['APP_ROUTING_DATA']) : []; $arrayRoutingData = (!is_null($arrayApplicationData['APP_ROUTING_DATA']) && (string)($arrayApplicationData['APP_ROUTING_DATA']) != '')? unserialize($arrayApplicationData['APP_ROUTING_DATA']) : [];
$iAppThreadIndex = $appFields['DEL_THREAD']; $iAppThreadIndex = $appFields['DEL_THREAD'];
$delType = 'NORMAL'; $delType = 'NORMAL';
$sendNotificationsMobile = false; $sendNotificationsMobile = false;
$appDelegation = new AppDelegation();
$taskNextDel = TaskPeer::retrieveByPK($nextDel["TAS_UID"]); $taskNextDel = TaskPeer::retrieveByPK($nextDel["TAS_UID"]);
$taskUidOrigin = $this->__getTaskUidOrigin($currentDelegation['APP_UID'], $currentDelegation['DEL_INDEX']); $arrayAppDelegationPrevious = $appDelegation->getPreviousDelegationValidTask($currentDelegation['APP_UID'], $currentDelegation['DEL_INDEX'], true);
$taskUidOrigin = $arrayAppDelegationPrevious['TAS_UID'];
$taskUidDest = $taskNextDel->getTasUid(); $taskUidDest = $taskNextDel->getTasUid();
if (array_key_exists($taskUidOrigin . '/' . $taskUidDest, $arrayRoutingData)) { if (array_key_exists($taskUidOrigin . '/' . $taskUidDest, $arrayRoutingData)) {

106
workflow/engine/classes/model/AppDelegation.php
View File

@@ -44,6 +44,54 @@
*/ */
class AppDelegation extends BaseAppDelegation class AppDelegation extends BaseAppDelegation
{ {
/**
* Get previous delegation (Valid Task)
*
* @param string $applicationUid Unique id of Case
* @param int $delIndex Delegation index
* @param bool $flagIncludeCurrentDel Include current delegation
*
* @return array Returns previous delegation, FALSE otherwise
*/
public function getPreviousDelegationValidTask($applicationUid, $delIndex, $flagIncludeCurrentDel = false)
{
$arrayAppDelegationPrevious = false;
$flagPrevious = true;
do {
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(AppDelegationPeer::TABLE_NAME . '.*');
$criteria->addSelectColumn(TaskPeer::TAS_TYPE);
$criteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::INNER_JOIN);
$criteria->add(AppDelegationPeer::APP_UID, $applicationUid, Criteria::EQUAL);
$criteria->add(AppDelegationPeer::DEL_INDEX, $delIndex, Criteria::EQUAL);
$rsCriteria = AppDelegationPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) {
$record = $rsCriteria->getRow();
if ($flagIncludeCurrentDel) {
if (preg_match('/^(?:' . 'NORMAL|SCRIPT\-TASK|WEBENTRYEVENT|START\-MESSAGE\-EVENT|START\-TIMER\-EVENT' . ')$/', $record['TAS_TYPE'])) {
$arrayAppDelegationPrevious = $record;
$flagPrevious = false;
}
}
$delIndex = $record['DEL_PREVIOUS'];
} else {
$flagPrevious = false;
}
$flagIncludeCurrentDel = true;
} while ($flagPrevious);
//Return
return $arrayAppDelegationPrevious;
}
/** /**
* create an application delegation * create an application delegation
@@ -130,7 +178,6 @@ class AppDelegation extends BaseAppDelegation
} }
} }
//Update set //Update set
$criteriaUpdate = new Criteria('workflow'); $criteriaUpdate = new Criteria('workflow');
$criteriaUpdate->add(AppDelegationPeer::DEL_LAST_INDEX, 0); $criteriaUpdate->add(AppDelegationPeer::DEL_LAST_INDEX, 0);
@@ -194,12 +241,14 @@ class AppDelegation extends BaseAppDelegation
$bpmn = new \ProcessMaker\Project\Bpmn(); $bpmn = new \ProcessMaker\Project\Bpmn();
$flagActionsByEmail = true; $flagActionsByEmail = true;
$arrayAppDelegationPrevious = $this->getPreviousDelegationValidTask($sAppUid, $delIndex);
$data = new stdclass(); $data = new stdclass();
$data->TAS_UID = $sTasUid; $data->TAS_UID = $sTasUid;
$data->APP_UID = $sAppUid; $data->APP_UID = $sAppUid;
$data->DEL_INDEX = $delIndex; $data->DEL_INDEX = $delIndex;
$data->USR_UID = $sUsrUid; $data->USR_UID = $sUsrUid;
$data->PREVIOUS_USR_UID = $delPreviusUsrUid; $data->PREVIOUS_USR_UID = ($arrayAppDelegationPrevious !== false)? $arrayAppDelegationPrevious['USR_UID'] : $delPreviusUsrUid;
if ($bpmn->exists($sProUid)) { if ($bpmn->exists($sProUid)) {
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
@@ -481,7 +530,7 @@ class AppDelegation extends BaseAppDelegation
} }
//usually this function is called when routing in the flow, so by default cron =0 //usually this function is called when routing in the flow, so by default cron =0
public function calculateDuration($cron = 0) public function calculateDuration($cron = 0)
{ {
$this->writeFileIfCalledFromCronForCalculateDuration($cron); $this->writeFileIfCalledFromCronForCalculateDuration($cron);
$this->patchDataWithValuesForCalculateDuration(); $this->patchDataWithValuesForCalculateDuration();
@@ -511,7 +560,7 @@ class AppDelegation extends BaseAppDelegation
} }
} }
public function getValuesToStoreForCalculateDuration($row, $calendar, $calData, $nowDate) public function getValuesToStoreForCalculateDuration($row, $calendar, $calData, $nowDate)
{ {
$rowValues = $this->completeRowDataForCalculateDuration($row, $nowDate); $rowValues = $this->completeRowDataForCalculateDuration($row, $nowDate);
return Array( return Array(
@@ -531,7 +580,7 @@ class AppDelegation extends BaseAppDelegation
return 0; return 0;
} }
//TODO 8 daily/hours must be extracted from calendar //TODO 8 daily/hours must be extracted from calendar
$taskTime = ($rowValues['cTaskDurationUnit'] == 'DAYS') $taskTime = ($rowValues['cTaskDurationUnit'] == 'DAYS')
? $rowValues['fTaskDuration'] * 8 / 24 ? $rowValues['fTaskDuration'] * 8 / 24
: $rowValues['fTaskDuration'] / 24; : $rowValues['fTaskDuration'] / 24;
@@ -541,40 +590,40 @@ class AppDelegation extends BaseAppDelegation
//time in days from init or delegate date to finish or today's date //time in days from init or delegate date to finish or today's date
private function calculateNetProcessingTime($calendar, $calData, $rowValues) private function calculateNetProcessingTime($calendar, $calData, $rowValues)
{ {
$initDateForCalc = $this->selectDate ($rowValues['dInitDate'], $rowValues['dDelegateDate'], 'max'); $initDateForCalc = $this->selectDate ($rowValues['dInitDate'], $rowValues['dDelegateDate'], 'max');
$endDateForCalc = $this->selectDate ($rowValues['dFinishDate'], $rowValues['dNow'], 'min'); $endDateForCalc = $this->selectDate ($rowValues['dFinishDate'], $rowValues['dNow'], 'min');
return $calendar->dashCalculateDurationWithCalendar( return $calendar->dashCalculateDurationWithCalendar(
$initDateForCalc->format('Y-m-d H:i:s'), $initDateForCalc->format('Y-m-d H:i:s'),
$endDateForCalc->format('Y-m-d H:i:s'), $endDateForCalc->format('Y-m-d H:i:s'),
$calData)/(24*60*60); $calData)/(24*60*60);
} }
//time in days from delegate date to init date //time in days from delegate date to init date
private function calculateQueueTime($calendar, $calData, $rowValues) private function calculateQueueTime($calendar, $calData, $rowValues)
{ {
$initDateForCalc = $rowValues['dDelegateDate']; $initDateForCalc = $rowValues['dDelegateDate'];
$endDateForCalc = $this->selectDate ($rowValues['dInitDate'], $rowValues['dNow'], 'min'); $endDateForCalc = $this->selectDate ($rowValues['dInitDate'], $rowValues['dNow'], 'min');
return $calendar->dashCalculateDurationWithCalendar( return $calendar->dashCalculateDurationWithCalendar(
$initDateForCalc->format('Y-m-d H:i:s'), $initDateForCalc->format('Y-m-d H:i:s'),
$endDateForCalc->format('Y-m-d H:i:s'), $endDateForCalc->format('Y-m-d H:i:s'),
$calData)/(24*60*60); $calData)/(24*60*60);
} }
//time in days from due date to finish or today date //time in days from due date to finish or today date
private function calculateDelayTime($calendar, $calData, $rowValues) private function calculateDelayTime($calendar, $calData, $rowValues)
{ {
$initDateForCalc = $this->selectDate($rowValues['dDueDate'], $rowValues['dDelegateDate'], 'max'); $initDateForCalc = $this->selectDate($rowValues['dDueDate'], $rowValues['dDelegateDate'], 'max');
$endDateForCalc = $this->selectDate ($rowValues['dFinishDate'], $rowValues['dNow'], 'min'); $endDateForCalc = $this->selectDate ($rowValues['dFinishDate'], $rowValues['dNow'], 'min');
return $calendar->dashCalculateDurationWithCalendar( return $calendar->dashCalculateDurationWithCalendar(
$initDateForCalc->format('Y-m-d H:i:s'), $initDateForCalc->format('Y-m-d H:i:s'),
$endDateForCalc->format('Y-m-d H:i:s'), $endDateForCalc->format('Y-m-d H:i:s'),
$calData)/(24*60*60); $calData)/(24*60*60);
} }
//to avoid aplying many times the same conversions and functions the row data //to avoid aplying many times the same conversions and functions the row data
//is used to create dates as DateTime objects and other fields are stracted also, //is used to create dates as DateTime objects and other fields are stracted also,
//so the array returned will work as a "context" object for the rest of the functions. //so the array returned will work as a "context" object for the rest of the functions.
private function completeRowDataForCalculateDuration($row, $nowDate) private function completeRowDataForCalculateDuration($row, $nowDate)
{ {
return Array( return Array(
'dDelegateDate' => $this->createDateFromString ($row['DEL_DELEGATE_DATE']), 'dDelegateDate' => $this->createDateFromString ($row['DEL_DELEGATE_DATE']),
@@ -594,10 +643,10 @@ class AppDelegation extends BaseAppDelegation
//NOTE date1 and date2 are DateTime objects. //NOTE date1 and date2 are DateTime objects.
private function selectDate($date1, $date2, $compareFunction) private function selectDate($date1, $date2, $compareFunction)
{ {
if ($date1 == null) if ($date1 == null)
return $date2; return $date2;
if ($date2 == null) if ($date2 == null)
return $date1; return $date1;
return $compareFunction($date1, $date2); return $compareFunction($date1, $date2);
@@ -643,7 +692,7 @@ class AppDelegation extends BaseAppDelegation
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
return $rs; return $rs;
} }
private function writeFileIfCalledFromCronForCalculateDuration($cron) private function writeFileIfCalledFromCronForCalculateDuration($cron)
{ {
if ($cron == 1) { if ($cron == 1) {
$arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) ); $arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) );
@@ -652,7 +701,7 @@ class AppDelegation extends BaseAppDelegation
} }
} }
private function patchDataWithValuesForCalculateDuration() private function patchDataWithValuesForCalculateDuration()
{ {
//patch rows with initdate = null and finish_date //patch rows with initdate = null and finish_date
$c = new Criteria(); $c = new Criteria();
@@ -684,7 +733,7 @@ class AppDelegation extends BaseAppDelegation
$row = $rs->getRow(); $row = $rs->getRow();
} }
} }
public function getLastDeleration ($APP_UID) public function getLastDeleration ($APP_UID)
@@ -858,4 +907,3 @@ class AppDelegation extends BaseAppDelegation
} }
} }

2
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -2106,7 +2106,7 @@ class BpmnWorkflow extends Project\Bpmn
//Update Process //Update Process
$process = \ProcessPeer::retrieveByPk($this->wp->getUid()); $process = \ProcessPeer::retrieveByPk($this->wp->getUid());
$arrayActionDone = (!is_null($process->getProActionDone()) && $process->getProActionDone() != '')? unserialize($process->getProActionDone()) : []; $arrayActionDone = (!is_null($process->getProActionDone()) && (string)($process->getProActionDone()) != '')? unserialize($process->getProActionDone()) : [];
$arrayActionDone[] = $actionDone; $arrayActionDone[] = $actionDone;
$this->wp->update(['PRO_ACTION_DONE' => serialize($arrayActionDone)]); $this->wp->update(['PRO_ACTION_DONE' => serialize($arrayActionDone)]);