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

* finish task#1306.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2013-04-23 07:33:37 +00:00
parent 2837b10fe4
commit ac76f3fb30
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/project/lang/en.php
View File

@@ -130,6 +130,8 @@ $lang->project->assignedToMe = 'To me';
$lang->project->statusSelects[''] = 'More';
$lang->project->statusSelects['finishedbyme'] = 'Finished by me';
$lang->project->statusSelects['wait'] = 'Pending';
$lang->project->statusSelects['undone'] = 'Undone';
$lang->project->statusSelects['unclosed'] = 'Unclosed';
$lang->project->statusSelects['doing'] = 'Doing';
$lang->project->statusSelects['done'] = 'Done';
$lang->project->statusSelects['closed'] = 'Closed';

2
module/project/lang/zh-cn.php
View File

@@ -130,6 +130,8 @@ $lang->project->assignedToMe = '指派给我';
$lang->project->statusSelects[''] = '更多';
$lang->project->statusSelects['finishedbyme'] = '我完成';
$lang->project->statusSelects['wait'] = '未开始';
$lang->project->statusSelects['undone'] = '未完成';
$lang->project->statusSelects['unclosed'] = '未关闭';
$lang->project->statusSelects['doing'] = '进行中';
$lang->project->statusSelects['done'] = '已完成';
$lang->project->statusSelects['closed'] = '已关闭';

4
module/task/model.php
View File

@@ -694,11 +694,13 @@ class taskModel extends model
->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
->where('t1.project')->eq((int)$projectID)
->andWhere('t1.deleted')->eq(0)
->beginIF($type == 'undone')->andWhere("t1.status = 'wait'")->orWhere("t1.status = 'doing'")->fi()
->beginIF($type == 'unclosed')->andWhere("t1.status != 'closed'")->fi()
->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())->andWhere('t1.status')->in('wait,doing')->fi()
->beginIF(strpos('all|needconfirm|assignedtome|delayed|finishedbyme', $type) === false)->andWhere('t1.status')->in($type)->fi()
->beginIF(strpos(',all,undone,unclosed,needconfirm,assignedtome,delayed,finishedbyme,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll();