nus-cs2103-AY1617S1 · filbert-c · Oct 14, 2016 · Oct 14, 2016 · Oct 14, 2016 · Oct 15, 2016
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.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=

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: java
 matrix:
   include:
     - jdk: oraclejdk8
-script: travis_retry ./gradlew clean headless allTests coverage coveralls -i
+script: travis_retry ./gradlew clean allTests coverage coveralls -i
 before_install:
           - "export DISPLAY=:99.0"
           - "sh -e /etc/init.d/xvfb start"

diff --git a/README.md b/README.md
@@ -1,34 +1,17 @@
-[![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-W10-C3/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-W10-C3/main)
+[![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-W10-C3/main/badge.svg)](https://coveralls.io/github/CS2103AUG2016-W10-C3/main)
 
-# Address Book (Level 4)
+# SmartyDo
 
-<img src="docs/images/Ui.png" width="600"><br>
+<img src="docs/images/selectCommand.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 time scheduler 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) 
 * [Developer Guide](docs/DeveloperGuide.md) 
-* [Learning Outcomes](docs/LearningOutcomes.md) 
 * [About Us](docs/AboutUs.md)
 * [Contact Us](docs/ContactUs.md)
-
-
-#### 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*. 
-
-
-#### Licence : [MIT](LICENSE)
diff --git a/SmartyDo.jar b/SmartyDo.jar
diff --git a/bash.exe.stackdump b/bash.exe.stackdump
@@ -0,0 +1,2 @@
+Stack trace:
+Frame     Function  Args
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,6 @@
  * 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'
@@ -27,6 +26,7 @@ allprojects {
 
     // This part is similar to global variables
     // Access them by using double-quoted strings (GStrings) and referencing by $ e.g. "Variable contains $Variable"
+    // Natty is used for Natural Language Date Parsing
     project.ext {
         controlsFxVersion = '8.40.11'
         guavaVersion = '19.0'
@@ -61,7 +61,7 @@ allprojects {
         }
         testCompile "org.testfx:openjfx-monocle:$monocleVersion"
     }
-    
+
     sourceSets {
         main {
             java {
@@ -72,7 +72,7 @@ allprojects {
             }
         }
     }
-    
+
     shadowJar {
         archiveName = "addressbook.jar"
 

diff --git a/collated/Collate-TUI.jar b/collated/Collate-TUI.jar
diff --git a/collated/RunCollate.cmd b/collated/RunCollate.cmd
@@ -0,0 +1,13 @@
+:: Name:     RunCollate.cmd
+:: Purpose:  Runs Collate!
+:: Author:   A0135812L Kenneth
+
+rmdir main /S /q
+rmdir test /S /q
+rmdir docs /S /q
+
+java -jar Collate-TUI.jar collate from ../src/main to main include java, fxml, css
+
+java -jar Collate-TUI.jar collate from ../src/test to test include java
+
+java -jar Collate-TUI.jar collate from ../docs to docs include md, html
diff --git a/collated/docs/A0121261Y.md b/collated/docs/A0121261Y.md
@@ -0,0 +1,52 @@
+# A0121261Y
+###### \DeveloperGuide.md
+``` md
+
+## 7.1 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 a task by specifying a task description only | record tasks that need to be done  
+`* * *` | user | delete a task | remove entries that I no longer need
+`* * *` | user | find a task by name | locate details of tasks without having to go through the entire list
+`* * *` | user |view list of completed and pending tasks | keep track of what needs to be done
+`* *` | user with many tasks at a time | sort my tasks by different criteria | view tasks easily
+`* *` | user with large projects/ tasks | add subtasks to main task | break down larger task into smaller tasks
+`* *` | user with many uncofirmed events | allocate timeslots for tentative meetings/tasks | avoid having plans that might conflict with unconfirmed plans
+`* *` | user | undo  1 previous operation | remove commands executed by accident   
+`* *` | user | specify a target folder as the data storage location | synchronise file with other applications
+```
+###### \UserGuide.md
+``` md
+### 3.8. **Undoing and Redoing**
+
+With `undo`, you are allowed to reverse your previous changes sequentially while `redo` allows you to reverse the change done by `undo`.<br>
+
+- `undo` command requires the application to have executed atleast one undoable command after launching.
+- `redo` command requires the application to have executed atleast one succussful `undo` command after launching.
+
+Undoable Commands:`add`, `delete`, `edit`, `done`
+
+> SmartyDo **does not store** history of actions in your computer.
+> Your history of actions resets when SmartyDo is launched.
+> Also, if you enter any undoable command after entering `redo` or `undo`, your history of actions would be _**removed**_. <br>
+
+Format: `undo`, `redo`
+
+**Example:**<br>
+Let's say you have added a task and your friend told you that your tutor has changed the date. You would like to undo it. You can undo it as long as you just added it, as shown below.
+
+<img src="images/editUndoCommand.png" width="500" align="middle"><br>Figure 9.1. Before(left) and after(right) of an undo command<br>
+
+By entering `undo` command, SmartyDo updates your list of tasks to how it was before you executed an undoable action. From the screenshot above, you can see that the date of the task named "Presentation" had changed.
+
+However, you realized that your friend was wrong and you want to change the date back again. In this case, you do not need to use edit command again. Instead you can simply use `redo` command, as shown below.
+
+<img src="images/undoredoCommand.png" width="500" align="middle"><br>Figure 9.2. Before(left) and after(right) of an undo command<br>
+
+By using `redo` command, SmartyDo updates your list of tasks to how it was before you executed `undo` command. From the screenshot above, you can see that the "Presentation" task has been restored to its previous state.
+```