[T7][T14-C4]

.project

@@ -20,4 +20,24 @@
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1475672512464</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1475672512512</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

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

@@ -1,3 +1,5 @@
+GRADLE_BUILD_COMMANDS=org.eclipse.jdt.core.javabuilder
+GRADLE_NATURES=org.eclipse.jdt.core.javanature
 build.commands=org.eclipse.jdt.core.javabuilder
 connection.arguments=
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

README.md

@@ -1,34 +1,38 @@
-[![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)
+# MESS (My Efficient Scheduling System)
 
-# Address Book (Level 4)
+#### Statuses
+* Master: [![Build Status](https://travis-ci.org/CS2103AUG2016-T14-C4/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-T14-C4/main)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-T14-C4/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-T14-C4/main?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/03ea8214af7d4213bc41ce73905a24e4)](https://www.codacy.com/app/syed/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103AUG2016-T14-C4/main&utm_campaign=Badge_Grade)
 
-<img src="docs/images/Ui.png" width="600"><br>
+* Develop: [![Build Status](https://travis-ci.org/CS2103AUG2016-T14-C4/main.svg?branch=develop)](https://travis-ci.org/CS2103AUG2016-T14-C4/main)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-T14-C4/main/badge.svg?branch=develop)](https://coveralls.io/github/CS2103AUG2016-T14-C4/main?branch=develop)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/03ea8214af7d4213bc41ce73905a24e4)](https://www.codacy.com/app/syed/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103AUG2016-T14-C4/main&amp;utm_campaign=Badge_Grade)
 
-* This is a desktop Address Book 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.
+<img src="docs/images/MESS.PNG" width="600"><br>
 
-
+* MESS is a desktop to do list application. It has a GUI but most of the user interactions happen using
+  a CLI (Command Line Interface) and mostly with one line of command as input.
+* It is an application intended for users to put their tasks and events into a scheduling system.
+* It uses Java as the main programming language. It is **written in OOP fashion**.
+* It is developed by a group of undergraduate students from School of Computing, National University of Singapore for the module CS2103 with the help from professor and supervisior.
+
+
 #### Site Map
-* [User Guide](docs/UserGuide.md) 
-* [Developer Guide](docs/DeveloperGuide.md) 
-* [Learning Outcomes](docs/LearningOutcomes.md) 
+* [User Guide](docs/UserGuide.md)
+* [Developer Guide](docs/DeveloperGuide.md)
 * [About Us](docs/AboutUs.md)
 * [Contact Us](docs/ContactUs.md)
 
 
+
 #### Acknowledgements
+* Orginal source and code base of this application is based on [Addressbook-level4](https://github.com/se-edu/addressbook-level4)forked from se-edu/addressbook-level4 created by [SE-EDU initiative](http://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*.
 
-* 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*. 
 
 
 #### Licence : [MIT](LICENSE)
+
+

build.gradle

@@ -48,6 +48,8 @@ allprojects {
     }
 
     dependencies {
+        compile "org.ocpsoft.prettytime:prettytime:4.0.0.Final"
+        compile "org.ocpsoft.prettytime:prettytime-nlp:4.0.0.Final"
         compile "org.controlsfx:controlsfx:$controlsFxVersion"
         compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
         compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion"
@@ -74,10 +76,10 @@ allprojects {
     }
 
     shadowJar {
-        archiveName = "addressbook.jar"
+        archiveName = "taskmanager.jar"
 
         manifest {
-            attributes "Main-Class": "seedu.address.MainApp"
+            attributes "Main-Class": "seedu.task.MainApp"
         }
 
         destinationDir = file("${buildDir}/jar/")
@@ -113,8 +115,8 @@ tasks.coveralls {
     onlyIf { System.env.'CI' }
 }
 
-class AddressBookTest extends Test {
-    public AddressBookTest() {
+class TaskManagerTest extends Test {
+    public TaskManagerTest() {
     	  forkEvery = 1
         systemProperty 'testfx.setup.timeout', '60000'
     }
@@ -128,7 +130,7 @@ class AddressBookTest extends Test {
     }
 }
 
-task guiTests(type: AddressBookTest) {
+task guiTests(type: TaskManagerTest) {
     include 'guitests/**'
 
     jacoco {
@@ -137,16 +139,16 @@ task guiTests(type: AddressBookTest) {
 }
 
 
-task nonGuiTests(type: AddressBookTest) {
-    include 'seedu/address/**'
+task nonGuiTests(type: TaskManagerTest) {
+    include 'seedu/task/**'
 
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }
 }
 
 // Test mode depends on whether headless task has been run
-task allTests(type: AddressBookTest) {
+task allTests(type: TaskManagerTest) {
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }

collated/docs/A0141052Y.md

@@ -0,0 +1,48 @@
+# A0141052Y
+###### \DeveloperGuide.md
+``` md
+
+1b. The previous action does not support undo
+> Use case ends
+
+```
+###### \DeveloperGuide.md
+``` md
+#### Use case: Find task by tag
+
+**MSS**
+
+1. User enters command and tags to be searched. <br/>
+2. MESS shows the tasks containing the tags <br>
+Use case ends.
+
+**Extensions**
+
+1a. The find by tag command format is wrong
+
+>MESS shows an error message. <br/>
+  Use case ends.
+
+1b. There is no matched task
+
+>MESS shows no tasks in the task list <br/>
+  Use case ends.
+```
+###### \UserGuide.md
+``` md
+#### Finding all tasks by tag name: `find-tag`
+Finds tasks that contains all given tags.
+Format: `find-tag TAG_NAME`
+
+> * The search is case sensitive e.g. `urgent` will not match `URGENT`
+> * Tasks must match all keywords (i.e. `AND` search).
+  e.g. `urgent task` will only match tasks with both `urgent` and `task` tags
+
+#### Activate real time search: `searchbox`
+Activates the real time search, which is located in the same input box used to input commands.<br/>
+Format: `searchbox`
+
+> * To exit from real time search, just hit <kbd>Enter</kbd>.
+> * Similar functionality to `find`
+
+```

collated/docs/A0144939R.md

@@ -0,0 +1,125 @@
+# A0144939R
+###### \DeveloperGuide.md
+``` md
+#### Use case: Alias command
+
+**MSS**
+
+1. User requests to alias a command
+2. MESS aliases the command to the given symbol<br>
+Use case ends.
+
+**Extensions**
+
+1a. The symbol is already aliased to another command
+> MESS changes the mapping to the new command.
+Use case ends.
+
+1b. The symbol is a standard command name(Eg: add, edit)
+> MESS shows an error message.
+Use case ends.
+
+1c. The command already has an alias
+> MESS maps the given symbol to the command, as a command can have multiple aliases
+Use case ends.
+
+```
+###### \DeveloperGuide.md
+``` md
+#### Use case: Change storage location
+
+**MSS**
+
+1. User requests to change storage file location
+2. MESS changes storage file location and saves in that location/loads from that location if file already contains data
+
+**Extensions**
+2a. The file path may not be valid
+
+> Error message will be displayed <br>
+Use case ends.
+
+2b. The folder may not be writable(Lack permission)
+
+> Error message will be displayed <br>
+Use case ends.
+
+```
+###### \UserGuide.md
+``` md
+
+#### Adding a task or event: `add`
+Adds a task to the to-do list<br>
+Format: `add TASK_NAME [starts START_DATETIME ends CLOSE_DATETIME tag TAG]`
+
+> Date format of START_DATE and CLOSE_DATE includes words like today, tomorrow, 3 days from now, day after tomorrow, noon, 12pm, 6am
+
+> Use ISO date-time format if you wish to type exact date. e.g. 2016/9/1 represents 1st September 2016
+
+* `TASK_NAME` need not be unique.
+* If there is no argument, the task will become floating.
+* `START_DATE` refer to the starting date and time of an event. For a task, the timestamp will be automatically saved as start date and time when the task is created. User can input start date and time for events.
+* `TAG` is for users to write tags for different tasks. Multiple tags are available by typing `tag TAG tag TAG`.
+
+Examples:
+* `add proposal ends tomorrow` <br> Adds a proposal task with a deadline 24 hours from now
+* `add meeting starts tomorrow 1pm ends tomorrow 3pm`<br> Adds a meeting event which start tomorrow at 1pm and ends tomorrow at 3pm
+* `add shopping` <br> Adds a floating task named revision test which has not specify the start and end date
+* `add tutorial tag cs2103` <br> Adds a floating task named tutorial with a tag CS2013
+* `add quiz tag cs2102 tag easy` <br> Adds a floating task named tutorial with a tag CS2012 and easy
+* `add test starts 9/1 2pm ends 9/1 3pm ` <br> Adds a task starts on 1 September 2pm and ends on 1 September 3pm
+
+
+#### Aliasing a command: `alias`
+Aliases a command to a symbol <br>
+Format: `alias COMMAND_NAME SYMBOL`
+
+> Once aliased, the original command will still continue to work. Hence, symbols cannot be command names.
+> One symbol can map to at most one command
+
+* `COMMAND_NAME` Must be a valid command
+* `SYMBOL` refers to the symbol you wish to alias to. SYMBOL cannot be a command name.
+
+Examples:
+* `alias add +` <br> Aliases the add command to the symbol +
+* `alias alias q`<br> Aliases the alias command to the symbol q
+
+```
+###### \UserGuide.md
+``` md
+#### Update entries : `update`
+Update a specific task.<br>
+Format: `update INDEX [name TASKNAME starts STARTDATETIME ends ENDDATETIME tag TAG remove-tag TO_REMOVE_TAG]`
+
+> * INDEX refers to the number appears on the list in front the task name.
+> * The task name is optional, but needs to be preceded by name
+> * The TAG here will be added to the referred task and the original tag remains. If you want to delete a tag, use `remove-tag TO_REMOVE_TAG` to delete tag by name.
+> * TO_REMOVE_TAG refers to the tag (or tags) that you want to be removed by typing the tags' name that you want to delete.
+> * You can choose what to update. It depends on you whether you want to update only one information or update multiple information.
+
+Examples:
+* `update 2 name shopping ends 9pm`<br>
+   update the task name of the second task on the list to shopping and the start time to 3/10/2016 9 p.m.
+
+* `update 1 tag cs2103`<br>
+  add the tag of the first task on to-do list to cs2103
+
+* `update 3 ends three hours later` <br>
+  update the task name of the third task on the list to a deadline three hours after you type this command
+
+* `update 2 tag family remove-tag friends` <br>  
+   add a tag family to the second task and remove the tag named friends
+
+```
+###### \UserGuide.md
+``` md
+
+#### Change storage location : `change-to`
+Changes to a new storage location and saves task manager data there<br>
+Note: If new file already has data, then the taskmanager will load that data.
+
+Format: `change-to NEWFILEPATH`
+Example:
+* `change-to data/taskmanager.xml`
+
+```