From ff412227a9ba523d706eadbe46d63f320914b173 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Wed, 20 Dec 2023 13:13:50 +0800 Subject: [PATCH] * kanban: refactor getkanbancardmenu(). --- module/kanban/model.php | 60 +----------- module/kanban/tao.php | 96 +++++++++++++++++++ module/kanban/test/kanban.class.php | 14 +-- .../kanban/test/model/getkanbancardmenu.php | 67 ++++++------- module/kanban/test/model/refreshcards.php | 20 ++-- 5 files changed, 150 insertions(+), 107 deletions(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 2de1803b4c..4a9c13b2c8 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3433,73 +3433,21 @@ class kanbanModel extends model * @access public * @return array */ - public function getKanbanCardMenu($executionID, $objects, $objecType) + public function getKanbanCardMenu(int $executionID, array $objects, string $objecType): array { $this->app->loadLang('execution'); - $methodName = $this->app->rawMethod; $menus = array(); switch ($objecType) { case 'story': - if(!isset($this->story)) $this->loadModel('story'); - - $objects = $this->story->mergeReviewer($objects); - foreach($objects as $story) - { - $menu = array(); - - $toTaskPriv = strpos('draft,reviewing,closed', $story->status) !== false ? false : true; - if(common::hasPriv('story', 'edit') and $this->story->isClickable($story, 'edit')) $menu[] = array('label' => $this->lang->story->edit, 'icon' => 'edit', 'url' => helper::createLink('story', 'edit', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('story', 'change') and $this->story->isClickable($story, 'change')) $menu[] = array('label' => $this->lang->story->change, 'icon' => 'alter', 'url' => helper::createLink('story', 'change', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('story', 'review') and $this->story->isClickable($story, 'review')) $menu[] = array('label' => $this->lang->story->review, 'icon' => 'search', 'url' => helper::createLink('story', 'review', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'create') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->wbs, 'icon' => 'plus', 'url' => helper::createLink('task', 'create', "executionID=$executionID&storyID=$story->id&moduleID=$story->module"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'batchCreate') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->batchWBS, 'icon' => 'pluses', 'url' => helper::createLink('task', 'batchCreate', "executionID=$executionID&storyID=$story->id&moduleID=0&taskID=0&iframe=true"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('story', 'activate') and $this->story->isClickable($story, 'activate')) $menu[] = array('label' => $this->lang->story->activate, 'icon' => 'magic', 'url' => helper::createLink('story', 'activate', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('execution', 'unlinkStory')) $menu[] = array('label' => $this->lang->execution->unlinkStory, 'icon' => 'unlink', 'url' => helper::createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no&from=taskkanban")); - if(common::hasPriv('story', 'delete')) $menu[] = array('label' => $this->lang->story->delete, 'icon' => 'trash', 'url' => helper::createLink('story', 'delete', "storyID=$story->id&confirm=no&from=taskkanban")); - - $menus[$story->id] = $menu; - } + $menus = $this->kanbanTao->getStoryCardMenu($executionID, $objects); break; case 'bug': - if(!isset($this->bug)) $this->loadModel('bug'); - - foreach($objects as $bug) - { - $menu = array(); - - if(common::hasPriv('bug', 'edit') && $this->bug->isClickable($bug, 'edit')) $menu[] = array('label' => $this->lang->bug->edit, 'icon' => 'edit', 'url' => helper::createLink('bug', 'edit', "bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('bug', 'confirm') && $this->bug->isClickable($bug, 'confirm')) $menu[] = array('label' => $this->lang->bug->confirm, 'icon' => 'ok', 'url' => helper::createLink('bug', 'confirm', "bugID=$bug->id&extra=&from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('bug', 'resolve') && $this->bug->isClickable($bug, 'resolve')) $menu[] = array('label' => $this->lang->bug->resolve, 'icon' => 'checked', 'url' => helper::createLink('bug', 'resolve', "bugID=$bug->id&extra=&from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('bug', 'close') && $this->bug->isClickable($bug, 'close')) $menu[] = array('label' => $this->lang->bug->close, 'icon' => 'off', 'url' => helper::createLink('bug', 'close', "bugID=$bug->id&extra=&from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('bug', 'create') && $this->bug->isClickable($bug, 'create')) $menu[] = array('label' => $this->lang->bug->copy, 'icon' => 'copy', 'url' => helper::createLink('bug', 'create', "productID=$bug->product&branch=$bug->branch&extras=bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('bug', 'activate') && $this->bug->isClickable($bug, 'activate')) $menu[] = array('label' => $this->lang->bug->activate, 'icon' => 'magic', 'url' => helper::createLink('bug', 'activate', "bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('story', 'create') && $bug->status != 'closed') $menu[] = array('label' => $this->lang->bug->toStory, 'icon' => 'lightbulb', 'url' => helper::createLink('story', 'create', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('bug', 'delete')) $menu[] = array('label' => $this->lang->bug->delete, 'icon' => 'trash', 'url' => helper::createLink('bug', 'delete', "bugID=$bug->id&confirm=no&from=taskkanban"), 'confirm' => $this->lang->bug->notice->confirmDelete); - - $menus[$bug->id] = $menu; - } + $menus = $this->kanbanTao->getBugCardMenu($objects); break; case 'task': - if(!isset($this->task)) $this->loadModel('task'); - - foreach($objects as $task) - { - $menu = array(); - - if(common::hasPriv('task', 'edit') and $this->task->isClickable($task, 'edit')) $menu[] = array('label' => $this->lang->task->edit, 'icon' => 'edit', 'url' => helper::createLink('task', 'edit', "taskID=$task->id&comment=false&kanbanGroup=default&from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'pause') and $this->task->isClickable($task, 'pause')) $menu[] = array('label' => $this->lang->task->pause, 'icon' => 'pause', 'url' => helper::createLink('task', 'pause', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'restart') and $this->task->isClickable($task, 'restart')) $menu[] = array('label' => $this->lang->task->restart, 'icon' => 'play', 'url' => helper::createLink('task', 'restart', "taskID=$task->id&from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'recordWorkhour') and $this->task->isClickable($task, 'recordWorkhour')) $menu[] = array('label' => $this->lang->task->recordWorkhour, 'icon' => 'time', 'url' => helper::createLink('task', 'recordWorkhour', "taskID=$task->id&from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'activate') and $this->task->isClickable($task, 'activate')) $menu[] = array('label' => $this->lang->task->activate, 'icon' => 'magic', 'url' => helper::createLink('task', 'activate', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'batchCreate') and $this->task->isClickable($task, 'batchCreate') and !$task->mode) $menu[] = array('label' => $this->lang->task->children, 'icon' => 'split', 'url' => helper::createLink('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'create') and $this->task->isClickable($task, 'create')) $menu[] = array('label' => $this->lang->task->copy, 'icon' => 'copy', 'url' => helper::createLink('task', 'create', "projctID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'cancel') and $this->task->isClickable($task, 'cancel')) $menu[] = array('label' => $this->lang->task->cancel, 'icon' => 'ban-circle', 'url' => helper::createLink('task', 'cancel', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg'); - if(common::hasPriv('task', 'delete')) $menu[] = array('label' => $this->lang->task->delete, 'icon' => 'trash', 'url' => helper::createLink('task', 'delete', "executionID=$task->execution&taskID=$task->id&confirm=no&from=taskkanban"), 'confirm' => $this->lang->task->confirmDelete); - - $menus[$task->id] = $menu; - } + $menus = $this->kanbanTao->getTaskCardMenu($objects); break; } return $menus; diff --git a/module/kanban/tao.php b/module/kanban/tao.php index 0258038588..ada9581125 100644 --- a/module/kanban/tao.php +++ b/module/kanban/tao.php @@ -927,4 +927,100 @@ class kanbanTao extends kanbanModel return $cardPairs; } + + /** + * 获取需求类型的卡片操作菜单。 + * Get menu of story card. + * + * @param int $executionID + * @param array $objects + * @access public + * @return array + */ + protected function getStoryCardMenu(int $executionID, array $objects): array + { + $menus = array(); + $objects = $this->loadModel('story')->mergeReviewer($objects); + foreach($objects as $story) + { + $menu = array(); + + $toTaskPriv = strpos('draft,reviewing,closed', $story->status) !== false ? false : true; + if(common::hasPriv('story', 'edit') and $this->story->isClickable($story, 'edit')) $menu[] = array('label' => $this->lang->story->edit, 'icon' => 'edit', 'url' => helper::createLink('story', 'edit', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('story', 'change') and $this->story->isClickable($story, 'change')) $menu[] = array('label' => $this->lang->story->change, 'icon' => 'alter', 'url' => helper::createLink('story', 'change', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('story', 'review') and $this->story->isClickable($story, 'review')) $menu[] = array('label' => $this->lang->story->review, 'icon' => 'search', 'url' => helper::createLink('story', 'review', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'create') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->wbs, 'icon' => 'plus', 'url' => helper::createLink('task', 'create', "executionID=$executionID&storyID=$story->id&moduleID=$story->module"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'batchCreate') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->batchWBS, 'icon' => 'pluses', 'url' => helper::createLink('task', 'batchCreate', "executionID=$executionID&storyID=$story->id&moduleID=0&taskID=0&iframe=true"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('story', 'activate') and $this->story->isClickable($story, 'activate')) $menu[] = array('label' => $this->lang->story->activate, 'icon' => 'magic', 'url' => helper::createLink('story', 'activate', "storyID=$story->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('execution', 'unlinkStory')) $menu[] = array('label' => $this->lang->execution->unlinkStory, 'icon' => 'unlink', 'url' => helper::createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no&from=taskkanban")); + if(common::hasPriv('story', 'delete')) $menu[] = array('label' => $this->lang->story->delete, 'icon' => 'trash', 'url' => helper::createLink('story', 'delete', "storyID=$story->id&confirm=no&from=taskkanban")); + + $menus[$story->id] = $menu; + } + + return $menus; + } + + /** + * 获取Bug类型的卡片操作菜单。 + * Get menu of bug card. + * + * @param array $objects + * @access public + * @return array + */ + protected function getBugCardMenu(array $objects): array + { + $menus = array(); + $this->loadModel('bug'); + foreach($objects as $bug) + { + $menu = array(); + + if(common::hasPriv('bug', 'edit') && $this->bug->isClickable($bug, 'edit')) $menu[] = array('label' => $this->lang->bug->edit, 'icon' => 'edit', 'url' => helper::createLink('bug', 'edit', "bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('bug', 'confirm') && $this->bug->isClickable($bug, 'confirm')) $menu[] = array('label' => $this->lang->bug->confirm, 'icon' => 'ok', 'url' => helper::createLink('bug', 'confirm', "bugID=$bug->id&extra=&from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('bug', 'resolve') && $this->bug->isClickable($bug, 'resolve')) $menu[] = array('label' => $this->lang->bug->resolve, 'icon' => 'checked', 'url' => helper::createLink('bug', 'resolve', "bugID=$bug->id&extra=&from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('bug', 'close') && $this->bug->isClickable($bug, 'close')) $menu[] = array('label' => $this->lang->bug->close, 'icon' => 'off', 'url' => helper::createLink('bug', 'close', "bugID=$bug->id&extra=&from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('bug', 'create') && $this->bug->isClickable($bug, 'create')) $menu[] = array('label' => $this->lang->bug->copy, 'icon' => 'copy', 'url' => helper::createLink('bug', 'create', "productID=$bug->product&branch=$bug->branch&extras=bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('bug', 'activate') && $this->bug->isClickable($bug, 'activate')) $menu[] = array('label' => $this->lang->bug->activate, 'icon' => 'magic', 'url' => helper::createLink('bug', 'activate', "bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('story', 'create') && $bug->status != 'closed') $menu[] = array('label' => $this->lang->bug->toStory, 'icon' => 'lightbulb', 'url' => helper::createLink('story', 'create', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('bug', 'delete')) $menu[] = array('label' => $this->lang->bug->delete, 'icon' => 'trash', 'url' => helper::createLink('bug', 'delete', "bugID=$bug->id&confirm=no&from=taskkanban"), 'confirm' => $this->lang->bug->notice->confirmDelete); + + $menus[$bug->id] = $menu; + } + + return $menus; + } + + /** + * 获取任务类型的卡片操作菜单。 + * Get menu of bug card. + * + * @param array $objects + * @access public + * @return array + */ + protected function getTaskCardMenu(array $objects): array + { + $menus = array(); + $this->loadModel('task'); + foreach($objects as $task) + { + $menu = array(); + + if(common::hasPriv('task', 'edit') and $this->task->isClickable($task, 'edit')) $menu[] = array('label' => $this->lang->task->edit, 'icon' => 'edit', 'url' => helper::createLink('task', 'edit', "taskID=$task->id&comment=false&kanbanGroup=default&from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'pause') and $this->task->isClickable($task, 'pause')) $menu[] = array('label' => $this->lang->task->pause, 'icon' => 'pause', 'url' => helper::createLink('task', 'pause', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'restart') and $this->task->isClickable($task, 'restart')) $menu[] = array('label' => $this->lang->task->restart, 'icon' => 'play', 'url' => helper::createLink('task', 'restart', "taskID=$task->id&from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'recordWorkhour') and $this->task->isClickable($task, 'recordWorkhour')) $menu[] = array('label' => $this->lang->task->recordWorkhour, 'icon' => 'time', 'url' => helper::createLink('task', 'recordWorkhour', "taskID=$task->id&from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'activate') and $this->task->isClickable($task, 'activate')) $menu[] = array('label' => $this->lang->task->activate, 'icon' => 'magic', 'url' => helper::createLink('task', 'activate', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'batchCreate') and $this->task->isClickable($task, 'batchCreate') and !$task->mode) $menu[] = array('label' => $this->lang->task->children, 'icon' => 'split', 'url' => helper::createLink('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'create') and $this->task->isClickable($task, 'create')) $menu[] = array('label' => $this->lang->task->copy, 'icon' => 'copy', 'url' => helper::createLink('task', 'create', "projctID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'cancel') and $this->task->isClickable($task, 'cancel')) $menu[] = array('label' => $this->lang->task->cancel, 'icon' => 'ban-circle', 'url' => helper::createLink('task', 'cancel', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg'); + if(common::hasPriv('task', 'delete')) $menu[] = array('label' => $this->lang->task->delete, 'icon' => 'trash', 'url' => helper::createLink('task', 'delete', "executionID=$task->execution&taskID=$task->id&confirm=no&from=taskkanban"), 'confirm' => $this->lang->task->confirmDelete); + + $menus[$task->id] = $menu; + } + + return $menus; + } } diff --git a/module/kanban/test/kanban.class.php b/module/kanban/test/kanban.class.php index c3c148f090..4c6b227022 100644 --- a/module/kanban/test/kanban.class.php +++ b/module/kanban/test/kanban.class.php @@ -1578,19 +1578,19 @@ class kanbanTest * @access public * @return int */ - public function getKanbanCardMenuTest($executionID, $objecType) + public function getKanbanCardMenuTest($executionID, $objectType) { global $tester; /* Get group objects. */ - if($objecType == 'story') $objectGroup['story'] = $tester->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory'); - if($objecType == 'bug') $objectGroup['bug'] = $tester->loadModel('bug')->getExecutionBugs($executionID); - if($objecType == 'task') $objectGroup['task'] = $tester->loadModel('execution')->getKanbanTasks($executionID, "id"); + if($objectType == 'story') $objectGroup['story'] = $tester->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory'); + if($objectType == 'bug') $objectGroup['bug'] = $tester->loadModel('bug')->getExecutionBugs($executionID); + if($objectType == 'task') $objectGroup['task'] = $tester->loadModel('execution')->getKanbanTasks($executionID, "id"); $objects = array(); /* Get objects cards menus. */ - if($objecType == 'story') $objects = $this->objectModel->getKanbanCardMenu($executionID, $objectGroup['story'], 'story'); - if($objecType == 'bug') $objects = $this->objectModel->getKanbanCardMenu($executionID, $objectGroup['bug'], 'bug'); - if($objecType == 'task') $objects = $this->objectModel->getKanbanCardMenu($executionID, $objectGroup['task'], 'task'); + if($objectType == 'story') $objects = $this->objectModel->getKanbanCardMenu($executionID, $objectGroup['story'], 'story'); + if($objectType == 'bug') $objects = $this->objectModel->getKanbanCardMenu($executionID, $objectGroup['bug'], 'bug'); + if($objectType == 'task') $objects = $this->objectModel->getKanbanCardMenu($executionID, $objectGroup['task'], 'task'); if(dao::isError()) return dao::getError(); diff --git a/module/kanban/test/model/getkanbancardmenu.php b/module/kanban/test/model/getkanbancardmenu.php index f928396c80..12c88a352d 100755 --- a/module/kanban/test/model/getkanbancardmenu.php +++ b/module/kanban/test/model/getkanbancardmenu.php @@ -4,47 +4,50 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/kanban.class.php'; su('admin'); +zdTable('project')->config('kanbanexecution')->gen(5); +zdTable('task')->config('rdkanbantask')->gen(20); + /** title=测试 kanbanModel->getKanbanCardMenu(); +timeout=0 cid=1 -pid=1 -测试获取执行101 story的操作数量 >> 12 -测试获取执行101 task的操作数量 >> 60 -测试获取执行101 bug的操作数量 >> 23 -测试获取执行102 story的操作数量 >> 12 -测试获取执行102 task的操作数量 >> 26 -测试获取执行102 bug的操作数量 >> 22 -测试获取执行103 story的操作数量 >> 12 -测试获取执行103 task的操作数量 >> 25 -测试获取执行103 bug的操作数量 >> 23 -测试获取执行104 story的操作数量 >> 12 -测试获取执行104 task的操作数量 >> 26 -测试获取执行104 bug的操作数量 >> 22 -测试获取执行105 story的操作数量 >> 12 -测试获取执行105 task的操作数量 >> 25 -测试获取执行105 bug的操作数量 >> 23 +- 测试获取执行1 story的操作数量 @0 +- 测试获取执行1 task的操作数量 @24 +- 测试获取执行1 bug的操作数量 @0 +- 测试获取执行2 story的操作数量 @0 +- 测试获取执行2 task的操作数量 @28 +- 测试获取执行2 bug的操作数量 @0 +- 测试获取执行3 story的操作数量 @0 +- 测试获取执行3 task的操作数量 @24 +- 测试获取执行3 bug的操作数量 @0 +- 测试获取执行4 story的操作数量 @0 +- 测试获取执行4 task的操作数量 @24 +- 测试获取执行4 bug的操作数量 @0 +- 测试获取执行5 story的操作数量 @0 +- 测试获取执行5 task的操作数量 @24 +- 测试获取执行5 bug的操作数量 @0 */ -$executionIDList = array('101', '102', '103', '104', '105'); +$executionIDList = array('1', '2', '3', '4', '5'); $browseTypeList = array('story', 'task', 'bug'); $kanban = new kanbanTest(); -r($kanban->getKanbanCardMenuTest($executionIDList[0], $browseTypeList[0])) && p() && e('12'); // 测试获取执行101 story的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[0], $browseTypeList[1])) && p() && e('60'); // 测试获取执行101 task的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[0], $browseTypeList[2])) && p() && e('23'); // 测试获取执行101 bug的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[1], $browseTypeList[0])) && p() && e('12'); // 测试获取执行102 story的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[1], $browseTypeList[1])) && p() && e('26'); // 测试获取执行102 task的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[1], $browseTypeList[2])) && p() && e('22'); // 测试获取执行102 bug的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[2], $browseTypeList[0])) && p() && e('12'); // 测试获取执行103 story的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[2], $browseTypeList[1])) && p() && e('25'); // 测试获取执行103 task的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[2], $browseTypeList[2])) && p() && e('23'); // 测试获取执行103 bug的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[3], $browseTypeList[0])) && p() && e('12'); // 测试获取执行104 story的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[3], $browseTypeList[1])) && p() && e('26'); // 测试获取执行104 task的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[3], $browseTypeList[2])) && p() && e('22'); // 测试获取执行104 bug的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[4], $browseTypeList[0])) && p() && e('12'); // 测试获取执行105 story的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[4], $browseTypeList[1])) && p() && e('25'); // 测试获取执行105 task的操作数量 -r($kanban->getKanbanCardMenuTest($executionIDList[4], $browseTypeList[2])) && p() && e('23'); // 测试获取执行105 bug的操作数量 \ No newline at end of file +r($kanban->getKanbanCardMenuTest($executionIDList[0], $browseTypeList[0])) && p() && e('0'); // 测试获取执行1 story的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[0], $browseTypeList[1])) && p() && e('24'); // 测试获取执行1 task的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[0], $browseTypeList[2])) && p() && e('0'); // 测试获取执行1 bug的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[1], $browseTypeList[0])) && p() && e('0'); // 测试获取执行2 story的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[1], $browseTypeList[1])) && p() && e('28'); // 测试获取执行2 task的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[1], $browseTypeList[2])) && p() && e('0'); // 测试获取执行2 bug的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[2], $browseTypeList[0])) && p() && e('0'); // 测试获取执行3 story的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[2], $browseTypeList[1])) && p() && e('24'); // 测试获取执行3 task的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[2], $browseTypeList[2])) && p() && e('0'); // 测试获取执行3 bug的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[3], $browseTypeList[0])) && p() && e('0'); // 测试获取执行4 story的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[3], $browseTypeList[1])) && p() && e('24'); // 测试获取执行4 task的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[3], $browseTypeList[2])) && p() && e('0'); // 测试获取执行4 bug的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[4], $browseTypeList[0])) && p() && e('0'); // 测试获取执行5 story的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[4], $browseTypeList[1])) && p() && e('24'); // 测试获取执行5 task的操作数量 +r($kanban->getKanbanCardMenuTest($executionIDList[4], $browseTypeList[2])) && p() && e('0'); // 测试获取执行5 bug的操作数量 \ No newline at end of file diff --git a/module/kanban/test/model/refreshcards.php b/module/kanban/test/model/refreshcards.php index 34a607ab27..52f143b178 100755 --- a/module/kanban/test/model/refreshcards.php +++ b/module/kanban/test/model/refreshcards.php @@ -5,22 +5,18 @@ include dirname(__FILE__, 2) . '/kanban.class.php'; su('admin'); zdTable('kanbanlane')->gen(5); - +zdTable('company')->gen(1); /** title=测试 kanbanModel->refreshCards(); -timeout=0 cid=1 +pid=1 -- 刷新泳道101的卡片 @1:1,21, - -- 刷新泳道102的卡片 @2:2,22, - -- 刷新泳道103的卡片 @3:3,23, - -- 刷新泳道104的卡片 @4:4,24, - -- 刷新泳道105的卡片 @5:5,25, +刷新泳道101的卡片 >> 401; 402; 403; 404:244,; 405; 406; 407; 408; 409; 410; 411: +刷新泳道102的卡片 >> 412; 413; 414; 415; 416; 417; 418; 419; 420:181,182,183, +刷新泳道103的卡片 >> 421:781,61,; 422; 423:782,; 424:783,; 425; 426; 427: +刷新泳道104的卡片 >> 428; 429; 430; 431; 432; 433; 434:246,; 435; 436:248,; 437; 438: +刷新泳道105的卡片 >> 439; 440; 441; 442; 443; 444; 445; 446; 447:184,185,186, */ @@ -32,4 +28,4 @@ r($kanban->refreshCardsTest($laneIDList[0])) && p() && e('1:1,21,'); // 刷新 r($kanban->refreshCardsTest($laneIDList[1])) && p() && e('2:2,22,'); // 刷新泳道102的卡片 r($kanban->refreshCardsTest($laneIDList[2])) && p() && e('3:3,23,'); // 刷新泳道103的卡片 r($kanban->refreshCardsTest($laneIDList[3])) && p() && e('4:4,24,'); // 刷新泳道104的卡片 -r($kanban->refreshCardsTest($laneIDList[4])) && p() && e('5:5,25,'); // 刷新泳道105的卡片 \ No newline at end of file +r($kanban->refreshCardsTest($laneIDList[4])) && p() && e('5:5,25,'); // 刷新泳道105的卡片