From 5d73710741aff1f9c317c8f8ef861bf2ca3dcab3 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 18 May 2022 11:00:54 +0800
Subject: [PATCH] * Finish task#54468.

---
 module/execution/js/taskkanban.js | 5 ++---
 module/kanban/model.php           | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

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 ? ('<span class="info info-id text-muted">#' + item.id + '</span>') : '';
         var priHtml    = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
-        var hoursHtml  = (item.estimate && scaleSize <= 1) ? ('<span class="info info-estimate text-muted">' + item.estimate + 'h</span>') : '';
+        var hoursHtml  = scaleSize <= 1 && item.status != 'wait' ? ('<span class="info info-estimate text-muted">' + taskLang.leftAB + ' ' + item.left + 'h</span>') : ('<span class="info info-estimate text-muted">' + taskLang.estimateAB + ' ' + item.estimate + 'h</span>');
         var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id);
 
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
-        $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
                     {