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

PMCORE-2732

Browse Source
This commit is contained in:
Paula Quispe
2021-01-21 13:55:02 -04:00
parent c0017b922a
commit 8e220eb14a
6 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1129,7 +1129,7 @@ class AbstractCases implements CasesInterface
if($key === 'user_id') {
$threadTasks[$i][$key] = $row;
// Get the user tooltip information
$threadTasks[$i]['user_tooltip'] = User::getInformation($row);
$threadTasks[$i]['user_tooltip'] = User::getInformation($row);
}
} else {
// Thread users
@@ -1140,6 +1140,7 @@ class AbstractCases implements CasesInterface
$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'] : '';
$threadUsers[$i]['user_tooltip'] = User::getInformation($row);
}
// Thread titles
if ($key === 'del_id') {

3
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Draft.php
View File

@@ -99,7 +99,10 @@ class Draft extends AbstractCases
// Get task color label
$item['TAS_COLOR'] = $this->getTaskColor($item['DEL_TASK_DUE_DATE']);
$item['TAS_COLOR_LABEL'] = self::TASK_COLORS[$item['TAS_COLOR']];
// Get task status
$item['TAS_STATUS'] = self::TASK_STATUS[$item['TAS_COLOR']];
// Get delay
$item['DELAY'] = getDiffBetweenDates($item['DEL_TASK_DUE_DATE'], date("Y-m-d H:i:s"));
// Apply the date format defined in environment
$item['DEL_TASK_DUE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_TASK_DUE_DATE']);
$item['DEL_DELEGATE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_DELEGATE_DATE']);

3
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php
View File

@@ -103,7 +103,10 @@ class Inbox extends AbstractCases
// Get task color label
$item['TAS_COLOR'] = $this->getTaskColor($item['DEL_TASK_DUE_DATE']);
$item['TAS_COLOR_LABEL'] = self::TASK_COLORS[$item['TAS_COLOR']];
// Get task status
$item['TAS_STATUS'] = self::TASK_STATUS[$item['TAS_COLOR']];
// Get delay
$item['DELAY'] = getDiffBetweenDates($item['DEL_TASK_DUE_DATE'], date("Y-m-d H:i:s"));
// Apply the date format defined in environment
$item['DEL_TASK_DUE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_TASK_DUE_DATE']);
$item['DEL_DELEGATE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_DELEGATE_DATE']);

3
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php
View File

@@ -98,7 +98,10 @@ class Paused extends AbstractCases
// Get task color label
$item['TAS_COLOR'] = $this->getTaskColor($item['DEL_TASK_DUE_DATE']);
$item['TAS_COLOR_LABEL'] = self::TASK_COLORS[$item['TAS_COLOR']];
// Get task status
$item['TAS_STATUS'] = self::TASK_STATUS[$item['TAS_COLOR']];
// Get delay
$item['DELAY'] = getDiffBetweenDates($item['DEL_TASK_DUE_DATE'], date("Y-m-d H:i:s"));
// Apply the date format defined in environment
$item['DEL_TASK_DUE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_TASK_DUE_DATE']);
$item['DEL_DELEGATE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_DELEGATE_DATE']);

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

@@ -122,6 +122,8 @@ class Search extends AbstractCases
$query->casesDone($casesClosed);
}
}
} else {
$query->isThreadOpen();
}
return $query;

3
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php
View File

@@ -108,7 +108,10 @@ class Unassigned extends AbstractCases
// Get task color label
$item['TAS_COLOR'] = $this->getTaskColor($item['DEL_TASK_DUE_DATE']);
$item['TAS_COLOR_LABEL'] = self::TASK_COLORS[$item['TAS_COLOR']];
// Get task status
$item['TAS_STATUS'] = self::TASK_STATUS[$item['TAS_COLOR']];
// Get delay
$item['DELAY'] = getDiffBetweenDates($item['DEL_TASK_DUE_DATE'], date("Y-m-d H:i:s"));
// Apply the date format defined in environment
$item['DEL_TASK_DUE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_TASK_DUE_DATE']);
$item['DEL_DELEGATE_DATE_LABEL'] = applyMaskDateEnvironment($item['DEL_DELEGATE_DATE']);