[T7][W11-C3]

.gitignore

@@ -5,7 +5,6 @@ lib/*
 *.iml
 *.log
 *.log.*
-*.csv
 config.json
 src/test/data/sandbox/
 preferences.json
@@ -14,3 +13,6 @@ preferences.json
 classes/
 /data/
 /bin/
+gradle.prefs
+org.eclipse.jdt.core.prefs
+data.txt

.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>Mastermind</name>
+	<comment>this is a to do task manager.</comment>
 	<projects>
 	</projects>
 	<buildSpec>

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

@@ -5,7 +5,7 @@ connection.gradle.user.home=null
 connection.java.home=null
 connection.jvm.arguments=
 connection.project.dir=
-derived.resources=.gradle,build
+derived.resources=.gradle.build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature
-project.path=\:
+project.path=\:

README.md

@@ -1,21 +1,14 @@
-[![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-W11-C3/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-W11-C3/main/builds)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-W11-C3/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-W11-C3/main?branch=master)
 
-# Address Book (Level 4)
+# Mastermind
 
-<img src="docs/images/Ui.png" width="600"><br>
+<img src="docs/images/latest_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 manager application called Mastermind. It has a GUI but most of the user interactions is through
   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.
-
+* Mastermind is a powerful task manager that allow users to manage tasks anywhere and get things done.
+* Mastermind is catered towards users that spend most of their time on the computer and prefer to use keyboard over mouse as inputs.
 
 #### Site Map
 * [User Guide](docs/UserGuide.md) 
@@ -29,6 +22,7 @@
 
 * 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*. 
+* This application is inspired from the [sample projects](https://github.com/se-edu/) created by SE_EDU initiatives
 
 
 #### Licence : [MIT](LICENSE)

build.gradle

@@ -52,6 +52,11 @@ 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 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
+        compile 'org.ocpsoft.prettytime:prettytime-nlp:4.0.0.Final'
+        compile 'net.sf.biweekly:biweekly:0.6.0'
+        compile group: 'org.apache.commons', name: 'commons-csv', version: '1.1'
+
 
         testCompile "junit:junit:$junitVersion"
         testCompile "org.testfx:testfx-core:$testFxVersion"

collated/docs/A0124797R.md

@@ -0,0 +1,210 @@
+# A0124797R
+###### /UserGuide.md
+``` md
+
+### Finding tasks that contain any keywords: `find`
+
+Even with the list category feature, scrolling through possibly thousands of tasks to find a specific one can be quite troublesome. Fret not! _Mastermind_ provides you with the `find` command to quickly search for a specific task your are looking for.
+
+`find` command displays a result of all tasks whose description contain any of the given keywords.
+
+_Format:_
+
+```java
+find <keyword>...
+```
+
+>* The search is case-insensitive.
+>* The order of the keywords does not matter.
+>* Tasks matching at least one keyword will be returned.
+
+_Examples:_
+
+```java
+// returns Dinner on 10/10/16 at 1900hrs (Date)
+> find Dinner
+```  
+```java
+// returns CS2010 PS10 on 11 Oct by 1000hrs (Assignment)
+> find "cs2010 ps10"
+```  
+> using find will always switch back to the home tab.
+
+### Finding all tasks that contain specific tags: `findtag`
+
+You have tagged your tasks previously and now you want to know what tasks are in that category.
+you can use `findtag` command to quickly search for tasks that are tagged with that specific tag.
+
+`findtag` command display result of all tasks whose tags contain the given keywords.
+
+_Format:_
+
+```java
+findtag <keyword>...
+```
+
+>* The search is case-sensitive.
+>* The order of the keywords does not matter.
+>* Tasks matching at least one keyword will be returned.
+
+_Examples:_
+
+```java
+// returns Dinner on 10/10/16 at 1900hrs (Date)
+> findtag date
+```  
+
+
+### Show upcoming tasks : `upcoming`
+
+What if you have too many task to do and only want to know tasks that are going to be due. You can ask _Mastermind_ to list `upcoming` tasks!
+
+_Format:_
+```java
+upcoming [tab_name]
+```
+
+> * Shows all floating tasks as well if there is no `[tab_name]` included.
+> * Does not show tasks that are already due.
+
+_Examples:_
+```java
+// list all tasks that are due within a weeks time.
+> upcoming
+```
+```java
+// list all deadlines that are due within a weeks time.
+> upcoming deadlines
+```
+
+
+
+### Changing save location : `relocate`
+
+_Mastermind_ allows you to relocate the save file to a new destination folder.
+
+_Format:_
+```
+relocate <new_folder_destination>
+```
+
+_Example:_
+```java
+// save file has been relocated to new destination folder at ~/document/mastermind
+> relocate ~/document/mastermind
+```
+
+> You can relocate into a cloud shared folder to access your save data from any other computer!
+>
+> Remember to input a folder and not a file!
+
+### Importing file : `import`
+
+_Mastermind_ allows you to import file from other to do list into _Mastermind_.
+
+Currently _Mastermind_ supports _.csv_ and _.ics_ file.
+
+> _.csv_ must be compliant to Google Calendar [specification](https://support.google.com/calendar/answer/37118?hl=en).
+
+_Format:_
+```
+import from <file location>
+```
+
+_Example:_
+```java
+// import success
+> import from ~/document/mastermind/data.ics
+```
+
+### Exporting data: `export`
+
+_Mastermind_ can assist you in exporting your data to _.csv_ format too. The _.csv_ file is fully compatible with Google Calendar so you can use it to synchronize with your personal calendar.
+
+_Format:_
+```java
+export [tasks] [deadlines] [events] [archives] to <destination_file_path>
+```
+
+_Example:_
+```java
+// export all data to personal folder
+> export to C:\Users\Jim\mastermind.csv
+```
+
+```java
+// export only deadlines and events data to personal folder
+> export events deadlines to C:\Users\Jim\mastermind.csv
+```
+```
+###### /AboutUs.md
+``` md
+#### [Dylan Chew Zhi Jiang](https://github.com/zavfel) <br>
+<img src="images/DylanChew.png" width="150"><br>
+* Components in charge of: [Logic](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/DeveloperGuide.md#logic-component)
+* Aspects/tools in charge of: Testing, Code quality
+* Features implemented:
+   * [List](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/UserGuide.md#listing-all-tasks-of-a-category-list)
+   * [Mark](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/UserGuide.md#completing-tasks--mark)
+   * [Unmark](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/UserGuide.md#unmarks-tasks--unmark)
+   * [Previous](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/UserGuide.md#repeating-a-previous-command-)
+   * [Upcoming](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/UserGuide.md#show-upcoming-tasks--upcoming)
+   * allow adding of recurring task in [Add](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/docs/UserGuide.md#adds-a-recurring-deadline)
+
+   * [Import (csv)](https://hackmd.io/AwIwTAbAJgLFIFoCMSDMB2BMkFYAcCAnBAIYkLrp6HrC2oCmS6QA?both#importing-file--import)
+
+* Code written: [[functional code](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/collated/main/A0124797R.md)][[test code](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/collated/test/A0124797R.md)][[docs](https://github.com/CS2103AUG2016-W11-C3/main/blob/master/collated/docs/A0124797R.md)]
+* Other major contributions:
+  * Did the initial refactoring from AddressBook to ToDoList
+  * Set up Travis and Coveralls
+  * Class Diagrams  
+
+-----
+```
+###### /DeveloperGuide.md
+``` md
+### Model component
+
+<img src="images/Model_diagram.png" width="800">  
+
+**API** : [`Model.java`](../src/main/java/harmony/mastermind/model/Model.java)
+
+The `Model`:
+* Stores a `UserPref` object that represents the user's preferences
+* Stores _Mastermind_'s data
+* Exposes a `UnmodifiableObservableList<ReadOnlyTask>` that can be 'observed' e.g. the `UI` can be bound to this list so that the `UI` automatically updates when the data in the list change.
+* Does not depend on any of the other three components.
+
+##### Task & TaskBuilder
+
+The `Task.java` and `TaskBuilder.java` can be found in `harmony.mastermind.model.task` package.
+
+We identified three different types of Tasks (Floating, Deadlines, Events), which differ only by the existence of start date and end date in their respective attributes. While inheritance seems to be a viable solution, it's not necessary true that a floating task is interchangeable with deadline and event, or vice versa. Moreover, how can we prevent the user from entering a start date without end date?
+
+Eventually, we resolved this issue by using the [Builder Pattern](https://www.tutorialspoint.com/design_pattern/builder_pattern.htm). This gives us the following benefits:
+
+- **Avoid long constructor**: `Task` object has many optional attributes, therefore it's impractical to keep multiple constructors with long parameter list. Builder pattern mitigates such problem by using step by step approach to build the `Task` object.
+
+- **Increase Readability**: The object creation process uses fluent method name that is much more readable than conventional constructor approach.
+
+- **Enforce mandatory attributes**: The only way to set the start and end date through `TaskBuilder` is by using `asEvent()`, `asDeadline()`, `asFloating()` methods. Ideally, the `TaskBuilder` should return an immutable `ReadOnlyTask` upon building. There's no way that the user can create a `Task` with start date but without an end date.
+
+_Example:_
+```java
+TaskBuilder taskBuilder = new TaskBuilder(taskName);
+taskBuilder.withCreationDate(createdDate);
+taskBuilder.withTags(tags);
+taskBuilder.asRecurring(recur);
+
+if (isEvent()){
+    taskBuilder.asEvent(startDate,endDate);
+} else if (isDeadline()){
+    taskBuilder.asDeadline(endDate);
+} else if (isFloating()){
+    taskBuilder.asFloating();
+}
+
+Task task = taskBuilder.build();
+```
+
+```