Merge branch 'master' of https://github.com/kimshitong/tp into branch…

…-dg-change-1

# Conflicts:
#	docs/DeveloperGuide.md

docs/DeveloperGuide.md

@@ -377,7 +377,7 @@ Given below is an example usage scenario and how the delete `Appointment` mechan
 
 **Step 1**: The user launches the application. The `Database` will be initialized with all data in the order that it was stored in.
 
-**Step 2**: The user inputs `delete_a 2`  to delete an appointment into MediConnect.
+**Step 2**: The user inputs `delete_a 2` to delete an appointment into MediConnect.
 The `delete_a` command calls `DeleteAppointmentCommandParser#parse(String)` which returns index of the appointment to delete.
 A new `DeleteAppointmentCommand` instance will be created
 
@@ -489,8 +489,8 @@ Given below is an example usage scenario and how the add `Specialisation` mechan
 
 **Step 1**: The user launches the application. The `Database` will be initialized with all data in the order that it was stored in.
 
-**Step 2**: The user inputs `delete_tag_d 2 t\Orthopaedic`  to delete a doctor's specialisation from MediConnect.
-The `delete_tag_d` command calls `DeleteSpecialisationCommandParser#parse(String)` which returns the index and specialisation of the doctor to be deleted.
+**Step 2**: The user inputs `delete_tag_d 2 t\Orthopaedic` to delete a doctor's specialisation from MediConnect.
+The `delete_tag_d` command calls `DeleteSpecialisationCommandParser#parse(String)` which returns the index of the doctor to modify.
 A new `DeleteSpecialisationCommand` instance will be created.
 
 **Step 3**: The created `DeleteSpecialisationCommand` instance is returned to `LogicManager` and its `execute` method is called.
@@ -1084,6 +1084,21 @@ Use case ends.
 
     Use case ends.
 
+* 1c.MediConnect detects that the appointment to be added, has the patient NRIC of a patient that does not already exist.
+    * 1c1. MediConnect shows an error message.
+
+      Use case ends.
+
+* 1d.MediConnect detects that the appointment to be added, has the doctor NRIC of a doctor that does not already exist.
+    * 1d1. MediConnect shows an error message.
+
+      Use case ends.
+
+* 1e.MediConnect detects that the appointment to be added overlaps with another appointment with the same patient and/or doctor.
+    * 1e1. MediConnect shows an error message.
+
+      Use case ends.
+
 **Use case: UC20 Edit an appointment’s particulars**
 
 **MSS**
@@ -1107,6 +1122,21 @@ Use case ends.
 
     Use case ends.
 
+* 1c.MediConnect detects that the edited appointment, has the patient NRIC of a patient that does not already exist.
+    * 1c1. MediConnect shows an error message.
+
+      Use case ends.
+
+* 1d.MediConnect detects that the edited appointment, has the doctor NRIC of a doctor that does not already exist.
+    * 1d1. MediConnect shows an error message.
+
+      Use case ends.
+
+* 1e.MediConnect detects that the edited appointment overlaps with another appointment with the same patient and/or doctor.
+    * 1e1. MediConnect shows an error message.
+
+      Use case ends.
+
 **Use case: UC21 Delete an appointment**
 
 **MSS**
@@ -1202,9 +1232,7 @@ Use case ends.
 * 1c. MediConnect detects that the given prescription does not exist in the appointment. 
   * 1c1. MediConnect shows an error message.
 
-    Use case ends.
-
-
+    Use case ends. 
 
 ### Non-Functional Requirements
 

docs/UserGuide.md

@@ -64,7 +64,7 @@ If you are new to MediConnect, you can head over to our [quick start](#quick-sta
 
 If you are familiar with MediConnect, you can head over to view the list of [features](#features) or the [command summary](#command-summary) to hone your MediConnect skills.
 
-Return back to [Table of Contents](#table-of-contents).
+Back to [Table of Contents](#table-of-contents).
 
 --------------------------------------------------------------------------------------------------------------------
 
@@ -876,7 +876,7 @@ Back to [General Features](#general-features).
 
 # FAQ
 
-**Q**: How do I transfer my data to another Computer?<br>
+**Q**: How do I transfer my data to another computer?<br>
 **A**: Install the app on the other computer and overwrite the empty data file it creates with the file that contains 
 the data of your previous MediConnect home folder.
 

docs/team/mounilsankar.md

@@ -23,7 +23,12 @@ Given below are my contributions to the project.
   * Added the ability to view details of a specific appointment in the clinic.
     * What it does: Opens a pop up window containing the full details of an appointment when the command view_a is entered.
     * Justification: This allows receptionists to see full details about an appointment so that they can see any remarks that doctors have made as well as prescriptions.
-    * Highlights: The main challenge of this feature was to update the right attribute in the model so that the ui would be able to display the right appointment in the pop up window that is showed to the receptionist
+    * Highlights: The main challenge of this feature was to update the right attribute in the model so that the ui would be able to display the right appointment in the pop up window that is showed to the receptionist.
+
+  * Added the ability to delete a specific appointment
+    * What it does: Deletes a specific appointment from the current list of appointments.
+    * Justification: This allows receptionists to delete any appointments mistakenly added.
+    * Highlights: This feature identifies the appointment to delete through its index in the appointment list.
 
 * **Code contributed**: [RepoSense link](https://nus-cs2103-ay2324s1.github.io/tp-dashboard/?search=mounilsankar&breakdown=true)
 
@@ -37,10 +42,9 @@ Given below are my contributions to the project.
   * Developer Guide:
     * Added first half of use cases (Pull requests [#86](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/86), [#294](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/294)).
     * Added implementation for `add` `delete` and `addTag` features (Pull requests [#165](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/165), [#267](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/267)).
+    * Added part of instruction for manual testing (Pull requests [#318](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/318)).
 
 * **Community**:
   * PRs reviewed (with non-trivial review comments): [#177](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/177), [#156](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/156), [#158](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/158), [103](https://github.com/AY2324S1-CS2103T-T08-1/tp/pull/103).
   * Reported bugs and suggestions for team W08 during PE-D (examples: [PE-D repolink](https://github.com/mounilsankar/ped/issues))
-
-* **Tools**:
-  * Integrated a third party library (Natty) to the project ([]())
+  * Contributed to forum discussion (examples: [#455](https://github.com/nus-cs2103-AY2324S1/forum/issues/455), [#446](https://github.com/nus-cs2103-AY2324S1/forum/issues/446))