nus-cs2103-AY1617S1 · antoniadevina · Oct 22, 2016 · Oct 22, 2016 · Oct 22, 2016 · Oct 22, 2016
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ lib/*
 *.log
 *.log.*
 *.csv
-config.json
 src/test/data/sandbox/
 preferences.json
 .DS_Store

diff --git a/.project b/.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>FlexiTrack</name>
+	<comment>Project FlexiTrack created by Buildship.</comment>
 	<projects>
 	</projects>
 	<buildSpec>

diff --git a/Collate-TUI.jar b/Collate-TUI.jar
diff --git a/NewUser.txt b/NewUser.txt
diff --git a/README.md b/README.md
@@ -1,21 +1,10 @@
-[![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-F09-C3/main.svg?branch=master)]
+(https://travis-ci.org/CS2103AUG2016-F09-C3/main.svg?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-F09-C3/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-F09-C3/main?branch=master)
 
-# Address Book (Level 4)
+# FlexiTrack (v0.5)
 
 <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.
-
 
 #### Site Map
 * [User Guide](docs/UserGuide.md) 
@@ -29,6 +18,9 @@
 
 * 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 program uses Natty Time (http://natty.joestelmach.com/)
 
+* This program is build based off Address Book Level 4's code sample
 
 #### Licence : [MIT](LICENSE)
diff --git a/build.gradle b/build.gradle
@@ -60,6 +60,8 @@ allprojects {
             exclude group: "junit", module: "junit"
         }
         testCompile "org.testfx:openjfx-monocle:$monocleVersion"
+
+        compile group: 'com.joestelmach', name: 'natty', version: '0.12'
     }
 
     sourceSets {
@@ -74,10 +76,10 @@ allprojects {
     }
 
     shadowJar {
-        archiveName = "addressbook.jar"
+        archiveName = "flexitrack.jar"
 
         manifest {
-            attributes "Main-Class": "seedu.address.MainApp"
+            attributes "Main-Class": "seedu.flexitrack.MainApp"
         }
 
         destinationDir = file("${buildDir}/jar/")
@@ -113,8 +115,8 @@ tasks.coveralls {
     onlyIf { System.env.'CI' }
 }
 
-class AddressBookTest extends Test {
-    public AddressBookTest() {
+class FlexiTrackTest extends Test {
+    public FlexiTrackTest() {
     	  forkEvery = 1
         systemProperty 'testfx.setup.timeout', '60000'
     }
@@ -128,7 +130,7 @@ class AddressBookTest extends Test {
     }
 }
 
-task guiTests(type: AddressBookTest) {
+task guiTests(type: FlexiTrackTest) {
     include 'guitests/**'
 
     jacoco {
@@ -137,16 +139,16 @@ task guiTests(type: AddressBookTest) {
 }
 
 
-task nonGuiTests(type: AddressBookTest) {
-    include 'seedu/address/**'
+task nonGuiTests(type: FlexiTrackTest) {
+    include 'seedu/flexitrack/**'
 
     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: FlexiTrackTest) {
     jacoco {
         destinationFile = new File("${buildDir}/jacoco/test.exec")
     }

diff --git a/collated/docs/A0127686R.md b/collated/docs/A0127686R.md
@@ -0,0 +1,123 @@
+# A0127686R
+###### /DeveloperGuide.md
+``` md
+## Appendix E : Product Survey
+
+####Google Calendar
+
+#####Pros: 
+> Help to organise schedules and pre-planned them in advance
+> Able to show schedules in multiple view (3 days, day, month or week) format
+> Easy to synchronise planned schedules across multiple devices
+
+
+#####Cons: 
+> Unable to use single line command to add new events
+> Each event creation take up around 2 minutes of the user time to fill up the details
+> Unable to do partial search for a particular event name
+> Confusing timing display on each event. (E.g 11p for night event and 11 for morning event)
+
+
+####Any.Do
+
+#####Pros:
+> Help to add a quick task to the list
+> Able to invite friends in the same event or task
+> Able to send notification to the user before the event start
+> Able to add new task(s) to personalised folder
+
+```
+###### /UserGuide.md
+``` md
+## Features
+
+> **Command Format**
+> * Words in `square brackets ([])` are the parameters.
+> * Items within `arrow signs (<>)` are optional.
+> * Items with `...` after them can have multiple instances.
+> * The order of parameters is fixed except for edit command.
+
+#### Adding a task: `add`
+#### Shortcut : `a`
+Adds a task to the FlexiTrack.<br>
+Format: `add [task title] < by/ [deadline] >`
+
+Examples: 
+* `add CS2103 tutorial 3 `
+* `add CS2103 tutorial 3 by/ Saturday`
+* `a CS2103 tutorial 3 by/ tmr 9am`
+
+#### Adding an event: `add`
+#### Shortcut : `a`
+Adds a event to the FlexiTrack.<br>
+Format: `add [event title] from/ [starting time] to/ [ending time]`
+
+Examples: 
+* `add Bintan trip from/ Saturday to/ Sunday`
+* `a CS2103 Lecture from/ Friday 2pm to/ Friday 4pm `
+
+```
+###### /UserGuide.md
+``` md
+#### Finding a task or an event containing any keyword in their title: `find`
+#### Shortcut : `f`
+Finds a task ot an event whose title contain any of the given keywords.<br>
+Format: `find KEYWORD [MORE_KEYWORDS]`
+
+> * The search is non case sensitive. e.g `soccer` will match `Soccer`
+> * The order of the keywords does not matter. e.g. `soccer dinner` will match `dinner soccer`
+> * Only the task/event title is searched.
+> * Only full words will be matched e.g. `socc` will not match `soccer` (unless 'f/' keyword is used)
+> * Task or event matching at least one keyword will be returned (i.e. `OR` search).
+    e.g. `soccer` will match `soccer training`
+> * Search by exact task name can be activated with the shortcut 'f/' before the task name.
+
+Examples: 
+* `find Soccer`<br>
+  Returns `Soccer training` but not `soccer training`
+* `find assignment dinner mid-term`<br>
+  Returns Any task/event having `assignment`, `dinner`, or `mid-term` in the title
+* `f attend CS2103 lecture`<br>
+  Returns Any task/event having `attend`, `CS2103`, or `lecture`
+
+#### Finding a specific task or an event containing an exact phrase in their title: `find f/`
+#### Shortcut : `f f/`
+Finds a task of an event whose title contain any of the given keywords.<br>
+Format: `find f/ EXACT PHRASE`
+
+```
+###### /UserGuide.md
+``` md
+## Time Format 
+FlexiTrack support various timing input. Here are some examples! 
+
+#### Exact timing 
+User Input | Timing information read by FlexiTrack
+---------- | :---------------
+21 June 2018 4pm | Jun 21 16:00:00 
+1st January 7.20 | Jan 01 07:20
+April 22nd 5am | Apr 22 05:00
+
+#### Relative timing 
+If today is 1st of February a relative timing input is also possible with FlexiTrack
+
+User Input | Timing information read by FlexiTrack
+---------- | :---------------
+Tomorrow 4pm | Feb 02 16:00:00 
+Next week 720am | Feb 08 07:20
+3 weeks 2 pm  | Feb 22 14:00 
+next month 8am | Mar 01 08:00 
+
+#### Notes on FlexiTrack timing  
+1. FlexiTrack does support year. However, make sure that you also specify the hour of the timing 
+	as FlexiTrack will choose timing over year when it is uncertain. 
+2. When you do not specify the exact timing, FlexiTrack will assign your task to be 8:00 for due
+	date and starting time, and 17:00 for ending time. 
+
+## FAQ
+
+**Q**: How do I transfer my data to another Computer?<br>
+**A**: Install the app in the other computer and overwrite the empty data file it creates with 
+       the file that contains the data of your previous FlexiTrack folder.
+
+```
diff --git a/collated/docs/A0127855W.md b/collated/docs/A0127855W.md
@@ -0,0 +1,144 @@
+# A0127855W
+###### /DeveloperGuide.md
+``` md
+
+### Undo/Redo Implementation
+
+Each undoable command has an execute() method and an executeUndo() method.
+
+2 static Command stacks are maintained. One in the UndoCommand class (doneCommandStack) and the other in the RedoCommand class (undoneCommandStack). From application startup, whenever an undoable command is entered, the created command object is first populated with the data of whatever the command changes, before the execute() method is called. The changes are then applied and the entire command object is pushed into the doneCommandStack.
+
+Subsequently, when the UndoCommand is entered, the last command entered is popped out of the doneCommandStack and the executeUndo() method is called. The command is then pushed into the undoneCommandStack.
+
+When the RedoCommand is entered, the last command undone is popped out of the undoneCommand Stack and the execute() method is called, effectively reexecuting the undone command. The command is then pushed into the doneCommandStack to ensure that the we can undo and redo the same command over and over. 
+
+This method of implemeting the undo/redo functionality was chosen due to its simplicity of implementation, as well as the relatively light memory usage, especially when compared to the 'save entire state' method of implementation.
+
+```
+###### /UserGuide.md
+``` md
+#### Find free time slots: `gap`
+#### Shortcut: `g`
+Find and list free time slots in the schedule that is equal to or longer than the specified timing (in hours).<br>
+Format: `find time [number of hours] < [number of slots to find] >`  
+
+> If there is there is a time slot longer than the required free time slot, 
+	then the free time period will be return to you
+> By default, find time will only give a single free slot when the number of slots required is not keyed in.
+
+Examples: 
+* `gap 3 `<br>	
+	You have a minimum of 3 hours free time slot between: today 5pm - 9pm. 
+* `g 5 3 `<br>	
+	You have a minimum of 5 hours free time slot between: Monday 2pm - 9pm, Tuesday 1pm - 6pm and Saturday 9am - 5pm. 
+
+#### Deleting a task or event : `delete`
+#### Shortcut : `d`
+Deletes the specified task/event from the FlexiTrack.<br>
+Format: `delete [index]`
+
+> Deletes the task/event at the specified `index`. 
+  The index refers to the index number shown in the most recent listing.<br>
+  The index **must be a positive integer** 1, 2, 3, ...
+
+Examples: 
+* `delete 2`<br>
+  Deletes the 2nd task/event in the address book. 
+* `d 1`<br>
+  Deletes the 1st task/event in the results of the `find` command.
+
+```
+###### /UserGuide.md
+``` md
+#### Clear the FlexiTrack : `clear`
+#### Shortcut : `c`
+Clears the FlexiTrack, resetting it to a blank slate.<br>
+Format: `clear`
+
+> The command can be undone as long as the user does not exit FlexiTrack after clearing.
+
+#### Edit a task or event: `edit`
+#### Shortcut : `e`
+Edits the specified task/event from the FlexiTrack.<br>
+Format: `edit [index] <by/ [deadline]> <n/ [title]> <from/ [starting time]> <to/ [ending time]>`
+
+
+> * Edits the task/event at the specified `index`. 
+  The index refers to the index number shown in the most recent listing.<br>
+  The index **must be a positive integer** 1, 2, 3, ...
+> * Edit parameters must fit the type of task / event being edited. e.g. duedate should only be edited on a task.
+> * Floating tasks can be converted into tasks or events by editing the appropriate parameter.
+> * User cannot edit a floating task into an event with only a starting time but no ending time or vice versa.
+
+Examples: 
+* `edit 2 n/ Name Edited`<br>
+  Edits the title of the task/event. 
+* `e 1 from/ today to/ tomorrow`<br>
+  Edits the start and end times of the specified event.
+```
+###### /UserGuide.md
+``` md
+#### List: `list`
+#### Shortcut : `l`
+Lists tasks and events that match the specified filter.<br>
+Format: `list <filter>`
+
+> Accepted filters include:
+> * future
+> * next week
+> * mark
+> * block
+> Unmarked floating tasks will be listed.
+
+Examples: 
+* `list next month` <br>
+  Returns a list of next month's tasks and events	
+
+#### Undo operations : `undo`
+#### Shortcut : `ud`
+Undo the previous operation.<br>
+Format: `undo`
+
+> The command will only undo commands entered during the current session of FlexiTrack
+> Undo works for: add, delete, clear, mark, unmark, block. 
+
+#### Redo operations : `redo`
+#### Shortcut : `rd`
+Redo the previously undone operation.<br>
+Format: `redo`
+
+> The command will only redo commands undone during the current session of FlexiTrack
+
+```
+###### /UserGuide.md
+``` md
+#### Exiting the program : `exit`
+#### Shortcut : `q`
+Exits the program.<br>
+Format: `exit`  
+
+```
+###### /UserGuide.md
+``` md
+## Command Summary
+
+Command | Shortcut | Format
+-------- | ---- | :-------- 
+Add task | a | `add [task title] <fr/ [number of recurrences] ty/ [daily | weekly | monthly]> <by/ [deadline]>` 
+Add event | a | `add [event title] <fr/ [number of recurrences] ty/ [daily | weekly | monthly]> from/ [starting time] to/ [ending time]`
+Block | b | `block [description] from/ [starting time] to/ [ending time]`
+Find time | g | `gap [number of hours] < [number of slots to find] >`
+Delete | d | `delete [index]`
+Clear | c | `clear`
+Edit | e | `edit [index] <by/ [deadline]> <n/ [title]> <from/ [starting time]> <to/ [ending time]>`
+Mark | m | `mark [index]`
+Unmark | u | `unmark [index]`
+Find | f | `find [key words] < [key words] >`
+List | l | `list <filter>`
+Select | s | `select [index]`
+Undo | ud | `undo`
+Redo | rd | `redo`
+Change Storage Path | cs | `cs [path]`
+Exit | q | `exit`
+Help | h | `help <command word>`
+```