[T11][F10-C1]

.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>TARS</name>
+	<comment>Task And Remember Stuff - Productivity tool created by F10-C1.</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=

.travis.yml

@@ -11,3 +11,6 @@ addons:
   apt:
     packages:
       - oracle-java8-installer
+
+notifications:
+  slack: cs2103aug2016-f10-c1:5ptG2TxXzNoNzKGzo3ymxl31

README.md

@@ -1,33 +1,30 @@
-[![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-F10-C1/main.svg?branch=develop)](https://travis-ci.org/CS2103AUG2016-F10-C1/main.svg?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-F10-C1/main/badge.svg?branch=develop)](https://coveralls.io/github/CS2103AUG2016-F10-C1/main?branch=develop)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/45df166d305f42fc85fefe45651c568e)](https://www.codacy.com/app/weikangchia/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103AUG2016-F10-C1/main&utm_campaign=Badge_Grade)
+# TARS: Task And Remember Stuff 
+### A Productivity Tool by CS2103AUG2016-F10-C1
 
-# Address Book (Level 4)
+<img src="docs/images/tars_ui.png" width="600"><br>
 
-<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 
-  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 To-Do List application. It has a GUI but most of the user interactions happen using 
+  a CLI (Command Line Interface). 
+* This application is a CS2103 project and is still undergoing development.
+* Our latest release: [v0.5](https://github.com/CS2103AUG2016-F10-C1/main/releases/tag/v0.5)
 
 
 #### Site Map
 * [User Guide](docs/UserGuide.md) 
-* [Developer Guide](docs/DeveloperGuide.md) 
-* [Learning Outcomes](docs/LearningOutcomes.md) 
+* [Developer Guide](docs/DeveloperGuide.md)  
 * [About Us](docs/AboutUs.md)
 * [Contact Us](docs/ContactUs.md)
 
 
 #### Acknowledgements
 
-* Some parts of this sample application were inspired by the excellent 
+* This application was adapted from a CS2103 sample application, [AddressBook-Level 4](https://github.com/nus-cs2103-AY1617S1/addressbook-level4) designed and built by *Assoc. Prof Damith C. Rajapakse* and his teaching team. 
+* This application was designed and built under the guidance and advice of our module tutor, *[Candiie](https://github.com/Candiie)*.
+* This application used [Natty](http://natty.joestelmach.com/) by Joestelmach for natural date parsing.
+* Some parts of this application were inspired by the excellent 
   [Java FX tutorial](http://code.makery.ch/library/javafx-8-tutorial/) by *Marco Jakob*. 
 
 

build.gradle

@@ -4,7 +4,7 @@
  * For more details take a look at the Java Quickstart chapter in the Gradle
  * user guide available at http://gradle.org/docs/2.2.1/userguide/tutorial_java_projects.html
  */
- 
+
 plugins {
     id "com.github.kt3k.coveralls" version "2.4.0"
     id "com.github.johnrengelman.shadow" version '1.2.3'
@@ -52,6 +52,7 @@ 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 "com.joestelmach:natty:0.12"
 
         testCompile "junit:junit:$junitVersion"
         testCompile "org.testfx:testfx-core:$testFxVersion"
@@ -61,7 +62,7 @@ allprojects {
         }
         testCompile "org.testfx:openjfx-monocle:$monocleVersion"
     }
-    
+
     sourceSets {
         main {
             java {
@@ -72,12 +73,12 @@ allprojects {
             }
         }
     }
-    
+
     shadowJar {
-        archiveName = "addressbook.jar"
+        archiveName = "tars.jar"
 
         manifest {
-            attributes "Main-Class": "seedu.address.MainApp"
+            attributes "Main-Class": "tars.MainApp"
         }
 
         destinationDir = file("${buildDir}/jar/")
@@ -113,8 +114,8 @@ tasks.coveralls {
     onlyIf { System.env.'CI' }
 }
 
-class AddressBookTest extends Test {
-    public AddressBookTest() {
+class TarsTest extends Test {
+    public TarsTest() {
     	  forkEvery = 1
         systemProperty 'testfx.setup.timeout', '60000'
     }
@@ -128,7 +129,7 @@ class AddressBookTest extends Test {
     }
 }
 
-task guiTests(type: AddressBookTest) {
+task guiTests(type: TarsTest) {
     include 'guitests/**'
 
     jacoco {
@@ -137,16 +138,16 @@ task guiTests(type: AddressBookTest) {
 }
 
 
-task nonGuiTests(type: AddressBookTest) {
-    include 'seedu/address/**'
+task nonGuiTests(type: TarsTest) {
+    include 'tars/**'
 
     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: TarsTest) {
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }

collate.bat

@@ -0,0 +1,7 @@
+java -jar Collate-TUI.jar collate from src/main to collated/main include java, fxml, css
+
+java -jar Collate-TUI.jar collate from src/test to collated/test include java
+
+java -jar Collate-TUI.jar collate from docs to collated/docs include md, html
+
+pause

collate.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+java -jar Collate-TUI.jar collate from src/main to collated/main include java, fxml, css
+
+java -jar Collate-TUI.jar collate from src/test to collated/test include java
+
+java -jar Collate-TUI.jar collate from docs to collated/docs include md, html
+
+exit 0

collated/docs/A0121533W.md

@@ -0,0 +1,147 @@
+# A0121533W
+###### \AboutUs.md
+``` md
+#### [Foo En Teng Joel](http://github.com/jaeoheeail) <br>
+<img src="images/JoelFoo.png", width="150"><br>
+
+* Components in charge of: [UI](https://github.com/CS2103AUG2016-F10-C1/main/blob/develop/docs/DeveloperGuide.md#ui-component)
+* Aspects/tools in charge of: SceneBuilder
+* Features implemented: 
+    * [Editing Tasks](https://github.com/CS2103AUG2016-F10-C1/main/blob/develop/docs/UserGuide.md#editing-a-task--edit)
+    * [Marking Tasks Done & Undone](https://github.com/CS2103AUG2016-F10-C1/main/blob/develop/docs/UserGuide.md#marking-tasks--mark)
+    * [Deleting Tasks](https://github.com/CS2103AUG2016-F10-C1/main/blob/develop/docs/UserGuide.md#deleting-a-task--del)
+* Code Written: [[functional code](https://github.com/CS2103AUG2016-F10-C1/main/blob/master/collated/main/A0121533W.md)][[test code](https://github.com/CS2103AUG2016-F10-C1/main/blob/master/collated/test/A0121533W.md)][[docs](https://github.com/CS2103AUG2016-F10-C1/main/blob/master/collated/docs/A0121533W.md)]
+* Other Major Contributions:
+    * Designed App Logo
+    * Designed App UI
+
+ -----
+```
+###### \DeveloperGuide.md
+``` md
+## Appendix D : Glossary
+
+##### Command
+> Reserved keywords for you to execute a command e.g. add, edit, del, do, ud.
+
+##### Event
+> Has a start time and end time.
+
+##### DateTime
+> Variable that has information on a particular date and time.
+
+##### Deadline
+> Tasks that have to be done before a specified deadline.
+
+##### Floating Tasks
+> Tasks without specific dateTimes.
+
+##### Index
+> Positive number corresponding to the order at which the item is listed.
+
+##### Mainstream OS
+> Windows, Linux, Unix, OS-X.
+
+##### Prefix
+> Reserved keywords for commands e.g. /p /dt /t
+
+##### Reserved Task
+> Tasks that have multiple DateTimes at which one can be confirmed later.
+
+##### Storage Directory
+> Your system's file path (e.g. /data/tars.xml) at which data are stored.
+
+##### Tag
+> Categorization of a task.
+
+##### Task
+> Something that needs to be done (see Floating Task, Deadline, Event).
+
+
+
+```
+###### \DeveloperGuide.md
+``` md
+## Appendix E : Product Survey
+
+Product | Strength | Weaknesses
+-------- | :-------- | :--------
+[Wunderlist](https://www.wunderlist.com/)|<ol type="1"><li>Cloud-based<ul><li>Ability to sync tasks</li></ul></li><li>Multiple-device Usage</li><li>Data is stored on the device and syncs with cloud storage when there's internet access<ul><li>Faster than internet based todo apps like Google Calendar</li></ul></li><li>Provides reminders</li><li>Simple user interface not too cluttered</li><li>Able to set a deadline (for dates only) for a task</li></ol>|<ol type="1"><li>Requires a lot of clicks and fields to fill to save a task</li><li>Unable to block multiple slots when the exact timing of a task is uncertain</li><li>Unable to set a due time for tasks</li></ol>
+[Todo.txt](http://todotxt.com/)|<ol type="1"><li>Quick & easy unix-y access</li><li>Solves Google calendar being too slow</li><li>Manage tasks with as few keystrokes as possible</li><li>Works without Internet connectivity</li></ol>|<ol type="1"><li>No block feature</li><li>Unable to look for suitable slot</li></ol>
+[Fantastical](https://flexibits.com/fantastical)|<ol type="1"><li>Flexible<ul><li>Choose between dark and light theme</li><li>Works with Google, iCloud, Exchange and more</li></ul></li><li>Use natural language to quickly create events and reminders</li></ol>|<ol type="1"><li>No block feature</li><li>Need to click to create an event</li><li>Only available for Mac</li></ol>
+[Todoist](https://en.todoist.com/)|<ol type="1"><li>Good parser<ul><li>Extensive list of words to use that it is able to recognize (e.g. every day/week/month, every 27th, every Jan 27th)</li></ul></li><li>Able to reorganize task or sort by date, priority or name</li><li>Ability to tag labels</li><li>Able to see a week's overview of tasks or only today's task</li><li>Able to import and export task in CSV format</li><li>Able to search tasks easily (search bar at the top)</li><li>Able to add task at any time and at any page (add task button next to search bar)</li></ol>|<ol type="1"><li>No block feature</li><li>Certain features can only be accessed by paying</li></ol>
+
+
+```
+###### \UserGuide.md
+``` md
+#### Deleting a task : `del`
+Deletes the task based on its index in the task list.  
+Formats: 
+* `del <INDEX> [INDEX ...]`  
+* `del <START_INDEX>..<END_INDEX>`
+
+> Deletes the task at the specific `<INDEX>`.
+> 
+> Start index of range must be before end index.
+
+Examples:
+* `del 3 6`
+* `del 1..3`
+
+```
+###### \UserGuide.md
+``` md
+#### Marking tasks as done : `do`
+Marks the task based on its index in the task list as done.
+Format: `do <INDEX> [INDEX ...]`  
+Format: `do <START_INDEX>..<END_INDEX>`
+
+> Marks the task at the specific `<INDEX>` as `done`.
+> 
+> Start index of range must be before end index.
+
+Examples:
+* `do 2 4 6`
+* `do 1..3`
+
+```
+###### \UserGuide.md
+``` md
+#### Editing a task : `edit`
+Edits any component of a particular task.  
+Format: `edit <INDEX> [/n TASK_NAME] [/dt DATETIME] [/p PRIORITY] [/ta TAG_TO_ADD ...] [/tr TAG_TO_REMOVE ...]`
+
+> Edits the task at the specific `<INDEX>`. 
+> 
+> `/ta` adds a tag to the task.
+> 
+> `/tr` removes a tag from the task.
+> 
+> Parameters can be in any order.
+
+Examples:
+* `edit 3 /n Meet John Tan /dt 08/10/2016 1000 to 1200 /p h /ta friend`
+
+
+#### Exiting the program : `exit`
+Exits the program.  
+Format: `exit` 
+
+```
+###### \UserGuide.md
+``` md
+#### Marking tasks as undone : `ud`
+Marks the task based on its index in the task list as undone.
+Format: `ud <INDEX> [INDEX ...]`  
+Format: `ud <START_INDEX>..<END_INDEX>`
+
+> Marks the task at the specific `<INDEX>` as `undone`.
+> 
+> Start index of range must be before end index.
+
+Examples:
+* `ud 2 4 6`
+* `ud 1..3`
+
+```