From 76b5fd033ffcedaf6975d61fa70ea8bfebbb4579 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 11 Apr 2025 16:23:07 +0800 Subject: [PATCH] * [bug#61433,done,0.5h,0h] Add other execution label. --- module/task/lang/de.php | 1 + module/task/lang/en.php | 1 + module/task/lang/fr.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/model.php | 9 ++++++--- module/task/test/model/getprojecttasklist.php | 14 ++++++++------ 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/module/task/lang/de.php b/module/task/lang/de.php index a42a37c1a9..ba80d1888f 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -77,6 +77,7 @@ $lang->task->keywords = 'Tags'; $lang->task->syncStory = 'Sync to task'; $lang->task->addSibling = 'Add Sibling'; $lang->task->addSub = 'Add Child'; +$lang->task->otherExecution = 'Other Execution'; $lang->task->common = 'Aufgabe'; $lang->task->id = 'ID'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index dedd54f463..3eaf16fa8c 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -77,6 +77,7 @@ $lang->task->keywords = 'Tags'; $lang->task->syncStory = 'Sync to task'; $lang->task->addSibling = 'Add Sibling'; $lang->task->addSub = 'Add Child'; +$lang->task->otherExecution = 'Other Execution'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index d03532614a..2a33173f1b 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -77,6 +77,7 @@ $lang->task->keywords = 'Tags'; $lang->task->syncStory = 'Sync to task'; $lang->task->addSibling = 'Add Sibling'; $lang->task->addSub = 'Add Child'; +$lang->task->otherExecution = 'Other Execution'; $lang->task->common = 'Tâche'; $lang->task->id = 'ID'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 8297004f8f..d09ef454f5 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -77,6 +77,7 @@ $lang->task->keywords = '关键词'; $lang->task->syncStory = '同步至任务'; $lang->task->addSibling = '添加同级'; $lang->task->addSub = '添加子级'; +$lang->task->otherExecution = '跨执行'; $lang->task->common = '任务'; $lang->task->id = '编号'; diff --git a/module/task/model.php b/module/task/model.php index ac9fb0d6d9..46a77e7563 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1798,10 +1798,11 @@ class taskModel extends model * * @param int $projectID * @param bool $isPairs + * @param int $executionID * @access public * @return array */ - public function getProjectTaskList(int $projectID, bool $isPairs = false): array + public function getProjectTaskList(int $projectID, bool $isPairs = false, int $executionID = 0): array { $taskList = $this->dao->select('*')->from(TABLE_TASK) ->where('deleted')->eq(0) @@ -1813,8 +1814,10 @@ class taskModel extends model $taskPairs = array(); foreach($taskList as $taskID => $task) { - $prefix = $task->parent > 0 ? "[{$this->lang->task->childrenAB}] " : ''; - $task->name = $prefix . "$task->id:" . (empty($task->finishedByRealName) ? '' : "$task->finishedByRealName:") . "$task->name"; + $prefix = $task->parent > 0 ? "[{$this->lang->task->childrenAB}] " : ''; + $task->name = $prefix . "$task->id:" . (empty($task->finishedByRealName) ? '' : "$task->finishedByRealName:") . "$task->name"; + if(!empty($executionID) && $task->execution != $executionID) $task->name = $task->name . " [{$this->lang->task->otherExecution}]"; + $taskPairs[$taskID] = $task->name; } diff --git a/module/task/test/model/getprojecttasklist.php b/module/task/test/model/getprojecttasklist.php index e99177135e..68390e84fe 100755 --- a/module/task/test/model/getprojecttasklist.php +++ b/module/task/test/model/getprojecttasklist.php @@ -44,9 +44,11 @@ cid=1 $task = $tester->loadModel('task'); -r($task->getProjectTaskList(0)) && p() && e('0'); // 测试获取项目ID 0下的任务 -r($task->getProjectTaskList(1)) && p('1:name') && e('1:任务1'); // 测试获取项目ID 1下的任务 -r($task->getProjectTaskList(2)) && p('2:name') && e('2:任务2'); // 测试获取项目ID 2下的任务 -r($task->getProjectTaskList(1, true)) && p('1') && e('1:任务1'); // 测试获取项目ID 1 isPairs true下的任务 -r($task->getProjectTaskList(2, true)) && p('2') && e('2:任务2'); // 测试获取项目ID 2 isPairs true下的任务 -r($task->getProjectTaskList(3)) && p() && e('0'); // 测试获取项目ID 3下的任务 +r($task->getProjectTaskList(0)) && p() && e('0'); // 测试获取项目ID 0下的任务 +r($task->getProjectTaskList(1)) && p('1:name') && e('1:任务1'); // 测试获取项目ID 1下的任务 +r($task->getProjectTaskList(2)) && p('2:name') && e('2:任务2'); // 测试获取项目ID 2下的任务 +r($task->getProjectTaskList(1, true)) && p('1') && e('1:任务1'); // 测试获取项目ID 1 isPairs true下的任务 +r($task->getProjectTaskList(2, true)) && p('2') && e('2:任务2'); // 测试获取项目ID 2 isPairs true下的任务 +r($task->getProjectTaskList(1, true, 3)) && p('1') && e('1:任务1'); // 测试获取项目ID 1 isPairs true下的任务 +r($task->getProjectTaskList(2, true, 5)) && p('2') && e('2:任务2 [跨执行]'); // 测试获取项目ID 2 isPairs true下的任务 +r($task->getProjectTaskList(3)) && p() && e('0'); // 测试获取项目ID 3下的任务