Fix redo interaction with reminder

AY1920S1-CS2103T-T10-3 · Oct 31, 2019 · d05b7a9 · d05b7a9
1 parent 9dbb455
commit d05b7a9
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/seedu/elisa/model/ItemModelManager.java b/src/main/java/seedu/elisa/model/ItemModelManager.java
@@ -202,7 +202,11 @@ public void addToSeparateList(Item item) {
 
         if (item.hasReminder()) {
             reminderList.add(item);
-            futureReminders.add(item);
+            if (item.getReminder().get().getOccurrenceDateTime().isAfter(LocalDateTime.now())) {
+                futureReminders.add(item);
+            } else {
+                activeReminders.add(item);
+            }
         }
     }
 
@@ -264,6 +268,8 @@ public Item removeItem(Item item) {
         } else {
             // never reached here as there are only three variants for the visualList
         }
+        activeReminders.remove(item);
+        futureReminders.remove(item);
         return removedItem;
     }
 
@@ -291,6 +297,8 @@ public Item deleteItem(int index) {
         taskList.remove(item);
         eventList.remove(item);
         reminderList.remove(item);
+        futureReminders.remove(item);
+        activeReminders.remove(item);
         if (priorityMode.getValue()) {
             getNextTask();
         }
@@ -308,6 +316,8 @@ public Item deleteItem(Item item) {
         taskList.removeItemFromList(item);
         eventList.removeItemFromList(item);
         reminderList.removeItemFromList(item);
+        activeReminders.remove(item);
+        futureReminders.remove(item);
         if (priorityMode.getValue()) {
             getNextTask();
         }