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

Merging changes made by Brayan related to counters

Browse Source
This commit is contained in:
Julio Cesar Laura
2015-03-26 23:57:28 -04:00
parent 6c6e43e458
commit bd3a3c40ba
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -593,6 +593,7 @@ class Derivation
//Count how many tasks should be derivated. //Count how many tasks should be derivated.
//$countNextTask = count($nextDelegations); //$countNextTask = count($nextDelegations);
$removeList = true;
foreach ($nextDelegations as $nextDel) { foreach ($nextDelegations as $nextDel) {
//BpmnEvent - END-MESSAGE-EVENT - Check and get unique id //BpmnEvent - END-MESSAGE-EVENT - Check and get unique id
if (preg_match("/^(.{32})\/(\-1)$/", $nextDel["TAS_UID"], $arrayMatch)) { if (preg_match("/^(.{32})\/(\-1)$/", $nextDel["TAS_UID"], $arrayMatch)) {
@@ -759,6 +760,7 @@ class Derivation
$aFields['APP_STATUS'] = $currentDelegation['APP_STATUS']; $aFields['APP_STATUS'] = $currentDelegation['APP_STATUS'];
$inbox = new ListInbox(); $inbox = new ListInbox();
$inbox->newRow($aFields, $appFields['CURRENT_USER_UID'], false, array(), ($nextDel['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE' ? true : false)); $inbox->newRow($aFields, $appFields['CURRENT_USER_UID'], false, array(), ($nextDel['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE' ? true : false));
$removeList = false;
} }
} else { } else {
$oRow = ApplicationPeer::retrieveByPK($appFields['APP_UID']); $oRow = ApplicationPeer::retrieveByPK($appFields['APP_UID']);

27
workflow/engine/classes/model/ListInbox.php
View File

@@ -192,6 +192,11 @@ class ListInbox extends BaseListInbox
public function newRow ($data, $delPreviusUsrUid, $isInitSubprocess = false, $dataPreviusApplication = array(), $isSelfService = false) public function newRow ($data, $delPreviusUsrUid, $isInitSubprocess = false, $dataPreviusApplication = array(), $isSelfService = false)
{ {
$removeList = true;
if (isset($data['REMOVED_LIST'])) {
$removeList = $data['REMOVED_LIST'];
unset($data['REMOVED_LIST']);
}
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid; $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
if (isset($data['DEL_TASK_DUE_DATE'])) { if (isset($data['DEL_TASK_DUE_DATE'])) {
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE']; $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
@@ -281,18 +286,20 @@ class ListInbox extends BaseListInbox
} else { } else {
$oRow = ApplicationPeer::retrieveByPK($data['APP_UID']); $oRow = ApplicationPeer::retrieveByPK($data['APP_UID']);
$aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
if ($data['DEL_INDEX'] == 2 || $aFields['APP_STATUS'] == 'DRAFT') { if ($removeList) {
$criteria = new Criteria(); if ($data['DEL_INDEX'] == 2 || $aFields['APP_STATUS'] == 'DRAFT') {
$criteria->addSelectColumn(SubApplicationPeer::APP_UID); $criteria = new Criteria();
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->addSelectColumn(SubApplicationPeer::APP_UID);
$dataset = SubApplicationPeer::doSelectRS($criteria); $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
if ($dataset->next()) { $dataset = SubApplicationPeer::doSelectRS($criteria);
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); if ($dataset->next()) {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
}
} else { } else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft'); $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
} }
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
} }
if (!$isSelfService) { if (!$isSelfService) {
$users->refreshTotal($data['USR_UID'], 'add', 'inbox'); $users->refreshTotal($data['USR_UID'], 'add', 'inbox');