nus-cs2103-AY1617S1 · praveer922 · Oct 21, 2016 · Oct 27, 2016 · Oct 27, 2016 · Oct 27, 2016
diff --git a/.classpath b/.classpath
@@ -17,5 +17,17 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="lib" path="libs/antlr-2.7.7.jar"/>
+	<classpathentry kind="lib" path="libs/antlr-runtime-3.5.2.jar"/>
+	<classpathentry kind="lib" path="libs/backport-util-concurrent-3.1.jar"/>
+	<classpathentry kind="lib" path="libs/commons-codec-1.5.jar"/>
+	<classpathentry kind="lib" path="libs/commons-lang-2.6.jar"/>
+	<classpathentry kind="lib" path="libs/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/ical4j-1.0.2.jar"/>
+	<classpathentry kind="lib" path="libs/logback-classic-0.9.jar"/>
+	<classpathentry kind="lib" path="libs/logback-core-0.9.6.jar"/>
+	<classpathentry kind="lib" path="libs/natty-0.12.jar"/>
+	<classpathentry kind="lib" path="libs/slf4j-api-1.7.10.jar"/>
+	<classpathentry kind="lib" path="libs/stringtemplate-3.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.project b/.project
@@ -1,10 +1,15 @@
 <?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 daily planner created by Praveer, Yufeng, Ming Yi.</comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -19,5 +24,26 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1475758393731</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>1475758393779</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>
diff --git a/README.md b/README.md
@@ -1,22 +1,13 @@
-[![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)
+[![Build Status](https://travis-ci.org/CS2103AUG2016-F11-C4/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-F11-C4/main)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-F11-C4/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-F11-C4/main?branch=master)
 
-# Address Book (Level 4)
+# Daily Planner
 
-<img src="docs/images/Ui.png" width="600"><br>
+<img src="docs/images/whiteboard.jpg" width="600"><br>
 
-* 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.
+* This is a desktop Daily Planner application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
+* It is a To-Do List application that helps the user plan and organise their daily schedule automatically.
 
-
 #### Site Map
 * [User Guide](docs/UserGuide.md) 
 * [Developer Guide](docs/DeveloperGuide.md) 
@@ -27,8 +18,8 @@
 
 #### 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*. 
+The application is based off a sample project created by created by the SE-EDU initiative
+at <a href="https://github.com/se-edu/">https://github.com/se-edu/</a>.
 
 
 #### Licence : [MIT](LICENSE)
diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,10 @@ allprojects {
         mavenCentral()
         maven { url "https://repo.eclipse.org/content/repositories/egit-releases/" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+
+        flatDir {
+            dirs 'libs'
+        }
     }
 
     // This part is similar to global variables
@@ -52,6 +56,8 @@ allprojects {
         compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
         compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion"
         compile "com.google.guava:guava:$guavaVersion"
+
+        compile fileTree(dir: 'libs', include: ['*.jar'])
 
         testCompile "junit:junit:$junitVersion"
         testCompile "org.testfx:testfx-core:$testFxVersion"

diff --git a/collated/docs/A0139102U.md b/collated/docs/A0139102U.md
@@ -0,0 +1,187 @@
+# A0139102U
+###### \DeveloperGuide.md
+``` md
+## Appendix A : User Stories
+
+Priorities: High (must have) - `* * *`, Medium (nice to have)  - `* *`,  Low (unlikely to have) - `*`
+
+
+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 new task | find out  tasks are urgently due
+`* * *` | user | set deadlines | be reminded of my due dates for my respective tasks
+`* * *` | user | delete a task | remove entries that are completed
+`* * *` | user | find a task by name | search for a task  without having to go through the entire list
+`* * *` | user | edit a task and its particulars | update instantly if there are any changes in the task
+`* *` | user | mark my tasks | know which ones are completed and uncompleted
+`* *` | user | undo my last action | amend my mistakes immediately or put lost information back completely
+`* *` | user | view the tasks | take a quick glance or have my tasks presented according to my needs and preference
+`* *` | busy user | sort my tasks | rank the importance and urgency(time and date) of my activities
+`*` | advanced user | pin my tasks on a new list | remind myself which are the tasks that require my constant attention
+`*` | advanced user | use natural language| specify my dates and time without using a fixed format
+
+## Appendix B : Use Cases
+
+(For all use cases below, the **System** is the `DailyPlanner` and the **Actor** is the `user`, unless specified otherwise)
+
+#### Use case: Add task
+
+**MSS**
+
+1. User requests to add task with minimum input `TASKNAME` 
+2. Task Manager adds task and displays the new list of tasks 
+Use case ends.
+
+**Extensions**
+
+1a. Name of task missing
+
+>1a1. Daily Planner shows an error message<br>
+    Use case resumes back to step 1
+
+1b.  Time slot for task is already filled
+>1b1. Daily Planner warns user that time slot clashes <br>
+	Use case resumes
+
+1c. Format is invalid
+> 3b1. Daily Planner shows an error message <br>
+	Use case resumes
+
+
+#### Use case: Delete task
+
+**MSS**
+
+1. User requests to view tasks for specific time period or completed list
+2. Daily Planner displays all tasks during time period or the completed tasks
+3. User requests to delete a specific task in the list or the clear the completed task list
+4. Daily Planner deletes the task(s)
+Use case ends
+
+**Extensions**
+
+2a. The list is empty
+>Use case ends
+
+3a. Given index is invalid
+>3b1. Task manager shows error message <br>
+	Use case resumes at step 2
+
+
+#### Use case: Completing task
+
+**MSS**
+
+1. User requests to view tasks for specific time period
+2. Daily Planner displays all tasks during time period
+3. User requests to mark a specific task in the list as completed
+4. Daily Planner mark the task as completed
+Use case ends
+
+**Extensions**
+
+2a. The list is empty
+>Use case ends
+
+3a. Given index is invalid
+>3b1. Task manager shows error message <br>
+	Use case resumes at step 2
+
+
+#### Use case: Pin a task
+
+**MSS**
+
+1. User requests to view tasks for specific time period
+2. Task Manager displays all tasks during time period
+3. User requests to pin a specific task in the current schedule list to the pinned list 
+4. Task Manager puts the task as on pinned list and displays it there
+Use case ends
+
+**Extensions**
+
+2a. The list is empty
+>Use case ends
+
+3a. Given index is invalid
+>3b1. Task manager shows error message <br>
+	Use case resumes at step 2
+
+
+#### Use case: Unpin a task
+
+**MSS**
+
+1. User refers to the INDEX on the pinned list 
+2. User requests to unpin a specific task in the pinned list to the tasks list 
+3. Task Manager removes the task from the pinned list
+Use case ends
+
+**Extensions**
+
+2a. The list is empty
+>Use case ends
+
+2a. Given index is invalid
+>3b1. Task manager shows error message <br>
+Use case resumes at step 2
+
+```
+###### \UserGuide.md
+``` md
+### Exiting the program : `exit`
+Exits the program.<br>
+Format: `exit`  <br>
+
+
+### Saving the data 
+Daily Planner data is saved in the hard disk automatically after any command that changes the data.<br>
+There is no need to save manually.
+
+<br> 
+
+
+
+
+
+## Descriptions and Usage
+### Tasks
+The daily planner stores all of the users events as a `Task`.
+
+A `Task` can be viewed, added, searched, edited or deleted with the right command word as can be found in [Commands](#commands).
+
+**Every `Task` must consist of a mandatory `TASKNAME` field and optional `START`, `END`, `CATEGORY` fields.**
+
+#### `START` and `END` Field
+The `START` and `END` field, if specified, tells the Daily Planner when a task should start and end.
+<br>
+Both `START` and `END` fields consist of either a `DATE` field, a `TIME` field or both `DATE` `TIME` fields, separated by a whitespace.
+<br>
+This allows for natural descriptors of starting and ending times.
+<br>
+The `TIME` field must be given in 12hr am or pm format.
+<br>
+The following are all valid `START` and `END` fields:
+```
+
+11/11/2016 5pm
+The 31st of April in the year 2008
+Fri, 21 Nov 1997
+Jan 21, '97
+Sun, Nov 21 5am
+jan 1st 9pm
+february twenty-eighth
+next thursday
+last wednesday
+today
+tomorrow 6pm
+yesterday 3pm
+next week
+next month
+next year
+3 days from now
+three weeks ago
+```
+
+```