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

PMCORE-3071

Browse Source
This commit is contained in:
Paula Quispe
2021-07-09 16:45:07 -04:00
parent 072b06d899
commit 10a65a7bf7
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1924,10 +1924,8 @@ class Delegation extends Model
'TASK.TAS_ASSIGN_TYPE', // Task assign rule 'TASK.TAS_ASSIGN_TYPE', // Task assign rule
'APP_DELEGATION.DEL_TITLE', // Thread title 'APP_DELEGATION.DEL_TITLE', // Thread title
'APP_DELEGATION.DEL_THREAD_STATUS', // Thread status 'APP_DELEGATION.DEL_THREAD_STATUS', // Thread status
'APP_DELEGATION.USR_UID', // Current UserUid
'APP_DELEGATION.USR_ID', // Current UserId 'APP_DELEGATION.USR_ID', // Current UserId
'USERS.USR_USERNAME', // Current UserName
'USERS.USR_FIRSTNAME', // Current User FirstName
'USERS.USR_LASTNAME', // Current User LastName
'APP_DELEGATION.DEL_TASK_DUE_DATE', // Due Date 'APP_DELEGATION.DEL_TASK_DUE_DATE', // Due Date
// Additional column for other functionalities // Additional column for other functionalities
'APP_DELEGATION.APP_UID', // Case Uid for Open case 'APP_DELEGATION.APP_UID', // Case Uid for Open case
@@ -1937,8 +1935,6 @@ class Delegation extends Model
]); ]);
// Join with task // Join with task
$query->joinTask(); $query->joinTask();
// Join with task
$query->joinUser();
// Get the open threads // Get the open threads
$query->threadOpen(); $query->threadOpen();
// Related to the specific case number // Related to the specific case number
@@ -1950,6 +1946,12 @@ class Delegation extends Model
$item['TAS_COLOR'] = $abs->getTaskColor($item['DEL_TASK_DUE_DATE']); $item['TAS_COLOR'] = $abs->getTaskColor($item['DEL_TASK_DUE_DATE']);
$item['TAS_COLOR_LABEL'] = AbstractCases::TASK_COLORS[$item['TAS_COLOR']]; $item['TAS_COLOR_LABEL'] = AbstractCases::TASK_COLORS[$item['TAS_COLOR']];
$item['UNASSIGNED'] = ($item['TAS_ASSIGN_TYPE'] === 'SELF_SERVICE' ? true : false); $item['UNASSIGNED'] = ($item['TAS_ASSIGN_TYPE'] === 'SELF_SERVICE' ? true : false);
$userInfo = User::getInformation($item['USR_ID']);
$item['user_tooltip'] = $userInfo;
$item['USR_USERNAME'] = !empty($userInfo['usr_username']) ? $userInfo['usr_username'] : '';
$item['USR_LASTNAME'] = !empty($userInfo['usr_lastname']) ? $userInfo['usr_lastname'] : '';
$item['USR_FIRSTNAME'] = !empty($userInfo['usr_firstname']) ? $userInfo['usr_firstname'] : '';
return $item; return $item;
}); });

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

@@ -570,18 +570,19 @@ class Home extends Api
/** /**
* Get the search cases * Get the search cases
* *
* @url GET /:app_number/pending-tasks * @url GET /:appNumber/pending-tasks
* *
* @param int $app_number * @param int $appNumber
* *
* @return array * @return array
* *
* @access protected * @access protected
* @class AccessControl {@permission PM_CASES} * @class AccessControl {@permission PM_CASES}
*/ */
public function getPendingTasks(int $app_number) public function getPendingTasks(int $appNumber)
{ {
$result = Delegation::getPendingTask($app_number); // Get the pending task
$result = Delegation::getPendingTask($appNumber);
return $result; return $result;
} }