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

Merged in bugfix/PMCORE-3259 (pull request #8086)

Browse Source 
PMCORE-3259

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-08-31 21:10:47 +00:00
committed by Julio Cesar Laura Avendaño
parent 29a29c0b25 d63071e182
commit 7c315d6422
4 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php
View File

@@ -1250,7 +1250,7 @@ class AbstractCases implements CasesInterface
*
* @return array
*/
public function threadInformation(array $thread, $addUserInfo = false, $addThreadInfo = false)
public function threadInformation(array $thread, $addUserInfo = false, $addThreadInfo = true)
{
$status = '';
$finishDate = 'now';

62
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php
View File

@@ -176,19 +176,24 @@ class Participated extends AbstractCases
switch ($filter) {
case 'STARTED':
case 'IN_PROGRESS':
$result = [];
$i = 0;
switch ($item['APP_STATUS']) {
case 'TO_DO':
// Get the pending task
$taskPending = Delegation::getPendingThreads($item['APP_NUMBER'], false);
$result = [];
foreach ($taskPending as $thread) {
$thread['APP_STATUS'] = $item['APP_STATUS'];
// Get the thread information
$result[$i] = $this->threadInformation($thread);
$i++;
$information = $this->threadInformation($thread);
$result['THREAD_TASKS'] = [];
$result['THREAD_TITLES'] = [];
$result['THREAD_TASKS'][] = $information['THREAD_TASK'];
$result['THREAD_TITLES'][] = $information['THREAD_TITLE'];
}
$item['PENDING'] = $result;
// Return THREAD_TASKS and THREAD_USERS in the same column
$item['PENDING'] = !empty($result['THREAD_TASKS']) ? $result['THREAD_TASKS'] : [];
// Return the THREAD_TITLES
$item['THREAD_TITLES'] = !empty($result['THREAD_TITLES']) ? $result['THREAD_TITLES'] : [];
break;
case 'COMPLETED':
// Get the last thread
@@ -199,22 +204,57 @@ class Participated extends AbstractCases
$thread['APP_STATUS'] = $item['APP_STATUS'];
$thread['APP_FINISH_DATE'] = $item['APP_FINISH_DATE'];
// Get the thread information
$result[$i] = $this->threadInformation($thread);
$information = $this->threadInformation($thread);
$result = [];
$result[] = $information['THREAD_TASK'];
// Return THREAD_TASKS and THREAD_USERS in the same column
$item['PENDING'] = $result;
// Return the THREAD_TITLES
$result = [];
$result[] = $information['THREAD_TITLE'];
$item['THREAD_TITLES'] = $result;
break;
default: // Other status
$result[$i] = $this->threadInformation($thread);
default: // Other status like DRAFT
// Get the last thread
$taskPending = Delegation::getLastThread($item['APP_NUMBER']);
// Get the head of array
$thread = head($taskPending);
// Define some values required for define the color status
$thread['APP_STATUS'] = $item['APP_STATUS'];
$thread['APP_FINISH_DATE'] = $item['APP_FINISH_DATE'];
// Get the thread information
$information = $this->threadInformation($thread);
$result = [];
$result[] = $information['THREAD_TASK'];
// Return THREAD_TASKS and THREAD_USERS in the same column
$item['PENDING'] = $result;
// Return the THREAD_TITLES
$result = [];
$result[] = $information['THREAD_TITLE'];
$item['THREAD_TITLES'] = $result;
}
break;
case 'COMPLETED':
// Get the last thread
$taskPending = Delegation::getLastThread($item['APP_NUMBER']);
// Get the head of array
$thread = head($taskPending);
// Define some values required for define the color status
$thread['APP_STATUS'] = $item['APP_STATUS'];
$thread['APP_FINISH_DATE'] = $item['APP_FINISH_DATE'];
// Get the thread information
$information = $this->threadInformation($thread);
$result = [];
$i = 0;
$result[$i] = $this->threadInformation($thread);
$result[] = $information['THREAD_TASK'];
// Return THREAD_TASKS and THREAD_USERS in the same column
$item['PENDING'] = $result;
// Return the THREAD_TITLES
$result = [];
$result[] = $information['THREAD_TITLE'];
$item['THREAD_TITLES'] = $result;
break;
}
// Get the send by related to the previous index
// Get send by related to the previous index
$previousThread = Delegation::getThreadInfo($item['APP_NUMBER'], $item['DEL_PREVIOUS']);
$userInfo = !empty($previousThread) ? User::getInformation($previousThread['USR_ID']) : [];
$result = [];

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php
View File

@@ -183,7 +183,7 @@ class Search extends AbstractCases
$result = [];
foreach ($taskPending as $thread) {
$thread['APP_STATUS'] = $item['APP_STATUS'];
$information = $this->threadInformation($thread, true, true);
$information = $this->threadInformation($thread, true);
$result['THREAD_TASKS'][$i] = $information['THREAD_TASK'];
$result['THREAD_USERS'][$i] = $information['THREAD_USER'];
$result['THREAD_TITLES'][$i] = $information['THREAD_TITLE'];

13
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Supervising.php
View File

@@ -155,13 +155,18 @@ class Supervising extends AbstractCases
$item['CASE_NOTES_COUNT'] = AppNotes::total($item['APP_NUMBER']);
// Get the detail related to the open thread
$taskPending = Delegation::getPendingThreads($item['APP_NUMBER']);
$information = [];
$result = [];
foreach ($taskPending as $thread) {
$thread['APP_STATUS'] = $item['APP_STATUS'];
$information[] = $this->threadInformation($thread);
$information = $this->threadInformation($thread);
$result['THREAD_TASKS'] = [];
$result['THREAD_TITLES'] = [];
$result['THREAD_TASKS'][] = $information['THREAD_TASK'];
$result['THREAD_TITLES'][] = $information['THREAD_TITLE'];
}
$item['PENDING'] = $information;
// Get the send by related to the previous index
$item['PENDING'] = $result['THREAD_TASKS'];
$item['THREAD_TITLES'] = $result['THREAD_TITLES'];
// Get send by related to the previous index
$previousThread = Delegation::getThreadInfo($item['APP_NUMBER'], $item['DEL_PREVIOUS']);
$userInfo = !empty($previousThread) ? User::getInformation($previousThread['USR_ID']) : [];
$result = [];