fernando/luos
1
0
Fork 0
Code Releases Activity

PMCORE-2525

Browse Source
This commit is contained in:
Andrea Adamczyk
2020-12-11 17:36:07 -04:00
parent fe3528113c
commit ae1d7d5075
2 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -789,7 +789,8 @@ class Delegation extends Model
{
// Add join for application, for get the case title when the case status is DRAFT
$query->joinApplication();
$query->status(Application::STATUS_TODO);
$query->status(Application::STATUS_DRAFT);
$query->threadOpen();
// Case assigned to the user
$query->userId($user);

62
workflow/engine/src/ProcessMaker/Services/Api/Home.php
View File

@@ -63,8 +63,8 @@ class Home extends Api
int $task = 0,
string $caseTitle = '',
string $paged = '0,15',
string $sort ='APP_NUMBER,ASC'
){
string $sort = 'APP_NUMBER,ASC'
) {
try {
$list = new Draft();
// Define the filters to apply
@@ -118,8 +118,8 @@ class Home extends Api
int $task = 0,
string $caseTitle = '',
string $paged = '0,15',
string $sort ='APP_NUMBER,ASC'
){
string $sort = 'APP_NUMBER,ASC'
) {
try {
$list = new Inbox();
// Define the filters to apply
@@ -173,8 +173,8 @@ class Home extends Api
int $task = 0,
string $caseTitle = '',
string $paged = '0,15',
string $sort ='APP_NUMBER,ASC'
){
string $sort = 'APP_NUMBER,ASC'
) {
try {
$list = new Unassigned();
// Define the filters to apply
@@ -230,8 +230,8 @@ class Home extends Api
int $task = 0,
string $caseTitle = '',
string $paged = '0,15',
string $sort ='APP_NUMBER,ASC'
){
string $sort = 'APP_NUMBER,ASC'
) {
try {
$list = new Paused();
// Define the filters to apply
@@ -295,8 +295,8 @@ class Home extends Api
string $finishCaseFrom = '',
string $finishCaseTo = '',
string $paged = '0,15',
string $sort ='APP_NUMBER,ASC'
){
string $sort = 'APP_NUMBER,ASC'
) {
// Define the filters to apply
$properties = [];
$properties['caseNumber'] = $caseNumber;
@@ -444,8 +444,8 @@ class Home extends Api
string $delegationDateFrom = '',
string $delegationDateTo = '',
string $paged = '0,15',
string $sort ='APP_NUMBER,ASC'
){
string $sort = 'APP_NUMBER,ASC'
) {
try {
$list = new Search();
// Define the filters to apply
@@ -598,4 +598,42 @@ class Home extends Api
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
}
/**
* Get the tasks counters for todo, draft, paused and unassigned
*
* @url GET /tasks/counter
* @return array
* @access protected
* @class AccessControl {@permission PM_CASES}
*/
public function getTasksCounters()
{
$result = [];
$usrUid = $this->getUserId();
$usrId = User::find($usrUid)->first()->USR_ID;
$inbox = new Inbox();
$inbox->setUserUid($usrUid);
$inbox->setUserId($usrId);
$result['todo'] = $inbox->getCounter();
$draft = new Draft();
$draft->setUserUid($usrUid);
$draft->setUserId($usrId);
$result['draft'] = $draft->getCounter();
$paused = new Paused();
$paused->setUserUid($usrUid);
$paused->setUserId($usrId);
$result['paused'] = $paused->getCounter();
$unassigned = new Unassigned();
$unassigned->setUserUid($usrUid);
$unassigned->setUserId($usrId);
$result['unassigned'] = $unassigned->getCounter();
return $result;
}
}