diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index 56a6cf5af4..5850843c51 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -215,14 +215,13 @@ function renderTaskItem(item, $item, col) if(scaleSize <= 2) { - var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var priHtml = '' + item.pri + ''; - var hoursHtml = (item.estimate && scaleSize <= 1) ? ('' + item.estimate + 'h') : ''; + var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('' + taskLang.leftAB + ' ' + item.left + 'h') : ('' + taskLang.estimateAB + ' ' + item.estimate + 'h'); var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); - $infos.html([idHtml, priHtml, hoursHtml].join('')); + $infos.html([priHtml, hoursHtml].join('')); if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline)); $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml); diff --git a/module/kanban/model.php b/module/kanban/model.php index aa07b92614..4dbf1b44e0 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1404,7 +1404,9 @@ class kanbanModel extends model if($lane->type == 'task') { - $cardData['name'] = $object->name; + $cardData['name'] = $object->name; + $cardData['status'] = $object->status; + $cardData['left'] = $object->left; } else {