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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2021-04-30 13:17:43 +08:00
parent 5b0230c7ce
commit 3f75e066e3
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+2 -5
View File
@@ -773,11 +773,8 @@ class programModel extends model
$hour = (object)$emptyHour;
foreach($projectTasks as $task)
{
if($task->status != 'cancel')
{
$hour->totalEstimate += $task->estimate;
$hour->totalConsumed += $task->consumed;
}
$hour->totalEstimate += $task->estimate;
$hour->totalConsumed += $task->consumed;
if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
}
$hours[$projectID] = $hour;
module/project/model.php
+2 -5
View File
@@ -1543,11 +1543,8 @@ class projectModel extends model
$hour = (object)$emptyHour;
foreach($executionTasks as $task)
{
if($task->status != 'cancel')
{
$hour->totalEstimate += $task->estimate;
$hour->totalConsumed += $task->consumed;
}
$hour->totalEstimate += $task->estimate;
$hour->totalConsumed += $task->consumed;
if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
}
$hours[$executionID] = $hour;