Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CalendarItemFilter Part 2 #164

Merged
merged 4 commits into from
Nov 5, 2016
Merged

CalendarItemFilter Part 2 #164

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60f05e5
filterEvents by name
louietyj Nov 5, 2016
04b4db9
filterEvents by eventStatus
louietyj Nov 5, 2016
c42adf3
filterEvents by time
louietyj Nov 5, 2016
6e708d5
Filter by tags
louietyj Nov 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/main/java/seedu/todo/controllers/concerns/CalendarItemFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.function.Predicate;

import seedu.todo.commons.exceptions.InvalidNaturalDateException;
import seedu.todo.models.Event;
import seedu.todo.models.Task;

/**
Expand All @@ -33,6 +34,7 @@ public static Map<String, String[]> getFilterTokenDefinitions() {
tokenDefinitions.put("eventStatus", new String[] { "over" , "past", "future" });
tokenDefinitions.put("timeFrom", new String[] { "from", "after" });
tokenDefinitions.put("timeTo", new String[] { "to", "before", "until", "by" });
tokenDefinitions.put("tag", new String[] { "tag" });
return tokenDefinitions;
}

Expand Down Expand Up @@ -88,7 +90,52 @@ public static List<Task> filterTasks(Map<String, String[]> parsedResult) throws
taskPredicates.add(Task.predBeforeDueDate(timeEnd));
}

// Filter by tag
if (parsedResult.get("tag") != null && parsedResult.get("tag")[1] != null) {
taskPredicates.add(Task.predTag(parsedResult.get("tag")[1]));
}

return Task.where(taskPredicates);
}

public static List<Event> filterEvents(Map<String, String[]> parsedResult) throws InvalidNaturalDateException {
List<Predicate<Event>> eventPredicates = new ArrayList<Predicate<Event>>();

// Filter by name
if (parsedResult.get("name") != null) {
eventPredicates.add(Event.predByName(parsedResult.get("name")[1]));
}

// Filter by eventStatus
if (parsedResult.get("eventStatus") != null && parsedResult.get("eventStatus")[1] != null) {
String eventStatus = parsedResult.get("eventStatus")[1];
LocalDateTime now = LocalDateTime.now();
if (eventStatus.equals("over") || eventStatus.equals("past")) {
eventPredicates.add(Event.predEndBefore(now));
} else if (eventStatus.equals("future")) {
eventPredicates.add(Event.predStartBefore(now));
}
}

// 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));
}

// Filter by tag
if (parsedResult.get("tag") != null && parsedResult.get("tag")[1] != null) {
eventPredicates.add(Event.predTag(parsedResult.get("tag")[1]));
}

return Event.where(eventPredicates);
}

}