From aba66b70b19ad09207fa82e60e7796d11dc674a4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 30 Jan 2019 17:52:08 +0200
Subject: [PATCH] Task fixes

---
 lib/data/models/task_model.dart | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index f8ba748c1..d1be63bd3 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -209,9 +209,10 @@ abstract class TaskEntity extends Object
 
   bool isBetween(String startDate, String endDate) {
     final times = taskTimes;
-    return DateTime.parse(startDate).compareTo(times.first.endDate.toLocal()) <=
-            0 &&
-        DateTime.parse(endDate).compareTo(times.last.endDate.toLocal()) == 1;
+    final firstEndDate = times.first.endDate ?? DateTime.now();
+    final lastEndDate = times.first.endDate ?? DateTime.now();
+    return DateTime.parse(startDate).compareTo(firstEndDate.toLocal()) <= 0 &&
+        DateTime.parse(endDate).compareTo(lastEndDate.toLocal()) == 1;
   }
 
   List<TaskTime> get taskTimes {
@@ -228,8 +229,9 @@ abstract class TaskEntity extends Object
 
       final taskTime = TaskTime(
           startDate: convertTimestampToDate(startDate).toUtc(),
-          endDate:
-              endDate > 0 ? convertTimestampToDate(endDate).toUtc() : null);
+          endDate: (endDate ?? 0) > 0
+              ? convertTimestampToDate(endDate).toUtc()
+              : null);
 
       details.add(taskTime);
     });
@@ -326,8 +328,6 @@ abstract class TaskEntity extends Object
   @BuiltValueField(wireName: 'custom_value2')
   String get customValue2;
 
-  
-
   List<EntityAction> getEntityActions({UserEntity user, ClientEntity client}) {
     final actions = <EntityAction>[];