Fix Bug

data/tasks.txt

@@ -1,4 +1,4 @@
 T | O | eat apple
-D | O | Complete CS2100 Assignment | Sep 18 2023 01:15 PM
+D | X | Complete CS2100 Assignment | Sep 18 2023 01:15 PM
 E | O | Play Tennis | Sep 25 2023 05:00 PM - Sep 25 2023 07:00 PM
 T | O | Learn JavaFX

src/main/java/jarvis/exceptions/ExceptionMessages.java

@@ -15,7 +15,7 @@ public class ExceptionMessages {
     public static final String INVALID_RANGE = "Please ensure that the date range is valid!";
     public static final String INVALID_TASK = "Please ensure that the task is valid (Event/Todo/Deadline)";
     public static final String INVALID_MARK = "I'm unable to perform the mark/unmark operation because the task"
-            + "is already marked/unmarked!";
+            + " is already marked/unmarked!";
     public static final String FILE_DOESNT_EXIST = "The file doesn't exist yet, but will be created under the path (";
     public static final String INVALID_INPUT = "Incorrect input has been detected from the file stored at the path (";
 

src/main/java/jarvis/tasks/Deadline.java

@@ -48,6 +48,6 @@ public String toFile() {
      * @return True if the deadline has passed, false otherwise.
      */
     public boolean hasPassed() {
-        return this.deadline.isBefore(LocalDateTime.now()) && !this.isCompleted();
+        return this.deadline.isBefore(LocalDateTime.now());
     }
 }

src/main/java/jarvis/tasks/Event.java

@@ -56,6 +56,6 @@ public String toFile() {
      * @return True if the event has started, false otherwise.
      */
     public boolean hasPassed() {
-        return this.from.isBefore(LocalDateTime.now()) && !this.isCompleted();
+        return this.from.isBefore(LocalDateTime.now());
     }
 }

src/main/java/jarvis/tasks/TaskList.java

@@ -117,10 +117,10 @@ public String getPendingTasks() {
         for (Task t : this.tasks) {
             if (t instanceof Todo) {
                 continue;
-            } else if (t.hasPassed()) {
+            } else if (t.hasPassed() && !t.isCompleted()) {
                 passedTasks.append(passedCount + 1).append(") ").append(t).append("\n");
                 passedCount++;
-            } else if (!t.hasPassed()) {
+            } else if (!t.hasPassed() && !t.isCompleted()) {
                 currentTasks.append(currentCount + 1).append(") ").append(t).append("\n");
                 currentCount++;
             }