Merge pull request #134 from yash-chowdhary/fixes

Fix task viewing
CS2103JAN2018-W15-B4 · Mar 28, 2018 · 7707f1d · 7707f1d
2 parents a272966 + 79cdedb
commit 7707f1d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/seedu/club/logic/commands/LogOutCommand.java b/src/main/java/seedu/club/logic/commands/LogOutCommand.java
@@ -27,6 +27,7 @@ public CommandResult execute() {
         } else {
             model.logOutMember();
             model.updateFilteredMemberList(Model.PREDICATE_NOT_SHOW_ALL_MEMBERS);
+            model.updateFilteredTaskList(Model.PREDICATE_NOT_SHOW_ALL_TASKS);
             return new CommandResult(MESSAGE_SUCCESS);
         }
     }

diff --git a/src/main/java/seedu/club/model/Model.java b/src/main/java/seedu/club/model/Model.java
@@ -31,9 +31,12 @@ public interface Model {
     Predicate<Member> PREDICATE_SHOW_ALL_MEMBERS = unused -> true;
 
 
-    /** {@code Predicate} that always evaluate to false */
+    /** {@code Predicate} that always evaluate to true */
     Predicate<Task> PREDICATE_SHOW_ALL_TASKS = unused -> true;
 
+    /** {@code Predicate} that always evaluate to false */
+    Predicate<Task> PREDICATE_NOT_SHOW_ALL_TASKS = unused -> false;
+
     /** {@code Predicate} that always evaluate to true */
     Predicate<Member> PREDICATE_NOT_SHOW_ALL_MEMBERS = unused -> false;
 

diff --git a/src/main/java/seedu/club/model/ModelManager.java b/src/main/java/seedu/club/model/ModelManager.java
@@ -71,6 +71,7 @@ public ModelManager(ReadOnlyClubBook clubBook, UserPrefs userPrefs) {
         filteredPolls = new FilteredList<>(this.clubBook.getPollList());
         filteredTasks = new FilteredList<>(this.clubBook.getTaskList());
         updateFilteredMemberList(PREDICATE_NOT_SHOW_ALL_MEMBERS);
+        updateFilteredTaskList(PREDICATE_NOT_SHOW_ALL_TASKS);
     }
 
     public ModelManager() {
@@ -137,7 +138,7 @@ public void logsInMember(String username, String password) {
         clubBook.logInMember(username, password);
         if (getLoggedInMember() != null) {
             updateFilteredMemberList(PREDICATE_SHOW_ALL_MEMBERS);
-            // updateFilteredTaskList(PREDICATE_SHOW_ALL_TASKS);
+            updateFilteredTaskList(PREDICATE_SHOW_ALL_TASKS);
         }
     }
 
@@ -301,7 +302,7 @@ public void addTaskToTaskList(Task toAdd) throws DuplicateTaskException {
             toAdd.setAssignee(assignee);
             toAdd.setStatus(status);
             clubBook.addTaskToTaskList(toAdd);
-            // updateFilteredTaskList(PREDICATE_SHOW_ALL_TASKS);
+            updateFilteredTaskList(PREDICATE_SHOW_ALL_TASKS);
             indicateClubBookChanged();
         } catch (DuplicateTaskException dte) {
             throw new DuplicateTaskException();