From c35e91b686ce71bff9063a31ee9fa88b8a623222 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 9 May 2018 11:30:12 +0300
Subject: [PATCH] Change task API duration to seconds

---
 app/Http/Controllers/TaskApiController.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/TaskApiController.php b/app/Http/Controllers/TaskApiController.php
index 81796a2feda7..8b51e8667fd3 100644
--- a/app/Http/Controllers/TaskApiController.php
+++ b/app/Http/Controllers/TaskApiController.php
@@ -117,8 +117,20 @@ class TaskApiController extends BaseAPIController
                 $endTime = false;
                 if (! empty($detail['end_datetime'])) {
                     $endTime = strtotime($detail['end_datetime']);
-                } elseif (! empty($detail['duration_seconds'])) {
-                    $endTime = $startTime + $detail['duration_seconds'];
+                } else {
+                    $duration = 0;
+                    if (! empty($detail['duration_seconds'])) {
+                        $duration += $detail['duration_seconds'];
+                    }
+                    if (! empty($detail['duration_minutes'])) {
+                        $duration += $detail['duration_minutes'] * 60;
+                    }
+                    if (! empty($detail['duration_hours'])) {
+                        $duration += $detail['duration_hours'] * 60 * 60;
+                    }
+                    if ($duration) {
+                        $endTime = $startTime + $duration;
+                    }
                 }
                 $timeLog[] = [$startTime, $endTime];
                 if (! $endTime) {