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

* fix bug #94

Browse Source
This commit is contained in:
fujia
2010-05-18 05:53:30 +00:00
parent 98f77a7b16
commit f32f68f2e9
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+22 -13
View File
@@ -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)