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.

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

Implement v1.4, fix bugs and refine UG #205

Merged
merged 5 commits into from Nov 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3,524 changes: 1,772 additions & 1,752 deletions docs/UserGuide.adoc

Large diffs are not rendered by default.

Binary file added docs/images/ItineraryAuto.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/ItineraryClear3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ItineraryInterface.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -15,8 +15,9 @@ public class AddEventCommand extends Command<Model> {

public static final String COMMAND_WORD = "add";
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an event to the itinerary, "
+ "based on the following format:\nadd title/[title] date/ [date] time/[time] l/[location] d/[desc]\n"
+ "NOTE: Title, date and time are compulsory the rest can be left as empty fields.";
+ "based on the following format:\nadd title/TITLE date/DATE time/TIME [l/LOCATION] [d/DESC]\n"
+ "NOTE: Title, date and time are compulsory location and description can be left as empty fields. \n"
+ "Please remember to also change the priority of your event using the dropdown box";

public static final String MESSAGE_DUPLICATE_EVENT = "There is another event which is happening at the same "
+ "date and time.\n"
Expand Down
Expand Up @@ -11,9 +11,13 @@
import seedu.address.itinerary.model.event.Tag;
import seedu.address.itinerary.model.event.Time;
import seedu.address.itinerary.model.event.Title;
import seedu.address.logic.parser.ArgumentMultimap;
import seedu.address.logic.parser.Prefix;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.ui.PageType;

import java.util.stream.Stream;

/**
* Contains utility methods used for parsing strings in the various *Parser classes.
*/
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/seedu/address/itinerary/model/event/Date.java
Expand Up @@ -49,6 +49,12 @@ public static boolean isValidDate(String test) {
return false;
}

} else if (month.equals("04") | month.equals("06") | month.equals("09") | month.equals("11")) {

if (Integer.parseInt(day) > 31) {
return false;
}

} else {

if (month.equals("02")) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/seedu/address/itinerary/ui/ItineraryPage.java
Expand Up @@ -53,7 +53,7 @@ public class ItineraryPage extends UiPart<VBox> implements Page {

private TagDropdown tagDropdown;

private HelpWindow helpWindow;
private HelpCommandWindow helpWindow;

private CodeWindow codeWindow;

Expand Down Expand Up @@ -107,7 +107,7 @@ public ItineraryPage(ItineraryLogic itineraryLogic) {

setAccelerators();

this.helpWindow = new HelpWindow();
this.helpWindow = new HelpCommandWindow();
this.codeWindow = new CodeWindow();

fillInnerParts();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/seedu/address/ui/CommandBox.java
Expand Up @@ -53,6 +53,7 @@ public CommandBox(CommandExecutor commandExecutor, List<String> history, String[
// calls #setStyleToDefault() whenever there is a change to the text of the command box.
commandTextField.textProperty().addListener((unused1, unused2, unused3) -> setStyleToDefault());

// Credits to the implementation of the controlsfx library
AutoCompletionBinding<String> autoComplete =
TextFields.bindAutoCompletion(commandTextField, possibleSuggestions);
autoComplete.setVisibleRowCount(3);
Expand Down