Merge branch 'master' into change-design

Author: khor-jingqian

docs/DeveloperGuide.md

@@ -263,7 +263,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
 | `* * *`  | student who has no knowledge of working out|view what exercise routines the application has|choose the right one for me
 | `* * *`  | busy student                               | add workout routines into my schedule | have the time to exercise
 | `* * *`  | student                                    | delete a workout routine       | keep my schedule up-to-date
-| `* * *`  | NUS student                                | see my timetable               | slot in my workout sessions with ease 
+| `* * *`  | NUS student                                | see my timetable               | slot in my workout sessions with ease
 
 *{More to be added}*
 
@@ -293,7 +293,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
     * 3a1. AddressBook shows an error message.
 
       Use case resumes at step 2.
-      
+     
 **Use case: Create a new routine**
 
 **MSS**
@@ -312,7 +312,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
     * 3a1. fitNUS shows an error message.
 
       Use case resumes at step 2.
-      
+     
 **Use case: Delete a routine**
 
 **MSS**

docs/UserGuide.md

@@ -16,7 +16,7 @@ fitNUS is  **optimized for use via a Command Line Interface** (CLI) while still
 
 --------------------------------------------------------------------------------------------------------------------
 <a name="quick-start"></a>
-## Quick start 
+## Quick start
 
 1. Ensure you have Java `11` or above installed in your Computer.
 

src/main/java/seedu/address/logic/Logic.java

@@ -12,6 +12,7 @@
 import seedu.address.model.person.Lesson;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Routine;
+import seedu.address.model.person.Slot;
 
 /**
  * API of the Logic component
@@ -45,6 +46,9 @@ public interface Logic {
     /** Returns an unmodifiable view of the filtered list of lessons */
     ObservableList<Lesson> getFilteredLessonList();
 
+    /** Returns an unmodifiable view of the filtered list of slots */
+    ObservableList<Slot> getFilteredSlotList();
+
     /**
      * Returns the user prefs' address book file path.
      */

src/main/java/seedu/address/logic/LogicManager.java

@@ -18,6 +18,7 @@
 import seedu.address.model.person.Lesson;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Routine;
+import seedu.address.model.person.Slot;
 import seedu.address.storage.Storage;
 
 /**
@@ -77,10 +78,16 @@ public ObservableList<Routine> getFilteredRoutineList() {
         return model.getFilteredRoutineList();
     }
 
+    @Override
     public ObservableList<Lesson> getFilteredLessonList() {
         return model.getFilteredLessonList();
     }
 
+    @Override
+    public ObservableList<Slot> getFilteredSlotList() {
+        return model.getFilteredSlotList();
+    }
+
     @Override
     public Path getAddressBookFilePath() {
         return model.getAddressBookFilePath();

src/main/java/seedu/address/logic/commands/FindLessonsCommand.java

@@ -0,0 +1,42 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.model.Model;
+import seedu.address.model.person.LessonNameContainsKeywordsPredicate;
+
+/**
+ * Finds and lists all lessons in fitNUS whose name contains any of the argument keywords.
+ * Keyword matching is case insensitive.
+ */
+public class FindLessonsCommand extends Command {
+
+    public static final String COMMAND_WORD = "find_lessons";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all lessons whose names contain any of "
+            + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+            + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+            + "Example: " + COMMAND_WORD + " CS1231";
+
+    private final LessonNameContainsKeywordsPredicate predicate;
+
+    public FindLessonsCommand(LessonNameContainsKeywordsPredicate predicate) {
+        this.predicate = predicate;
+    }
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.updateFilteredLessonList(predicate);
+        return new CommandResult(
+                String.format(Messages.MESSAGE_LESSONS_LISTED_OVERVIEW, model.getFilteredLessonList().size()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof FindLessonsCommand // instanceof handles nulls
+                && predicate.equals(((FindLessonsCommand) other).predicate)); // state check
+    }
+}

src/main/java/seedu/address/logic/commands/TimetableAddLessonCommand.java

@@ -20,7 +20,7 @@ public class TimetableAddLessonCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a Lesson to the timetable in fitNUS. "
             + "Parameters: "
             + PREFIX_NAME + "LESSON_NAME "
-            + PREFIX_DAY + "DAY"
+            + PREFIX_DAY + "DAY "
             + PREFIX_TIME + "TIME"
             + "\n"
             + "Example: " + COMMAND_WORD + " "

src/main/java/seedu/address/logic/commands/TimetableAddRoutineCommand.java

@@ -19,7 +19,7 @@ public class TimetableAddRoutineCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a Routine to the timetable in fitNUS. "
             + "Parameters: "
             + PREFIX_ROUTINE + "ROUTINE_NAME "
-            + PREFIX_DAY + "DAY"
+            + PREFIX_DAY + "DAY "
             + PREFIX_TIME + "TIME"
             + "\n"
             + "Example: " + COMMAND_WORD + " "

src/main/java/seedu/address/logic/commands/TimetableDeleteSlotCommand.java

@@ -19,7 +19,7 @@ public class TimetableDeleteSlotCommand extends Command {
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Deletes the slot identified by its day and time.\n"
             + "Parameters: "
-            + PREFIX_DAY + "DAY"
+            + PREFIX_DAY + "DAY "
             + PREFIX_TIME + "TIME"
             + "\n"
             + "Example: " + COMMAND_WORD + " "

src/main/java/seedu/address/logic/commands/routines/RoutineAddExerciseCommand.java

@@ -10,6 +10,7 @@
 import seedu.address.model.Model;
 import seedu.address.model.person.Exercise;
 import seedu.address.model.person.Routine;
+import seedu.address.model.person.exceptions.DuplicateExerciseException;
 
 /**
  * Adds an Routine to fitNUS.
@@ -30,6 +31,8 @@ public class RoutineAddExerciseCommand extends Command {
     public static final String MESSAGE_SUCCESS = "Exercise added to Routine: %1$s";
     public static final String MESSAGE_MISSING_ROUTINE = "This routine does not exist in fitNUS";
     public static final String MESSAGE_MISSING_EXERCISE = "This exercise does not exist in fitNUS";
+    public static final String MESSAGE_DUPLICATE_EXERCISE = "This exercise already exist in the routine!";
+
 
     private final Routine routineToAdd;
     private final Exercise exerciseToAdd;
@@ -53,8 +56,12 @@ public CommandResult execute(Model model) throws CommandException {
             throw new CommandException(MESSAGE_MISSING_EXERCISE);
         }
 
-        model.addExerciseToRoutine(routineToAdd, exerciseToAdd);
-        return new CommandResult(String.format(String.format(MESSAGE_SUCCESS, routineToAdd), exerciseToAdd));
+        try {
+            model.addExerciseToRoutine(routineToAdd, exerciseToAdd);
+            return new CommandResult(String.format(String.format(MESSAGE_SUCCESS, routineToAdd), exerciseToAdd));
+        } catch (DuplicateExerciseException error) {
+            throw new CommandException(MESSAGE_DUPLICATE_EXERCISE);
+        }
     }
 
     @Override

src/main/java/seedu/address/logic/commands/routines/RoutineDeleteExerciseCommand.java

@@ -0,0 +1,70 @@
+package seedu.address.logic.commands.routines;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ROUTINE;
+
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Exercise;
+import seedu.address.model.person.Routine;
+
+/**
+ * Deletes a routine identified using it's displayed index from fitNUS.
+ */
+public class RoutineDeleteExerciseCommand extends Command {
+
+    public static final String COMMAND_WORD = "routine_delete_exercise";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Deletes the mentioned Exercise used in the specified Routine.\n"
+            + "Parameters: "
+            + PREFIX_ROUTINE + "ROUTINE_NAME "
+            + PREFIX_EMAIL + "EXERCISE_NAME"
+            + "\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_ROUTINE + "Leg Day Session "
+            + PREFIX_EMAIL + "Squats ";
+
+    public static final String MESSAGE_DELETE_EXERCISE_SUCCESS = "Deleted Exercise from Routine: %1$s";
+    public static final String MESSAGE_MISSING_ROUTINE = "Deleted Exercise from Routine: %1$s";
+    public static final String MESSAGE_MISSING_EXERCISE = "Deleted Exercise from Routine: %1$s";
+
+    private final Routine routine;
+    private final Exercise exercise;
+
+    /**
+     * Creates a RoutineDeleteExericseCommand object.
+     * @param routine Specified Routine that the user wants to delete an Exercise from.
+     * @param exercise Specified Exercise that the user wants to delete.
+     */
+    public RoutineDeleteExerciseCommand(Routine routine, Exercise exercise) {
+        this.routine = routine;
+        this.exercise = exercise;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+
+        if (!model.hasRoutine(routine)) {
+            throw new CommandException(MESSAGE_MISSING_ROUTINE);
+        } else if (!model.hasExercise(exercise)) {
+            throw new CommandException(MESSAGE_MISSING_EXERCISE);
+        }
+
+        model.deleteExerciseToRoutine(routine, exercise);
+        return new CommandResult(String.format(String.format(MESSAGE_DELETE_EXERCISE_SUCCESS,
+                routine), exercise));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof RoutineDeleteExerciseCommand // instanceof handles nulls
+                && exercise.equals(((RoutineDeleteExerciseCommand) other).exercise) // state check
+                && routine.equals(((RoutineDeleteExerciseCommand) other).routine)); // state check
+    }
+}