From ac76f3fb30693cd73380237ea07d7d1f6016a5e3 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Tue, 23 Apr 2013 07:33:37 +0000
Subject: [PATCH]  * finish task#1306.

---
 module/project/lang/en.php    | 2 ++
 module/project/lang/zh-cn.php | 2 ++
 module/task/model.php         | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 7134484a1f..78e0f1999d 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -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';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 43098ccba8..0d010b0d75 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -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']       = '已关闭';
diff --git a/module/task/model.php b/module/task/model.php
index 980b66261b..6145c2f2b6 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -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();