Update subtask spent based on the time tracking

1 files changed, 20 insertions, 5 deletions

diff --git a/app/Subscriber/SubtaskTimesheetSubscriber.php b/app/Subscriber/SubtaskTimesheetSubscriber.php
index df10fc43..acae9a4b 100644
--- a/app/Subscriber/SubtaskTimesheetSubscriber.php
+++ b/app/Subscriber/SubtaskTimesheetSubscriber.php
@@ -11,21 +11,36 @@ class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterfac
     public static function getSubscribedEvents()
     {
         return array(
-            Subtask::EVENT_UPDATE => array('log', 0),
+            Subtask::EVENT_CREATE => array('updateTaskTime', 0),
+            Subtask::EVENT_UPDATE => array(
+                array('logStartEnd', 10),
+                array('updateTaskTime', 0),
+            )
         );
     }
 
-    public function log(SubtaskEvent $event)
+    public function updateTaskTime(SubtaskEvent $event)
     {
-        if (isset($event['status'])) {
+        if (isset($event['task_id'])) {
+            $this->subtaskTimeTracking->updateTaskTimeTracking($event['task_id']);
+        }
+    }
+
+    public function logStartEnd(SubtaskEvent $event)
+    {
+        if ($this->config->get('subtask_time_tracking') == 1 && isset($event['status'])) {
 
             $subtask = $this->subtask->getById($event['id']);
 
+            if (empty($subtask['user_id'])) {
+                return false;
+            }
+
             if ($subtask['status'] == Subtask::STATUS_INPROGRESS) {
-                $this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']);
+                return $this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']);
             }
             else {
-                $this->subtaskTimeTracking->logEndTime($subtask['id'], $subtask['user_id']);
+                return $this->subtaskTimeTracking->logEndTime($subtask['id'], $subtask['user_id']);
             }
         }
     }