nus-cs2113-AY1920S2 · siuhian · Apr 5, 2020 · Apr 5, 2020 · Apr 5, 2020 · Apr 5, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,13 @@
+# data files
+/data/
+
+# build/libs files
+/build/libs
+
+# text-ui-test data files
+/text-ui-test/data/
+/text-ui-test/ACTUAL.txt
+
 # IDEA files
 /.idea/
 /out/
@@ -11,6 +21,4 @@ src/main/resources/docs/
 # MacOS custom attributes files created by Finder
 .DS_Store
 *.iml
-bin/
-
-/text-ui-test/ACTUAL.txt
+bin/
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-slate
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '5.1.0'
 }
 
-group 'seedu.duke'
+group 'jikan'
 version '0.1.0'
 
 repositories {
@@ -21,11 +21,11 @@ test {
 }
 
 application {
-    mainClassName = "seedu.duke.Duke"
+    mainClassName = "jikan.Jikan"
 }
 
 shadowJar {
-    archiveBaseName = "duke"
+    archiveBaseName = "jikan"
     archiveVersion = "0.0.1"
     archiveClassifier = null
     archiveAppendix = null
@@ -37,4 +37,11 @@ checkstyle {
 
 run{
     standardInput = System.in
+    enableAssertions = true
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': 'jikan.Jikan'
+    }
 }
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -1,9 +1,10 @@
 # About us
 
-Display | Name | Github Profile | Portfolio 
---------|:----:|:--------------:|:---------:
-![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+| Name | Github Profile | Portfolio | Portfolio (web link) 
+|:----:|:--------------:|:---------:|:--------------------:
+Ng Siu Hian | [Github](https://github.com/siuhian) | [Portfolio](./team/siuhian.md) | [Portfolio (web link)](https://ay1920s2-cs2113-t15-1.github.io/tp/team/siuhian.html)
+Ananda Lye | [Github](https://github.com/ananda-lye) | [Portfolio](./team/ananda-lye.md) | [Portfolio (web link)](https://ay1920s2-cs2113-t15-1.github.io/tp/team/ananda-lye.html)
+Beatrice Chan | [Github](https://github.com/btricec) | [Portfolio](./team/btricec.md) | [Portfolio (web link)](https://ay1920s2-cs2113-t15-1.github.io/tp/team/btricec.html)
+Nigelle Leo | [Github](https://github.com/nigellenl) | [Portfolio](./team/nigellenl.md) | [Portfolio (web link)](https://ay1920s2-cs2113-t15-1.github.io/tp/team/nigellenl.html)
+Riccardo Di Maio | [Github](https://github.com/rdimaio) | [Portfolio](./team/rdimaio.md) | [Portfolio (web link)](https://ay1920s2-cs2113-t15-1.github.io/tp/team/rdimaio.html)
+
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/README.md b/docs/README.md
@@ -1,8 +1,8 @@
-# Duke
+# Jikan
 
-{Give product intro here}
+**Jikan** is a CLI time-tracker built in Java that aims to help manage tasks and projects. Users can set tags and goals for their entries, ultimately being able to keep track of what's left to do and maintain an overview of how time was spent.
 
 Useful links:
-* [User Guide](UserGuide.md)
-* [Developer Guide](UserGuide.md)
-* [About Us](AboutUs.md)
+* [User Guide](UserGuide.md) | [Web version](https://ay1920s2-cs2113-t15-1.github.io/tp/UserGuide.html)
+* [Developer Guide](DeveloperGuide.md) | [Web version](https://ay1920s2-cs2113-t15-1.github.io/tp/DeveloperGuide.html)
+* [About Us](AboutUs.md) | [Web version](https://ay1920s2-cs2113-t15-1.github.io/tp/AboutUs.html)
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/docs/pictures/ACSD.png b/docs/pictures/ACSD.png
diff --git a/docs/pictures/Architecture_Diagram.png b/docs/pictures/Architecture_Diagram.png
diff --git a/docs/pictures/Chaining_Activity_Diagram.png b/docs/pictures/Chaining_Activity_Diagram.png
diff --git a/docs/pictures/ClassDiagram.png b/docs/pictures/ClassDiagram.png
diff --git a/docs/pictures/CleanCD.png b/docs/pictures/CleanCD.png
diff --git a/docs/pictures/Commands.png b/docs/pictures/Commands.png
diff --git a/docs/pictures/EditSequenceDiagram.png b/docs/pictures/EditSequenceDiagram.png
diff --git a/docs/pictures/EditTagFlowChart.png b/docs/pictures/EditTagFlowChart.png
diff --git a/docs/pictures/Find_Reference_Frame.PNG b/docs/pictures/Find_Reference_Frame.PNG
diff --git a/docs/pictures/Find_Sequence_Diagram.png b/docs/pictures/Find_Sequence_Diagram.png
diff --git a/docs/pictures/FlowchartinitCleaner.png b/docs/pictures/FlowchartinitCleaner.png
diff --git a/docs/pictures/FlowchartsetStatus.png b/docs/pictures/FlowchartsetStatus.png
diff --git a/docs/pictures/GoalDisplay.PNG b/docs/pictures/GoalDisplay.PNG
diff --git a/docs/pictures/GraphTargets.png b/docs/pictures/GraphTargets.png
diff --git a/docs/pictures/SDautoClean.png b/docs/pictures/SDautoClean.png
diff --git a/docs/pictures/Simplified_Class_Diagram.png b/docs/pictures/Simplified_Class_Diagram.png
diff --git a/docs/pictures/StartCD.png b/docs/pictures/StartCD.png
diff --git a/docs/pictures/afterClean.png b/docs/pictures/afterClean.png
diff --git a/docs/pictures/checkActivity.png b/docs/pictures/checkActivity.png
diff --git a/docs/pictures/checkTimev2.png b/docs/pictures/checkTimev2.png
diff --git a/docs/pictures/checkactivityv2.png b/docs/pictures/checkactivityv2.png
diff --git a/docs/pictures/checktime.png b/docs/pictures/checktime.png
diff --git a/docs/pictures/cleanEg.png b/docs/pictures/cleanEg.png
diff --git a/docs/pictures/cleanlist.png b/docs/pictures/cleanlist.png
diff --git a/docs/pictures/continue.png b/docs/pictures/continue.png
diff --git a/docs/pictures/continueActivity.jpg b/docs/pictures/continueActivity.jpg
diff --git a/docs/pictures/continue_flowchart.PNG b/docs/pictures/continue_flowchart.PNG
diff --git a/docs/pictures/end.png b/docs/pictures/end.png
diff --git a/docs/pictures/filter-find_chain.PNG b/docs/pictures/filter-find_chain.PNG
diff --git a/docs/pictures/filter-graph_chain.PNG b/docs/pictures/filter-graph_chain.PNG
diff --git a/docs/pictures/filter.PNG b/docs/pictures/filter.PNG
diff --git a/docs/pictures/filter_eg.PNG b/docs/pictures/filter_eg.PNG
diff --git a/docs/pictures/find-allocations_chain.PNG b/docs/pictures/find-allocations_chain.PNG
diff --git a/docs/pictures/find_eg.PNG b/docs/pictures/find_eg.PNG
diff --git a/docs/pictures/graph.png b/docs/pictures/graph.png
diff --git a/docs/pictures/graph_core.PNG b/docs/pictures/graph_core.PNG
diff --git a/docs/pictures/graph_seqDiag.png b/docs/pictures/graph_seqDiag.png
diff --git a/docs/pictures/graphallocations.png b/docs/pictures/graphallocations.png
diff --git a/docs/pictures/graphtags.PNG b/docs/pictures/graphtags.PNG
diff --git a/docs/pictures/graphtags_example.PNG b/docs/pictures/graphtags_example.PNG
diff --git a/docs/pictures/graphtags_example2.png b/docs/pictures/graphtags_example2.png
diff --git a/docs/pictures/list-graphtags_chain.PNG b/docs/pictures/list-graphtags_chain.PNG
diff --git a/docs/pictures/list.PNG b/docs/pictures/list.PNG
diff --git a/docs/pictures/list_core.PNG b/docs/pictures/list_core.PNG
diff --git a/docs/pictures/list_filter_chain.PNG b/docs/pictures/list_filter_chain.PNG
diff --git a/docs/pictures/list_week.PNG b/docs/pictures/list_week.PNG
diff --git a/docs/pictures/listforgraphallocations.png b/docs/pictures/listforgraphallocations.png
diff --git a/docs/pictures/setStatusSD.png b/docs/pictures/setStatusSD.png
diff --git a/docs/pictures/startCD2.png b/docs/pictures/startCD2.png
diff --git a/docs/team/ananda-lye.md b/docs/team/ananda-lye.md
@@ -0,0 +1,166 @@
+# Project Portfolio Page (PPP)  
+## Project overview  
+**Jikan** is a CLI time-tracker built in Java that  aims to help manage tasks and projects.  
+Users can set tags and goals for their entries,  
+ultimately being able to keep track of what's left to do and maintain an overview of how time was spent.  
+
+## Summary of contributions  
+### Code contributed  
+[Link to tP Code Dashboard](https://nus-cs2113-ay1920s2.github.io/tp-dashboard/#search=ananda-lye)
+
+### Enhancements implemented
+* Find and Filter Activities
+    * Developed the `find` and `filter` commands for users to view a sub-list of activities, matching for name and 
+    tag keywords respectively.
+    * Both commands allow for multiple keywords to be matched with `find` accepting `/` separated keywords and `filter`
+    accepting space-separated keywords. Activities which match either keyword will be included in the sub-list.
+    * Both commands can be limited to only searching activities in the last shown list by including the `-s` flag.
+    This is particularly helpful when used before graphing functions to omit undesired activities.
+        * This can also be included as a single-line user input, separating commands by `;` which reduces the
+        number of user inputs and printing calls required to achieve the same results.
+
+* Last Shown List Implementation
+    * Proposed and implemented the last shown list which is used in `list`, `find`, `filter` and `graph` commands.
+    * This proposal sets the direction for how the Jikan software is used, as all analysis done by the user revolves
+    around this functionality (combining `list` by date range, `find` and `filter` chaining, to allow `graph` to be 
+    clutter-free).
+
+* Activity Progress and Ui
+    * Proposed and implemented the progress percentage based user messages, allowing for the progress bars in `end` and
+    `graph` commands.
+
+
+### Contributions to documentation
+* Implemented and de-conflicted the high-level flow of the User Guide, distinguishing from Basic to Advanced features for 
+improved format standardisation.
+* Provided instructions and examples for `find` and `filter` commands and their multiple variations.
+
+### Contributions to the DG
+* Drafted write-ups and diagrams in the design section, mainly the overall architecture diagram and class diagram.
+* Drafted the `find` and `filter` sections, including the sequence diagram, design considerations, and proposed features.
+
+### Contributions to team-based tasks
+* Generated ideas with the team on the set of features for the Jikan application.
+* Made use of the issue tracker extensively to track enhancement and bugs found.
+* Developed jUnit tests for `find`, `filter` and `list` commands.
+
+### Review/mentoring contributions
+* Provided feedback to teammates before and after implementation to ensure that everyone is on the same page.
+
+### Contributions beyond the project team
+* Provided feedback to the developer guide of another team.
+    * [Reviewing of DG on Week 11](https://github.com/nus-cs2113-AY1920S2/tp/pull/14)
+
+* Reported bugs in other team's product in PE dry run.
+    * [PED](https://github.com/ananda-lye/ped/issues)
+
+## Contributions to the User Guide (Extracts)
+
+### Finding Activities by Name: `find`
+**Usage:** Users can request for a sub-list of activities that has names which contain any of the given keywords. If there are more than one keyword, each keyword should be separated with ` / `.
+
+**Format:**
+* `find KEYWORD`
+* `find KEYWORD1 / KEYWORD2 / KEYWORD3`
+
+### Filtering Activities by Tags: `filter`
+**Usage:** Users can request for a sub-list of activities that has specific tags. Each tag should be space separated.
+
+**Format:**
+* `filter TAGNAME`
+* `filter TAGNAME1 TAGNAME2`
+
+### Chaining Finds & Filters: `-s`
+**Usage:** Users can provide the `find` and `filter` command on the last shown list (also compatible after a `list` 
+command) by providing the `-s` flag after each `find` or `filter` command.
+
+**Format:** 
+* `find -s KEYWORD`
+* `filter -s TAGNAME`
+* `filter -s TAGNAME1 TAGNAME2`
+* `find -s KEYWORD1 / KEYWORD2 / KEYWORD3`
+
+**Example:**  
+If we want to find all CS2106 tutorials, we can first use `filter 2106` to filter out all activities tagged `2106`, then use the find command with the flag, `find -s Tutorial` to get a list of all 2106 Tutorials.
+
+#### Single Input Chaining: `;`
+**Usage:** Users can achieve the same outcome as multiple `-s` chaining with a single input. This is done by separating
+`find` and `filter` commands with ` ; `.
+
+**Examples:**
+* `filter TAGNAME ; find KEYWORD1 ; find KEYWORD2`
+* `filter -s TAGNAME ; find KEYWORD1 ; find KEYWORD2`
+
+Note: `-s` is only relevant in the first command of the entire input string, as subsequent commands are automatically chained.
+
+## Contributions to the Developer Guide (Extracts)
+## 2. Design
+The section provides a high-level explanation of how the Jikan software is designed.
+
+### 2.1 High-Level Architecture
+The users interact with the Jikan software which modifies the local storage data file.
+
+Within the Jikan software, there are 5 main components:
+* **Parser Component** - Parses the user inputs and calls the relevant `Command` object to execute the desired
+command.
+* **Ui Component** - Prints to the user the output of the desired `Commands`.
+* **Commands Component** - Contains all the `Commands` to be called by the `Parser` based on user inputs.
+* **Activities Component** - Maintains the non-permanent state of all `Activities` in the `Activity List` to be accessed
+by the executing `Commands`.
+* **Storage Component** - Interacts with and modifies the local storage file, which contains the permanent (lasting
+even after the program terminates) state of all activities. It retrieves this permanent state and populates the `Activity List` at the start of each session.
+
+### 3.8 Find & Filter Features
+
+#### Find Feature
+This command accepts keyword(s) and searches either the entire activity list or the last shown list for activities with 
+names containing each keyword.
+
+#### Filter Feature
+This feature accepts space-separated keyword(s) to search either the entire list or the last shown list 
+for activities with tags matching each keyword. The keywords should be an exact-match with the tag names.
+
+
+#### 3.8.1 Design Considerations
+As the `find` and `filter` commands are important for the user to analyse and eventually graph time-spent on each 
+activity. The user should be allowed to query for all useful combinations of activities in the activity list. 
+This entails:
+* The user should be allowed to match for multiple keywords at once.
+* The user should be allowed to exclude certain activities by limiting his search to a previously shown list as 
+    opposed to the entire activity list.
+    (chaining `list`, `find`, and `filter` commands).
+
+
+#### 3.8.2a Current Implementation for Find
+* This feature is called by the user when the `find` command is entered into the command line. 
+The string following the command are the parameters:
+    * `-s` flag indicates that the searching should be limited to activities previously shown to the user.
+    * The remaining parameters are a string of keywords separated by ` / `. 
+* The Parser will create a FindCommand object.
+* The FindCommand will invoke its own `executeCommand()` method.
+    * The Parser's `lastShownList` will be cleared.
+    * Then it will loop through `activityList` to find activities with names that contain the keyword.
+    * If one is found, it will be added to `lastShownList`.
+    * `printResults()` of the Ui will be called:
+        * If `lastShownList` is not empty, it will print the matching activities.
+        * Else, it will respond to the user that there are no tasks which match the given keyword.
+
+
+#### 3.8.2b Current Implementation for Filter 
+* This feature is called by the user when the `filter` command is entered into the command line. The space separated strings following the command are the keywords to match activity tags with.
+* The Parser will create a FilterCommand object.
+* The FindCommand will invoke its own `executeCommand()` method.
+* The Parser's `lastShownList` will be cleared.
+* For each keyword:
+    * Then it will loop through `activityList` to find activities with tags that contain the keyword.
+    * If one is found, it will be added to `lastShownList`.
+    * `printResults()` method of the Ui will be called
+        * If `lastShownList` is not empty, it will print the matching activities.
+        * Else, it will respond to the user that there are no tasks which match the given keyword.
+
+#### 3.8.4 Additional features
+`find` and `filter` command supports the limiting of searches to activities in the last shown list. This
+is done in 2 ways:
+* The `-s` flag following the command (eg. `find -s keyword`)
+* The `;` delimiter for a combination of `find` and `filter` in a single input (eg. `find KEYWORD ; filter TAGNAME`)
+