From 7feffbdcfa4b6fc97819ab8702937755a9a5c09c Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 25 Jan 2022 14:57:15 +0800
Subject: [PATCH] * Modify test problem.

---
 module/kanban/control.php                   | 4 ++--
 module/kanban/css/view.css                  | 3 ++-
 module/kanban/view/importexecution.html.php | 4 ++--
 module/kanban/view/importplan.html.php      | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 580be46d96..1ec0ed2951 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1161,7 +1161,7 @@ class kanban extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $this->view->projects            = $this->project->getPairsByProgram();
+        $this->view->projects            = array($this->lang->kanban->allProjects) + $this->project->getPairsByProgram();
         $this->view->selectedProjectID   = $selectedProjectID;
         $this->view->lanePairs           = $this->kanban->getLanePairsByGroup($groupID);
         $this->view->executions2Imported = $this->project->getStats($selectedProjectID, 'undone', 0, 0, 30, 'id_asc', $pager);
@@ -1449,7 +1449,7 @@ class kanban extends control
 
         $this->display();
     }
-  
+
     /**
      * Set archived.
      *
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 91acc53cef..8b7e5b16ee 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -103,6 +103,7 @@
 .kanban-card .header .executionName {display: flex; width: 100%; float: left;}
 .kanban-card .header .executionName .title {padding-right: 0px; margin-right: 5px;}
 .kanban-card .header .executionName > span {flex: none;}
+.execInfo, .releaseInfo, .productplanInfo {margin-top: 23px;}
 .label-wait {background: #EFEFEF !important; color: #838A9D;}
 .label-doing {background: #f8d2d2 !important; color: #e64b4c;}
 .label-suspended {background: #fff3d9 !important; color: #ff9800;}
@@ -110,7 +111,7 @@
 .label-closed, .label-terminate {background: #e5e5e5 !important; color: #b8b8b8;}
 .label-deleted {background: #ff5d5d !important; color: #fff;}
 .label-normal {background: #e1e8d9 !important; color: #9abe76;}
-.region .kanban-item > .kanban-card > .execInfo > .user, .region .kanban-item > .kanban-card > .releaseInfo > .user, .region .kanban-item > .kanban-card > .productplanInfo > .user {position: absolute; right: 10px; bottom: -2px}
+.region .kanban-item > .kanban-card > .execInfo > .user, .region .kanban-item > .kanban-card > .releaseInfo > .user, .region .kanban-item > .kanban-card > .productplanInfo > .user {position: absolute; right: 13px; bottom: 1px}
 .region .kanban-item > .kanban-card > .execInfo > .user > .avatar, .region .kanban-item > .kanban-card > .releaseInfo > .user > .avatar, .region .kanban-item > .kanban-card > .productplanInfo > .user > .avatar {display: inline-block; width: 24px; height: 24px; line-height: 24px; margin-right: 0px; margin-left: 2px}
 .kanban-card .releaseTitle .icon, .kanban-card .title .icon, .kanban-card .productplanTitle .icon, .kanban-card .title .icon {padding-right: 5px;}
 .kanban-card .releaseTitle, .kanban-card .productplanTitle {width: 100%; float: left;}
diff --git a/module/kanban/view/importexecution.html.php b/module/kanban/view/importexecution.html.php
index 5c44d0ef8d..965b6d2330 100644
--- a/module/kanban/view/importexecution.html.php
+++ b/module/kanban/view/importexecution.html.php
@@ -40,8 +40,8 @@
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-name'><?php echo $lang->execution->name;?></th>
-          <th class='c-status'><?php echo $lang->execution->status;?></th>
+          <th class='c-name'><?php echo $lang->execution->execName;?></th>
+          <th class='c-status'><?php echo $lang->execution->execStatus;?></th>
           <th class='c-user'><?php echo $lang->execution->owner;?></th>
           <th class='c-date'><?php echo $lang->execution->end;?></th>
           <th class='c-hour'><?php echo $lang->execution->totalEstimate;?></th>
diff --git a/module/kanban/view/importplan.html.php b/module/kanban/view/importplan.html.php
index bc44dfab3f..2561d34c18 100644
--- a/module/kanban/view/importplan.html.php
+++ b/module/kanban/view/importplan.html.php
@@ -69,7 +69,7 @@
           <td title='<?php echo $plan->stories;?>'><?php echo $plan->stories;?></td>
           <td title='<?php echo $plan->bugs;?>'><?php echo $plan->bugs;?></td>
           <td title='<?php echo $plan->hour;?>'><?php echo $plan->hour;?></td>
-          <td title='<?php echo strip_tags(htmlspecialchars_decode($plan->desc));;?>'><?php echo strip_tags(htmlspecialchars_decode($plan->desc));;?></td>
+          <td class='c-name' title='<?php echo strip_tags(htmlspecialchars_decode($plan->desc));?>'><?php echo strip_tags(htmlspecialchars_decode($plan->desc));?></td>
         </tr>
         <?php endforeach;?>
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>