[T7][T15-C4]

.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>addressbook-level4</name>
-	<comment>Project addressbook-level4 created by Buildship.</comment>
+	<name>main</name>
+	<comment>Project JYM created by Murray, Zihua, Yaquan.</comment>
 	<projects>
 	</projects>
 	<buildSpec>

.settings/org.eclipse.buildship.core.prefs

@@ -1,7 +1,6 @@
 build.commands=org.eclipse.jdt.core.javabuilder
 connection.arguments=
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.gradle.user.home=null
 connection.java.home=null
 connection.jvm.arguments=
 connection.project.dir=

README.md

@@ -1,34 +1,24 @@
 [![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/addressbook-level4)
 [![Coverage Status](https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master)](https://coveralls.io/github/se-edu/addressbook-level4?branch=master)
 
-# Address Book (Level 4)
+# JYM
 
 <img src="docs/images/Ui.png" width="600"><br>
 
-* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using 
+* This is a desktop task management application. It has a GUI but most of the user interactions happen using 
   a CLI (Command Line Interface).
-* It is a Java sample application intended for students learning Software Engineering while using Java as 
-  the main programming language. 
-* It is **written in OOP fashion**. It provides a **reasonably well-written** code example that is 
-  **significantly bigger** (around 6 KLoC)than what students usually write in beginner-level SE modules. 
-* What's different from [level 3](https://github.com/se-edu/addressbook-level3):
-    * A more sophisticated GUI that includes a list panel and an in-built Browser.
-    * More test cases, including automated GUI testing.
-    * Support for *Build Automation* using Gradle and for *Continuous Integration* using Travis CI.
-
 
 #### Site Map
 * [User Guide](docs/UserGuide.md) 
 * [Developer Guide](docs/DeveloperGuide.md) 
-* [Learning Outcomes](docs/LearningOutcomes.md) 
 * [About Us](docs/AboutUs.md)
 * [Contact Us](docs/ContactUs.md)
 
 
 #### Acknowledgements
 
-* Some parts of this sample application were inspired by the excellent 
-  [Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*. 
+* Some parts of this sample application were inspired by these excellent 
+  [Addressbook Repositories](https://github.com/se-edu/) by *Damith C. RAJAPAKSE*. 
 
 
 #### Licence : [MIT](LICENSE)

docs/AboutUs.md

@@ -1,52 +1,33 @@
 # About Us
 
-We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
+We are a team in the [CS 2103 Class](http://www.comp.nus.edu.sg/~cs2103/AY1617S1/).
 
 ## Project Team
 
-#### [Damith C. Rajapakse](http://www.comp.nus.edu.sg/~damithch) <br>
-<img src="images/DamithRajapakse.jpg" width="150"><br>
-**Role**: Project Advisor
+#### [Nishant Budhdev](https://github.com/nishantbudhdev) <br>
+<img src="images/Nishant Budhdev.jpg" width="150"><br>
+**Role**: Project Mentor
 
 -----
 
-#### [Joshua Lee](http://github.com/lejolly)
-<img src="images/JoshuaLee.jpg" width="150"><br>
-Role: Developer <br>  
-Responsibilities: UI
+#### [Murray Chen](https://github.com/mchen14) <br>
+Role: Team Lead, Developer <br>
+Responsibilities: Code Quality
 
 -----
 
-#### [Leow Yijin](http://github.com/yijinl) 
-<img src="images/LeowYijin.jpg" width="150"><br>
+#### [Zihua Huang](https://github.com/JamesHuangUC)
 Role: Developer <br>  
-Responsibilities: Data
+Responsibilities: Integration, Git Expert, Scheduling and Tracking
 
 -----
 
-#### [Martin Choo](http://github.com/m133225)
-<img src="images/MartinChoo.jpg" width="150"><br>
+#### [Yaquan Wang](https://github.com/A0116137M) 
 Role: Developer <br>  
-Responsibilities: Dev Ops
-
------
-
-#### [Thien Nguyen](https://github.com/ndt93)
- Role: Developer <br>  
- Responsibilities: Threading
-
- -----
-
-#### [You Liang](http://github.com/yl-coder) 
-<img src="images/YouLiang.jpg" width="150"><br>
- Role: Developer <br>  
- Responsibilities: UI
+Responsibilities: Documentation, Testing, Deliverables and Deadlines
 
  -----
 
 # Contributors
 
 We welcome contributions. See [Contact Us](ContactUs.md) page for more info.
-
-* [Akshay Narayan](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Aokkhoy)
-* [Sam Yong](https://github.com/se-edu/addressbook-level4/pulls?q=is%3Apr+author%3Amauris)

docs/ContactUs.md

@@ -1,8 +1,8 @@
 # Contact Us
 
-* **Bug reports, Suggestions** : Post in our [issue tracker](https://github.com/se-edu/addressbook-level4/issues)
+* **Bug reports, Suggestions** : Post in our [issue tracker](https://github.com/CS2103AUG2016-T15-C4/main/issues)
   if you noticed bugs or have suggestions on how to improve.
 
 * **Contributing** : We welcome pull requests. Follow the process described [here](https://github.com/oss-generic/process)
 
-* **Email us** : You can also reach us at `damith [at] comp.nus.edu.sg`
+* **Email us** : You can also reach us at `zihuahuang [at] u.nus.edu`

docs/DeveloperGuide.md

@@ -241,7 +241,7 @@ Here are the steps to create a new release.
 
 ### Managing Dependencies
 
-A project often depends on third-party libraries. For example, Address Book depends on the
+A project often depends on third-party libraries. For example, JYM depends on the
 [Jackson library](http://wiki.fasterxml.com/JacksonHome) for XML parsing. Managing these _dependencies_
 can be automated using Gradle. For example, Gradle can download the dependencies automatically, which
 is better than these alternatives.<br>
@@ -256,26 +256,39 @@ Priorities: High (must have) - `* * *`, Medium (nice to have)  - `* *`,  Low (un
 Priority | As a ... | I want to ... | So that I can...
 -------- | :-------- | :--------- | :-----------
 `* * *` | new user | see usage instructions | refer to instructions when I forget how to use the App
-`* * *` | user | add a new person |
-`* * *` | user | delete a person | remove entries that I no longer need
-`* * *` | user | find a person by name | locate details of persons without having to go through the entire list
-`* *` | user | hide [private contact details](#private-contact-detail) by default | minimize chance of someone else seeing them by accident
-`*` | user with many persons in the address book | sort persons by name | locate a person easily
+`* * *` | user | add a new task or event with a given deadline or date and priority | remember what tasks I have to do in the future. 
+`* * *` | user | add a floating task with no given deadline or date | work on long term tasks that have no given deadline.
+`* * *` | user | mark a task or event as completed | refer to which tasks I have finished or not finished
+`* * *` | user | find a task or event by name | locate details of tasks/events without having to go through the entire list
+`* * *` | user | list upcoming tasks in sorted order | determine which tasks I should do next
+`* * *` | user | edit tasks | update tasks if things change.
+`* * *` | user | undo recent commands | revert tasks/events created by mistake.
+`* * *` | user | receive reminders for upcoming tasks | don't forget about tasks
+`* *` | user | add tasks through plain English | type more naturally than having to write in commands and flags.
+`* *` | user | view tasks in a calendar format | figure out what events/tasks I have upcoming more easily.
+`* *` | user | specify the location to place the data storage | do things with it, like sync it to my Dropbox.
+`* *` | user | bring up the program with a hotkey | pull it up quickly and conveniently when I need to add a task.
+`* *` | user | schedule multiple time blocks with one task | schedule tasks or events that have multiple and different deadlines or dates.
+`* *` | user | auto-complete certain tasks | save time instead of having to type out the whole command.
+`*` | user | manipulate the schedule with a mouse | save time manipulating the calendar directly as opposed to having to go back to the CLI and type in more command rescheduling events (e.g. drag-drop vs. retyping event details)
+`*` | user | view list or calendar in a pop out window | look at it more easily while working on other items.
+`*` | user | have a nice GUI | have an easier time manipulating the information and let the program be more pleasing to my eyes.
 
 {More to be added}
 
 ## Appendix B : Use Cases
 
-(For all use cases below, the **System** is the `AddressBook` and the **Actor** is the `user`, unless specified otherwise)
+(For all use cases below, the **System** is the `JYM` and the **Actor** is the `user`, unless specified otherwise)
 
-#### Use case: Delete person
+#### Use case: Mark Task completed.
 
 **MSS**
 
-1. User requests to list persons
-2. AddressBook shows a list of persons
-3. User requests to delete a specific person in the list
-4. AddressBook deletes the person <br>
+1. User requests to view list of active tasks
+2. System shows list of tasks
+3. User requests to mark a task as completed from the list.
+4. System marks task as completed
+5. System removes task from list of active tasks. <br>
 Use case ends.
 
 **Extensions**
@@ -286,17 +299,46 @@ Use case ends.
 
 3a. The given index is invalid
 
-> 3a1. AddressBook shows an error message <br>
+> 3a1. JYM shows an error message <br>
   Use case resumes at step 2
 
+#### Use case: Update Task
+
+**MSS**
+
+1. User requests to view list of active tasks
+2. System shows list of tasks
+3. User requests to update a task with given description and/or deadline
+4. System updates task.
+Use case ends.
+
+**Extensions**
+
+2a. List is empty
+
+> Use case ends
+
+3a. Given index invalid
+
+> 3a1. JYM shows error message <br>
+  Use case resumes at step 2
+
+3b. Invalid deadline supplied by user
+
+> 3b1. JYM returns error message <br>
+  Use case resumes at step 2
+
 {More to be added}
 
 ## Appendix C : Non Functional Requirements
 
-1. Should work on any [mainstream OS](#mainstream-os) as long as it has Java `1.8.0_60` or higher installed.
-2. Should be able to hold up to 1000 persons.
-3. Should come with automated unit tests and open source code.
-4. Should favor DOS style commands over Unix-style commands.
+1. Program should load within 5 seconds
+2. Storage file should be limited to 100MB default (can be changed by user)
+3. Should work on any mainstream OS
+4. Should hold up to 1000 tasks/events on the active task list at any time
+5. Comes with automated unit tests.
+6. Commands should be intuitive and easy to use.
+7. Interface is simple and easy to understand.
 
 {More to be added}
 
@@ -306,11 +348,45 @@ Use case ends.
 
 > Windows, Linux, Unix, OS-X
 
-##### Private contact detail
+##### Task
+
+> An activity that needs to be completed by a certain date or time. Contains
+a description, deadline, and priority.
+
+##### Event
+
+> An activity that happens within a set boundary of time, with a start and end time on a given date.
+Contains a description, event date and time, priority, and location.
+
+##### Floating Task
+
+> A task with no set deadline. 
+
+##### Active Task List
+
+> List of tasks that have yet to be marked complete and whose deadlines have not passed yet.
+
 
-> A contact detail that is not meant to be shared with others
 
 ## Appendix E : Product Survey
 
-{TODO: Add a summary of competing products}
+##### Google Calendar Quickadd
+
+> Satisfies many stories, but cannot add multiple events simultaneously, and does not hold support for both tasks and events. <br>
+> Everything is an event, and although one can create them in a certain way to make them act like tasks, it can be tedious and not optimal to do so.
+
+##### iStudiez Pro
+
+> Satisfies many stories, in particular having a nice GUI and being able to view the task list in many formats. However, there is no shortcut to add tasks, and you cannot type everything in one line without tabbing over to a separate text box.
+
+##### S Planner (Samsung Phone Calendar, Android 4.2.2)
+
+> Is only a smartphone app. Harder to type in tasks and events on the phone. <br>
+> Syncs with Google Calendar. <br>
+
+##### GO Note Widget (to-do list add-on for GO Launcher)
 
+> Clean and simple interface (clutter-free) <br>
+> Can mark tasks with colored labels <br>
+> No option to state the start or end time of a task <br>
+> Smartphone app.