From 337a3b71e879cf1100c3d1b3cf6fa40b4a9c98ba Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2022 11:29:06 +0300
Subject: [PATCH] Improve check for overlapping task times

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

diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index f245a0085..9618d264a 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -338,6 +338,10 @@ abstract class TaskEntity extends Object
 
       if (time.isRunning) {
         countRunning++;
+
+        if (startDate.isBefore(lastDateTime)) {
+          isValid = false;
+        }
       } else {
         if (startDate.isBefore(lastDateTime) || startDate.isAfter(endDate)) {
           isValid = false;
@@ -364,7 +368,9 @@ abstract class TaskEntity extends Object
       final endDate = time.endDate;
 
       if (time.isRunning) {
-        //
+        if (startDate.isBefore(lastDateTime)) {
+          indices.add(counter);
+        }
       } else {
         if (startDate.isBefore(lastDateTime) || startDate.isAfter(endDate)) {
           indices.add(counter);