Merge pull request #229 from NBQian/dup-prefix-bug

123456789
nus-cs2103-AY2223S2 · Apr 10, 2023 · 51d263c · 51d263c
2 parents 8ccef45 + 9b65e9c
commit 51d263c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/docs/team/nbqian.md b/docs/team/nbqian.md
@@ -36,14 +36,14 @@ Given below are my contributions to the project.
     * Created labels and categorized issues on GitHub
 * **Enhancements to existing features**:
     * Changed the find, edit, delete command such that they now require the user to use prefixes to specify the fields to search for, edit, or delete
-    * Changed the add command such that when a new student is created, his/her name cannot be part of any existing students' names, and vice versa.
-    * Added lesson unique lists in teh application, added, and updated relevant methods in a logical model, storage, and other classes ot fit the change.
+    * Changed the add and edit command such that when a new student is created or an existing student is modified, his/her name cannot be part of any existing students' names, and vice versa.
+    * Added lesson unique lists in the application, added, and updated relevant methods in a logical model, storage, and other classes ot fit the change.
 * **Documentation**:
   * User Guide:
     * Added documentation for the features `new-lesson`, `view-lesson`, `delete-lesson`, `update-lesson`, `new-exam`, `view-exam`, `delete-exam`, `update-exam`: [#184](https://github.com/AY2223S2-CS2103T-W13-4/tp/pull/184)
     * Added Glossary, List of Commands, and List of Prefixes as 3 separate tables: [#117](https://github.com/AY2223S2-CS2103T-W13-4/tp/pull/117)
   * Developer Guide:
-    * Added implementation for `CreateLessonCommand` [#89](https://github.com/AY2223S2-CS2103T-W13-4/tp/pull/89)
+    * Added implementation for `CreateLessonCommand` with Sequence Diagramm and Activity Diagram [#89](https://github.com/AY2223S2-CS2103T-W13-4/tp/pull/89)
     * Added Glossary and changed the table of contents [#198](https://github.com/AY2223S2-CS2103T-W13-4/tp/pull/198)
 
 * **Community**:

diff --git a/src/main/java/seedu/address/logic/commands/lesson/ViewLessonCommand.java b/src/main/java/seedu/address/logic/commands/lesson/ViewLessonCommand.java
@@ -3,8 +3,8 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_LESSON;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_SUBJECT;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_STUDENTS;
 
 import java.util.List;
@@ -29,18 +29,18 @@ public class ViewLessonCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all lessons filtered by\n"
         + "* name of student (case-insensitive) and/or\n"
         + "* date and/or\n"
-        + "* subject and/or\n"
+        + "* lesson title and/or\n"
         + "* whether it is done\n"
         + "and displays them as a list with index numbers.\n"
         + "Parameters: "
         + PREFIX_NAME + "STUDENT_NAME "
         + PREFIX_DATE + "DATE "
-        + PREFIX_SUBJECT + "SUBJECT "
+        + PREFIX_LESSON + "LESSON "
         + PREFIX_DONE + "COMPLETED KEYWORD\n"
         + "Example: " + COMMAND_WORD + " "
         + PREFIX_NAME + "John Doe "
         + PREFIX_DATE + "2023-05-21 "
-        + PREFIX_SUBJECT + "Math "
+        + PREFIX_LESSON + "Math "
         + PREFIX_DONE + "done(or not done)";
     private static final String SEPERATOR = "--------------------------------------------------\n";
     private static final Predicate<Lesson> SHOW_ALL_LESSONS = lesson -> true;

diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -26,6 +26,5 @@ public class CliSyntax {
     public static final Prefix PREFIX_STARTTIME = new Prefix("start/");
     public static final Prefix PREFIX_ENDTIME = new Prefix("end/");
     public static final Prefix PREFIX_DATE = new Prefix("date/");
-    public static final Prefix PREFIX_SUBJECT = new Prefix("subject/");
     public static final Prefix PREFIX_DONE = new Prefix("done/");
 }