From 596ea0124b95547e245e9d8844b6fbe89fe45532 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 8 Jun 2022 05:01:16 +0000 Subject: [PATCH 1/5] * Finish task #56383. --- module/kanban/lang/en.php | 2 ++ module/kanban/lang/zh-cn.php | 2 ++ module/kanban/model.php | 14 +++++++++++++- module/kanban/view/space.html.php | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 661b6b5100..4413597406 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,6 +100,7 @@ $lang->kanban->closedBy = 'Closed By'; $lang->kanban->closedDate = 'Closed Date'; $lang->kanban->empty = 'No Kanban'; $lang->kanban->teamSumCount = '%s people in total'; +$lang->kanban->cardsCount = '%s card in total'; $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 a706e5927f..5e4c460c68 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 = '设置空间'; @@ -99,6 +100,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..7198a45a0a 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3414,11 +3414,23 @@ class kanbanModel extends model */ public function getGroupBySpaceList($spaceIdList, $kanbanIdList = '') { - return $this->dao->select('*')->from(TABLE_KANBAN) + $kanbanList = $this->dao->select('*')->from(TABLE_KANBAN) ->where('deleted')->eq(0) ->andWhere('space')->in($spaceIdList) ->beginIF($kanbanIdList)->andWhere('id')->in($kanbanIdList)->fi() ->fetchGroup('space', 'id'); + foreach($kanbanList as $kanbanPairs) + { + foreach($kanbanPairs as $kanban) + { + $cards = $this->dao->select('*')->from(TABLE_KANBANCARD) + ->where('deleted')->eq(0) + ->andWhere('kanban')->eq($kanban->id) + ->fetchAll(); + $kanban->cardsCount = count($cards); + } + } + return $kanbanList; } /** diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index c98e90e271..efa9c111d4 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -153,6 +153,7 @@
kanban->teamSumCount, $teamCount);?>
+
cardsCount) ? $lang->kanban->noCard : sprintf($lang->kanban->cardsCount, $kanban->cardsCount)?>
From 0dc3a87d2e9745963435214f243a94e0776edc5c Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 8 Jun 2022 08:02:47 +0000 Subject: [PATCH 2/5] * Finish task #56383 --- module/kanban/model.php | 21 ++++++++++++++++----- module/kanban/view/space.html.php | 9 ++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 7198a45a0a..3510657d3e 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3419,15 +3419,26 @@ class kanbanModel extends model ->andWhere('space')->in($spaceIdList) ->beginIF($kanbanIdList)->andWhere('id')->in($kanbanIdList)->fi() ->fetchGroup('space', 'id'); + + $kanbanIDList = array(); foreach($kanbanList as $kanbanPairs) { foreach($kanbanPairs as $kanban) { - $cards = $this->dao->select('*')->from(TABLE_KANBANCARD) - ->where('deleted')->eq(0) - ->andWhere('kanban')->eq($kanban->id) - ->fetchAll(); - $kanban->cardsCount = count($cards); + $kanbanIDList[$kanban->id] = $kanban->id; + } + } + $cardsCount = $this->dao->select('kanban, COUNT(*) as count')->from(TABLE_KANBANCARD) + ->where('deleted')->eq(0) + ->andWhere('kanban')->in($kanbanIDList) + ->groupBy('kanban') + ->fetchPairs('kanban'); + + foreach($kanbanList as $kanbanPairs) + { + foreach($kanbanPairs as $kanban) + { + if(isset($cardsCount[$kanban->id])) $kanban->cardsCount = $cardsCount[$kanban->id]; } } return $kanbanList; diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index efa9c111d4..04d70c79d1 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -153,7 +153,14 @@
kanban->teamSumCount, $teamCount);?>
-
cardsCount) ? $lang->kanban->noCard : sprintf($lang->kanban->cardsCount, $kanban->cardsCount)?>
+ kanban->cardsCount; + if($kanban->cardsCount > 1) + { + $cardsCount = str_replace("card", "cards", $cardsCount); + } + ?> +
cardsCount) ? $lang->kanban->noCard : sprintf($cardsCount, $kanban->cardsCount)?>
From 6265fcd76fc895d0c290cebb667086242c7fb4f3 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 8 Jun 2022 09:37:10 +0000 Subject: [PATCH 3/5] * Finish task #56383. --- module/kanban/model.php | 19 +++++++------------ module/kanban/view/space.html.php | 10 ++-------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 3510657d3e..b77203fb7b 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3414,34 +3414,29 @@ class kanbanModel extends model */ public function getGroupBySpaceList($spaceIdList, $kanbanIdList = '') { - $kanbanList = $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($kanbanList as $kanbanPairs) - { - foreach($kanbanPairs as $kanban) - { - $kanbanIDList[$kanban->id] = $kanban->id; - } - } + 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($kanbanList as $kanbanPairs) + foreach($spaceList as $kanbanList) { - foreach($kanbanPairs as $kanban) + foreach($kanbanList as $kanban) { - if(isset($cardsCount[$kanban->id])) $kanban->cardsCount = $cardsCount[$kanban->id]; + $kanban->cardsCount = zget($cardsCount, $kanban->id, 0); } } - return $kanbanList; + + return $spaceList; } /** diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index 04d70c79d1..5b0e6504a0 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -153,14 +153,8 @@
kanban->teamSumCount, $teamCount);?>
- kanban->cardsCount; - if($kanban->cardsCount > 1) - { - $cardsCount = str_replace("card", "cards", $cardsCount); - } - ?> -
cardsCount) ? $lang->kanban->noCard : sprintf($cardsCount, $kanban->cardsCount)?>
+ cardsCount > 1) ? str_replace("card", "cards", $lang->kanban->cardsCount) : $lang->kanban->cardsCount;?> +
cardsCount) ? $lang->kanban->noCard : sprintf($cardsCount, $kanban->cardsCount);?>
From 9694af1c79e4186f17779b277d73cdf5ace424a1 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Thu, 9 Jun 2022 00:52:00 +0000 Subject: [PATCH 4/5] * Finish task #56383. --- module/kanban/lang/en.php | 4 ++-- module/kanban/view/space.html.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 4413597406..59a93ac408 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -99,8 +99,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->cardsCount = '%s card 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/view/space.html.php b/module/kanban/view/space.html.php index 5b0e6504a0..51f546b81c 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -153,7 +153,7 @@
kanban->teamSumCount, $teamCount);?>
- cardsCount > 1) ? str_replace("card", "cards", $lang->kanban->cardsCount) : $lang->kanban->cardsCount;?> + cardsCount > 1) ? str_replace("Card", "Cards", $lang->kanban->cardsCount) : $lang->kanban->cardsCount;?>
cardsCount) ? $lang->kanban->noCard : sprintf($cardsCount, $kanban->cardsCount);?>
From f7c784d6fafcd002c181933e40eefb38102843b3 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Thu, 9 Jun 2022 01:10:38 +0000 Subject: [PATCH 5/5] * Finish task #56383. --- module/kanban/view/space.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index 51f546b81c..7aeb61a43e 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -152,7 +152,8 @@ -
kanban->teamSumCount, $teamCount);?>
+ 1) ? $lang->kanban->teamSumCount : str_replace("Pers", "Person", $lang->kanban->teamSumCount);?> +
cardsCount > 1) ? str_replace("Card", "Cards", $lang->kanban->cardsCount) : $lang->kanban->cardsCount;?>
cardsCount) ? $lang->kanban->noCard : sprintf($cardsCount, $kanban->cardsCount);?>