Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option for users to allow clashing schedules by including -allow in command + Tests #162

Merged
merged 23 commits into from Oct 27, 2019
Merged

Add option for users to allow clashing schedules by including -allow in command + Tests #162

merged 23 commits into from Oct 27, 2019

Conversation

qiujiaaa
Copy link

@qiujiaaa qiujiaaa commented Oct 26, 2019 •
edited

  • Clashing schedules not allowed to be added/edited unless user includes -allow flag
  • Shows list of conflicting schedules (order number and time)
  • Tests:
    -- AddScheduleCommandTest
    -- DeleteScheduleCommandTest
    -- AddScheduleCommandParserTest
    -- DeleteScheduleCommandParserTest
    -- AddOrderCommandTest

@EugeneTeu EugeneTeu added priority.High Must do type.Task Something that needs to be done, but not a story, bug, or an epic. e.g. Move testing code into a new labels Oct 26, 2019
@EugeneTeu EugeneTeu added this to the v1.3 milestone Oct 26, 2019
EugeneTeu
EugeneTeu reviewed Oct 26, 2019
View reviewed changes
src/main/java/seedu/address/commons/core/Messages.java
@@ -20,9 +20,10 @@
public static final String MESSAGE_ORDER_CANCELLED = "This order is already cancelled in SML.";
public static final String MESSAGE_ORDER_COMPLETED = "This order is already completed in SML.";
public static final String MESSAGE_ORDER_UNSCHEDULED = "This order is unscheduled in SML.";
public static final String MESSAGE_SCHEDULE_CONFLICT = "Scheduling conflict detected. Add \"-allow\" flag to "
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put example here e.g -allow ....

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted and changed!

@qiujiaaa qiujiaaa changed the title Add option for users to allow clashing schedules by including -allow in command Add option for users to allow clashing schedules by including -allow in command + Tests Oct 27, 2019
@EugeneTeu EugeneTeu merged commit a881f09 into AY1920S1-CS2103T-T09-4:master Oct 27, 2019
@nus-se-bot nus-se-bot mentioned this pull request Oct 30, 2019
Open
27 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EugeneTeu EugeneTeu EugeneTeu approved these changes

Assignees

@qiujiaaa qiujiaaa

Labels
priority.High Must do type.Task Something that needs to be done, but not a story, bug, or an epic. e.g. Move testing code into a new
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@qiujiaaa @EugeneTeu