diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index a13f177e3b..292dd960eb 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -1,5 +1,6 @@ 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'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 7f936b2ea0..7dcb446d7b 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -1,5 +1,6 @@ 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 = '激活日期'; diff --git a/module/kanban/model.php b/module/kanban/model.php index df7c270ae0..b77203fb7b 100644 --- a/module/kanban/model.php +++ b/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; } /** diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index 2eaf86b12d..9e4be37cdd 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -155,7 +155,10 @@ -