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

* fix bug #2215.

Browse Source
This commit is contained in:
wangyidong
2020-03-19 15:38:14 +08:00
parent 7c2c59bc24
commit 1e542ecbe5
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+13 -6
View File
@@ -579,6 +579,7 @@ class taskModel extends model
$currentTask = !empty($task) ? $task : new stdclass();
if(!isset($currentTask->status)) $currentTask->status = $oldTask->status;
$currentTask->assignedTo = $oldTask->assignedTo;
if(!empty($this->post->assignedTo))
{
$currentTask->assignedTo = $this->post->assignedTo;
@@ -1155,8 +1156,8 @@ class taskModel extends model
$estimate = new stdclass();
$estimate->date = zget($task, 'realStarted', date(DT_DATE1));
$estimate->task = $taskID;
$estimate->consumed = zget($task, 'consumed', 0);
$estimate->left = zget($task, 'left', 0);
$estimate->consumed = zget($_POST, 'consumed', 0);
$estimate->left = zget($_POST, 'left', 0);
$estimate->work = zget($task, 'work', '');
$estimate->account = $this->app->user->account;
$estimate->consumed = $estimate->consumed - $oldTask->consumed;
@@ -1378,14 +1379,20 @@ class taskModel extends model
}
$estimate = new stdclass();
$estimate->date = zget($task, 'finishedDate', date(DT_DATE1));
$estimate->date = zget($_POST, 'finishedDate', date(DT_DATE1));
$estimate->task = $taskID;
$estimate->consumed = zget($task, 'consumed', 0);
$estimate->left = zget($task, 'left', 0);
$estimate->left = 0;
$estimate->work = zget($task, 'work', '');
$estimate->account = $this->app->user->account;
$estimate->consumed = $consumed;
if(!empty($oldTask->team))
{
foreach($oldTask->team as $teamAccount => $team)
{
if($teamAccount == $this->app->user->account) continue;
$estimate->left += $team->left;
}
}
if($estimate->consumed) $this->addTaskEstimate($estimate);
if(!empty($oldTask->team))