fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/HOR-1550-31 (pull request #4730)

Browse Source 
HOR-1550
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-11 17:45:22 -04:00
parent 0fd3460680 a5ab5e2d58
commit c17ab87c94
3 changed files with 148 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -2887,6 +2887,53 @@ class Cases
$dataResponse = $data;
//Verify data
$arrayCasesToReassign = $data['cases'];
$arrayMsg = [];
foreach($arrayCasesToReassign as $key => $value) {
$appDelegation = \AppDelegationPeer::retrieveByPK($value['APP_UID'], $value['DEL_INDEX']);
if (is_null($appDelegation)) {
$arrayMsg[] = [
'app_uid' => $value['APP_UID'],
'del_index' => $value['DEL_INDEX'],
'result' => 0,
'status' => 'DELEGATION_NOT_EXISTS'
];
}
}
if (!empty($arrayMsg)) {
return ['cases' => $arrayMsg];
}
$task = new \ProcessMaker\BusinessModel\Task();
$userUid = $data['usr_uid_target'];
foreach($arrayCasesToReassign as $value) {
$appDelegation = \AppDelegationPeer::retrieveByPK($value['APP_UID'], $value['DEL_INDEX']);
//Verify data
$taskUid = $appDelegation->getTasUid();
$flagBoolean = $task->checkUserOrGroupAssignedTask($taskUid, $userUid);
if (!$flagBoolean) {
$arrayMsg[] = [
'app_uid' => $value['APP_UID'],
'del_index' => $value['DEL_INDEX'],
'result' => 0,
'status' => 'USER_NOT_ASSIGNED_TO_TASK'
];
}
}
if (!empty($arrayMsg)) {
return ['cases' => $arrayMsg];
}
G::LoadClass( 'case' );
$oCases = new \Cases();
$appDelegation = new \AppDelegation();
@@ -2908,6 +2955,7 @@ class Cases
$reassigned = $oCases->reassignCase($val['APP_UID'], $val['DEL_INDEX'], $usrUid, $data['usr_uid_target']);
$result = $reassigned ? 1 : 0 ;
$dataResponse['cases'][$key]['result'] = $result;
$dataResponse['cases'][$key]['status'] = 'SUCCESS';
}
}
unset($dataResponse['usr_uid_target']);

48
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -1972,4 +1972,52 @@ class Task
);
return $aTypes;
}
/**
* Check user to group assigned Task (Normal and/or Ad-Hoc Users)
*
* @param string $taskUid Unique uid of Task
* @param string $userUid Unique uid of User
*
* return bool
*/
public function checkUserOrGroupAssignedTask($taskUid, $usrUid)
{
$criteriaUser = new \Criteria('workflow');
$criteriaUser->add(\TaskUserPeer::TAS_UID, $taskUid, \Criteria::EQUAL);
$criteriaUser->add(\TaskUserPeer::USR_UID, $usrUid, \Criteria::EQUAL);
$criteriaUser->add(\TaskUserPeer::TU_RELATION, 1, \Criteria::EQUAL);
$rsCriteria = \TaskUserPeer::doSelectRS($criteriaUser);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) {
return true;
}
$criteriaGroup = new \Criteria('workflow');
$criteriaGroup->addSelectColumn(\TaskUserPeer::USR_UID);
$criteriaGroup->add(\TaskUserPeer::TAS_UID, $taskUid, \Criteria::EQUAL);
$criteriaGroup->add(\TaskUserPeer::TU_RELATION, 2, \Criteria::EQUAL);
$rsCriteriaGroup = \TaskUserPeer::doSelectRS($criteriaGroup);
$rsCriteriaGroup->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteriaGroup->next()) {
$row = $rsCriteriaGroup->getRow();
$groupUid = $row['USR_UID'];
$obj = \GroupUserPeer::retrieveByPK($groupUid, $usrUid);
if (!is_null($obj)) {
return true;
}
}
//Return
return false;
}
}