Skip to content

Commit

Permalink
Merge pull request #191 from qiujiaaa/docs
Browse files Browse the repository at this point in the history
Update UG and error messages
  • Loading branch information
EugeneTeu authored Oct 31, 2019
2 parents 9c5313e + 25409dc commit 59325e1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
11 changes: 10 additions & 1 deletion docs/UserGuide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,9 @@ Date should be in the format YYYY.MM.DD with valid year, month and date.
==== Add a schedule : `add-s`
Adds a schedule. +
If there are conflicts with the existing schedules, use the `-allow` flag to allow clashing schedules, or change the time. +
[underline]#Format#: `add-s ORDER_INDEX cd/DATE ct/TIME v/VENUE [t/TAG]… [-allow] ` +
*Note*: You can add multiple schedules at the same time slot but it will affect the visibility of the order index on the schedule. +

[underline]#Format#: `add-s ORDER_INDEX cd/DATE ct/TIME v/VENUE [t/TAG]… [-allow]` +
[underline]#Example#: +

* `add-s 3 cd/2018.7.25 ct/18.00 v/Starbucks t/freebie -allow` +
Expand Down Expand Up @@ -567,6 +569,8 @@ Deletes a schedule. +
==== Edit a schedule : `edit-s`
Edits an existing schedule. +
If there are conflicts with the existing schedules, use the `-allow` flag to allow clashing schedules, or change the time. +
*Note*: You can add multiple schedules at the same time slot but it will affect the visibility of the order index on the schedule. +

[underline]#Format#: `edit-s ORDER_INDEX [cd/DATE] [ct/TIME] [v/VENUE] [t/TAG]… [-allow]`
****
- Edits the schedule of the order at the specified `ORDER_INDEX`.
Expand All @@ -581,6 +585,11 @@ If there are conflicts with the existing schedules, use the `-allow` flag to all
* Edit the date of the schedule of the 1st order and allow it to clash with the existing schedules. +
`edit-s 1 cd/2019.12.12 -allow`

==== Clear the schedules : `clear-s`
Clears every schedule in SML. +

[underline]#Format#: `clear-s`

=== General Commands

==== Undo : `undo`
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/seedu/address/commons/core/Messages.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public class Messages {
public static final String MESSAGE_SCHEDULE_CONFLICT = "Scheduling conflict detected. Add \"-allow\" flag to "
+ "confirm overlapping schedules.";

public static final String TIME_MESSAGE_CONSTRAINTS = "Time should only contain numbers in the format of HH.MM";
public static final String TIME_MESSAGE_CONSTRAINTS = "Time should only contain numbers in the format of HH.MM, "
+ "with valid hour and minute.";
public static final String DATE_MESSAGE_CONSTRAINTS_LESS_THAN_DEFAULT = "Year should not be less than 1970";

public static final String DATE_MESSAGE_CONSTRAINTS_LESS_THAN_0 =
"Date should only contain numbers in the format of YYYY.MM.DD and be positive";
public static final String DATE_MESSAGE_CONSTRAINTS =
"Date should only contain numbers in the format of YYYY.MM.DD";
"Date should only contain numbers in the format of YYYY.MM.DD, with valid year, month and date.";
public static final String OPTIONAL_DATE_MESSAGE_CONSTRAINTS =
"Date should have starting and ending in the format YYYY.MM.DD\n"
+ "Example: d1/2018.10.05 d2/2019.04.12";
Expand Down

0 comments on commit 59325e1

Please sign in to comment.