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

PM-3927

Browse Source
This commit is contained in:
Paula V. Quispe
2015-11-06 15:42:21 -04:00
parent 2fa79e860b
commit 1e168102aa
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.case.php
View File

@@ -1993,10 +1993,16 @@ class Cases
throw (new PropelException('The row cannot be created!', new PropelException($msg)));
}
$taskNext = TaskPeer::retrieveByPK($appDel->getTasUid());
if($taskNext->getTasType() == 'NORMAL' && $oApplication->getAppStatus() == "DRAFT"){
if($taskNext->getTasType() == 'NORMAL'){
if($oApplication->getAppStatus() == "DRAFT"){
$sUserUid = $appDel->getUsrUid();
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "draft");
}else{
$sUserUid = $appDel->getUsrUid();
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "inbox");
}
}
}
/*----------------------------------********---------------------------------*/

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

@@ -655,7 +655,7 @@ class Derivation
if ($application->getAppStatus() == "DRAFT") {
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
} else {
if ($arrayNextDelegationData["TAS_UID"] != "-1") {
@@ -685,7 +685,7 @@ class Derivation
if ($application->getAppStatus() == "DRAFT") {
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
}
}
@@ -696,7 +696,7 @@ class Derivation
if ($application->getAppStatus() == "DRAFT") {
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
}
}

4
workflow/engine/classes/model/ListCompleted.php
View File

@@ -116,7 +116,7 @@ class ListCompleted extends BaseListCompleted
$dataset->next();
$aRow = $dataset->getRow();
if ($aRow['TAS_TYPE'] != 'SUBPROCESS') {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
//$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
}
} else {
$criteria = new Criteria();
@@ -125,7 +125,7 @@ class ListCompleted extends BaseListCompleted
$dataset = SubApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($dataset->next()) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
//$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
} else {
//$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
}

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

@@ -324,12 +324,12 @@ class ListInbox extends BaseListInbox
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = SubApplicationPeer::doSelectRS($criteria);
if ($dataset->next()) {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
} else {
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
}
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
}
}
if (!$isSelfService) {
@@ -343,7 +343,7 @@ class ListInbox extends BaseListInbox
if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
} else {
$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
}
}
self::create($data, $isSelfService);