diff options
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/Subtask.php | 39 | ||||
| -rw-r--r-- | app/Model/SubtaskTimeTracking.php | 68 |
2 files changed, 69 insertions, 38 deletions
diff --git a/app/Model/Subtask.php b/app/Model/Subtask.php index 1d5ed566..048594bd 100644 --- a/app/Model/Subtask.php +++ b/app/Model/Subtask.php @@ -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); @@ -268,37 +262,6 @@ class Subtask extends Base } /** - * 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 * * @access public diff --git a/app/Model/SubtaskTimeTracking.php b/app/Model/SubtaskTimeTracking.php index cc839ddb..3104dc20 100644 --- a/app/Model/SubtaskTimeTracking.php +++ b/app/Model/SubtaskTimeTracking.php @@ -68,6 +68,8 @@ class SubtaskTimeTracking extends Base */ public function logEndTime($subtask_id, $user_id) { + $this->updateSubtaskTimeSpent($subtask_id, $user_id); + return $this->db ->table(self::TABLE) ->eq('subtask_id', $subtask_id) @@ -77,4 +79,70 @@ class SubtaskTimeTracking extends Base 'end' => time() )); } + + /** + * 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->calculateSubtaskTime($task_id); + + 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'], + )); + } + + /** + * Sum time spent and time estimated for all subtasks + * + * @access public + * @param integer $task_id Task id + * @return array + */ + public function calculateSubtaskTime($task_id) + { + return $this->db + ->table(Subtask::TABLE) + ->eq('task_id', $task_id) + ->columns( + 'SUM(time_spent) AS total_spent', + 'SUM(time_estimated) AS total_estimated' + ) + ->findOne(); + } + + /** + * Update subtask time spent based on the punch clock table + * + * @access public + * @param integer $subtask_id + * @param integer $user_id + * @return bool + */ + public function updateSubtaskTimeSpent($subtask_id, $user_id) + { + $start_time = $this->db + ->table(self::TABLE) + ->eq('subtask_id', $subtask_id) + ->eq('user_id', $user_id) + ->eq('end', 0) + ->findOneColumn('start'); + + return $start_time && + $this->db + ->getConnection() + ->exec('UPDATE '.Subtask::TABLE.' SET time_spent=time_spent+'.round((time() - $start_time) / 3600, 1).' WHERE id='.$subtask_id); + } } |