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

* finish task #6233.

Browse Source
This commit is contained in:
wangyidong
2019-08-22 11:14:56 +08:00
parent 0ef65f1688
commit 162887854f
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+14 -14
View File
@@ -1125,12 +1125,13 @@ class taskModel extends model
}
/* Record consumed and left. */
$estimate = fixer::input('post')
->setDefault('account', $this->app->user->account)
->setDefault('task', $taskID)
->setDefault('date', $task->realStarted)
->remove('realStarted,comment,status')
->get();
$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->work = zget($task, 'work', '');
$estimate->account = $this->app->user->account;
$estimate->consumed = $estimate->consumed - $oldTask->consumed;
$this->addTaskEstimate($estimate);
@@ -1349,14 +1350,13 @@ class taskModel extends model
}
}
$estimate = fixer::input('post')
->setDefault('account', $this->app->user->account)
->setDefault('task', $taskID)
->setDefault('date', date(DT_DATE1))
->setIF($this->post->finishedDate, 'date', $this->post->finishedDate)
->setDefault('left', 0)
->remove('finishedDate,comment,assignedTo,files,labels,consumed,currentConsumed,status')
->get();
$estimate = new stdclass();
$estimate->date = zget($task, 'finishedDate', date(DT_DATE1));
$estimate->task = $taskID;
$estimate->consumed = zget($task, 'consumed', 0);
$estimate->left = zget($task, 'left', 0);
$estimate->work = zget($task, 'work', '');
$estimate->account = $this->app->user->account;
$estimate->consumed = $consumed;
if($estimate->consumed) $this->addTaskEstimate($estimate);