nus-cs2103-AY1617S1 · LiXiaoooowei · Oct 24, 2016 · Oct 24, 2016 · Oct 24, 2016 · Oct 25, 2016
diff --git a/.classpath b/.classpath
@@ -16,6 +16,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>addressbook-level4</name>
+	<name>TaskManager</name>
 	<comment>Project addressbook-level4 created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -17,7 +17,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/README.md b/README.md
@@ -1,20 +1,16 @@
 [![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)
+# Task Manager
 
 <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 task managing 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
@@ -26,7 +22,7 @@
 
 
 #### Acknowledgements
-
+* The sample project created by SE-EDU initiative at https://github.com/se-edu/. 
 * 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*. 
 

diff --git a/deliverables/V0.0 Deliverables.docx b/deliverables/V0.0 Deliverables.docx
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -10,43 +10,35 @@ We are a team based in the [School of Computing, National University of Singapor
 
 -----
 
-#### [Joshua Lee](http://github.com/lejolly)
-<img src="images/JoshuaLee.jpg" width="150"><br>
-Role: Developer <br>  
-Responsibilities: UI
+#### Chan Jun Wei
+<img src="images/ChanJunWei.jpg" width="150"><br>
+**Role**: Project Mentor  
 
 -----
 
-#### [Leow Yijin](http://github.com/yijinl) 
-<img src="images/LeowYijin.jpg" width="150"><br>
+#### [Shi Xiyue](https://github.com/shixiyue)
+<img src="images/ShiXiyue.jpg" width="150"><br>
 Role: Developer <br>  
-Responsibilities: Data
+Responsibilities:<br> 
+* ‘Storage' && 'Model' Component.
+* Code Quality I/c: Looks after code quality, ensures adherence to coding standards, etc.
+* Scheduling and tracking I/c: In charge of defining, assigning, and tracking project tasks.
 
 -----
 
-#### [Martin Choo](http://github.com/m133225)
-<img src="images/MartinChoo.jpg" width="150"><br>
+#### [Li Xiaowei](https://github.com/LiXiaoooowei)
+<img src="images/LiXiaowei.jpg" width="150"><br>
 Role: Developer <br>  
-Responsibilities: Dev Ops
+Responsibilities:<br> 
+* Logic Component and Common Component I/c: ensure that the codes adhere to coding standards, and update documentation of any changes in the two components 
+* Testing I/c: Ensures the testing of the project is done properly and on time.
 
 -----
 
-#### [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>
+#### [Angeline Neoh Xing Yii](https://github.com/angellineeee)
+<img src="images/AngelineNeoh.jpg" width="150"><br>
  Role: Developer <br>  
- Responsibilities: UI
-
- -----
-
-# 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)
+ Responsibilities:<br>
+* 'UI' Component.
+* Documentation I/c: Responsible for the quality of various project documents.
+* Integration I/c: In charge of versioning of the code, maintaining the code repository, integrating various parts of the software to create a whole.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
@@ -256,47 +256,67 @@ 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
-
-{More to be added}
+`* * *` | user | add a task by specifying a task description only | record that need to be done ‘some day’
+`* * *` | user | add a task with the deadline specified | record the task which needs to be done by a specified deadline
+`* * *` | user | add an event by specifying the starting and ending time | record the exact details of the event 
+`* * *` | user | edit  a task | update my tasks
+`* * *` | user | delete a task | get rid of tasks that I no longer care to track
+`* * *` | user | find a task by name | locate details of tasks without having to go through the entire list
+`* * *` | user | specify a specific folder as the data storage location | choose to store the data file in a local folder controlled by a cloud syncing service, allowing me to access task data from multiple computers
+`* *` | user | undo operation | recover from mistakes
+`* *` | user | have some flexibility in the command format | do operations in an intuitively way
+`* * ` | user | add tags to a task | categorize my tasks better
+`* * ` | user with many tasks | filter tasks by attributes such as start time, deadline, tag, and priority | locate some tasks easily
+`*` | user with many tasks in the address book | sort tasks by date or priority level  | know my most important upcoming tasks or know what needs to be done soon. 
+`* ` | user | mark a task as done | monitor my task progression
+`* ` | user | add a recurring task | save my troubles to retype my tasks
+`* ` | user | add priority level to a task| focus on more important tasks
 
 ## 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 `Task Manager` and the **Actor** is the `user`, unless specified otherwise)
 
-#### Use case: Delete person
+#### Use case: Delete task
 
 **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 list tasks
+2. Task Manager shows a list of tasks
+3. User requests to delete a specific task in the list
+4. Task Manager deletes the task <br>
 Use case ends.
 
 **Extensions**
 
+1a. User requests to delete a specific file
+Use case resumes at step 4
+
 2a. The list is empty
 
 > Use case ends
 
 3a. The given index is invalid
 
-> 3a1. AddressBook shows an error message <br>
+> 3a1. Task Manager shows an error message <br>
   Use case resumes at step 2
 
+#### Use case: Find task
+
+**MSS**
+
+1. User requests to find tasks by keyword
+2. Task Manager shows a list of tasks
+Use case ends.
+
 {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.
+2. Should be able to hold up to 1000 tasks.
 3. Should come with automated unit tests and open source code.
 4. Should favor DOS style commands over Unix-style commands.
+5. Should have a clean GUI.
 
 {More to be added}
 
@@ -306,11 +326,32 @@ Use case ends.
 
 > Windows, Linux, Unix, OS-X
 
-##### Private contact detail
-
-> A contact detail that is not meant to be shared with others
-
 ## Appendix E : Product Survey
 
-{TODO: Add a summary of competing products}
-
+**Todo.txt**<br>
+* Strength<br>
+  * It is offline and easy to start.
+  * Users can quickly add a task by typing a command. 
+  * Users can add context to a task.
+  * Users can add priority to a task. Prioritized tasks are shown in different colors.
+  * Users can mark a task as complete.<br>
+* Weakness<br>
+  * It does not support for events and deadlines.  
+  * It does not support for undo operations. 
+  * The UI is too simple.<br>
+
+**Wunderlist**<br>
+* Strength<br>
+  * It is offline.
+  * It can sync to any android, ios or windows phone. 
+  * Users can quickly add a task through the text box at the home page.
+  * Users can add context to a task like alarm as remainder.
+  * Users can add priority to a task. 
+  * Users can mark a task as complete.
+  * Users can create folder and save different tasks under specific folder.
+  * It display tasks in different deadline folder. eg. This week, This month<br>
+* Weakness<br>
+  * It does not support for events.  
+  * It does not support for undo operations. 
+  * No calendar view of tasks.
+  * Unable to design the colour theme or changing of background image.