From c7e52521e3b40887790d0bc498e6f3db8d760f99 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 25 Jan 2022 17:20:19 +0800
Subject: [PATCH 1/3] * Fix bug#18962.

---
 module/kanban/control.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index d2e20ad36a..ea30388e18 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -963,7 +963,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function importCard($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedKanbanID = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
+    public function importCard($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedKanbanID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -1016,7 +1016,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function importPlan($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProductID = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
+    public function importPlan($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProductID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if($_POST)
         {
@@ -1068,7 +1068,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function importRelease($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProductID = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
+    public function importRelease($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProductID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if($_POST)
         {
@@ -1120,7 +1120,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function importBuild($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProjectID = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
+    public function importBuild($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProjectID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if($_POST)
         {
@@ -1173,7 +1173,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function importExecution($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProjectID = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
+    public function importExecution($kanbanID = 0, $regionID = 0, $groupID = 0, $columnID = 0, $selectedProjectID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if($_POST)
         {

From f2296b64b6f1d11cc46003681cea95ff55b25753 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 25 Jan 2022 17:21:05 +0800
Subject: [PATCH 2/3] * Fix bug#18964.

---
 module/kanban/js/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 8640755f82..73275abcd5 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -585,7 +585,7 @@ function renderProductplanItem(item, $item)
     var begin      = $.zui.createDate(item.begin);
     var end        = $.zui.createDate(item.end);
     var today      = new Date();
-    var labelType  = end.toLocaleDateString() == today.toLocaleDateString() ? 'danger' : 'wait';
+    var labelType  = begin.getTime() <= today.getTime() || end.getTime() >= today.getTime() ? 'danger' : 'wait';
     var labelTitle = $.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd');
 
     if((item.begin == '2030-01-01' || item.end == '2030-01-01'))

From 065bea5ddd2e212cc84a4c6dc42828eea3b7af57 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 25 Jan 2022 17:27:25 +0800
Subject: [PATCH 3/3] * Fix bug#18968.

---
 module/kanban/css/view.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index bac0c622d5..9c02f084cf 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -108,6 +108,7 @@
 .label-doing {background: #f8d2d2 !important; color: #e64b4c;}
 .label-suspended {background: #fff3d9 !important; color: #ff9800;}
 .label-future {background: #EFEFEF !important; color: #838A9D; border-radius: 9px}
+.label-done {background: #dfe9d8 !important; color: #429b16;}
 .label-closed, .label-terminate {background: #e5e5e5 !important; color: #b8b8b8;}
 .label-deleted {background: #ff5d5d !important; color: #fff;}
 .label-normal {background: #e1e8d9 !important; color: #9abe76;}