forked from nus-cs2103-AY2324S2/tp
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #63 from erv-teo/branch-remarks
Add remark feature
- Loading branch information
Showing
30 changed files
with
607 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
src/main/java/seedu/address/logic/commands/RemarkCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package seedu.address.logic.commands; | ||
|
|
||
| import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; | ||
| import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import seedu.address.commons.core.index.Index; | ||
| import seedu.address.logic.Messages; | ||
| import seedu.address.logic.commands.exceptions.CommandException; | ||
| import seedu.address.model.Model; | ||
| import seedu.address.model.person.Person; | ||
| import seedu.address.model.person.Remark; | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * Changes the remark of an existing person in the address book. | ||
| */ | ||
| public class RemarkCommand extends Command { | ||
| public static final String COMMAND_WORD = "remark"; | ||
| public static final String MESSAGE_USAGE = COMMAND_WORD | ||
| + ": Edits the remark of the person identified " | ||
| + "by the index number used in the last person listing. " | ||
| + "Existing remark will be overwritten by the input.\n" | ||
| + "Parameters: INDEX (must be a positive integer) " | ||
| + "r\\[REMARK]\n" | ||
| + "Example: " + COMMAND_WORD + " 1 " | ||
| + "r\\Likes to swim."; | ||
|
|
||
| public static final String MESSAGE_ARGUMENTS = "Index: %1$d, Remark: %2$s"; | ||
| public static final String MESSAGE_ADD_REMARK_SUCCESS = "Added remark to Patient: %1$s"; | ||
| public static final String MESSAGE_DELETE_REMARK_SUCCESS = "Removed remark from Patient: %1$s"; | ||
|
|
||
| private final Index index; | ||
| private final Remark remark; | ||
|
|
||
| /** | ||
| * @param index of the person in the filtered person list to edit the remark | ||
| * @param remark of the person to be updated to | ||
| */ | ||
| public RemarkCommand(Index index, Remark remark) { | ||
| requireAllNonNull(index, remark); | ||
|
|
||
| this.index = index; | ||
| this.remark = remark; | ||
| } | ||
|
|
||
| @Override | ||
| public CommandResult execute(Model model) throws CommandException { | ||
| List<Person> lastShownList = model.getFilteredPersonList(); | ||
|
|
||
| if (index.getZeroBased() >= lastShownList.size()) { | ||
| throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX); | ||
| } | ||
|
|
||
| Person personToEdit = lastShownList.get(index.getZeroBased()); | ||
| Person editedPerson = new Person( | ||
| personToEdit.getName(), personToEdit.getTags(), personToEdit.getDob(), | ||
| personToEdit.getIc(), personToEdit.getAdmissionDate(), personToEdit.getWard(), | ||
| remark); | ||
|
|
||
| model.setPerson(personToEdit, editedPerson); | ||
| model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS); | ||
|
|
||
| return new CommandResult(generateSuccessMessage(editedPerson)); | ||
| } | ||
|
|
||
| /** | ||
| * Generates a command execution success message based on whether | ||
| * the remark is added to or removed from | ||
| * {@code personToEdit}. | ||
| */ | ||
| private String generateSuccessMessage(Person personToEdit) { | ||
| String message = !remark.value.isEmpty() ? MESSAGE_ADD_REMARK_SUCCESS : MESSAGE_DELETE_REMARK_SUCCESS; | ||
| return String.format(message, Messages.format(personToEdit)); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == this) { | ||
| return true; | ||
| } | ||
|
|
||
| // instanceof handles nulls | ||
| if (!(other instanceof RemarkCommand)) { | ||
| return false; | ||
| } | ||
|
|
||
| RemarkCommand e = (RemarkCommand) other; | ||
| return index.equals(e.index) | ||
| && remark.equals(e.remark); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
src/main/java/seedu/address/logic/parser/RemarkCommandParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package seedu.address.logic.parser; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
| import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; | ||
| import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK; | ||
|
|
||
| import seedu.address.commons.core.index.Index; | ||
| import seedu.address.commons.exceptions.IllegalValueException; | ||
| import seedu.address.logic.commands.RemarkCommand; | ||
| import seedu.address.logic.parser.exceptions.ParseException; | ||
| import seedu.address.model.person.Remark; | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * Parses input arguments and creates a new RemarkCommand object | ||
| */ | ||
| public class RemarkCommandParser implements Parser<RemarkCommand> { | ||
|
|
||
| /** | ||
| * Parses the given {@code String} of arguments in the context of the RemarkCommand | ||
| * and returns an RemarkCommand object for execution. | ||
| * @throws ParseException if the user input does not conform the expected format | ||
| */ | ||
| @Override | ||
| public RemarkCommand parse(String args) throws ParseException { | ||
| requireNonNull(args); | ||
| ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, | ||
| PREFIX_REMARK); | ||
|
|
||
| Index index; | ||
| try { | ||
| index = ParserUtil.parseIndex(argMultimap.getPreamble()); | ||
| } catch (IllegalValueException ive) { | ||
| throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, | ||
| RemarkCommand.MESSAGE_USAGE), ive); | ||
| } | ||
|
|
||
| argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_REMARK); | ||
|
|
||
| Remark remark = new Remark(argMultimap.getValue(PREFIX_REMARK).orElse("")); | ||
|
|
||
| return new RemarkCommand(index, remark); | ||
| } | ||
| } |
Oops, something went wrong.