fernando/luos
1
0
Fork 0
Code Releases Activity

PM-3927

Browse Source
This commit is contained in:
Paula V. Quispe
2015-11-06 13:04:49 -04:00
parent 29582243fb
commit 231c068b07
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1404,7 +1404,6 @@ class Cases
$rsCriteria = RoutePeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
@@ -1973,6 +1972,7 @@ class Cases
public function CloseCurrentDelegation($sAppUid, $iDelIndex)
{
try {
$oApplication = ApplicationPeer::retrieveByPk($sAppUid);
$c = new Criteria();
$c->add(AppDelegationPeer::APP_UID, $sAppUid);
$c->add(AppDelegationPeer::DEL_INDEX, $iDelIndex);
@@ -1991,6 +1991,12 @@ 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"){
$sUserUid = $appDel->getUsrUid();
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "draft");
}
}
/*----------------------------------********---------------------------------*/
$inbox = new ListInbox();

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

@@ -653,7 +653,7 @@ class Derivation
$application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]);
if ($application->getAppStatus() == "DRAFT") {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
@@ -683,7 +683,7 @@ class Derivation
$application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]);
if ($application->getAppStatus() == "DRAFT") {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
@@ -694,7 +694,7 @@ class Derivation
$application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]);
if ($application->getAppStatus() == "DRAFT") {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}

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

@@ -127,7 +127,7 @@ class ListCompleted extends BaseListCompleted
if ($dataset->next()) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
} else {
$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
//$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
}
}

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

@@ -326,7 +326,7 @@ class ListInbox extends BaseListInbox
if ($dataset->next()) {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
}
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
@@ -341,7 +341,8 @@ class ListInbox extends BaseListInbox
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}
if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
} else {
$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
}