AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update subtask spent based on the time tracking

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-07 21:44:51 -05:00
parent 2d890cbc71
commit c9cc82eec8
4 changed files with 90 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Model/Subtask.php
View File

@@ -176,9 +176,6 @@ class Subtask extends Base
$subtask_id = $this->persist(self::TABLE, $values);
if ($subtask_id) {
$this->updateTaskTimeTracking($values['task_id']);
$this->container['dispatcher']->dispatch(
self::EVENT_CREATE,
new SubtaskEvent(array('id' => $subtask_id) + $values)
@@ -202,10 +199,6 @@ class Subtask extends Base
if ($result) {
if (isset($values['task_id'])) {
$this->updateTaskTimeTracking($values['task_id']);
}
$this->container['dispatcher']->dispatch(
self::EVENT_UPDATE,
new SubtaskEvent($values)
@@ -231,6 +224,7 @@ class Subtask extends Base
$values = array(
'id' => $subtask['id'],
'status' => ($subtask['status'] + 1) % 3,
'task_id' => $subtask['task_id'],
);
return $this->update($values);
@@ -267,37 +261,6 @@ class Subtask extends Base
->count() === 1;
}
/**
* Update task time tracking based on subtasks time tracking
*
* @access public
* @param integer $task_id Task id
* @return bool
*/
public function updateTaskTimeTracking($task_id)
{
$result = $this->db
->table(self::TABLE)
->eq('task_id', $task_id)
->columns(
'SUM(time_spent) AS total_spent',
'SUM(time_estimated) AS total_estimated'
)
->findOne();
if (empty($result['total_spent']) && empty($result['total_estimated'])) {
return true;
}
return $this->db
->table(Task::TABLE)
->eq('id', $task_id)
->update(array(
'time_spent' => $result['total_spent'],
'time_estimated' => $result['total_estimated'],
));
}
/**
* Remove
*