diff --git a/src/main/java/seedu/address/logic/commands/RemarkCommand.java b/src/main/java/seedu/address/logic/commands/RemarkCommand.java index 6915fca4c92..7deadfcec31 100644 --- a/src/main/java/seedu/address/logic/commands/RemarkCommand.java +++ b/src/main/java/seedu/address/logic/commands/RemarkCommand.java @@ -78,15 +78,14 @@ public CommandResult execute(Model model) throws CommandException { newRemark = RemarkSyntaxHandler.generateKeepRemarkCommand(remark.value, currentRemark); } - Person editedPerson = new Person( - personToEdit.getName(), personToEdit.getPhone(), personToEdit.getEmail(), - personToEdit.getAddress(), newRemark, personToEdit.getTags()); - model.setPerson(personToEdit, editedPerson); + + personToEdit.setRemark(newRemark); + model.setLastViewedPersonIndex(index); model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS); - return new CommandResult(generateSuccessMessage(editedPerson), true); + return new CommandResult(generateSuccessMessage(personToEdit), true); } /** diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java index e28c6cd3ec1..2d3e7509787 100644 --- a/src/main/java/seedu/address/logic/parser/ParserUtil.java +++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java @@ -334,6 +334,8 @@ public static Pair parseTagScore(String tagScore) throws ParseExcept if (tagScorePairArr.length != 2) { throw new ParseException("Invalid score, score must be non-negative integer."); } + + Tag tag = parseTag(tagScorePairArr[0], ""); if (!ScoreList.isValidScoreTag(tag)) { throw new ParseException("Invalid score tag, tag must a tag of the category " diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java index c7c3af02dbc..17ed2026082 100644 --- a/src/main/java/seedu/address/model/person/Person.java +++ b/src/main/java/seedu/address/model/person/Person.java @@ -126,6 +126,9 @@ public void setStatus(Status newStatus) { this.currentStatus = newStatus; } + public void setRemark(Remark remark) { + this.remark = remark; + } /**