From d1e6c39df4e6cb9eec60bf498e0d1c7abb23ace8 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 14 Sep 2015 22:10:08 -0400
Subject: Fix issue: task time tracking is not updated when deleting a subtask

---
 app/Model/SubtaskTimeTracking.php                | 19 +++----------------
 app/Subscriber/SubtaskTimeTrackingSubscriber.php |  1 +
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'app')

diff --git a/app/Model/SubtaskTimeTracking.php b/app/Model/SubtaskTimeTracking.php
index 997031e8..56998769 100644
--- a/app/Model/SubtaskTimeTracking.php
+++ b/app/Model/SubtaskTimeTracking.php
@@ -339,20 +339,7 @@ class SubtaskTimeTracking extends Base
      */
     public function updateTaskTimeTracking($task_id)
     {
-        $result = $this->calculateSubtaskTime($task_id);
-        $values = array();
-
-        if ($result['total_spent'] > 0) {
-            $values['time_spent'] = $result['total_spent'];
-        }
-
-        if ($result['total_estimated'] > 0) {
-            $values['time_estimated'] = $result['total_estimated'];
-        }
-
-        if (empty($values)) {
-            return true;
-        }
+        $values = $this->calculateSubtaskTime($task_id);
 
         return $this->db
                     ->table(Task::TABLE)
@@ -373,8 +360,8 @@ class SubtaskTimeTracking extends Base
                     ->table(Subtask::TABLE)
                     ->eq('task_id', $task_id)
                     ->columns(
-                        'SUM(time_spent) AS total_spent',
-                        'SUM(time_estimated) AS total_estimated'
+                        'SUM(time_spent) AS time_spent',
+                        'SUM(time_estimated) AS time_estimated'
                     )
                     ->findOne();
     }
diff --git a/app/Subscriber/SubtaskTimeTrackingSubscriber.php b/app/Subscriber/SubtaskTimeTrackingSubscriber.php
index e45b2c93..2d3b5f99 100644
--- a/app/Subscriber/SubtaskTimeTrackingSubscriber.php
+++ b/app/Subscriber/SubtaskTimeTrackingSubscriber.php
@@ -12,6 +12,7 @@ class SubtaskTimeTrackingSubscriber extends \Core\Base implements EventSubscribe
     {
         return array(
             Subtask::EVENT_CREATE => array('updateTaskTime', 0),
+            Subtask::EVENT_DELETE => array('updateTaskTime', 0),
             Subtask::EVENT_UPDATE => array(
                 array('logStartEnd', 10),
                 array('updateTaskTime', 0),
-- 
cgit v1.2.3