Merge pull request #43 from jerryk1997/master

Added Member and fixed
AY1920S1-CS2103T-T17-1 · Oct 18, 2019 · a82bbdc · a82bbdc
2 parents 297fb70 + 089c31e
commit a82bbdc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AddMemberCommand.java b/src/main/java/seedu/address/logic/commands/AddMemberCommand.java
@@ -52,6 +52,7 @@ public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
 
         Project projectToEdit = model.getWorkingProject().get();
+
         Project editedProject = new Project(projectToEdit.getTitle(), projectToEdit.getDescription(), projectToEdit.getTasks(), projectToEdit.getFinance());
 
         Person personToAdd = createNewMember(toAdd);

diff --git a/src/main/java/seedu/address/logic/commands/RemoveMemberCommand.java b/src/main/java/seedu/address/logic/commands/RemoveMemberCommand.java
@@ -27,7 +27,9 @@ public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
 
         Project projectToEdit = model.getWorkingProject().get();
+
         Project editedProject = new Project(projectToEdit.getTitle(), projectToEdit.getDescription(), projectToEdit.getTasks(), projectToEdit.getFinance());
+
         editedProject.getMembers().addAll(projectToEdit.getMembers());
         editedProject.deleteMember(targetMember);
         model.setProject(projectToEdit, editedProject);

diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -1,20 +1,9 @@
 package seedu.address.logic.parser;
 
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-
-import java.time.DayOfWeek;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.exceptions.IllegalValueException;
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.parser.exceptions.ParseException;
-
 import seedu.address.model.finance.Budget;
 import seedu.address.model.finance.Spending;
 import seedu.address.model.person.Address;
@@ -27,10 +16,14 @@
 import seedu.address.model.tag.Tag;
 import seedu.address.model.timetable.TimeRange;
 
-import java.util.List;
-import java.util.Date;
-import java.util.ArrayList;
 
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 
 import static seedu.address.model.finance.Spending.DATE_FORMAT;