[CS2103T-W13-4] TutorPro

docs/UserGuide.md

@@ -51,13 +51,13 @@ TutorPro is a **desktop app designed to help private tutors manage their student
 
 3. Copy the file to the folder you want to use as the _home folder_ for your address book.
 
-4. Open a command terminal, `cd` into the folder in which you put the jar file, and use the `java -jar addressbook.jar` command to run the application.<br>
+4. Open a command terminal, `cd` into the folder in which you put the jar file, and use the `java -jar TutorPro.jar` command to run the application.<br>
    A GUI similar to the one below should appear in a few seconds. Note how the app contains some sample data.<br>
    ![Ui](images/Ui.png)
 
 5. Type the command in the command box and press Enter to execute it. e.g. typing **`help`** and pressing Enter will open the help window.<br>
 
-6. Refer to the [Features](#features) below for details of each command.
+6. Refer to the Features below for details of each command.
 
 --------------------------------------------------------------------------------------------------------------------
 ### Glossary
@@ -95,7 +95,7 @@ When you first run the app, you may see a display window pop up similar to the o
 
 You may enter the following commands in the Command Box to see how the Display List changes:
 * `list` lists all students.
-* `delete-b 1` deletes the student with index 1.
+* `delete 1` deletes the student with index 1.
 * `view-homework` displays all the homework from all students.
 
 You may also click the quick access buttons one each student card to see how the Detailed Information Section changes.
@@ -191,8 +191,9 @@ Format: `new-homework [name/STUDENT_NAME] [homework/HOMEWORK_NAME] [deadline/DEA
 * The `DEADLINE` must be in the future.
 
 Examples:
-* `assign-homework name/John homework/listening comprehension ex1 deadline/02-12-2023-2359` adds the assignment `listening comprehension ex1` to the student named `John. The deadline is 02 Dec 2023 at 23:25.
+* `new-homework name/John homework/listening comprehension ex1 deadline/2023-04-30 2359` adds the assignment `listening comprehension ex1` to the student named `John. The deadline is 02 Dec 2023 at 23:25.
 
+:exclamation: **Caution:** STUDENT_NAME is case-sensitive and supports partial matching. For example, `John` will match `John Doe` but not `john`.
 
 :exclamation: **Caution:** STUDENT_NAME, HOMEWORK_INDEX , and DEADLINE should all only appear at most once and should not be empty.
 
@@ -215,6 +216,8 @@ Examples:
 * `view-homework status/completed` displays all completed homework from all students.
 * `view-homework name/John status/pending` displays pending homework for a student named `John`.
 
+:exclamation: **Caution:** STUDENT_NAME is case-sensitive and supports partial matching. For example, `John` will match `John Doe` but not `john`.
+
 :exclamation: **Caution:** STATUS should only appear at most once and should not be empty. STUDENT_NAME can be zero or multiple but they all cannot be empty.
 
 #### Delete Homework from a Student
@@ -232,6 +235,8 @@ Examples:
 * `delete-homework name/John index/1` deletes the first homework assignment for the student named John.
 * `delete-homework name/Susan index/3` deletes the third homework assignment for the student named Susan.
 
+:exclamation: **Caution:** STUDENT_NAME is case-sensitive and supports partial matching. For example, `John` will match `John Doe` but not `john`.
+
 :exclamation: **Caution:** STUDENT_NAME, and HOMEWORK_INDEX should all only appear at most once and should not be empty.
 
 #### Mark the Homework of a Student as Done
@@ -249,8 +254,9 @@ Examples:
 * `mark-homework name/John index/1` marks the first homework assignment for the student named John.
 * `mark-homework name/Susan index/3` marks the third homework assignment for the student named Susan.
 
-:exclamation: **Caution:** STUDENT_NAME, and HOMEWORK_INDEX should all only appear at most once and should not be empty.
+:exclamation: **Caution:** STUDENT_NAME is case-sensitive and supports partial matching. For example, `John` will match `John Doe` but not `john`.
 
+:exclamation: **Caution:** STUDENT_NAME, and HOMEWORK_INDEX should all only appear at most once and should not be empty.
 
 #### Unmark Homework of a Student as Undone
 
@@ -267,6 +273,8 @@ Examples:
 * `unmark-homework name/John index/1`unmarks the first homework assignment for the student named John.
 * `unmark-homework name/Susan index/3` unmarks the third homework assignment for the student named Susan.
 
+:exclamation: **Caution:** STUDENT_NAME is case-sensitive and supports partial matching. For example, `John` will match `John Doe` but not `john`.
+
 :exclamation: **Caution:** STUDENT_NAME, and HOMEWORK_INDEX should all only appear at most once and should not be empty.
 
 #### Update Homework of a Student
@@ -288,6 +296,8 @@ Examples:
 * `updates-homework name/Susan index/3 deadline/2023-05-12 23:59` updates the deadline of homework 3 of Susan to be `2023-05-12 23:59`.
 * `updates-homework name/Donald index/2 homework/Math Assignment 1 deadline/2023-05-12 23:59` updates the name of homework 2 of Donald to be `Math Assignment 1` and updates the deadline of homework 2 of Donald to be `2023-05-12 23:59`.
 
+:exclamation: **Caution:** STUDENT_NAME is case-sensitive and supports partial matching. For example, `John` will match `John Doe` but not `john`.
+
 :exclamation:  **Caution:** STUDENT_NAME, HOMEWORK_INDEX , and DEADLINE should all only appear at most once and should not be empty.
 
 ### Lessons Commands
@@ -298,10 +308,10 @@ Creates a new lesson for a given student, with a lesson title and time.
 
 Format: `new-lesson [name/STUDENT_NAME] [lesson/LESSON_TITLE] [start/START_TIME] [end/END_TIME]`
 
-* All fields are mandatory.
+* All fields, except for additional student names, are mandatory.
 
 Examples:
-`new-lesson name/John Doe lesson/The Water Cycle start/25-03-23-1300 end/25-03-23-1500`
+* `new-lesson name/John Doe lesson/The Water Cycle start/25-03-23 1300 end/25-03-23 1500` creates a new lesson for the student named `John Doe` with the lesson title `The Water Cycle` starting at `25 Mar 2023 13:00` and ending at `25 Mar 2023 15:00`.
 
 
 #### View Lessons History
@@ -318,6 +328,34 @@ Examples:
 * `view-lesson` Displays the lesson history for all the tutor’s students.
 * `view-lesson name/John` Displays the lesson history for the student named John. If two students have the same name, then ask which one to show.
 
+Examples:
+* `view-lesson` Displays the lesson history for all the tutor’s students.
+* `view-lesson name/John subject/Math date/2023-05-03` Displays the lessons for student John, which are of subject Math, on the day 2023-05-03.
+* `view-lesson done/done` Displays all lessons that have been completed
+
+### Remove a Lesson
+Deletes a lesson for a given student.
+
+Format: `delete-lesson [name/STUDENT_NAME] [index/LESSON_INDEX]`
+
+* The `STUDENT_NAME` must be an existing student of the tutor. Note that there can only be one student's name.
+* Deletes the lesson at the specified `LESSON_INDEX`.
+
+Example:
+* `delete-lesson name/John Doe index/1` deletes the first lesson for the student named John Doe.
+
+### Update a Lesson
+Updates a lesson for a given student. This includes the lesson title, start time, and end time.
+
+Format: `update-lesson (optional)[name/STUDENT_NAME] (optional)[lesson/LESSON_TITLE] (optional)[start/START_TIME] (optional)[end/END_TIME]`
+
+* The `STUDENT_NAME` must be an existing student of the tutor. Note that there can only be one student's name.
+* Updates the specified Lesson with the new information (lesson name and/or start time and/or end time).
+* At least one of the fields must be specified.
+
+Example:
+* `update-lesson name/John Doe lesson/The Water Cycle start/25-03-23 1300 end/25-03-23 1500` updates the lesson for John Doe with the new information.
+
 ### Exams Commands
 
 #### Add an Exam to be tracked
@@ -449,4 +487,3 @@ Examples:
 * `dd MMM yyyy HH:mm `
 * `MMM dd, yyyy HHmm`
 * `MMM dd, yyyy HH:mm `
-* `dd-mm-yyyy HHmm`

src/main/java/seedu/address/commons/core/Messages.java

@@ -77,4 +77,8 @@ public class Messages {
     public static final String MESSAGE_EMPTY_DEADLINE = "Deadline cannot be empty!";
     public static final Object MESSAGE_ONLY_ONE_STATUS = "Only one status is allowed!";
     public static final Object MESSAGE_EMPTY_STATUS = "Status cannot be empty!";
+    public static final String MESSAGE_CONTAIN_STUDENT_NAME = "There is at least one existing student "
+            + "whose name contains \"%s\".";
+    public static final String MESSAGE_EXTENDED_STUDENT_NAME = "There is at least one existing student "
+            + "whose name is contained in \"%s\".";
 }

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

@@ -9,6 +9,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
+import seedu.address.commons.core.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.student.Student;
@@ -60,6 +61,16 @@ public CommandResult execute(Model model) throws CommandException {
             throw new CommandException(MESSAGE_DUPLICATE_STUDENT);
         }
 
+        if (model.hasDuplicateNameAdd(toAdd.getName().toString())) {
+            throw new CommandException(String.format(Messages.MESSAGE_CONTAIN_STUDENT_NAME,
+                toAdd.getName().toString()));
+        }
+
+        if (model.hasExtendedName(toAdd.getName().toString())) {
+            throw new CommandException(String.format(Messages.MESSAGE_EXTENDED_STUDENT_NAME,
+                toAdd.getName().toString()));
+        }
+
         model.addPerson(toAdd);
         return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
     }

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

@@ -76,6 +76,18 @@ public CommandResult execute(Model model) throws CommandException {
 
         Student personToEdit = lastShownList.get(index.getZeroBased());
         Student editedPerson = createEditedPerson(personToEdit, editStudentDescriptor);
+        String newName = editedPerson.getName().toString();
+        if (!newName.equals(personToEdit.getName().toString())) {
+            if (model.hasDuplicateNameEdit(newName, index.getZeroBased())) {
+                throw new CommandException(String.format(Messages.MESSAGE_CONTAIN_STUDENT_NAME,
+                    newName));
+            }
+
+            if (model.hasExtendedNameEdit(newName, index.getZeroBased())) {
+                throw new CommandException(String.format(Messages.MESSAGE_EXTENDED_STUDENT_NAME,
+                    newName));
+            }
+        }
 
         if (!personToEdit.isSameStudent(editedPerson) && model.hasPerson(editedPerson)) {
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);

src/main/java/seedu/address/logic/commands/homework/UpdateHomeworkCommand.java

@@ -84,6 +84,9 @@ public CommandResult execute(Model model) throws CommandException {
             String newHomeworkName = this.homeworkName.orElse(homeworkToUpdate.getDescription());
             LocalDateTime newDeadline = this.deadline.orElse(homeworkToUpdate.getDeadline());
             Homework newHomework = new Homework(newHomeworkName, newDeadline);
+            if (homeworkToUpdate.isCompleted()) {
+                newHomework.markAsDone();
+            }
             updateHomework(student, homeworkToUpdate, newHomework);
 
             return new CommandResult(

src/main/java/seedu/address/logic/commands/lesson/CreateLessonCommand.java

@@ -90,6 +90,7 @@ public CommandResult execute(Model model) throws CommandException {
             dupNames = new StringBuilder(dupNames.substring(0, dupNames.length() - 2));
             throw new CommandException(String.format(Messages.MESSAGE_HAS_DUPLICATE_NAMES, dupNames));
         }
+
         model.updateFilteredStudentList(predicate);
 
         List<Student> studentList = model.getFilteredStudentList();

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -46,10 +46,11 @@ public class ParserUtil {
         "yyyy/MM/dd'T'HH:mm", "yyyy-MM-dd HHmm",
         "yyyy-MM-dd HH:mm", "dd MMM yyyy HHmm",
         "dd MMM yyyy HH:mm", "MMM dd, yyyy HHmm",
-        "MMM dd, yyyy HH:mm", "dd-mm-yyyy HHmm"
+        "MMM dd, yyyy HH:mm"
     };
     //@@author
 
+
     /**
      * Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
      * trimmed.
@@ -432,4 +433,5 @@ public static Grade parseGrade(String grade) throws ParseException {
         }
         return res;
     }
+
 }

src/main/java/seedu/address/logic/parser/exam/CreateExamCommandParser.java

@@ -52,8 +52,8 @@ public CreateExamCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
                 CreateExamCommand.MESSAGE_USAGE));
         }
-        LocalDateTime startTime = ParserUtil.parseDeadline(argMultimap.getValue(PREFIX_STARTTIME).get());
-        LocalDateTime endTime = ParserUtil.parseDeadline(argMultimap.getValue(PREFIX_ENDTIME).get());
+        LocalDateTime startTime = ParserUtil.parseStartTime(argMultimap.getValue(PREFIX_STARTTIME).get());
+        LocalDateTime endTime = ParserUtil.parseEndTime(argMultimap.getValue(PREFIX_ENDTIME).get());
         List<String> nameKeywords = argMultimap.getAllValues(PREFIX_NAME);
 
         Double weightage = null;

src/main/java/seedu/address/model/Model.java

@@ -86,6 +86,9 @@ public interface Model {
     void updateFilteredStudentList(Predicate<Student> predicate);
 
     boolean hasDuplicateName(String name);
-
+    boolean hasDuplicateNameEdit(String name, Integer index);
+    boolean hasExtendedName(String name);
+    boolean hasExtendedNameEdit(String name, Integer index);
     boolean noSuchStudent(String name);
+    boolean hasDuplicateNameAdd(String toString);
 }

src/main/java/seedu/address/model/ModelManager.java

@@ -147,6 +147,9 @@ public boolean equals(Object obj) {
                 && filteredPersons.equals(other.filteredPersons);
     }
 
+    /**
+     * Returns true if the model has a student whose name is part of the input name.
+     */
     @Override
     public boolean hasDuplicateName(String name) {
         int count = 0;
@@ -158,6 +161,53 @@ public boolean hasDuplicateName(String name) {
         return count >= 2;
     }
 
+    @Override
+    public boolean hasDuplicateNameAdd(String name) {
+        int count = 0;
+        for (Student s : filteredPersons) {
+            if (s.getName().toString().contains(name)) {
+                count++;
+            }
+        }
+        return count >= 1;
+    }
+
+    @Override
+    public boolean hasDuplicateNameEdit(String name, Integer index) {
+        int count = 0;
+        for (int i = 0; i < filteredPersons.size(); i++) {
+            if (filteredPersons.get(i).getName().toString().contains(name) && i != index) {
+                count++;
+            }
+        }
+        return count >= 1;
+    }
+
+    /**
+     * Returns true if the model has a student whose name is part of the input name.
+     */
+    @Override
+    public boolean hasExtendedName(String name) {
+        int count = 0;
+        for (Student s : filteredPersons) {
+            if (name.contains(s.getName().toString())) {
+                count++;
+            }
+        }
+        return count >= 1;
+    }
+
+    @Override
+    public boolean hasExtendedNameEdit(String name, Integer index) {
+        int count = 0;
+        for (int i = 0; i < filteredPersons.size(); i++) {
+            if (name.contains(filteredPersons.get(i).getName().toString()) && i != index) {
+                count++;
+            }
+        }
+        return count >= 1;
+    }
+
     @Override
     public boolean noSuchStudent(String name) {
         for (Student s : filteredPersons) {

src/main/java/seedu/address/ui/exam/ExamCard.java

@@ -1,5 +1,7 @@
 package seedu.address.ui.exam;
 
+import java.time.format.DateTimeFormatter;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
@@ -11,7 +13,7 @@
  * A UI component that displays information of a {@code Person}.
  */
 public class ExamCard extends UiPart<Region> {
-
+    private static final DateTimeFormatter PRINT_FORMATTER = DateTimeFormatter.ofPattern("dd MMM yyyy HH:mm");
     private static final String FXML = "ExamListCard.fxml";
 
     @FXML
@@ -35,8 +37,8 @@ public ExamCard(Exam exam, int id) {
         super(FXML);
         this.id.setText(id + ". ");
         title.setText(exam.getDescription());
-        startTime.setText(exam.getStartTime().toString());
-        endTime.setText(exam.getEndTime().toString());
+        startTime.setText(exam.getStartTime().format(PRINT_FORMATTER));
+        endTime.setText(exam.getEndTime().format(PRINT_FORMATTER));
     }
 
     @Override

src/main/java/seedu/address/ui/lesson/LessonCard.java

@@ -1,5 +1,7 @@
 package seedu.address.ui.lesson;
 
+import java.time.format.DateTimeFormatter;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
@@ -11,6 +13,7 @@
  * A UI component that displays information of a {@code Person}.
  */
 public class LessonCard extends UiPart<Region> {
+    private static final DateTimeFormatter PRINT_FORMATTER = DateTimeFormatter.ofPattern("dd MMM yyyy HH:mm");
     private static final String FXML = "LessonListCard.fxml";
     private static final String DOT = ". ";
 
@@ -35,8 +38,8 @@ public LessonCard(Lesson lesson, int id) {
         super(FXML);
         this.id.setText(id + DOT);
         title.setText(lesson.getTitle());
-        startTime.setText(lesson.getStartTimeString());
-        endTime.setText(lesson.getEndTimeString());
+        startTime.setText(lesson.getStartTime().format(PRINT_FORMATTER));
+        endTime.setText(lesson.getEndTime().format(PRINT_FORMATTER));
     }
 
     @Override