From c7a6e0bcc7d1fc6c9ae8fa0576c373ce7dc9ab8f Mon Sep 17 00:00:00 2001 From: raydenlim <109991591+raydenlim@users.noreply.github.com> Date: Sat, 28 Oct 2023 03:21:59 +0800 Subject: [PATCH 1/6] Update UG Fix logic errors in GradedTest --- docs/UserGuide.md | 418 ++++++++++-------- docs/_config.yml | 1 - .../address/model/GradedTestListBook.java | 9 +- .../seedu/address/model/ModelManager.java | 4 +- 4 files changed, 246 insertions(+), 186 deletions(-) delete mode 100644 docs/_config.yml diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 20087625011..271aad39e6c 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -15,16 +15,16 @@ _Say goodbye to chaos and hello to an organized and efficient classroom experien

-F.A.K.E.J.A.R.V.I.S. is the **ultimate solution for CS1101S Avengers who manage a multitude of tutoring tasks.** This platform empowers you to efficiently track assignment gradings, monitor student participation, and seamlessly plan tutorials, consultations, and mastery checks. This is your one-stop solution to managing your time and students as a CS1101S Avenger! +F.A.K.E.J.A.R.V.I.S. is your **friendly companion for efficient task and administrative management**, allowing you to excel as a CS1101S Avenger. With this tol, you can effortlessly track assignment gradings, monitor student participation, and seamlessly plan tutorials, consultations, and mastery checks. -The application is designed for efficient usage through a Command-Line Interface, all while preserving the advantages of having a Graphical User Interface. +As Avengers ourselves, we understand the importance of managing both our time and our students effectively. F.A.K.E.J.A.R.V.I.S. is the one-stop solution to streamlining your workload, making your life easier. It is designed to empower you with the benefits of a Command-Line Interface(CLI), all while preserving the advantages of having a Graphical User Interface(GUI). -If you're new to the Command-Line Interface and need assistance, this User Guide is here to help you become familiar with it and use the application with ease. +If you're new to the CLI and need assistance, don't worry! This UserGuide is your trusted assistant, and will guide you through every step and ensure that you can unlock the full potential of F.A.K.E.J.A.R.V.I.S. Let's get started! + + -* Table of Contents - {:toc} ### How to use the User Guide You may refer to the **Table of Contents** on the right for easy navigation of the User Guide. @@ -146,89 +146,93 @@ Format: `help` ### Adding a person: `add` -Adds a person to the address book. +You can add a person to your address book. Format: `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…​` - - -**Tip:** A person can have any number of tags (including 0) - - Examples: * `add n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01` * `add n/Betsy Crowe t/friend e/betsycrowe@example.com a/Newgate Prison p/1234567 t/criminal` -### Listing all persons : `list` + +**Tip:** You can add any number of tags to a person! (including 0) + + +### Listing All Persons : `list` -Shows a list of all persons in the address book. +You can list out all persons in your address book. Format: `list` -### Editing a person : `edit` +### Editing a Person : `edit` -Edits an existing person in the address book. +You can edit an existing person in your address book. Format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…​` -* Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed person list. The index **must be a positive integer** 1, 2, 3, …​ -* At least one of the optional fields must be provided. -* Existing values will be updated to the input values. -* When editing tags, the existing tags of the person will be removed i.e adding of tags is not cumulative. -* You can remove all the person’s tags by typing `t/` without - specifying any tags after it. +[//]: # (* Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed +person list. The index **must be a positive integer** 1, 2, 3, …​ THIS CAN BE IN THE GLOSSARY) Examples: * `edit 1 p/91234567 e/johndoe@example.com` Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively. * `edit 2 n/Betsy Crower t/` Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags. -### Locating persons by name: `find` +> **Note:** +> * At least one of the optional fields must be provided. (i.e NAME, PHONE, EMAIL, ADDRESS) +> * Editing tags overwrites existing tags; it's not cumulative. To remove all tags, use `t/` without specifying any +> tags after it. +> * You can remove all the person’s tags by typing `t/` without + specifying any tags after it. -Finds persons whose names contain any of the given keywords. +### Locating Persons by Name: `find` -Format: `find KEYWORD [MORE_KEYWORDS]` +You can find a person whose name contain any of the given keywords. -* The search is case-insensitive. e.g `hans` will match `Hans` -* The order of the keywords does not matter. e.g. `Hans Bo` will match `Bo Hans` -* Only the name is searched. -* Only full words will be matched e.g. `Han` will not match `Hans` -* Persons matching at least one keyword will be returned (i.e. `OR` search). - e.g. `Hans Bo` will return `Hans Gruber`, `Bo Yang` +Format: `find KEYWORD [MORE_KEYWORDS]` Examples: * `find John` returns `john` and `John Doe` * `find alex david` returns `Alex Yeoh`, `David Li`
![result for 'find alex david'](images/findAlexDavidResult.png) +> **Note:** +> * The search is case-insensitive. e.g `hans` will match `Hans` +> * The order of the keywords does not matter. e.g. `Hans Bo` will match `Bo Hans` +> * You can remove all the person’s tags by typing `t/` without + specifying any tags after it. +> * Only full words will be matched e.g. `Han` will not match `Hans` +> * Persons matching at least one keyword will be returned (i.e. `OR` search). e.g. `Hans Bo` will return `Hans Gruber`, `Bo Yang` + ### Deleting a person : `delete` -Deletes the specified person from the address book. +You can delete any specific person from your address book. Format: `delete INDEX` -* Deletes the person at the specified `INDEX`. -* The index refers to the index number shown in the displayed person list. -* The index **must be a positive integer** 1, 2, 3, …​ - Examples: * `list` followed by `delete 2` deletes the 2nd person in the address book. * `find Betsy` followed by `delete 1` deletes the 1st person in the results of the `find` command. +> **Note:** +> * Deletes the person at the specified `INDEX`. +> * The index refers to the index number shown in the displayed person list. +> * The index **must be a positive integer** 1, 2, 3, …​ + ### Clearing all entries : `clear` -Clears all entries from the address book. +You can clear all entries from your address book. Format: `clear` ### Exiting the program : `exit` -Exits the program. +You can exit the program. Format: `exit` ### Saving the data -F.A.K.E.J.A.R.V.I.S. data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually. +No need to worry about saving. F.A.K.E.J.A.R.V.I.S. data are saved in the hard disk automatically after any command that changes the data. ### Editing the data file @@ -240,284 +244,345 @@ If your changes to the data file makes its format invalid, F.A.K.E.J.A.R.V.I.S. ### Archiving data files `[coming in v2.0]` -_Details coming soon ..._ +_Stay tuned for more features and enhancements in `v2.0`, including archiving data files and more!_ + +## Task Management +F.A.K.E.J.A.R.V.I.S. also simplifies task management. Here's how to make the most of it: ### 📝Adding a Task: `addtask` -Adds a task to your task list. + +You can add a task to your task list. Format: `addtask tn/TASK_NAME td/TASK_DESCRIPTION d/DUE_DATE tp/TASK_PRIORITY` -Parameters: -* TASK_NAME The name of the task. -* TASK_DESCRIPTION The description of the task. -* DUE_DATE The due date or deadline of the task. -* TASK_PRIORITY The priority level of the task. Given as `high`, `medium` or `low`. +> **Parameters:** +> * TASK_NAME The name of the task. +> * TASK_DESCRIPTION The description of the task. +> * DUE_DATE The due date or deadline of the task. +> * TASK_PRIORITY The priority level of the task. Given as `high`, `medium` or `low`. Examples: * `addtask tn/Prepare Lecture slides d/30/09/2023 tp/high` creates a task to prepare lecture slides with a high priority due on September 30, 2023. * `addtask tn/Read Chapter 5` creates a task to read Chapter 5 without specifying a due date or priority. - ### 👀Viewing Tasks: `viewtasks` -Views the list of tasks. -Format: `viewtasks [tn/TASK_NAME] / [td/TASK_DESCRIPTION] / [d/DUE_DATE] / [tp/TASK_PRIORITY] / [tprog/TASK_PROGRESS]` +You can view your task lists. -* Only the task name, task description, due date, task priority and task progress are searched. -* Only one field can be searched at a time. -* The search is case-insensitive, e.g. `cs2101` will match `CS2101`. -* The order of the keywords does not matter, e.g. `quant book` will match `book quant`. -* If no task matching the search criteria is found, the resulting task list will be blank. +Format: `viewtasks [tn/TASK_NAME] / [td/TASK_DESCRIPTION] / [d/DUE_DATE] / [tp/TASK_PRIORITY] / [tprog/TASK_PROGRESS]` -Parameters: -* TASK_NAME The name of the task. -* TASK_DESCRIPTION The description of the task. -* DUE_DATE The due date or deadline of the task. -* TASK_PRIORITY The priority level of the task. Given as `high`, `medium` or `low`. -* TASK_PROGRESS The progress level of the task. Given as `done`, `pending` or `not_started`. +> **Parameters:** +> * TASK_NAME The name of the task. +> * TASK_DESCRIPTION The description of the task. +> * DUE_DATE The due date or deadline of the task. +> * TASK_PRIORITY The priority level of the task. Given as `high`, `medium` or `low`. +> * TASK_PROGRESS The progress level of the task. Given as `done`, `pending` or `not_started`. Examples: * `viewtasks` displays all tasks in the user's task list. * `viewtasks tp/high` displays only high-priority tasks. * `viewtasks d/30/09/2023` displays tasks due on September 30, 2023. +> **Tip:** +> * Only the task name, task description, due date, task priority and task progress are searched. +> * Only one field can be searched at a time. +> * The search is case-insensitive, e.g. `cs2101` will match `CS2101`. +> * The order of the keywords does not matter, e.g. `quant book` will match `book quant`. +> * If no task matching the search criteria is found, the resulting task list will be blank. + ### ✅Updating a Task's Progress: `updateprogress` -Marks a task as completed. -Format: `updateprogress TASK_INDEX tprog/NEW_PROGRESS` +You can mark a task as completed. -* The index refers to the index number shown in the displayed task list. -* The index **must be a positive integer** 1, 2, 3, …​ that is within the range of the task list. +Format: `updateprogress TASK_INDEX tprog/NEW_PROGRESS` -Parameters: -* TASK_INDEX The index of the task to update the progress. -* NEW_PROGRESS The new progress level of the task. Given as `done`, `pending` or `not_started`. +> **Parameters:** +> * TASK_INDEX The index of the task to update the progress. +> * NEW_PROGRESS The new progress level of the task. Given as `done`, `pending` or `not_started`. Examples: * `completetask 1 tprog/pending` marks the task with index 1 as pending. * `completetask 3 tprog/done` marks the task with index 3 as done. +> **Tip:** +> * The index refers to the index number shown in the displayed task list. +> * The index **must be a positive integer** 1, 2, 3, …​ that is within the range of the task list. ### ❌Deleting a Task: `deletetask` + Deletes a task from the task list. Format: `deletetask TASK_INDEX` -* The index refers to the index number shown in the displayed task list. -* The index **must be a positive integer** 1, 2, 3, …​ that is within the range of the task list. - -Parameters: -* TASK_INDEX The index of the task to delete. +> **Parameters:** +> * TASK_INDEX The index of the task to delete. Examples: * `deletetask 3` deletes the task with index 3 from the task list. * `deletetask 2` deletes the task with index 2 from the task list. -### 📆Taking attendance: `takeattendance` -Takes the attendance of a student +> **Tip:** +> * The index refers to the index number shown in the displayed task list. +> * The index **must be a positive integer** 1, 2, 3, …​ that is within the range of the task list. -Format: `takeattendance n/STUDENT_NAME s/SESSION p/PRESENCE` +## Attendance Management -Parameters: -* STUDENT_NAME - The name of the student. -* SESSION - The session number. -* PRESENCE - The attendance status of the student (e.g., present, absent). +### 📆Taking Attendance: `takeattendance` + +You can take the attendance of your student(s). + +Format: `takeattendance n/STUDENT_NAME s/SESSION p/PRESENCE` Examples: * `takeattendance n/John Doe s/5 present` Marks John Doe as present on the 5th session. * `takeattendance n/Foo Bar s/2 absent` Marks Foo Bar as absent on the 2nd session. -### 👀Viewing attendance: `viewattendance` -Views the attendance list +> **Parameters:** +> * STUDENT_NAME - The name of the student. +> * SESSION - The session number. +> * PRESENCE - The attendance status of the student (e.g., present, absent). + +### 👀Viewing Attendance: `viewattendance` + +You can view the attendance list of your students. Format: `viewattendance n/STUDENT_NAME [MORE_STUDENT_NAMES]` -Parameters: -* STUDENT_NAME - The name of the student you want to view the attendance of. +> **Parameters:** +> * STUDENT_NAME - The name of the student you want to view the attendance of. Examples: * `viewattendance` Displays the overall attendance across all students and sessions. * `viewattendance n/Rayan` Displays all the sessions that Rayan has attended. * `viewattendance n/Jayson Resley` Displays all the sessions that Jayson and Resley have attended. -### 🔎Finding a Student: `find` -Finds a student’s profile +[//]: # (### 🔎Finding a Student: `find`) -Format: `find n/STUDENT_NAME [MORE_STUDENT_NAMES]` +[//]: # () +[//]: # (Finds a student’s profile) -Parameters: -* STUDENT_NAME - The name of the student you want to find. +[//]: # () +[//]: # (Format: `find n/STUDENT_NAME [MORE_STUDENT_NAMES]`) -Examples: -* `find n/John Doe` Finds and displays the profile of students with the name “John Doe”. -* `find n/Jane Doe` Finds and displays the profile of students with the name “Jane Doe”. +[//]: # () +[//]: # (Parameters:) -### 🥅Filtering results: `filter` -Filters the results displayed on the dashboard +[//]: # (* STUDENT_NAME - The name of the student you want to find.) -Format: -* `filter_add n/FILTER_ATTRIBUTE n/FILTER_DESCRIPTION` -* `filter_delete n/FILTER_ATTRIBUTE n/FILTER_DESCRIPTION` +[//]: # () +[//]: # (Examples:) -Parameters: -* `FILTER_ATTRIBUTE` - The filter type filter_studentScores - * `filter_studentScores` - * `filter_studentGrades` -* `FILTER_DESCRIPTION` - The conditions for the filter +[//]: # (* `find n/John Doe` Finds and displays the profile of students with the name “John Doe”.) -Examples: -* `filter_add n/filter_studentGrades n/A` Sets the dashboard to display students who have an “A” grade. -* `Filter_add n/filter_studentScores n/>80` Sets the dashboard to show students with test scores above 80. +[//]: # (* `find n/Jane Doe` Finds and displays the profile of students with the name “Jane Doe”.) + +[//]: # (### 🥅Filtering results: `filter`) -### 📝Adding a grade to an assignment: `addgrade` -Adds a grade to a student’s assignment. +[//]: # (Filters the results displayed on the dashboard) + +[//]: # () +[//]: # (Format:) + +[//]: # (* `filter_add n/FILTER_ATTRIBUTE n/FILTER_DESCRIPTION`) + +[//]: # (* `filter_delete n/FILTER_ATTRIBUTE n/FILTER_DESCRIPTION`) + +[//]: # () +[//]: # (Parameters:) + +[//]: # (* `FILTER_ATTRIBUTE` - The filter type filter_studentScores) + +[//]: # ( * `filter_studentScores`) + +[//]: # ( * `filter_studentGrades`) + +[//]: # (* `FILTER_DESCRIPTION` - The conditions for the filter) + +[//]: # () +[//]: # (Examples:) + +[//]: # (* `filter_add n/filter_studentGrades n/A` Sets the dashboard to display students who have an “A” grade.) + +[//]: # (* `Filter_add n/filter_studentScores n/>80` Sets the dashboard to show students with test scores above 80.) + +## Assignment Management + +### 📝Adding a Grade to an Assignment: `addgrade` + +You can add a grade to your student’s assignment. Format: `addgrade INDEX as/ASSIGNMENT g/GRADE` -Parameters: -* INDEX The index of the student. -* ASSIGNMENT The name of the assignment. -* GRADE The grade of the student. +> **Parameters:** +> * INDEX The index of the student. +> * ASSIGNMENT The name of the assignment. +> * GRADE The grade of the student. Examples: * `addgrade 1 as/Functional Expressionism g/1300` adds a grade of 1300 to student 1's Functional Expressionism assignment. * `addgrade 2 as/Rune Reading g/600` adds a grade of 600 to student 2's Rune Reading assignment. -### 👀Viewing an assignment grade: `viewgrade` -Shows a student’s assignment grade. +### 👀Viewing an Assignment Grade: `viewgrade` + +You can view your student’s assignment grade. Format: `viewgrade INDEX as/ASSIGNMENT` -Parameters: -* INDEX The index of the student. -* ASSIGNMENT The name of the assignment. +> **Parameters:** +> * INDEX The index of the student. +> * ASSIGNMENT The name of the assignment. Examples: * `viewgrade 1 as/Functional Expressionism` shows student 1's Functional Expressionism grade. * `viewgrade 2 as/Rune Reading` shows student 2's Rune Reading grade. -### 🛠️Editing an assignment grade: `editgrade` -Edits a student’s assignment grade. +### 🛠️Editing an Assignment Grade: `editgrade` + +You can edit your student’s assignment grade. Format: `editgrade INDEX as/ASSIGNMENT g/GRADE` -Parameters: -* INDEX The index of the student. -* ASSIGNMENT The name of the assignment. -* GRADE The score of the student. +> **Parameters:** +> * INDEX The index of the student. +> * ASSIGNMENT The name of the assignment. +> * GRADE The score of the student. Examples: * `editgrade 1 as/Functional Expressionism g/1200` edits the grade of student 1's Functional Expressionism assignment to 1200. * `editgrade 2 as/Rune Reading g/1000` edits the grade of student 2's Rune Reading assignment to 1000. -### ❌Deleting an assignment grade: `deletegrade` -Deletes a student’s assignment grade. +### ❌Deleting an Assignment Grade: `deletegrade` + +You can delete your student’s assignment grade. Format: `deletegrade INDEX as/ASSIGNMENT` -Parameters: -* INDEX The index of the student. -* ASSIGNMENT The name of the assignment. +> **Parameters:** +> * INDEX The index of the student. +> * ASSIGNMENT The name of the assignment. Examples: * `deletegrade 1 as/Functional Expressionism` deletes student 1's Functional Expressionism grade. * `deletegrade 2 as/Rune Reading` deletes student 2's Rune Reading grade. -### 📝Adding a comment to an assignment: `addcomment` -Adds a comment to a student’s assignment. +### 📝Adding a Comment to an Assignment: `addcomment` + +You can add a comment to your student’s assignment. Format: `addcomment n/STUDENT_NAME a/ASSIGNMENT c/COMMENT` -Parameters: -* STUDENT_NAME The name of the student. -* ASSIGNMENT The name of the assignment. -* COMMENT The comment. +> **Parameters:** +> * STUDENT_NAME The name of the student. +> * ASSIGNMENT The name of the assignment. +> * COMMENT The comment. Examples: * `addcomment n/Rayson a/Functional Expressionism c/Excellent` adds the comment “Excellent” on Rayson’s Functional Expressionism assignment. * `addcomment n/Wesley a/Rune Reading c/Not bad` adds the comment “Not bad” on Wesley’s Rune Reading assignment. -### 👀Viewing a comment: `viewcomment` -Shows the comment tagged to a student’s assignment. +### 👀Viewing a Comment: `viewcomment` + +You can view the comment(s) tagged to your student’s assignment. Format: `viewcomment n/STUDENT_NAME a/ASSIGNMENT` -Parameters: -* STUDENT_NAME The name of the student. -* ASSIGNMENT The name of the assignment. +> **Parameters:** +> * STUDENT_NAME The name of the student. +> * ASSIGNMENT The name of the assignment. Examples: * `viewcomment n/Rayson a/Functional Expressionism` shows the comment on Rayson’s Functional Expressionism assignment. * `viewcomment n/Wesley a/Rune Reading` shows the comment on Wesley’s Rune Reading assignment. -### 🛠️Editing a comment: `editcomment` -Edits the comment on a student’s assignment. +### 🛠️Editing a Comment: `editcomment` + +You can edit the comment of your student’s assignment. Format: `editcomment n/STUDENT_NAME a/ASSIGNMENT c/COMMENT` -Parameters: -* STUDENT_NAME The name of the student. -* ASSIGNMENT The name of the assignment. -* COMMENT The new comment. +> **Parameters:** +> * STUDENT_NAME The name of the student. +> * ASSIGNMENT The name of the assignment. +> * COMMENT The new comment. Examples: * `editcomment n/Rayson a/Functional Expressionism c/Decent` changes the comment on Rayson’s Functional Expressionism assignment to “Decent”. * `editcomment n/Wesley a/Rune Reading c/Great` changes the comment on Wesley’s Rune Reading assignment to “Great”. -### ❌Deleting a comment: `deletecomment` -Deletes the comment tagged to a student’s assignment. +### ❌Deleting a Comment: `deletecomment` + +You can delete the comment tagged to your student’s assignment. Format: `deletecomment n/STUDENT_NAME a/ASSIGNMENT` -Parameters: -* STUDENT_NAME The name of the student. -* ASSIGNMENT The name of the assignment. +> **Parameters:** +> * STUDENT_NAME The name of the student. +> * ASSIGNMENT The name of the assignment. Examples: * `deletecomment n/Rayson a/Functional Expressionism` deletes the comment on Rayson’s Functional Expressionism assignment. * `deletecomment n/Wesley a/Rune Reading` deletes the comment on Wesley’s Rune Reading assignment. +## Graded Test Management +### 🛠️Editing a Graded Test Score: `editgradedtest` + +You can edit your student’s graded test scores. + +Format: `editgrade INDEX ra1/READING_ASSESSMENT_1 ra2/READING_ASSESSMENT_2 mt/MIDTERMS f/FINALS pe/PRACTICALEXAM ` + +> **Parameters:** +> * INDEX The index of the student. +> * READING_ASSESSMENT_1 The score of the student's Reading Assessment 1. +> * READING_ASSESSMENT_2 The score of the student's Reading Assessment 2. +> * MIDTERMS The score of the student's MidTerms. +> * FINALS The score of the student's Final Assessment. +> * PRACTICALEXAM The score of the student's Practical Exams. + + +## Consultation Management ### 📆Creating a Consult: `createconsult` -Creates a consultation into upcoming consultations. + +You can create a consultation for any upcoming consultations. Format: `createconsult d/DATE tt/TIME n/STUDENT_NAME n/STUDENT_NAME …` -Parameters: -* DATE The date of consultation -* TIME The time of consultation -* STUDENT_NAME The name of the student(s) +> **Parameters:** +> * DATE The date of consultation +> * TIME The time of consultation +> * STUDENT_NAME The name of the student(s) Examples: * `createconsult d/2023-10-30 tt/12:30 n/John Doe` creates a consultation for John Doe on 2023-10-30 12:30. -* `createconsult d/2023-09-30 tt/15:30 n/John Doe n/Foo Bar n/Rayson n/Wesley` creates a consultation for John Doe, -Foo Bar, Rayson and Wesley on 2023-09-30 15:30. +* `createconsult d/2023-09-30 tt/15:30 n/John Doe n/Foo Bar n/Rayson n/Wesley` creates a consultation for John Doe, Foo Bar, Rayson and Wesley on 2023-09-30 15:30. + +### 👀Showing List of Consultations: `showconsults` -### 👀Showing list of consultations: `showconsults` -Shows the list of upcoming consultations. +You can view the list of all upcoming consultation(s). Format: `showconsults` Example: -* `showconsults` displays a list of upcoming consultations +* `showconsults` displays a list of upcoming consultation(s) -### 👀Viewing details of a consultation: `viewconsult` -Shows the details of a consultation. +### 👀Viewing Details of a Consultation: `viewconsult` + +You can view the details of your consultation(s). Format: `viewconsult INDEX` -Parameters: -* INDEX The index of the consultation in the upcoming consultations. +> **Parameters:** +> * INDEX The index of the consultation in the upcoming consultation(s). Examples: * `viewconsult 1` shows the details of the consultation (if there is a consult scheduled). @@ -529,14 +594,15 @@ Examples: * `viewconsult -1`shows an error message “Consultation not found” (if there is no consult scheduled). -### 🛠️Adding students to a consultation: `addtoconsult` -Adds student(s) into a consultation. +### 🛠️Adding Students to a Consultation: `addtoconsult` + +You can add your student(s) into a consultation slot. Format: `addtoconsult INDEX n/STUDENT_NAME …` -Parameters: -* INDEX The index of the consultation in the upcoming consultations. -* STUDENT_NAME The name of student to be added into the consultation. +> **Parameters:** +> * INDEX The index of the consultation in the upcoming consultations. +> * STUDENT_NAME The name of student to be added into the consultation. Examples: * `addtoconsult 2 n/Foo Bar`. @@ -544,27 +610,29 @@ Examples: * `addtoconsult -1 n/Foo Bar`shows an error message. -### ❌Removing students from a consultation: `removefromconsult` -Removes student(s) from a consultation. +### ❌Removing Students from a Consultation: `removefromconsult` + +You can remove your student(s) from a consultation. Format: `removefromconsult INDEX n/STUDENT_NAME …` -Parameters: -* INDEX The index of the consultation in the upcoming consultations. -* STUDENT_NAME The name of student to be added into the consultation. +> **Parameters:** +> * INDEX The index of the consultation in the upcoming consultations. +> * STUDENT_NAME The name of student to be added into the consultation. Examples: * `removefromconsult 2 n/Foo Bar`. * `removefromconsult 1 n/NOTINCONSULT` shows an error message “Student not found”. -### ❌Deleting a consultation: `deleteconsult` -Deletes the consultation specified by the index. +### ❌Deleting a Consultation: `deleteconsult` + +You can delete the consultation slot specified by an index. Format: `deleteconsult INDEX` -Parameters: -* INDEX The index of the consultation in the upcoming consultations. +> **Parameters:** +> * INDEX The index of the consultation in the upcoming consultations. Examples: * `deleteconsult 1` deletes the first consultation. diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index 10e6731ad27..00000000000 --- a/docs/_config.yml +++ /dev/null @@ -1 +0,0 @@ -markdown: kramdown diff --git a/src/main/java/seedu/address/model/GradedTestListBook.java b/src/main/java/seedu/address/model/GradedTestListBook.java index 6ce97e23c1e..ee062ec6040 100644 --- a/src/main/java/seedu/address/model/GradedTestListBook.java +++ b/src/main/java/seedu/address/model/GradedTestListBook.java @@ -37,10 +37,8 @@ public GradedTestListBook(ReadOnlyGradedTestList toBeCopied) { resetData(toBeCopied); } - //// list overwrite operations - /** - * Replaces the contents of the GradedTest list with {@code gradedTEst}. + * Replaces the contents of the GradedTest list with {@code gradedTest}. * {@code gradedTests} must not contain duplicate gradedTest. */ public void setGradedTests(List gradedTests) { @@ -67,8 +65,6 @@ public void resetData(ReadOnlyGradedTestList newData) { setGradedTests(newData.getGradedTestList()); } - //// gradedTest-level operations - /** * Returns the gradedTest at the given index. */ @@ -92,8 +88,6 @@ public void addGradedTest(GradedTest gt) { gradedTests.add(gt); } - - /** * Removes {@code key} from this {@code GradedTestListBook}. * {@code key} must exist in the gradedTest list book. @@ -102,7 +96,6 @@ public void removeGradedTest(GradedTest key) { gradedTests.remove(key); } - //// util methods @Override public String toString() { diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 9422f451eeb..1a35a8e72f1 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -253,7 +253,7 @@ public ReadOnlyGradedTestList getGradedTestList() { } /** - * Returns true if a task with the same identity as {@code gradedTest} exists in the gradedTest. + * Returns true if a gradedTest with the same identity as {@code gradedTest} exists in the gradedTest. */ public boolean hasGradedTest(GradedTest gradedTest) { requireNonNull(gradedTest); @@ -276,7 +276,7 @@ public void deleteGradedTest(GradedTest target) { */ public void addGradedTest(GradedTest gradedTest) { gradedTestList.addGradedTest(gradedTest); - updateFilteredTaskList(PREDICATE_SHOW_ALL_TASKS); + updateFilteredGradedTestList(PREDICATE_SHOW_ALL_GRADED_TEST); } @Override From 599ccb6187de1167971ca1982c6ae04dd0c46bea Mon Sep 17 00:00:00 2001 From: raydenlim <109991591+raydenlim@users.noreply.github.com> Date: Sat, 28 Oct 2023 04:12:34 +0800 Subject: [PATCH 2/6] Test auto toc --- docs/UserGuide.md | 1 + docs/stylesheets/main.css | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index c4a30208cff..6f3d450dd8e 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -22,6 +22,7 @@ As Avengers ourselves, we understand the importance of managing both our time an If you're new to the CLI and need assistance, don't worry! This UserGuide is your trusted assistant, and will guide you through every step and ensure that you can unlock the full potential of F.A.K.E.J.A.R.V.I.S. Let's get started! + diff --git a/docs/stylesheets/main.css b/docs/stylesheets/main.css index 1074ade42dd..68a15f1e881 100644 --- a/docs/stylesheets/main.css +++ b/docs/stylesheets/main.css @@ -74,6 +74,15 @@ mark { width: 300px; } +#main-nav { + display: flex; + flex-direction: column; + flex: 0 0 auto; + max-width: 300px; + max-height: calc(100vh); + width: 300px; +} + #site-nav { border-right: 1px solid lightgrey; padding-bottom: 20px; @@ -89,7 +98,8 @@ mark { overflow-y: auto; } -#page-nav { +#page-nav + #main-nav { border-left: 1px solid lightgrey; } From 989e375c95cbb9e746a59d829265c11a09894c5f Mon Sep 17 00:00:00 2001 From: raydenlim <109991591+raydenlim@users.noreply.github.com> Date: Sat, 28 Oct 2023 17:23:40 +0800 Subject: [PATCH 3/6] Fix inconsistencies in UG --- docs/UserGuide.md | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 6f3d450dd8e..d78f7181135 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -186,9 +186,9 @@ Shows a message explaining how to access the help page. Format: `help` -### Adding a person: `add` +### Adding a Student: `add` -You can add a person to your address book. +You can add a student to your address book. Format: `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…​` @@ -200,15 +200,15 @@ Examples: **Tip:** You can add any number of tags to a person! (including 0) -### Listing All Persons : `list` +### Listing All Students : `list` -You can list out all persons in your address book. +You can list out all students in your address book. Format: `list` -### Editing a Person : `edit` +### Editing a Student Field : `edit` -You can edit an existing person in your address book. +You can edit an existing student's fields in your address book. Format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…​` @@ -226,9 +226,9 @@ Examples: > * You can remove all the person’s tags by typing `t/` without specifying any tags after it. -### Locating Persons by Name: `find` +### Locating Student by Name: `find` -You can find a person whose name contain any of the given keywords. +You can find a student whose name contain any of the given keywords. Format: `find KEYWORD [MORE_KEYWORDS]` @@ -245,9 +245,9 @@ Examples: > * Only full words will be matched e.g. `Han` will not match `Hans` > * Persons matching at least one keyword will be returned (i.e. `OR` search). e.g. `Hans Bo` will return `Hans Gruber`, `Bo Yang` -### Deleting a person : `delete` +### Deleting a Student : `delete` -You can delete any specific person from your address book. +You can delete any specific student from your address book. Format: `delete INDEX` @@ -260,23 +260,23 @@ Examples: > * The index refers to the index number shown in the displayed person list. > * The index **must be a positive integer** 1, 2, 3, …​ -### Clearing all entries : `clear` +### Clearing all Entries : `clear` You can clear all entries from your address book. Format: `clear` -### Exiting the program : `exit` +### Exiting F.A.K.E.J.A.R.V.I.S. : `exit` -You can exit the program. +You can exit the F.A.K.E.J.A.R.V.I.S. Format: `exit` -### Saving the data +### Saving the Data -No need to worry about saving. F.A.K.E.J.A.R.V.I.S. data are saved in the hard disk automatically after any command that changes the data. +F.A.K.E.J.A.R.V.I.S. data are saved in the hard disk automatically after any command that changes the data. Ther is no need to save data manually. -### Editing the data file +### Editing the Data File F.A.K.E.J.A.R.V.I.S. data are saved automatically as a JSON file `[JAR file location]/data/fakejarvis.json`. Advanced users are welcome to update data directly by editing that data file. @@ -284,7 +284,7 @@ F.A.K.E.J.A.R.V.I.S. data are saved automatically as a JSON file `[JAR file loca If your changes to the data file makes its format invalid, F.A.K.E.J.A.R.V.I.S. will discard all data and start with an empty data file at the next run. Hence, it is recommended to take a backup of the file before editing it. -### Archiving data files `[coming in v2.0]` +### Archiving Data Files `[coming in v2.0]` _Stay tuned for more features and enhancements in `v2.0`, including archiving data files and more!_ @@ -310,7 +310,7 @@ Examples: ### 👀Viewing Tasks: `viewtasks` -You can view your task lists. +You can view you list of tasks. Format: `viewtasks [tn/TASK_NAME] / [td/TASK_DESCRIPTION] / [d/DUE_DATE] / [tp/TASK_PRIORITY] / [tprog/TASK_PROGRESS]` @@ -528,7 +528,7 @@ Examples: * `addcomment n/Wesley a/Rune Reading c/Not bad` adds the comment “Not bad” on Wesley’s Rune Reading assignment. -### 👀Viewing a Comment: `viewcomment` +### 👀Viewing an Assignment Comment: `viewcomment` You can view the comment(s) tagged to your student’s assignment. @@ -543,7 +543,7 @@ Examples: * `viewcomment n/Wesley a/Rune Reading` shows the comment on Wesley’s Rune Reading assignment. -### 🛠️Editing a Comment: `editcomment` +### 🛠️Editing an Assignment Comment: `editcomment` You can edit the comment of your student’s assignment. @@ -559,7 +559,7 @@ Examples: * `editcomment n/Wesley a/Rune Reading c/Great` changes the comment on Wesley’s Rune Reading assignment to “Great”. -### ❌Deleting a Comment: `deletecomment` +### ❌Deleting an Assignment Comment: `deletecomment` You can delete the comment tagged to your student’s assignment. @@ -591,7 +591,7 @@ Format: `editgrade INDEX ra1/READING_ASSESSMENT_1 ra2/READING_ASSESSMENT_2 mt/MI ## Consultation Management -### 📆Creating a Consult: `createconsult` +### 📆Creating a Consultation: `createconsult` You can create a consultation for any upcoming consultations. @@ -607,7 +607,7 @@ Examples: * `createconsult d/2023-09-30 tt/15:30 n/John Doe n/Foo Bar n/Rayson n/Wesley` creates a consultation for John Doe, Foo Bar, Rayson and Wesley on 2023-09-30 15:30. -### 👀Showing List of Consultations: `showconsults` +### 👀Showing a List of Consultations: `showconsults` You can view the list of all upcoming consultation(s). @@ -617,7 +617,7 @@ Example: * `showconsults` displays a list of upcoming consultation(s) -### 👀Viewing Details of a Consultation: `viewconsult` +### 👀Viewing the Details of a Consultation: `viewconsult` You can view the details of your consultation(s). From d173ed5022e50088a533b02c5741dfbd1e3d2774 Mon Sep 17 00:00:00 2001 From: raydenlim <109991591+raydenlim@users.noreply.github.com> Date: Sat, 28 Oct 2023 17:25:35 +0800 Subject: [PATCH 4/6] Update UG --- docs/UserGuide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index d78f7181135..d62b210e7c6 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -673,11 +673,11 @@ You can delete the consultation slot specified by an index. Format: `deleteconsult INDEX` -> **Parameters:** +> **Parameters:**git > * INDEX The index of the consultation in the upcoming consultations. Examples: -* `deleteconsult 1` deletes the first consultation. +* `deleteconsult 1` deletes the first consultation in the consultation list. * `deleteconsult -1` shows an error message “Consultation not found”. From a06fe981ef8a20da393cef65d56ab224fb4aa451 Mon Sep 17 00:00:00 2001 From: raydenlim <109991591+raydenlim@users.noreply.github.com> Date: Sat, 28 Oct 2023 19:55:20 +0800 Subject: [PATCH 5/6] Update UG --- docs/UserGuide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index d62b210e7c6..4310f6a099d 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -15,11 +15,11 @@ _Say goodbye to chaos and hello to an organized and efficient classroom experien

-F.A.K.E.J.A.R.V.I.S. is your **friendly companion for efficient task and administrative management**, allowing you to excel as a CS1101S Avenger. With this tol, you can effortlessly track assignment gradings, monitor student participation, and seamlessly plan tutorials, consultations, and mastery checks. +F.A.K.E.J.A.R.V.I.S. is your **friendly companion for efficient task and administrative management**, allowing you to excel as a CS1101S Avenger. With this tool, you can effortlessly track assignment gradings, monitor student participation, and seamlessly plan tutorials, consultations, and mastery checks. As Avengers ourselves, we understand the importance of managing both our time and our students effectively. F.A.K.E.J.A.R.V.I.S. is the one-stop solution to streamlining your workload, making your life easier. It is designed to empower you with the benefits of a Command-Line Interface(CLI), all while preserving the advantages of having a Graphical User Interface(GUI). -If you're new to the CLI and need assistance, don't worry! This UserGuide is your trusted assistant, and will guide you through every step and ensure that you can unlock the full potential of F.A.K.E.J.A.R.V.I.S. Let's get started! +If you are new to CLI, or unfamiliar with the commands F.A.K.E.J.A.R.V.I.S. offers and need assistance, don't worry! This UserGuide is your trusted assistant, and will guide you through every step and ensure that you can unlock the full potential of F.A.K.E.J.A.R.V.I.S. Let's get started! From 2b7a9ef2ae0d477215da297d5246a0d0ec365523 Mon Sep 17 00:00:00 2001 From: raydenlim <109991591+raydenlim@users.noreply.github.com> Date: Sun, 29 Oct 2023 00:06:08 +0800 Subject: [PATCH 6/6] Test Auto TOC generation --- docs/_markbind/layouts/default.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/_markbind/layouts/default.md b/docs/_markbind/layouts/default.md index 711f988dc1d..9c2da466242 100644 --- a/docs/_markbind/layouts/default.md +++ b/docs/_markbind/layouts/default.md @@ -50,6 +50,9 @@
{{ content }}
+