From 0476f07678e2a024063e61a5e729674cd506956d Mon Sep 17 00:00:00 2001
From: fujia <yuren_@126.com>
Date: Tue, 18 May 2010 05:53:30 +0000
Subject: [PATCH]  * fix bug #94

---
 trunk/module/bug/control.php |  4 ++--
 trunk/module/task/model.php  | 35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/trunk/module/bug/control.php b/trunk/module/bug/control.php
index c8fba64d6d..f8c540f547 100644
--- a/trunk/module/bug/control.php
+++ b/trunk/module/bug/control.php
@@ -449,9 +449,9 @@ class bug extends control
         /* 设置菜单。*/
         $this->bug->setMenu($this->products, $productID);
 
-        $this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->activate;
+        $this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->close;
         $this->view->position[]    = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
-        $this->view->position[]    = $this->lang->bug->activate;
+        $this->view->position[]    = $this->lang->bug->close;
 
         $this->view->bug     = $bug;
         $this->view->users   = $this->user->getPairs();
diff --git a/trunk/module/task/model.php b/trunk/module/task/model.php
index 1bb011cf4e..3fcc989281 100644
--- a/trunk/module/task/model.php
+++ b/trunk/module/task/model.php
@@ -206,12 +206,16 @@ class taskModel extends model
         $today = helper::today();
         foreach($tasks as $task)
         {
-            /* 计算是否延期。*/
-            if($task->deadline != '0000-00-00')
-            {
-                $delay = helper::diffDate($today, $task->deadline);
-                if($delay > 0) $task->delay = $delay;
-            }
+            /* 计算是否延期。*/
+            if($task->status !== 'done' and $task->status !== 'cancel')
+            {   
+                if($task->deadline != '0000-00-00')
+                {
+                    $delay = helper::diffDate($today, $task->deadline);
+                    if($delay > 0) $task->delay = $delay;
+                }
+            }    
+	    
             /* 判断需求是否变更。*/
             $task->needConfirm = false;
             if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)
@@ -225,13 +229,18 @@ class taskModel extends model
     /* 计算一个任务的相关状态。*/
     private function processTask($task)
     {
-        $today = helper::today();
-        if($task->deadline != '0000-00-00')
-        {
-            $delay = helper::diffDate($today, $task->deadline);
-            if($delay > 0) $task->delay = $delay;
-        }
-
+        $today = helper::today();
+       
+        /* 计算是否延期。*/
+        if($task->status !== 'done' and $task->status !== 'cancel')
+        {
+            if($task->deadline != '0000-00-00')
+            {
+                $delay = helper::diffDate($today, $task->deadline);
+            	if($delay > 0) $task->delay = $delay;            
+	        } 
+	    }
+	    
         /* 判断需求是否变更。*/
         $task->needConfirm = false;
         if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)