Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#61433,done,0.5h,0h] Add other execution label.

Browse Source
This commit is contained in:
wangyuting
2025-04-14 10:41:30 +08:00
committed by 刘刚
parent 69c24f47a2
commit 76b5fd033f
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/lang/de.php
+1
View File
@@ -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';
module/task/lang/en.php
+1
View File
@@ -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';
module/task/lang/fr.php
+1
View File
@@ -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';
module/task/lang/zh-cn.php
+1
View File
@@ -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 = '编号';
module/task/model.php
+6 -3
View File
@@ -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;
}
module/task/test/model/getprojecttasklist.php
+8 -6
View File
@@ -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下的任务