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

PMCORE-1332

Browse Source
This commit is contained in:
Luciana Nuñez
2022-11-01 12:17:57 -04:00
parent 26a122b5e4
commit 122b9e5e19
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/workflow/engine/src/ProcessMaker/Model/DelegationTest.php
View File

@@ -3332,13 +3332,13 @@ class DelegationTest extends TestCase
//Create task //Create task
$task = Task::factory()->create(); $task = Task::factory()->create();
//Create a delegation //Create a delegation
Delegation::factory()->create([ $delegation = Delegation::factory()->create([
'DEL_THREAD_STATUS' => 'OPEN', 'DEL_THREAD_STATUS' => 'OPEN',
'DEL_FINISH_DATE' => null, 'DEL_FINISH_DATE' => null,
'APP_NUMBER' => $application->APP_NUMBER, 'APP_NUMBER' => $application->APP_NUMBER,
'TAS_UID' => $task->TAS_UID, 'TAS_UID' => $task->TAS_UID,
]); ]);
$result = Delegation::getOpenThreads($application->APP_NUMBER, $task->TAS_UID); $result = Delegation::getOpenThread($application->APP_NUMBER, $delegation->DEL_INDEX);
$this->assertEquals($application->APP_NUMBER, $result['APP_NUMBER']); $this->assertEquals($application->APP_NUMBER, $result['APP_NUMBER']);
} }
@@ -3357,12 +3357,12 @@ class DelegationTest extends TestCase
//Create task //Create task
$task = Task::factory()->create(); $task = Task::factory()->create();
//Create a delegation //Create a delegation
Delegation::factory()->create([ $delegation = Delegation::factory()->create([
'DEL_THREAD_STATUS' => 'CLOSED', 'DEL_THREAD_STATUS' => 'CLOSED',
'APP_NUMBER' => $application->APP_NUMBER, 'APP_NUMBER' => $application->APP_NUMBER,
'TAS_UID' => $task->TAS_UID, 'TAS_UID' => $task->TAS_UID,
]); ]);
$result = Delegation::getOpenThreads($application->APP_NUMBER, $task->TAS_UID); $result = Delegation::getOpenThread($application->APP_NUMBER, $delegation->DEL_INDEX);
$this->assertEmpty($result); $this->assertEmpty($result);
} }
@@ -3383,12 +3383,12 @@ class DelegationTest extends TestCase
//Create task //Create task
$task = Task::factory()->create(); $task = Task::factory()->create();
//Create a delegation //Create a delegation
Delegation::factory()->create([ $delegation = Delegation::factory()->create([
'DEL_THREAD_STATUS' => 'CLOSED', 'DEL_THREAD_STATUS' => 'CLOSED',
'APP_NUMBER' => $application->APP_NUMBER, 'APP_NUMBER' => $application->APP_NUMBER,
'TAS_UID' => $task->TAS_UID, 'TAS_UID' => $task->TAS_UID,
]); ]);
$result = Delegation::getOpenThreads($application->APP_NUMBER, $task->TAS_UID); $result = Delegation::getOpenThread($application->APP_NUMBER, $delegation->DEL_INDEX);
$this->assertEmpty($result); $this->assertEmpty($result);
} }

1
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -374,6 +374,7 @@ function getReassignList()
$caseReaderFields[] = ['name' => 'APP_NUMBER']; $caseReaderFields[] = ['name' => 'APP_NUMBER'];
$caseReaderFields[] = ['name' => 'APP_TITLE']; $caseReaderFields[] = ['name' => 'APP_TITLE'];
$caseReaderFields[] = ['name' => 'APP_UID']; $caseReaderFields[] = ['name' => 'APP_UID'];
$caseReaderFields[] = ['name' => 'DEL_INDEX'];
$caseReaderFields[] = ['name' => 'USR_UID']; $caseReaderFields[] = ['name' => 'USR_UID'];
$caseReaderFields[] = ['name' => 'APP_TAS_TITLE']; $caseReaderFields[] = ['name' => 'APP_TAS_TITLE'];
$caseReaderFields[] = ['name' => 'APP_PRO_TITLE']; $caseReaderFields[] = ['name' => 'APP_PRO_TITLE'];

2
workflow/engine/methods/cases/proxySaveReassignCasesList.php
View File

@@ -26,7 +26,7 @@ if (empty($dataPost)) {
foreach ($dataPost as $data) { foreach ($dataPost as $data) {
// It was supposed will return only one thread related to the task // It was supposed will return only one thread related to the task
// todo: implement the reassign case for multi instance task // todo: implement the reassign case for multi instance task
$openThreads = Delegation::getOpenThreads($data->APP_NUMBER, $data->TAS_UID); $openThreads = Delegation::getOpenThread($data->APP_NUMBER, $data->DEL_INDEX);
if (!empty($openThreads)) { if (!empty($openThreads)) {
// Get the user information assigned in the index // Get the user information assigned in the index
$currentUsrUid = Delegation::getCurrentUser($openThreads['APP_NUMBER'], $openThreads['DEL_INDEX']); $currentUsrUid = Delegation::getCurrentUser($openThreads['APP_NUMBER'], $openThreads['DEL_INDEX']);

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

@@ -1847,25 +1847,25 @@ class Delegation extends Model
* Return the open thread related to the task * Return the open thread related to the task
* *
* @param int $appNumber, Case number * @param int $appNumber, Case number
* @param string $tasUid, The task uid * @param int $delIndex
* *
* @return array * @return array
*/ */
public static function getOpenThreads(int $appNumber, string $tasUid) public static function getOpenThread(int $appNumber, int $delIndex)
{ {
$query = Delegation::query()->select(); $query = Delegation::query()->select();
$query->where('DEL_THREAD_STATUS', 'OPEN'); $query->where('DEL_THREAD_STATUS', 'OPEN');
$query->where('DEL_FINISH_DATE', null); $query->where('DEL_FINISH_DATE', null);
$query->where('APP_NUMBER', $appNumber); $query->where('APP_NUMBER', $appNumber);
$query->where('TAS_UID', $tasUid); $query->where('DEL_INDEX', $delIndex);
$results = $query->get(); $results = $query->get();
$arrayOpenThreads = []; $arrayOpenThread = [];
$results->each(function ($item, $key) use (&$arrayOpenThreads) { $results->each(function ($item, $key) use (&$arrayOpenThread) {
$arrayOpenThreads = $item->toArray(); $arrayOpenThread = $item->toArray();
}); });
return $arrayOpenThreads; return $arrayOpenThread;
} }
/** /**