filterEvents by time

CS2103AUG2016-F11-C1 · Nov 5, 2016 · c42adf3 · c42adf3
1 parent 04b4db9
commit c42adf3
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/main/java/seedu/todo/controllers/concerns/CalendarItemFilter.java b/src/main/java/seedu/todo/controllers/concerns/CalendarItemFilter.java
@@ -110,7 +110,21 @@ public static List<Event> filterEvents(Map<String, String[]> parsedResult) throw
                 eventPredicates.add(Event.predStartBefore(now));
             }
         }
-        return null;
+
+        // Filter by time
+        String[] datePair = DateParser.extractDatePair(parsedResult);
+        String timeStartNatural = datePair[0];
+        String timeEndNatural = datePair[1];
+        if (timeStartNatural != null) {
+            LocalDateTime timeStart = DateParser.parseNatural(timeStartNatural);
+            eventPredicates.add(Event.predStartAfter(timeStart));
+        }
+        if (timeEndNatural != null) {
+            LocalDateTime timeEnd = DateParser.parseNatural(timeEndNatural);
+            eventPredicates.add(Event.predEndBefore(timeEnd));
+        }
+
+        return Event.where(eventPredicates);
     }
 
 }