From aa29e7a105ff973915bc2170e39c4074cb888c98 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 20 Dec 2018 09:35:25 +0200
Subject: [PATCH] Tasks

---
 lib/data/models/task_model.dart | 13 ++++++-------
 lib/ui/task/task_item_view.dart |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index a310c4c4c..494f7daf9 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -53,13 +53,13 @@ class TaskFields {
 }
 
 class TaskTime {
-  TaskTime({DateTime startDate, this.endDate}) : startDate = DateTime.now();
+  TaskTime({this.startDate, this.endDate});
 
   final DateTime startDate;
   final DateTime endDate;
 
-  int get duration =>
-      (endDate ?? DateTime.now()).difference(startDate).inSeconds;
+  Duration get duration =>
+      (endDate ?? DateTime.now()).difference(startDate);
 
   List<dynamic> get asList => <dynamic>[
         (startDate.millisecondsSinceEpoch / 1000).floor(),
@@ -117,9 +117,8 @@ abstract class TaskEntity extends Object
 
       final taskTime = TaskTime(
           startDate: convertTimestampToDate(startDate),
-          endDate: convertTimestampToDate(endDate > 0
-              ? endDate
-              : (DateTime.now().millisecondsSinceEpoch / 1000).floor()));
+          endDate: endDate > 0 ? convertTimestampToDate(endDate) : DateTime.now()
+      );
 
       details.add(taskTime);
     });
@@ -139,7 +138,7 @@ abstract class TaskEntity extends Object
     int seconds = 0;
 
     taskTimes.forEach((taskTime) {
-      seconds += taskTime.duration;
+      seconds += taskTime.duration.inSeconds;
     });
 
     return Duration(seconds: seconds);
diff --git a/lib/ui/task/task_item_view.dart b/lib/ui/task/task_item_view.dart
index 9468323c0..b26e139ed 100644
--- a/lib/ui/task/task_item_view.dart
+++ b/lib/ui/task/task_item_view.dart
@@ -31,7 +31,7 @@ class TaskItemListTile extends StatelessWidget {
         .format(taskItem.startDate);
     final subtitle = '$startDateString - $endDateString';
     final duration =
-        formatDuration(taskItem.endDate.difference(taskItem.startDate));
+        formatDuration(taskItem.duration);
 
     return Material(
         color: Theme.of(context).canvasColor,