From b223f55900776588bafecff75c1464008b2d8e50 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 18 May 2022 14:00:29 +0800
Subject: [PATCH] * Code for task#54467.

---
 module/execution/js/kanban.js     | 9 ++++++---
 module/execution/js/taskkanban.js | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 82f86d8dc5..ee04f7a9b2 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -430,9 +430,10 @@ function renderUserAvatar(user, objectType, objectID, size)
 /**
  * Render deadline
  * @param {String|Date} deadline Deadline
+ * @param {string}      status
  * @returns {JQuery}
  */
-function renderDeadline(deadline)
+function renderDeadline(deadline, status)
 {
     if(deadline == '0000-00-00') return;
 
@@ -444,8 +445,10 @@ function renderDeadline(deadline)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var deadlineDate     = $.zui.formatDate(date, 'MM-dd');
+    var statusList       = ['wait','doing','pause'];
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
 
-    return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
+    return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
 }
 
 /**
@@ -607,7 +610,7 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline));
+        if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
         if(scaleSize <= 1) $infos.appendTo($item);
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 5850843c51..2c06579c14 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -45,9 +45,10 @@ function renderUserAvatar(user, objectType, objectID, size)
 /**
  * Render deadline
  * @param {String|Date} deadline Deadline
+   @param {string}      status
  * @returns {JQuery}
  */
-function renderDeadline(deadline)
+function renderDeadline(deadline, status)
 {
     if(deadline == '0000-00-00') return;
 
@@ -59,8 +60,10 @@ function renderDeadline(deadline)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var deadlineDate     = $.zui.formatDate(date, 'MM-dd');
+    var statusList       = ['wait','doing','pause'];
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
 
-    return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
+    return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
 }
 
 /**
@@ -222,7 +225,7 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline));
+        if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
         if(scaleSize <= 1) $infos.appendTo($item);