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

PMCORE-2698

Browse Source
This commit is contained in:
Paula Quispe
2021-01-14 09:53:58 -04:00
parent df53646f1c
commit 5a0a0a84e7
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1124,14 +1124,17 @@ class AbstractCases implements CasesInterface
if($key === 'user_id') {
$threadTasks[$i][$key] = $row;
// Get the user tooltip information
$threadTasks[$i] = User::getInformation($row);
$threadTasks[$i]['user_tooltip'] = User::getInformation($row);
}
} else {
// Thread users
if ($key === 'user_id') {
$threadUsers[$i][$key] = $row;
// Get the user tooltip information
$threadTasks[$i] = User::getInformation($row);
// Get user information
$userInfo = User::getInformation($row);
$threadUsers[$i]['usr_username'] = !empty($userInfo) ? $userInfo['usr_username'] : '';
$threadUsers[$i]['usr_lastname'] = !empty($userInfo) ? $userInfo['usr_lastname'] : '';
$threadUsers[$i]['usr_firstname'] = !empty($userInfo) ? $userInfo['usr_firstname'] : '';
}
// Thread titles
if ($key === 'del_id') {

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

@@ -184,7 +184,7 @@ class Participated extends AbstractCases
$result[$i]['tas_color'] = (!empty($thread['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($thread['DEL_TASK_DUE_DATE']) : '';
$result[$i]['tas_color_label'] = (!empty($result[$i]['tas_color'])) ? self::TASK_COLORS[$result[$i]['tas_color']] : '';
// Get the user tooltip information
$result[$i] = User::getInformation($thread['USR_ID']);
$result[$i]['user_tooltip'] = User::getInformation($thread['USR_ID']);
$i++;
}
$item['PENDING'] = $result;
@@ -196,7 +196,7 @@ class Participated extends AbstractCases
$result[$i]['tas_color'] = (!empty($item['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($item['DEL_TASK_DUE_DATE']) : '';
$result[$i]['tas_color_label'] = (!empty($result[$i]['tas_color'])) ? self::TASK_COLORS[$result[$i]['tas_color']] : '';
// Get the user tooltip information
$result[$i] = User::getInformation($item['USR_ID']);
$result[$i]['user_tooltip'] = User::getInformation($item['USR_ID']);
$item['PENDING'] = $result;
}
break;
@@ -217,7 +217,7 @@ class Participated extends AbstractCases
$result[$i]['tas_color'] = (!empty($item['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($item['DEL_TASK_DUE_DATE']) : '';
$result[$i]['tas_color_label'] = (!empty($result[$i]['tas_color'])) ? self::TASK_COLORS[$result[$i]['tas_color']] : '';
// Get the user tooltip information
$result[$i] = User::getInformation($item['USR_ID']);
$result[$i]['user_tooltip'] = User::getInformation($item['USR_ID']);
$item['PENDING'] = $result;
break;
}

2
workflow/engine/src/ProcessMaker/Model/User.php
View File

@@ -220,6 +220,7 @@ class User extends Model
'USR_FIRSTNAME',
'USR_LASTNAME',
'USR_EMAIL',
'USR_POSITION'
])
->userId($usrId)
->limit(1);
@@ -230,6 +231,7 @@ class User extends Model
$info['usr_firstname'] = $item->USR_FIRSTNAME;
$info['usr_lastname'] = $item->USR_LASTNAME;
$info['usr_email'] = $item->USR_EMAIL;
$info['usr_position'] = $item->USR_POSITION;
});
return $info;