Merge branch 'sprint/200-zhouxudong_56383' into 'sprint_200'

Sprint/200 zhouxudong 56383

See merge request easycorp/zentaopms!3809

module/kanban/lang/en.php

@@ -1,5 +1,6 @@
 <?php
 /* Actions. */
+$lang->kanban->noCard              = 'No card';
 $lang->kanban->create              = 'Create Kanban';
 $lang->kanban->createSpace         = 'Create Space';
 $lang->kanban->editSpace           = 'Edit Space';
@@ -99,7 +100,8 @@ $lang->kanban->closed         = 'Closed';
 $lang->kanban->closedBy       = 'Closed By';
 $lang->kanban->closedDate     = 'Closed Date';
 $lang->kanban->empty          = 'No Kanban';
-$lang->kanban->teamSumCount   = '%s people in total';
+$lang->kanban->teamSumCount   = '%s Pers';
+$lang->kanban->cardsCount     = '%s Card';
 $lang->kanban->cardCount      = 'Card Count';
 $lang->kanban->activatedBy    = 'Activated By';
 $lang->kanban->activatedDate  = 'Activated Date';

module/kanban/lang/zh-cn.php

@@ -1,5 +1,6 @@
 <?php
 /* Actions. */
+$lang->kanban->noCard              = '暂无卡片';
 $lang->kanban->create              = '创建看板';
 $lang->kanban->createSpace         = '创建空间';
 $lang->kanban->editSpace           = '设置空间';
@@ -100,6 +101,7 @@ $lang->kanban->closedBy       = '由谁关闭';
 $lang->kanban->closedDate     = '关闭日期';
 $lang->kanban->empty          = '暂时没有看板';
 $lang->kanban->teamSumCount   = '共%s人';
+$lang->kanban->cardsCount     = '共%s张卡片';
 $lang->kanban->cardCount      = '卡片数量';
 $lang->kanban->activatedBy    = '由谁激活';
 $lang->kanban->activatedDate  = '激活日期';

module/kanban/model.php

@@ -3414,11 +3414,29 @@ class kanbanModel extends model
      */
     public function getGroupBySpaceList($spaceIdList, $kanbanIdList = '')
     {
-        return $this->dao->select('*')->from(TABLE_KANBAN)
+        $spaceList = $this->dao->select('*')->from(TABLE_KANBAN)
             ->where('deleted')->eq(0)
             ->andWhere('space')->in($spaceIdList)
             ->beginIF($kanbanIdList)->andWhere('id')->in($kanbanIdList)->fi()
             ->fetchGroup('space', 'id');
+
+        $kanbanIDList = array();
+        foreach($spaceList as $kanbanList) $kanbanIDList = array_merge_recursive($kanbanIDList, array_keys($kanbanList));
+        $cardsCount = $this->dao->select('kanban, COUNT(*) as count')->from(TABLE_KANBANCARD)
+            ->where('deleted')->eq(0)
+            ->andWhere('kanban')->in($kanbanIDList)
+            ->groupBy('kanban')
+            ->fetchPairs('kanban');
+
+        foreach($spaceList as $kanbanList)
+        {
+            foreach($kanbanList as $kanban)
+            {
+                $kanban->cardsCount = zget($cardsCount, $kanban->id, 0);
+            }
+        }
+
+        return $spaceList;
     }
 
     /**

module/kanban/view/space.html.php

@@ -155,7 +155,10 @@
                     <?php endif;?>
                   </div>
                   <?php endif;?>
-                  <div class='kanban-members-total pull-left'><?php echo sprintf($lang->kanban->teamSumCount, $teamCount);?></div>
+                  <?php $teamCountLang = ($teamCount > 1) ? $lang->kanban->teamSumCount : str_replace("Pers", "Person", $lang->kanban->teamSumCount);?>
+                  <div class='kanban-members-total pull-left'><?php echo sprintf($teamCountLang, $teamCount);?></div>
+                  <?php $cardsCount = ($kanban->cardsCount > 1) ? str_replace("Card", "Cards", $lang->kanban->cardsCount) : $lang->kanban->cardsCount;?>
+                  <div class='kanban-members-total pull-right'><?php echo empty($kanban->cardsCount) ? $lang->kanban->noCard : sprintf($cardsCount, $kanban->cardsCount);?></div>
                 </div>
               </div>
             </div>