Merge remote-tracking branch 'upstream/master' into finalVersion

Author: skinnychenpi

docs/DeveloperGuide.md

@@ -30,9 +30,9 @@ their profile pictures.
 
    * **`listp`** : Lists all contacts.
 
-   * **`add`**`n/John Doe ph/98765432 e/johnd@example.com a/John street, block 123, #01-01` : Adds a contact named `John Doe` to MeetBuddy.
+   * **`addp`**`n/John Doe ph/98765432 e/johnd@example.com a/John street, block 123, #01-01` : Adds a contact named `John Doe` to MeetBuddy.
 
-   * **`delete`**`3` : Deletes the 3rd contact shown in the current list.
+   * **`deletep`**`3` : Deletes the 3rd contact shown in the current list.
 
    * **`exit`** : Exits the app.
 
@@ -122,7 +122,7 @@ If your changes to the data file makes its format invalid, MeetBuddy will discar
 
 Adds a person to MeetBuddy.
 
-Format: `add n/NAME ph/PHONE_NUMBER e/EMAIL a/ADDRESS [g/GROUP]…​`
+Format: `addp n/NAME [ph/PHONE] [e/EMAIL] [a/ADDRESS] [g/GROUP]...​`
 
 <div markdown="span" class="alert alert-primary">:bulb: **Tip:**
 A person can have any number of groups (including 0)
@@ -132,8 +132,8 @@ In MeetBuddy we assume that all the persons in the contact list have different n
 </div>
 
 Examples:
-* `add n/John Doe ph/98765432 e/johnd@example.com a/John street, block 123, #01-01`
-* `add n/Betsy Crowe g/CS2103 e/betsycrowe@example.com a/Newgate Prison ph/1234567 g/badminton`
+* `addp n/John Doe ph/98765432 e/johnd@example.com a/John street, block 123, #01-01`
+* `addp n/Betsy Crowe g/CS2103 e/betsycrowe@example.com a/Newgate Prison ph/1234567 g/badminton`
 
 ### Listing all persons : `listp`
 
@@ -215,9 +215,11 @@ Format: `sortp by/FIELD d/DIRECTION`
     * Sort by email : `EMAIL`
     * Sort by phone number : `PHONE`
     * Sort by address : `ADDRESS`
+    * These are all case-insensitive
 * `DIRECTION` is only restricted to the following cases:
     * Sort by ascending alphabetical order : `ASC`
     * Sort by descending alphabetical order : `DESC`
+    * These are all case-insensitive
 
 Examples:
 * `sortp by/NAME d/ASC` sorts the persons by name and present the result in ascending alphabetical order.
@@ -282,13 +284,17 @@ Examples:
 
 ### Locating meetings: `findm`
 
-Finds meetings whose information contain any of the given keywords.
+Finds meetings that satisfy all the given criteria.
 
-Format: `findm [n/NAME] [time/TIME] [desc/DESCRIPTION] [pr/PRIORITY] [g/GROUP]...[p/INDEX OF PERSON RELATED]...`
+Format: `findm [n/NAME] [time/TIME]... [desc/DESCRIPTION] [pr/PRIORITY] [g/GROUP]... [p/INDEX OF PERSON RELATED]...`
 
+* Though all fields are optional, we require the user to enter at least one.
 * The search is case-sensitive in name searching. e.g `CS2103` will not match `cs2103`
 * The order of the searching filed does not matter. e.g. `findm n/CS pr/3` will be the same as `findm pr/3 n/CS`.
-* Time field refers to a point of time, as long as this point of time is in between of a meeting's start time and ending time, the search will return this specific meeting.
+* Time field refers to a point of time, as long as this point of time is 
+  in between of a meeting's start time and ending time (inclusive), 
+  the search will return this specific meeting.
+* The user can enter many times. The meetings will have to satisfy all of them.
 * Time field must follow YYYY-MM-DD HH:MM format.
 * For other fields, the requirement is the same as addm (Adding a meeting). You can refer to the previous UG instruction.
 
@@ -309,7 +315,6 @@ Format: `showm INDEX`
 
 ### Sorting of meetings : `sortm`
 
-
 Sorts the meetings displayed according to a specified field.
 
 Format: `sortm by/FIELD d/DIRECTION`
@@ -321,9 +326,11 @@ Format: `sortm by/FIELD d/DIRECTION`
     * Sort by end time : `END`
     * Sort by priority : `PRIORITY`
     * Sort by description : `DESCRIPTION`
+    * These are all case-insensitive
 * `DIRECTION` is only restricted to the following cases:
     * Sort by ascending order : `ASC`
     * Sort by descending order : `DESC`
+    * These are all case-insensitive
 Examples:    
 * `sortm by/PRIORITY d/ASC` sorts the meetings by priority and present the result in ascending order.
 
@@ -334,16 +341,16 @@ Shows a list of all persons and meetings in MeetBuddy.
 
 Format: `list`
 
-## Timetable feature
-=======
 ### Adding persons related for a meeting: `addptm`
 
 Adds persons related to a meeting in MeetBuddy.
 
 Format: `addptm INDEX p/PERSON RELATED INDEX1 [p/PERSON RELATED INDEX2]… ​`
 * The index refers to the meeting index, and it **must be a positive integer** 1, 2, 3, …​
 * The user must input at least one person related index field.
-* Person Related Index refers to the index of the contact list shown in the GUI. The index should be an integer and not out of bounds. If duplicated person index is in the input, the program will automatically remove the duplication.
+* Person Related Index refers to the index of the contact list shown in the GUI. 
+The index should be an integer and not out of bounds. If duplicated person index is in the input,
+the program will automatically remove the duplication.
 
 Examples:
 * `addptm 1 p/1 p/2 p/2` Adds the person on index 1 and 2 into the contacts related field in meeting 1.
@@ -389,7 +396,10 @@ Examples:
  setting a meeting 
  to 6:44-7:01 might cause display issues from the 7 - 7.01 will not display the date or time. Also even though 15 minute 
  meetings are allowed to be scheduled, the words will appear squished on the timetable. It is therefore highly 
- recommended to set your meeting times to be `AT LEAST 30 MINS` and `AT MOST 24 characters` long.
+ recommended to set your meeting times to be `AT LEAST 30 MINS` and  meeting names`AT MOST 24 characters` long.
+ It is recommended to avoid scheduling your meetings overlapping across 7am (for example, meetings ending at 7:01 am)
+ to get optimum viewing functionality. A recommended way to schedule meetings is to choose a time between 7am - 5pm.
+ 
 
 ![An Example of words being squished](images/SquishedTimetable.png)
 
@@ -423,13 +433,13 @@ Examples:
 
 Action | Format, Examples
 --------|------------------
-**Add** | `addp n/NAME ph/PHONE_NUMBER e/EMAIL a/ADDRESS [g/GROUP]…​` <br> e.g., `addp n/James Ho ph/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 g/CS2106 g/badminton` <br> <br> `addm n/NAME st/START TIME ed/END TIME desc/DESCRIPTION pr/PRIORITY [g/GROUP]...[p/INDEX OF PERSON RELATED]...​` <br> e.g., `addm n/CS2103 Lecture st/2021-03-12 14:00 ed/2021-03-12 16:00 desc/Week 7 pr/3 g/lectures g/SoC p/1 p/2`
+**Add** | `addp n/NAME [ph/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [g/GROUP]…​` <br> e.g., `addp n/James Ho ph/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 g/CS2106 g/badminton` <br> <br> `addm n/NAME st/TIME ed/TIME [desc/DESCRIPTIONS] [pr/PRIORITY] [p/PERSON RELATED INDEX]… [g/GROUP]…​` <br> e.g., `addm n/CS2103 Lecture st/2021-03-12 14:00 ed/2021-03-12 16:00 desc/Week 7 pr/3 g/lectures g/SoC p/1 p/2`
 **Delete** | `deletep INDEX`<br> e.g., `deletep 3` <br> <br> `deletem INDEX`<br> e.g., `deletem 3`
 **Edit** | `editp INDEX [n/NAME] [ph/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [g/GROUP]…​`<br> e.g.,`editp 2 n/James Lee e/jameslee@example.com` <br> <br> `editm INDEX [n/NAME] [st/START TIME] [ed/END TIME] [desc/DESCRIPTION] [pr/PRIORITY] [p/PERSON RELATED INDEX] [g/GROUP]...​`<br> e.g.,`editm 2 n/CS2103 Lecture`
-**Find** | `findp KEYWORD [MORE_KEYWORDS]`<br> e.g., `findp James Jake` <br> <br> `findpg KEYWORD [MORE_KEYWORDS]`<br> e.g., `findpg badminton` <br>  <br> `findm [n/NAME] [time/TIME] [desc/DESCRIPTION] [pr/PRIORITY] [g/GROUP]...[p/INDEX OF PERSON RELATED]...`<br> e.g., `findm n/CS pr/3` <br>
+**Find** | `findp KEYWORD [MORE_KEYWORDS]`<br> e.g., `findp James Jake` <br> <br> `findpg KEYWORD [MORE_KEYWORDS]`<br> e.g., `findpg badminton` <br>  <br> `findm [n/NAME] [time/TIME]... [desc/DESCRIPTION] [pr/PRIORITY] [g/GROUP]... [p/INDEX OF PERSON RELATED]...`<br> e.g., `findm n/CS pr/3` <br>
 **List** | `list`, `listm`, `listp`
 **Sort** | `sortp by/FIELD d/DIRECTION` <br>  `sortm by/FIELD d/DIRECTION`
 **Help** | `help`
 **SetTimetable**| `setTimetable DATE`
-**AddPersonRelatedToAMeeting**|`addptm INDEX p/PERSON RELATED INDEX1 p/PERSON RELATED INDEX2… ​`
-**DeletePersonRelatedFromAMeeting**|`deletepfm INDEX p/PERSON RELATED INDEX1 p/PERSON RELATED INDEX2… ​`
+**AddPersonRelatedToAMeeting**|`addptm INDEX p/PERSON RELATED INDEX1 [p/PERSON RELATED INDEX2]… ​`
+**DeletePersonRelatedFromAMeeting**|`deletepfm INDEX p/PERSON RELATED INDEX1 [p/PERSON RELATED INDEX2]… ​`

docs/UserGuide.md

@@ -6,8 +6,8 @@
 box Logic LOGIC_COLOR_T1
 participant ":LogicManager" as LogicManager LOGIC_COLOR
 participant ":MeetBuddyParser" as MeetBuddyParser LOGIC_COLOR
-participant ":DeleteCommandParser" as DeleteCommandParser LOGIC_COLOR
-participant "d:DeleteCommand" as DeleteCommand LOGIC_COLOR
+participant ":DeletePersonCommandParser" as DeletePersonCommandParser LOGIC_COLOR
+participant "d:DeletePersonCommand" as DeletePersonCommand LOGIC_COLOR
 participant ":CommandResult" as CommandResult LOGIC_COLOR
 end box
 
@@ -21,50 +21,50 @@ activate LogicManager
 LogicManager -> MeetBuddyParser : parseCommand("delete 1")
 activate MeetBuddyParser
 
-create DeleteCommandParser
-MeetBuddyParser -> DeleteCommandParser
-activate DeleteCommandParser
+create DeletePersonCommandParser
+MeetBuddyParser -> DeletePersonCommandParser
+activate DeletePersonCommandParser
 
-DeleteCommandParser --> MeetBuddyParser
-deactivate DeleteCommandParser
+DeletePersonCommandParser --> MeetBuddyParser
+deactivate DeletePersonCommandParser
 
-MeetBuddyParser -> DeleteCommandParser : parse("1")
-activate DeleteCommandParser
+MeetBuddyParser -> DeletePersonCommandParser : parse("1")
+activate DeletePersonCommandParser
 
-create DeleteCommand
-DeleteCommandParser -> DeleteCommand
-activate DeleteCommand
+create DeletePersonCommand
+DeletePersonCommandParser -> DeletePersonCommand
+activate DeletePersonCommand
 
-DeleteCommand --> DeleteCommandParser : d
-deactivate DeleteCommand
+DeletePersonCommand --> DeletePersonCommandParser : d
+deactivate DeletePersonCommand
 
-DeleteCommandParser --> MeetBuddyParser : d
-deactivate DeleteCommandParser
+DeletePersonCommandParser --> MeetBuddyParser : d
+deactivate DeletePersonCommandParser
 'Hidden arrow to position the destroy marker below the end of the activation bar.
-DeleteCommandParser -[hidden]-> MeetBuddyParser
-destroy DeleteCommandParser
+DeletePersonCommandParser -[hidden]-> MeetBuddyParser
+destroy DeletePersonCommandParser
 
 MeetBuddyParser --> LogicManager : d
 deactivate MeetBuddyParser
 
-LogicManager -> DeleteCommand : execute()
-activate DeleteCommand
+LogicManager -> DeletePersonCommand : execute()
+activate DeletePersonCommand
 
-DeleteCommand -> Model : deletePerson(1)
+DeletePersonCommand -> Model : deletePerson(1)
 activate Model
 
-Model --> DeleteCommand
+Model --> DeletePersonCommand
 deactivate Model
 
 create CommandResult
-DeleteCommand -> CommandResult
+DeletePersonCommand -> CommandResult
 activate CommandResult
 
-CommandResult --> DeleteCommand
+CommandResult --> DeletePersonCommand
 deactivate CommandResult
 
-DeleteCommand --> LogicManager : result
-deactivate DeleteCommand
+DeletePersonCommand --> LogicManager : result
+deactivate DeletePersonCommand
 
 [<--LogicManager
 deactivate LogicManager

docs/diagrams/DeleteSequenceDiagram.puml

@@ -31,8 +31,8 @@ public class AddMeetingCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_START_TIME + "START TIME "
             + PREFIX_END_TIME + "END TIME "
-            + PREFIX_DESCRIPTION + "DESCRIPTION "
-            + PREFIX_PRIORITY + "PRIORITY "
+            + "[" + PREFIX_DESCRIPTION + "DESCRIPTION] "
+            + "[" + PREFIX_PRIORITY + "PRIORITY] "
             + "[" + PREFIX_GROUP + "GROUP]..."
             + "[" + PREFIX_PERSON_CONNECTION + "INDEX OF PERSON RELATED]...\n"
             + "Example: " + COMMAND_WORD + " "
@@ -131,4 +131,3 @@ public boolean equals(Object other) {
                 && toAdd.equals(((AddMeetingCommand) other).toAdd));
     }
 }
-

docs/images/DeleteSequenceDiagram.png

@@ -28,14 +28,14 @@ public class FindMeetingCommand extends Command {
 
     public static final String COMMAND_WORD = "findm";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds meetings with that has all the "
-            + "specified values.\n"
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds meetings that meet all the "
+            + "specified criteria.\n"
             + "Parameters: "
             + "[" + PREFIX_NAME + "NAME] "
-            + "[" + PREFIX_TIME + "TIME] "
+            + "[" + PREFIX_TIME + "TIME]... "
             + "[" + PREFIX_DESCRIPTION + "DESCRIPTION] "
             + "[" + PREFIX_PRIORITY + "PRIORITY] "
-            + "[" + PREFIX_GROUP + "GROUP]..."
+            + "[" + PREFIX_GROUP + "GROUP]... "
             + "[" + PREFIX_PERSON_CONNECTION + "INDEX OF PERSON RELATED]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "CS2103 Lecture "

src/main/java/seedu/address/logic/commands/meetings/AddMeetingCommand.java

@@ -23,9 +23,9 @@ public class AddPersonCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
             + "Parameters: "
             + PREFIX_NAME + "NAME "
-            + PREFIX_PHONE + "PHONE "
-            + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_ADDRESS + "ADDRESS "
+            + "[" + PREFIX_PHONE + "PHONE] "
+            + "[" + PREFIX_EMAIL + "EMAIL] "
+            + "[" + PREFIX_ADDRESS + "ADDRESS] "
             + "[" + PREFIX_GROUP + "GROUP]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "