@@ -1495,8 +1554,8 @@ Format: `addtoconsult INDEX n/STUDENT_NAME …`
:information_source: Note:
-* The index refers to the index number shown in the displayed consultation list.
-* The index **must be a positive integer** 1, 2, 3, … that is within the range of the consultation list.
+* The consultation index refers to the index number shown in the displayed consultation list.
+* The consultation index **must be a positive integer** 1, 2, 3, … that is within the range of the consultation list.
* The name of the student must exist in F.A.K.E.J.A.R.V.I.S.
@@ -1529,21 +1588,21 @@ Format: `addtoconsult INDEX n/STUDENT_NAME …`
You can remove your student(s) from a consultation.
-Format: `removefromconsult INDEX n/STUDENT_NAME …`
-
-| Parameter | Description |
-|--------------|--------------------------------------------------------------|
-| INDEX | The index of the consultation in the upcoming consultations. |
-| STUDENT_NAME | The name of the student to be added to the consultation. |
+Format: `removefromconsult CONSULTATION_INDEX n/STUDENT_NAME…`
+|
|
+|-------------------------------------|-------------------------------------------------------------------------------|
+|
:information_source: Note:
-* The index refers to the index number shown in the displayed consultation list.
-* The index **must be a positive integer** 1, 2, 3, … that is within the range of the consultation list.
+* The consultation index refers to the index number shown in the displayed consultation list.
+* The consultation index **must be a positive integer** 1, 2, 3, … that is within the range of the consultation list.
* The name of the student must exist in F.A.K.E.J.A.R.V.I.S.
@@ -1566,20 +1625,20 @@ Format: `removefromconsult INDEX n/STUDENT_NAME …`
You can delete the consultation slot specified by an index.
-Format: `deleteconsult INDEX`
-
-| Parameter | Description |
-|-----------|--------------------------------------------------------------|
-| INDEX | The index of the consultation in the upcoming consultations. |
+Format: `deleteconsult CONSULTATION_INDEX`
+|
**Parameter** |
**Description** |
+|-------------------------------------|-------------------------------------------------------------------------------|
+|
CONSULTATION_INDEX |
The index of the consultation in the upcoming consultations. |
+
:information_source: Note:
-* The index refers to the index number shown in the displayed consultation list.
-* The index **must be a positive integer** 1, 2, 3, … that is within the range of the consultation list.
+* The consultation index refers to the index number shown in the displayed consultation list.
+* The consultation index **must be a positive integer** 1, 2, 3, … that is within the range of the consultation list.
@@ -1625,34 +1684,35 @@ Format: `deleteconsult INDEX`
## Command summary
-|
**Action** |
**Format** |
**Examples** |
-|--------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-|
**Add** | `add n/NAME p/PHONE_NUMBER e/EMAIL th/TELEGRAM_HANDLE [t/TAG]… [gt/GRADED_TESTS]`
| `add n/James Ho p/12345678 e/jamesho@u.nus.edu th/james03 t/friend t/colleague gt/default` |
-|
**Clear** | `clear` | `clear` |
-|
**Delete** | `delete INDEX` | `delete 3` |
-|
**Edit** | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [th/TELGRAM_HANDLE] [t/TAG]…[gt/GRADEDTEST]…` | `edit 2 n/James Lee e/jameslee@u.nus.edu gt/default` |
-|
**Find** | `find KEYWORD [MORE_KEYWORDS]`
| `find John`
`find alex david` |
-|
**List** | `list` | `list` |
-|
**Add Task** | `addtask tn/TASK_NAME td/TASK_DESCRIPTION d/DUE_DATE tp/TASK_PRIORITY` | `addtask tn/Prepare Lecture slides d/30/09/2023 tp/high`,
`addtask tn/Read Chapter 5` |
-|
**View Tasks** | `viewtasks [tn/TASK_NAME] / [td/TASK_DESCRIPTION] / [d/DUE_DATE] / [tp/TASK_PRIORITY] /
[tprog/TASK_PROGRESS]` | `viewtasks`,
`viewtasks tp/high`,
`viewtasks d/30/09/2023` |
-|
**Update Progress** | `updateprogress TASK_INDEX tprog/NEW_PROGRESS` | `updateprogress 1 tprog/pending`,
`updateprogress 3 tprog/done` |
-|
**Delete Task** | `deletetask TASK_INDEX` | `deletetask 3`,
`deletetask 2` |
-|
**View Grade** | `viewgrade INDEX as/ASSIGNMENT` | `viewgrade 1 as/Functional Expressionism`,
`viewgrade 2 as/Rune Reading` |
-|
**Edit Grade** | `editgrade INDEX as/ASSIGNMENT g/GRADE` | `editgrade 1 as/Functional Expressionism g/1200`,
`editgrade 2 as/Rune Reading g/1000` |
-|
**Delete Grade** | `deletegrade INDEX as/ASSIGNMENT` | `deletegrade 1 as/Functional Expressionism`,
`deletegrade 2 as/Rune Reading` |
-|
**Edit Comment** | `editcomment n/STUDENT_NAME a/ASSIGNMENT c/COMMENT` | `editcomment n/Rayson a/Functional Expressionism c/Decent`,
`editcomment n/Wesley a/Rune Reading c/Great` |
-|
**Delete Comment** | `deletecomment n/STUDENT_NAME a/ASSIGNMENT` | `deletecomment n/Rayson a/Functional Expressionism`, `deletecomment n/Wesley a/Rune Reading` |
-|
**Edit Graded Test** | `editgradedtest INDEX [ra1/READING_ASSESSMENT_1] [ra2/READING_ASSESSMENT_2] [mt/MIDTERMS] [f/FINALS] [pe/PRACTICALEXAM]` | `editgradedtest 1 ra1/90 ra2/80 mt/85 f/88 pe/95`,
`editgradedtest 2 ra1/88 ra2/92 mt/78 f/80 pe/89` |
-|
**Take Attendance** | `takeattendance n/STUDENT_NAME s/SESSION p/PRESENCE` | `takeattendance n/John Doe s/5 present`,
`takeattendance n/Foo Bar s/2 absent` |
-|
**View Attendance** | `viewattendance n/STUDENT_NAME [MORE_STUDENT_NAMES]` | `viewattendance`,
`viewattendance n/Rayan`,
`viewattendance n/Jayson Resley` |
-|
**Create Consultation** | `createconsult d/DATE tt/TIME n/STUDENT_NAME …` | `createconsult d/30/10/2023 tt/12:30 n/Alex Yeoh`,
`createconsult d/30/09/2023 tt/15:30 n/Alex Yeoh n/Betsy Crower n/David Li` |
-|
**Add To Consult** | `addtoconsult INDEX n/STUDENT_NAME …` | `addtoconsult 2 n/Betsy Crower`,
`addtoconsult 1 n/David Li n/Roy Balakrishnan` |
-|
**Remove From Consult** | `removefromconsult INDEX n/STUDENT_NAME …` | `removefromconsult 2 n/Betsy Crower` |
-|
**Delete Consult** | `deleteconsult INDEX` | `deleteconsult 1` |
-|
**Create Session** | `createsession s/SESSION_NUMBER n/STUDENT_NAME …` | `createsession s/4 n/Betsy Crower n/David Li` |
-|
**Update Session Remark** | `updatesessionremark s/SESSION_NUMBER r/REMARK` | `updatesessionremark s/2 r/Teach Essence of Recursion`,
`updatesessionremark s/4 r/Taught streams and metacircular evalutator` |
-|
**Delete Session** | `deletesession s/SESSION_NUMBER` | `deletesession s/1`,
`deletesession s/4` |
+|
**Action** |
**Format** |
**Examples** |
+|--------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
+|
**Add** | `add n/NAME p/PHONE_NUMBER e/EMAIL th/TELEGRAM_HANDLE [t/TAG]… [gt/GRADED_TESTS]`
| `add n/James Ho p/12345678 e/jamesho@u.nus.edu th/james03 t/friend t/colleague gt/default` |
+|
**Clear** | `clear` | `clear` |
+|
**Delete** | `delete STUDENT_INDEX`
| `delete 3` |
+|
**Edit** | `edit STUDENT_INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [th/TELGRAM_HANDLE] [t/TAG]…[gt/GRADEDTEST]` | `edit 2 n/James Lee e/jameslee@u.nus.edu gt/default` |
+|
**Find** | `find KEYWORD [MORE_KEYWORDS]`
| `find John`
`find alex david` |
+|
**List** | `list` | `list` |
+|
**Add Task** | `addtask tn/TASK_NAME td/TASK_DESCRIPTION d/DUE_DATE tp/TASK_PRIORITY` | `addtask tn/Prepare Lecture slides d/30/09/2023 tp/high`,
`addtask tn/Read Chapter 5` |
+|
**View Tasks** | `viewtasks [tn/TASK_NAME] / [td/TASK_DESCRIPTION] / [d/DUE_DATE] / [tp/TASK_PRIORITY] /
[tprog/TASK_PROGRESS]` | `viewtasks`,
`viewtasks tp/high`,
`viewtasks d/30/09/2023` |
+|
**Update Progress** | `updateprogress TASK_INDEX tprog/NEW_PROGRESS` | `updateprogress 1 tprog/pending`,
`updateprogress 3 tprog/done` |
+|
**Delete Task** | `deletetask TASK_INDEX` | `deletetask 3`,
`deletetask 2` |
+|
**View Grade** | `viewgrade STUDENT_INDEX as/ASSIGNMENT` | `viewgrade 1 as/Functional Expressionism`,
`viewgrade 2 as/Rune Reading` |
+|
**Edit Grade** | `editgrade STUDENT_INDEX as/ASSIGNMENT g/GRADE` | `editgrade 1 as/Functional Expressionism g/1200`,
`editgrade 2 as/Rune Reading g/1000` |
+|
**Delete Grade** | `deletegrade STUDENT_INDEX as/ASSIGNMENT` | `deletegrade 1 as/Functional Expressionism`,
`deletegrade 2 as/Rune Reading` |
+|
**Edit Comment** | `editcomment STUDENT_INDEX as/ASSIGNMENT c/COMMENT` | `editcomment 1 as/Functional Expressionism c/Decent`,
`editcomment 2 as/Rune Reading c/Great` |
+|
**Delete Comment** | `deletecomment STUDENT_INDEX as/ASSIGNMENT` | `deletecomment 1 as/Functional Expressionism`,
`deletecomment 2 as/Rune Reading` |
+|
**Edit Graded Test** | `editgradedtest STUDENT_INDEX [ra1/READING_ASSESSMENT_1] [ra2/READING_ASSESSMENT_2] [mt/MIDTERMS] [f/FINALS] [pe/PRACTICALEXAM]` | `editgradedtest 1 ra1/90 ra2/80 mt/85 f/88 pe/95`,
`editgradedtest 2 ra1/88 ra2/92 mt/78 f/80 pe/89` |
+|
**Take Attendance** | `takeattendance n/STUDENT_NAME s/SESSION p/PRESENCE` | `takeattendance n/John Doe s/5 present`,
`takeattendance n/Foo Bar s/2 absent` |
+|
**View Attendance** | `viewattendance [n/STUDENT_NAME]…` | `viewattendance`,
`viewattendance n/Rayan`,
`viewattendance n/Jayson Resley` |
+|
**Create Consultation** | `createconsult d/DATE tt/TIME n/STUDENT_NAME…` | `createconsult d/30/10/2023 tt/12:30 n/Alex Yeoh`,
`createconsult d/30/09/2023 tt/15:30 n/Alex Yeoh n/Betsy Crower n/David Li` |
+|
**Add To Consult** | `addtoconsult CONSULTATION_INDEX n/STUDENT_NAME…`
| `addtoconsult 2 n/Betsy Crower`,
`addtoconsult 1 n/David Li n/Roy Balakrishnan` |
+|
**Remove From Consult** | `removefromconsult CONSULTATION_INDEX n/STUDENT_NAME…` | `removefromconsult 2 n/Betsy Crower` |
+|
**Delete Consult** | `deleteconsult CONSULTATION_INDEX` | `deleteconsult 1` |
+|
**Create Session** | `createsession s/SESSION_NUMBER n/STUDENT_NAME…` | `createsession s/4 n/Betsy Crower n/David Li` |
+|
**Update Session Remark** | `updatesessionremark s/SESSION_NUMBER r/REMARK` | `updatesessionremark s/2 r/Teach Essence of Recursion`,
`updatesessionremark s/4 r/Taught streams and metacircular evalutator` |
+|
**Delete Session** | `deletesession s/SESSION_NUMBER` | `deletesession s/1`,
`deletesession s/4` |
+
[Back to Table of Contents](#table-of-contents)
@@ -1664,14 +1724,14 @@ Format: `deleteconsult INDEX`
## Encountering Errors
This section outlines a list of error messages that you may encounter during your usage of the application. It aims to help you better understand the messages that you may receive and what it means to you.
-| Error | What it means | How to resolve |
-|---------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Unknown command** | You have supplied a command that was unrecognisable.
E.g., Command word was given in upper case. | 1. Double-check the spelling and case of the command.
2. Refer to the [features](#features) section above for the correct commands. |
-| **Invalid command format!** | You have supplied a command with the incorrect format.
E.g., Command is missing the compulsory parameters. | 1. Double-check the command format and the parameters required.
2. Refer to the [features](#features) section above for the correct command formats. |
-| **The Index provided is invalid** | You have provided an index that is out of the range of the items. | 1. Only provide Indexes that are within the range of the list.
E.g., if there are 3 items in the list, the valid indexes that can be used are (1, 2, 3). |
-| **At least one field to edit must be provided.** | You have not provided a field to edit. | 1. Double-check that a prefix and a field was provided together with the command. |
-| **This `task` / `person` already exists in the `task list` / `students list`.** | You have tried to either add a duplicate entry with the same fields, or edit an entry such that all the fields are duplicates of an existing entry. | 1. Double-check that the fields supplied are correct.
2. Remove the old entry from F.A.K.E.J.A.R.V.I.S. |
-| **Date needs to be in the format dd/MM/yyyy, or date has already crossed.** | You have either supplied the date in an unrecognisable format, or provided a date that is in the past. | 1. Double-check that the format of the date provided is dd/MM/yyyy (e.g. 28/10/2023)
2. Choose a date from today or later. |
-| **Time needs to be in the format HH:mm.** | You have supplied the time in an unrecognisable format. | 1. Double-check that the format of the time provided is HH:mm (e.g. 22:00) |
+|
Error |
What it means |
How to resolve |
+|--------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|
**Unknown command** | You have supplied a command that was unrecognisable.
E.g., Command word was given in upper case. | 1. Double-check the spelling and case of the command.
2. Refer to the [features](#features) section above for the correct commands. |
+|
**Invalid command format!** | You have supplied a command with the incorrect format.
E.g., Command is missing the compulsory parameters. | 1. Double-check the command format and the parameters required.
2. Refer to the [features](#features) section above for the correct command formats. |
+|
**The Index provided is invalid** | You have provided an index that is out of the range of the items. | 1. Only provide Indexes that are within the range of the list.
E.g., if there are 3 items in the list, the valid indexes that can be used are (1, 2, 3). |
+|
**At least one field to edit must be provided.** | You have not provided a field to edit. | 1. Double-check that a prefix and a field was provided together with the command. |
+|
**This `task` / `person` already exists in the `task list` / `students list`.** | You have tried to either add a duplicate entry with the same fields, or edit an entry such that all the fields are duplicates of an existing entry. | 1. Double-check that the fields supplied are correct.
2. Remove the old entry from F.A.K.E.J.A.R.V.I.S. |
+|
**Date needs to be in the format dd/MM/yyyy, or date has already crossed.** | You have either supplied the date in an unrecognisable format, or provided a date that is in the past. | 1. Double-check that the format of the date provided is dd/MM/yyyy (e.g. 28/10/2023)
2. Choose a date from today or later. |
+|
**Time needs to be in the format HH:mm.** | You have supplied the time in an unrecognisable format. | 1. Double-check that the format of the time provided is HH:mm (e.g. 22:00) |
[Back to Table of Contents](#table-of-contents)
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 9e8cb38924f..a6a8281ccad 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -44,9 +44,9 @@ public class EditCommand extends Command {
public static final String COMMAND_WORD = "edit";
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
- + "by the index number used in the displayed person list. "
+ + "by the student index number used in the displayed person list. "
+ "Existing values will be overwritten by the input values.\n"
- + "Parameters: INDEX (must be a positive integer) "
+ + "Parameters: STUDENT_INDEX (must be a positive integer) "
+ "[" + PREFIX_NAME + "NAME] "
+ "[" + PREFIX_PHONE + "PHONE] "
+ "[" + PREFIX_EMAIL + "EMAIL] "
diff --git a/src/main/java/seedu/address/logic/commands/EditGradeCommand.java b/src/main/java/seedu/address/logic/commands/EditGradeCommand.java
index 905ddecc6ab..ebb2c8a495d 100644
--- a/src/main/java/seedu/address/logic/commands/EditGradeCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditGradeCommand.java
@@ -33,8 +33,8 @@ public class EditGradeCommand extends Command {
public static final String COMMAND_WORD = "editgrade";
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits a grade to a person’s assignment identified "
- + "by the index number used in the displayed person list. "
- + "Parameters: INDEX (must be a positive integer) "
+ + "by the student index number used in the displayed person list. "
+ + "Parameters: STUDENT_INDEX (must be a positive integer) "
+ PREFIX_ASSIGNMENT + "ASSIGNMENT "
+ PREFIX_GRADE + "GRADE ";
diff --git a/src/main/java/seedu/address/logic/commands/EditGradedTestCommand.java b/src/main/java/seedu/address/logic/commands/EditGradedTestCommand.java
index 5e264567187..ce0c111e54f 100644
--- a/src/main/java/seedu/address/logic/commands/EditGradedTestCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditGradedTestCommand.java
@@ -41,8 +41,8 @@ public class EditGradedTestCommand extends Command {
public static final String COMMAND_WORD = "editgradedtest";
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the graded test of a person, "
- + "identified by the index number used in the displayed person list. \n"
- + "Parameters: INDEX (must be a positive integer) "
+ + "identified by the student index number used in the displayed person list. \n"
+ + "Parameters: STUDENT_INDEX (must be a positive integer) "
+ "[" + PREFIX_READING_ASSESSMENT1 + "RA1] "
+ "[" + PREFIX_READING_ASSESSMENT2 + "RA2] "
+ "[" + PREFIX_MIDTERMS + "MIDTERMS] "
diff --git a/src/main/java/seedu/address/logic/commands/ViewAttendanceCommand.java b/src/main/java/seedu/address/logic/commands/ViewAttendanceCommand.java
index ac1ab735b8a..22b0e7a50c9 100644
--- a/src/main/java/seedu/address/logic/commands/ViewAttendanceCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ViewAttendanceCommand.java
@@ -26,7 +26,7 @@ public class ViewAttendanceCommand extends Command {
public static final String COMMAND_WORD = "viewattendance";
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Views the attendance of a student. "
+ "Parameters: "
- + PREFIX_NAME + "KEYWORD [MORE_KEYWORDS]...\n"
+ + "[" + PREFIX_NAME + "STUDENT_NAME]...\n"
+ "Example: " + COMMAND_WORD + " "
+ PREFIX_NAME + "John Doe Alice";
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
index 65ad8adb4e5..658b71fe07e 100644
--- a/src/main/java/seedu/address/logic/parser/ParserUtil.java
+++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -42,10 +42,9 @@
*/
public class ParserUtil {
- public static final String MESSAGE_INVALID_INDEX = "Index is not a non-zero unsigned integer.";
- public static final String MESSAGE_INVALID_DATE = "Date is needs to be in the format dd/MM/yyyy, "
- + "or date provided does not exist.";
- public static final String MESSAGE_INVALID_TIME = "Time is needs to be in the format HH:mm.";
+ public static final String MESSAGE_INVALID_INDEX = "Index not a non-zero unsigned integer.";
+ public static final String MESSAGE_INVALID_DATE = "Date needs to be in the format dd/MM/yyyy.";
+ public static final String MESSAGE_INVALID_TIME = "Time needs to be in the format HH:mm.";
/**
* Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be