Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ Examples: `start 2` Initialises the second project in the project list.

## **Features** after project initialisation

### Task-related features
#### Checking the project dashboard `dashboard `
Shows a summary of the important information regarding the project.

Format: `dashboard`

#### Listing all tasks `list`

Shows a list of all tasks in the task list sorted by priority.
Expand Down Expand Up @@ -165,6 +171,15 @@ Instruction:

Outcome: The task is assigned with the priority level.

#### Viewing tasks allocated to a team member `view `
Displays a list of tasks allocated to the specified members.

Format: `view NAME`
- NAME refers to the name of the team member when it was first input during project creation.

Example: `view Niaaz` Displays a list of tasks allocated to Niaaz.

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

### **Teammate**-related features
#### Create new teammate `new teammate `
Expand Down Expand Up @@ -215,9 +230,6 @@ Format: `task participants TASK_NUMBER`

Example: `task participants 1` Displays the teammates that are assigned to do task 1


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

## FAQ

**Q**: How do I transfer my data to another Computer?<br>
Expand Down
Binary file modified docs/images/Ui.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 @@ -34,10 +34,9 @@ public class AddCommandParser implements Parser<AddCommand> {
*/
public AddCommand parse(String args) throws ParseException {
ArgumentMultimap argMultimap =
ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
PREFIX_ADDRESS, PREFIX_TAG, PREFIX_TASK);
ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_TAG, PREFIX_TASK);

if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE, PREFIX_EMAIL)
if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL)
|| !argMultimap.getPreamble().isEmpty()) {
throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
}
Expand Down
57 changes: 0 additions & 57 deletions src/main/java/seedu/address/model/person/Address.java

This file was deleted.

22 changes: 4 additions & 18 deletions src/main/java/seedu/address/model/person/Person.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,17 @@ public class Person {
private Email email;

// Data fields
private Address address;
private final Set<Tag> tags = new HashSet<>();
private HashMap<Name, Participation> listOfParticipations = new HashMap<>();

/**
* Every field must be present and not null.
*/
public Person(PersonName name, Phone phone, Email email, Address address, Set<Tag> tags) {
requireAllNonNull(name, phone, email, address, tags);
public Person(PersonName name, Phone phone, Email email, Set<Tag> tags) {
requireAllNonNull(name, phone, email, tags);
this.name = name;
this.phone = phone;
this.email = email;
this.address = address;
this.tags.addAll(tags);
}

Expand All @@ -53,18 +51,10 @@ public Email getEmail() {
return email;
}

public Address getAddress() {
return address;
}

public void updateName(String newNameStr) {
name = new PersonName(newNameStr);
}

public void updateAddress(String newAddressStr) {
address = new Address(newAddressStr);
}

public void updatePhone(String newPhonestr) {
phone = new Phone(newPhonestr);
}
Expand Down Expand Up @@ -97,8 +87,7 @@ public boolean isSameTeammate(Person otherTeammate) {
return otherTeammate != null
&& otherTeammate.getName().equals(getName())
&& (otherTeammate.getPhone().equals(getPhone())
|| otherTeammate.getEmail().equals(getEmail())
|| otherTeammate.getAddress().equals(getAddress()));
|| otherTeammate.getEmail().equals(getEmail()));
}

/**
Expand All @@ -119,14 +108,13 @@ public boolean equals(Object other) {
return otherProject.getName().equals(getName())
&& otherProject.getPhone().equals(getPhone())
&& otherProject.getEmail().equals(getEmail())
&& otherProject.getAddress().equals(getAddress())
&& otherProject.getTags().equals(getTags());
}

@Override
public int hashCode() {
// use this method for custom fields hashing instead of implementing your own
return Objects.hash(name, phone, email, address, tags);
return Objects.hash(name, phone, email, tags);
}

@Override
Expand All @@ -137,8 +125,6 @@ public String toString() {
.append(getPhone())
.append(" Email: ")
.append(getEmail())
.append(" Address: ")
.append(getAddress())
.append(" Tags: ");
getTags().forEach(builder::append);
return builder.toString();
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/view/ProjectListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
</HBox>
<FlowPane fx:id="tags" />
<Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
<Label fx:id="address" styleClass="cell_small_label" text="\$address" />
<Label fx:id="email" styleClass="cell_small_label" text="\$email" />
<FlowPane fx:id="tasks" />
</VBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"projects": [ {
"name": "Valid Project",
"phone": "9482424",
"email": "hans@example.com",
"address": "4th street"
"email": "hans@example.com"
}, {
"name": "Project With Invalid Phone Field",
"phone": "948asdf2424",
"email": "hans@example.com",
"address": "4th street"
"email": "hans@example.com"
} ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"projects": [ {
"name": "Project with invalid name field: Ha!ns Mu@ster",
"phone": "9482424",
"email": "hans@example.com",
"address": "4th street"
"email": "hans@example.com"
} ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
"name": "Alice Pauline",
"phone": "94351253",
"email": "alice@example.com",
"address": "123, Jurong West Ave 6, #08-111",
"tagged": [ "friends" ]
}, {
"name": "Alice Pauline",
"phone": "94351253",
"email": "pauline@example.com",
"address": "4th street",
"occupied": ["write DG"]
} ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"projects": [ {
"name": "Hans Muster",
"phone": "9482424",
"email": "invalid@email!3e",
"address": "4th street"
"email": "invalid@email!3e"
} ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,42 @@
"name" : "Alice Pauline",
"phone" : "94351253",
"email" : "alice@example.com",
"address" : "123, Jurong West Ave 6, #08-111",
"tagged" : [ "friends" ],
"occupied" : [ "Write DG", "Write user stories" ]
}, {
"name" : "Benson Meier",
"phone" : "98765432",
"email" : "johnd@example.com",
"address" : "311, Clementi Ave 2, #02-25",
"tagged" : [ "owesMoney", "friends" ],
"occupied" : [ "Practice presentation" ]
}, {
"name" : "Carl Kurz",
"phone" : "95352563",
"email" : "heinz@example.com",
"address" : "wall street",
"tagged" : [ ],
"occupied" : [ "Read info pack" ]
}, {
"name" : "Daniel Meier",
"phone" : "87652533",
"email" : "cornelia@example.com",
"address" : "10th street",
"tagged" : [ "friends" ],
"occupied" : [ ]
}, {
"name" : "Elle Meyer",
"phone" : "9482224",
"email" : "werner@example.com",
"address" : "michegan ave",
"tagged" : [ ],
"occupied" : [ ]
}, {
"name" : "Fiona Kunz",
"phone" : "9482427",
"email" : "lydia@example.com",
"address" : "little tokyo",
"tagged" : [ ],
"occupied" : [ ]
}, {
"name" : "George Best",
"phone" : "9482442",
"email" : "anna@example.com",
"address" : "4th street",
"tagged" : [ ],
"occupied" : [ ]
} ]
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/seedu/address/logic/LogicManagerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX;
import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
Expand Down Expand Up @@ -79,8 +78,7 @@ public void execute_storageThrowsIoException_throwsCommandException() {
logic = new LogicManager(model, storage);

// Execute add command
String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
+ ADDRESS_DESC_AMY;
String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY;
Project expectedProject = new ProjectBuilder(AMY).withTags().withTasks().build();
ModelManager expectedModel = new ModelManager();
expectedModel.addProject(expectedProject);
Expand Down
Loading