Skip to content

Commit

Permalink
Merge pull request #176 from owenong1/branch-finalEdits
Browse files Browse the repository at this point in the history
Final
  • Loading branch information
owenong1 authored Apr 15, 2024
2 parents 5ae9620 + 9afff74 commit 8eb96ea
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 14 deletions.
4 changes: 3 additions & 1 deletion docs/DeveloperGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,9 @@ switch hello
--------------------------------------------------------------------------------------------------------------------
<div style="page-break-after: always;"></div>

## **Appendix: Enhancement (Team Size 5)**
## **Appendix: Enhancement**

Team Size: 5

1. **To show custom error for wrong time in `ctag` command**: When creating event tags with the `ctag` command,
you will not get notified correctly on why you failed when you input the incorrect time(like 25:73:74 in the 24-hour
Expand Down
58 changes: 45 additions & 13 deletions src/main/java/seedu/address/model/util/SampleDataUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,62 @@
public class SampleDataUtil {
public static Person[] getSamplePersons() {
return new Person[] {
new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("[email protected]"),
new Person(new Name("Alex Yeoh"), new Phone("99999999"), new Email("[email protected]"),
new Address("Blk 30 Geylang Street 29, #06-40"),
getTagSet("friends"),
getEventTagSet("marketing|marketing dpt|2024-04-01T09:00:00|2024-04-01T09:00:00")),
getTagSet("operations"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("[email protected]"),
new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
getTagSet("colleagues", "friends"),
getEventTagSet("marketing|marketing dpt|2024-04-01T09:00:00|2024-04-01T09:00:00")),
getTagSet("marketing"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("[email protected]"),
new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
getTagSet("neighbours"),
getEventTagSet("logistics|logistics dpt|2024-04-01T09:00:00|2024-04-01T09:00:00")),
getTagSet("logistics"),
getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
new Person(new Name("David Li"), new Phone("91031282"), new Email("[email protected]"),
new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
getTagSet("family"),
getEventTagSet("logistics|logistics dpt|2024-04-01T09:00:00|2024-04-01T09:00:00")),
getTagSet("publicity"),
getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("[email protected]"),
new Address("Blk 47 Tampines Street 20, #17-35"),
getTagSet("classmates"),
getEventTagSet("logistics|logistics dpt|2024-04-01T09:00:00|2024-04-01T09:00:00")),
getTagSet("publicity"),
getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("[email protected]"),
new Address("Blk 45 Aljunied Street 85, #11-31"),
getTagSet("colleagues"),
getEventTagSet("VPD|vice project director|2024-04-01T09:00:00|2024-04-01T09:00:00"))
getTagSet("VPD"),
getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
new Person(new Name("Tom Goh"), new Phone("91234812"), new Email("[email protected]"),
new Address("Blk 98 Telok Blangah Street 85, #11-09"),
getTagSet("secretary"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("John Tan"), new Phone("91232345"), new Email("[email protected]"),
new Address("Blk 1 Hougang Street 3, #07-18"),
getTagSet("operations"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Ben Tan"), new Phone("83478596"), new Email("[email protected]"),
new Address("NA"),
getTagSet("operations"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Ann Lee"), new Phone("82882919"), new Email("[email protected]"),
new Address("NA"),
getTagSet("head", "publicity"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Amy Lim"), new Phone("82882919"), new Email("[email protected]"),
new Address("AMK Blk 91"),
getTagSet("head", "operations"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Betty Ho"), new Phone("93882919"), new Email("[email protected]"),
new Address("AMK Blk 10"),
getTagSet("logistics"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Zack Goh"), new Phone("82820119"), new Email("[email protected]"),
new Address("AMK Blk 10"),
getTagSet("logistics"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
new Person(new Name("Xan"), new Phone("82882919"), new Email("[email protected]"),
new Address("Bishan Blk 10"),
getTagSet("logistics"),
getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
};
}

Expand Down

0 comments on commit 8eb96ea

Please sign in to comment.