From 1464ea5165cf1c28b3abe847ffd44daecb816e22 Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Sun, 29 Jan 2017 03:08:03 +0100 Subject: [PATCH] fix total estimate calculation --- app/scripts/main/global-services/tasks-util-f.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/scripts/main/global-services/tasks-util-f.js b/app/scripts/main/global-services/tasks-util-f.js index d9d587eb1f..118570a756 100644 --- a/app/scripts/main/global-services/tasks-util-f.js +++ b/app/scripts/main/global-services/tasks-util-f.js @@ -87,7 +87,13 @@ if (angular.isArray(tasks) && tasks.length > 0) { totalEstimate = moment.duration(); _.each(tasks, (task) => { - totalEstimate.add(task.timeEstimate); + if (task.subTasks && task.subTasks.length > 0) { + _.each(task.subTasks, (subTask) => { + totalEstimate.add(subTask.timeEstimate); + }); + } else { + totalEstimate.add(task.timeEstimate); + } }); } return totalEstimate;