diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index d130952575e..4c6adb99ef2 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -209,12 +209,63 @@ The following sequence diagram shows the lastmet operation:
### Setting last met overdue duration feature
+The setting last met overdue duration feature allows users to choose the number of days before clients show up in the Last Met Display.
+
+#### Implementation
+
+The updating of last met command is facilitated by the `SetCommandParser` class which is created by the `AddressBookParser`.
+
+The `SetCommandParser#parse()` overrides `Parser#parse()` in the `Parser` interface.
+- `SetCommandParser#parse()` - Parses the input arguments by storing the prefixes of it respective values in a `ArgumentMultimap` object.
+- It will then convert the String input into an Integer object before creating a new `SetCommand` object with the formatted integer.
+
+The `SetCommand` object is then executed by the `Logic` component.
+
+The `SetCommand` object then communicates with the `Model` component to update the static lastMetDuration value in the Last Met class.
+Upon updating the new lastMetDuration value, the `SetCommand` object then calls the `checkOverdue` function in all the `Person` objects in the addressbook
+to update the `isOverdue` boolean in all the `Person` objects. The Last Met Display then shows all the updated `Person` objects with `isOverdue` equals to `true`.
+
+The method `SetCommand#execute()` returns a CommandResult object which contains the success message to be displayed to the user.
### Adding schedule feature
+The adding schedule feature allows users to make appointments to track all their upcoming appointments with clients.
+
+#### Implementation
+
+The updating of schedule command is facilitated by the `ScheduleCommandParser` class which is created by the `AddressBookParser`.
+
+The `ScheduleCommandParser#parse()` overrides `Parser#parse()` in the `Parser` interface.
+- `ScheduleCommandParser#parse()` - Parses the input arguments by storing the prefixes of it respective values in a `ArgumentMultimap` object.
+- It will then convert the String input into a DateTime object before creating a new `ScheduleCommand` object with the formatted dateTime.
+
+The `ScheduleCommand` object is then executed by the `Logic` component.
+
+The `ScheduleCommand` object then communicates with the `Model` component to update the Schedule to the client. The `Model` component then updates the `Person` object with the new Schedule.
+- `Model#setPerson(Person, Person)` - Sets the client in the existing client list to the new `Person` object which has been edited by the `ScheduleCommand#execute()` which contains the new Schedule.
+- `Model#setDisplayClient(Person)` - Updates the displayed client in the UI to the client that has been edited with the new Schedule.
+
+The method `ScheduleCommand#execute()` returns a CommandResult object which contains the success message to be displayed to the user.
### Marking schedule feature
+The marking schedule feature allows users to close upcoming appointments to track all their upcoming appointments with clients.
+
+#### Implementation
+
+The marking of schedule command is facilitated by the `MarkCommandParser` class which is created by the `AddressBookParser`.
+
+The `MarkCommandParser#parse()` overrides `Parser#parse()` in the `Parser` interface.
+- `MarkCommandParser#parse()` - Parses the input arguments by storing the prefixes of it respective values in a `ArgumentMultimap` object.
+- It will then convert the String input into a DateTime object before creating a new `MarkCommand` object with the formatted dateTime.
+
+The `MarkCommand` object is then executed by the `Logic` component.
+
+The `MarkCommand` object then communicates with the `Model` component to update the Schedule to the client. The `Model` component then updates the `Person` object with the new Schedule with `isDone` set to `true`.
+- `Model#setPerson(Person, Person)` - Sets the client in the existing client list to the new `Person` object which has been edited by the `MarkCommand#execute()` which contains the new Schedule.
+- `Model#setDisplayClient(Person)` - Updates the displayed client in the UI to the client that has been edited with the new Schedule.
+
+The method `MarkCommand#execute()` returns a CommandResult object which contains the success message to be displayed to the user.
### Add policy feature
@@ -598,7 +649,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
* 1c. Invalid command usage in the request.
* 1c1. ClientCare shows command usage.
* 1c2. User enters new data.
- Steps 1d1-1d2 are repeated until the data entered are correct.
+ Steps 1c1-1c2 are repeated until the data entered are correct.
Use case ends.
* 1d. Future date.
* 1d1. ClientCare lets user know he cannot meet someone in the future.
@@ -611,7 +662,8 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
**MSS**
1. User enters the last met overdue duration to the new desired value.
-2. ClientCare updates the new last met overdue duration.
+2. ClientCare updates the new last met overdue duration.
+3. ClientCare refreshes the Last Met Display for all clients that meets the new last met overdue duration.
Use case ends.
**Extensions**
@@ -631,7 +683,8 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
**MSS**
1. User schedules a date and time to meet with a client.
-2. ClientCare sets up the appointment.
+2. ClientCare sets up the appointment.
+3. ClientCare shifts a client from the Last Met Display to the Schedule Display if he exists in the Last Met Display.
Use case ends.
**Extensions**
@@ -645,9 +698,14 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
* 1b2. User enters new data.
Steps 1b1-1b2 are repeated until the data entered are correct.
Use case ends.
-* 1c. Invalid command usage in the request.
- * 1c1. ClientCare shows command usage.
- * 1c2. User enters new data.
+* 1c. The client does not exist.
+ * 1c1. ClientCare shows an error message.
+ * 1c2. User enters new data.
+ Steps 1c1-1c2 are repeated until the data entered are correct.
+ Use case ends.
+* 1d. Invalid command usage in the request.
+ * 1d1. ClientCare shows command usage.
+ * 1d2. User enters new data.
Steps 1c1-1c2 are repeated until the data entered are correct.
Use case ends.
@@ -656,7 +714,8 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
**MSS**
1. User marks an appointment with client as done.
-2. ClientCare updates appointment has done and updates last met.
+2. ClientCare updates appointment has done.
+3. ClientCare shifts the client from the Schedule Display to Last Met Display if his last met date is still overdue.
Use case ends.
**Extensions**
@@ -671,7 +730,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
* 1c. Invalid command usage in the request.
* 1c1. ClientCare shows command usage.
* 1c2. User enters new data.
- Steps 1d1-1d2 are repeated until the data entered are correct.
+ Steps 1c1-1c2 are repeated until the data entered are correct.
Use case ends.
@@ -792,6 +851,15 @@ testers are expected to do more *exploratory* testing.
## **Appendix: Planned Enhancements**
+1. **Feature Flaw** - Currently, users can only schedule one appointment per client. In future versions, we will support multiple appointments per client.
+2. **Feature Flaw** - Currently, names are case-sensitive. `John` and `john` are regarded as different clients. In future versions, names will be case-insensitive.
+3. **Feature Flaw** - Currently, tags only allow alphanumeric values. Spaces and special characters are not allowed. In future versions, we will support the use of spaces and special characters for tags.
+4. **Feature Flaw** - Currently, users are not allowed to use special characters like `/` when adding or editing the client name. In future versions, we will support the use of special characters like `/` for names.
+5. **Feature Flaw** - Currently, users must fulfill all compulsory parameters to add a person. In future versions, we will make more parameters optional.
+6. **Feature Flaw** - Currently, users must re-sort the client list after adding, editing or updating clients. Client List does not auto update or re-sort itself upon adding/editing or updating. In future versions, we will support the auto sorting when clients are updated.
+7. **UI Bug** - Currently, the policy name and policy id may get truncated if there are too many characters. In future versions, we will support the wrapping of fields in the Policy Display.
+8. **UI Bug** - Currently, the phone number and remark may get truncated if they are too long. In future versions, we will support the wrapping of all fields in the Client View Display.
+
--------------------------------------------------------------------------------------------------------------------
## **Appendix: Effort**
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 652294022ba..7cc2e274ca2 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -238,6 +238,64 @@ Alternatively, [Command Summary](#command-summary) has all of them under one pag
**CAUTION**: If you are using a PDF version of this document, be careful when copying and pasting commands that span multiple lines as the command format may be copied over incorrectly.
+
+
+### Handling ClientCare Error Messages
+While using ClientCare, you may encounter errors when you mistype or missed something out in your commands.
+Not to worry, you will learn how to handle these error messages with ease in this section.
+
+There are **4** types of error messages you may encounter in the Feedback Display.
+
+##### 1) Invalid Command
+This occurs when you have mis-spelt the command keyword or the keyword does not exist. If you do not remember what are the command keywords available, you can easily refer them again under [Command Summary](#command-summary).
+
+
+
+
+##### 2) Invalid Command Format
+This occurs when you have missed certain required fields or prefixes in the commands.
+
+For example: adding a policy to a client requires an index, policy name and policy ID. Missing any one of these will throw an invalid command format error.
+`addpolicy 1 i/02141` will cause an error as you have missed out the `n/` prefix and its input value.
+
+
+
+
+
+
+##### 3) Invalid Fields
+This occurs when you have all the prefixes required in a command but may have typed an invalid value.
+There are 2 possible situations where this is possible.
+
+* Invalid field format:
+For example: A phone number can only accept numbers. Putting alphabets in a phone number is not allowed.
+Typing `edit 2 c/123vad43` causes invalid field format error.
+
+
+
+
+* Invalid field value:
+For example: You are not allowed to type a future date when using the command `met` even though your date format is correct.
+If today is 5 Jan 2024, typing `met 2 d/2024-10-08` which is 8 Oct 2024 will cause an invalid field value error.
+
+
+
+
+##### 4) Invalid Index
+This occurs when you gave ClientCare an index value that is larger than your current client list.
+
+For example: If you only have 7 clients, then your index should be a value from 1 to 7.
+`edit 27 n/Bob` will cause an error as you have less than 27 clients.
+
+
+
+
+
+
+**Note:** ClientCare will only show you **one** error message at a time. If you have multiple errors, not to worry!
+ClientCare will be with you to correct each error!
+
+
--------------------------------------------------------------------------------------------------------------------
diff --git a/docs/images/ug/error_command.png b/docs/images/ug/error_command.png
new file mode 100644
index 00000000000..3032a663224
Binary files /dev/null and b/docs/images/ug/error_command.png differ
diff --git a/docs/images/ug/error_commandformat.png b/docs/images/ug/error_commandformat.png
new file mode 100644
index 00000000000..c41ba5fadc0
Binary files /dev/null and b/docs/images/ug/error_commandformat.png differ
diff --git a/docs/images/ug/error_futuremet.png b/docs/images/ug/error_futuremet.png
new file mode 100644
index 00000000000..cd5346d6216
Binary files /dev/null and b/docs/images/ug/error_futuremet.png differ
diff --git a/docs/images/ug/error_index.png b/docs/images/ug/error_index.png
new file mode 100644
index 00000000000..0b8608c3e2d
Binary files /dev/null and b/docs/images/ug/error_index.png differ
diff --git a/docs/images/ug/error_phone.png b/docs/images/ug/error_phone.png
new file mode 100644
index 00000000000..9310589c0ce
Binary files /dev/null and b/docs/images/ug/error_phone.png differ