diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 02b96d6e7d..d3c6520a29 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -83,7 +83,8 @@ $lang->project->ajaxGetProducts= "API: get project's products"; /* Browse. */ $lang->project->allTasks = 'All'; -$lang->project->assignedToMe = 'My'; +$lang->project->assignedToMe = 'To me'; +$lang->project->finishedByMe = 'My done'; $lang->project->statusWait = 'Wait'; $lang->project->statusDoing = 'Doing'; $lang->project->statusDone = 'Done'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 77cbe518c3..eb695e4f6e 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -84,6 +84,7 @@ $lang->project->ajaxGetProducts= '接口:获得项目产品列表'; /* 分组浏览。*/ $lang->project->allTasks = '所有任务'; $lang->project->assignedToMe = '指派给我'; +$lang->project->finishedByMe = '由我完成'; $lang->project->statusWait = '未开始'; $lang->project->statusDoing = '进行中'; $lang->project->statusDone = '已完成'; diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php index 7d3151a6b6..55a1515308 100644 --- a/module/project/view/taskheader.html.php +++ b/module/project/view/taskheader.html.php @@ -11,6 +11,7 @@ function switchGroup(projectID, groupBy) " ; common::printLink('project', 'task', "project=$project->id", $lang->project->allTasks); echo '' ; echo ""; common::printLink('project', 'task', "project=$project->id&type=assignedtome", $lang->project->assignedToMe); echo '' ; + echo ""; common::printLink('project', 'task', "project=$project->id&type=finishedbyme", $lang->project->finishedByMe); echo '' ; echo "" ; common::printLink('project', 'task', "project=$project->id&type=wait", $lang->project->statusWait); echo '' ; echo "" ; common::printLink('project', 'task', "project=$project->id&type=doing", $lang->project->statusDoing); echo '' ; echo "" ; common::printLink('project', 'task', "project=$project->id&type=done", $lang->project->statusDone); echo '' ; diff --git a/module/task/model.php b/module/task/model.php index a714c7caf0..248bab3c1a 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -306,8 +306,9 @@ class taskModel extends model ->andWhere('t1.deleted')->eq(0) ->beginIF($type == 'needconfirm')->andWhere('t2.version > t1.storyVersion')->andWhere("t2.status = 'active'")->fi() ->beginIF($type == 'assignedtome')->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi() + ->beginIF($type == 'finishedbyme')->andWhere('t1.finishedby')->eq($this->app->user->account)->fi() ->beginIF($type == 'delayed')->andWhere('deadline')->between('1970-1-1', helper::now())->fi() - ->beginIF(strpos('all|needconfirm|assignedtome|delayed', $type) === false)->andWhere('t1.status')->in($type)->fi() + ->beginIF(strpos('all|needconfirm|assignedtome|delayed|finishedbyme', $type) === false)->andWhere('t1.status')->in($type)->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll();