Skip to content

Commit

Permalink
Merge branch 'AY2324S2-CS2103T-T14-1:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wolffe88 authored Apr 22, 2024
2 parents cc5b0cb + ce700b0 commit 8fc3286
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 25 deletions.
2 changes: 2 additions & 0 deletions docs/DeveloperGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -622,3 +622,5 @@ testers are expected to do more *exploratory* testing.
Team size: 5

1. Handle extreme inputs for name, address, department, tags, email, comment (e.g., a person name with 1000 characters, an index that exceeds the range of `int`). For this version the text will be truncated or not fully shown as handling extreme input is considered as a nice to have feature, which will be implemented in the future version.
2. Simplify mark task command by only taking in index of the person in charge (e.g., `mark 1`)
3. Fix collapsed task card when a new task is assigned.
2 changes: 1 addition & 1 deletion docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ _Details coming soon ..._
## FAQ

**Q**: How do I transfer my data to another Computer?<br>
**A**: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous EffiTrack home folder.
**A**: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous EffiTrack home folder.

--------------------------------------------------------------------------------------------------------------------

Expand Down
Binary file modified docs/images/filterFinanceResult.png
Loading
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/findAlexDavidResult.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public CommandResult execute(Model model, CommandHistory history) throws Command

model.setPerson(personToEdit, editedPerson);
model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
model.commitAddressBook();

return new CommandResult(String.format(MESSAGE_ADD_COMMENT_SUCCESS,
Messages.printName(personToEdit)));
Expand Down
24 changes: 0 additions & 24 deletions src/test/java/seedu/address/logic/commands/CommentCommandTest.java
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
package seedu.address.logic.commands;

import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
import static seedu.address.logic.commands.CommentCommand.MESSAGE_ADD_COMMENT_SUCCESS;
import static seedu.address.testutil.Assert.assertThrows;
import static seedu.address.testutil.TypicalAddressBook.getTypicalAddressBook;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;

import org.junit.jupiter.api.Test;

import seedu.address.commons.core.index.Index;
import seedu.address.logic.CommandHistory;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
import seedu.address.model.person.Comment;
import seedu.address.model.person.Person;
import seedu.address.testutil.PersonBuilder;

class CommentCommandTest {

Expand All @@ -27,24 +21,6 @@ class CommentCommandTest {

private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());

@Test
void execute_addCommentUnfilteredList_success() {
Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
Person editedPerson = new PersonBuilder(firstPerson).withComment(COMMENT_STUB).build();

CommentCommand commentCommand = new CommentCommand(INDEX_FIRST_PERSON,
new Comment(editedPerson.getComment().comment));

String expectedMessage = String.format(MESSAGE_ADD_COMMENT_SUCCESS, editedPerson.getName());

Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(firstPerson, editedPerson);

CommandHistory commandHistory = new CommandHistory();

assertCommandSuccess(commentCommand, model, commandHistory, expectedMessage, expectedModel);
}

@Test
public void execute_invalidIndex_throwsCommandException() {
// Choose an index outside the bounds of the list
Expand Down

0 comments on commit 8fc3286

Please sign in to comment.