Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated User Story #33

Open
wants to merge 145 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
d0d625a
Altered some lines to enable coverage from Coveralls
tenvinc Aug 31, 2018
384c72f
Merge remote-tracking branch 'upstream/master'
tenvinc Sep 10, 2018
70c1f05
the modified version of the developer guide, updated with user story.
OscarZeng Sep 19, 2018
465b523
Update DeveloperGuide.adoc
nguyenngoclinhchi Sep 20, 2018
39a5fb2
Renamed all instance of Person into Record.
tenvinc Sep 16, 2018
9b259a5
Removed the existing implementation for parsing addresses.
tenvinc Sep 17, 2018
773aef4
Removed the existing implementation for parsing email.
tenvinc Sep 18, 2018
a66a84f
Removed the existing implementation for parsing email.
tenvinc Sep 18, 2018
cb61f4a
Merge branch 'MorphAddressBook' of https://github.com/tenvinc/address…
tenvinc Sep 20, 2018
d0f6286
Modified code to follow checkstyle guidelines
tenvinc Sep 20, 2018
70ae950
Merge pull request #10 from tenvinc/MorphAddressBook
tenvinc Sep 21, 2018
da33989
Update deploy_github_pages.sh
tenvinc Sep 22, 2018
14ef941
Added a new super class MoneyFlow which Income and Expense extends from.
tenvinc Sep 22, 2018
da28f6e
Combined parseIncome and parseExpense into parseMoneyFlow.
tenvinc Sep 22, 2018
496e7bf
Modified Junit tests to suit new implementation of add functionality
tenvinc Sep 23, 2018
5fa15f2
Changed the prefix for Moneyflow from e/ to m/
tenvinc Sep 23, 2018
12efdcf
Fixed checkstyle issues reported in Travis
tenvinc Sep 23, 2018
5a0a10d
Merge pull request #9 from tenvinc/MorphAddressBook
tztzt Sep 23, 2018
3934550
Updated user guide for add functionality
tenvinc Sep 24, 2018
77167be
Added a new parser to parse the arguments for List Command
tenvinc Sep 24, 2018
ea628d7
Merge branch 'tenvinc-add_modification'
OscarZeng Sep 24, 2018
00af255
Merge pull request #11 from tenvinc/add_modification
nguyenngoclinhchi Sep 26, 2018
54c40de
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
nguyenngoclinhchi Sep 26, 2018
c2686fb
Created a predicate DateIsWithinInterval as a filter for the read onl…
tenvinc Sep 25, 2018
186e836
Added a check to see if the order of the dates is valid for the list …
tenvinc Sep 25, 2018
5bf8929
Modified existing tests to test for the new logic in ListCommand
tenvinc Sep 25, 2018
fecf686
updated developer guide
OscarZeng Sep 27, 2018
46f0ca6
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/main
OscarZeng Sep 27, 2018
ad7518f
Updated the AboutUs.adoc
tenvinc Sep 27, 2018
582a2c0
Merge pull request #12 from CS2113-AY1819S1-T09-4/AboutUs
OscarZeng Sep 27, 2018
52f2165
Updated tztzt.png
tenvinc Sep 27, 2018
befb9e3
Merge pull request #13 from CS2113-AY1819S1-T09-4/AboutUs
nguyenngoclinhchi Sep 27, 2018
f27e03b
Delete tztzt.png
tenvinc Sep 27, 2018
6990862
Reuploaded tztzt.png
tenvinc Sep 27, 2018
7d43395
Added DateUtil which contains methods to check whether a date is logical
tenvinc Sep 28, 2018
0ef98b6
Tag Record Data Structure
tztzt Sep 28, 2018
0f533e2
Added a single argument mode for list command.
tenvinc Sep 28, 2018
64a36cb
Tags Data
tztzt Sep 28, 2018
7e88b9e
Completed JUnit tests for testing the multiple argument combinations …
tenvinc Sep 28, 2018
9eaf64e
Tags v0.1 - Working Version, without display for tags yet
tztzt Sep 28, 2018
3d28888
Adding Tags v0.1 Minor Changes
tztzt Sep 28, 2018
90117e6
Adding Tags v0.2 Bug, reverted
tztzt Sep 28, 2018
35d3477
v0.3 Non-Working Version Crashes at TagMap File
tztzt Sep 29, 2018
33f8662
V0.3 Remove Use of ObservableTagList to Test
tztzt Sep 29, 2018
9078616
v0.3 Indicating Crash line
tztzt Sep 29, 2018
a99779a
v0.3 Indicating actual crash line
tztzt Sep 29, 2018
e65fb36
v0.5 Resolved problems for tags storage
tztzt Sep 29, 2018
6893913
v0.6 Tags Structure Neater
tztzt Sep 29, 2018
ab96b7e
v0.7 Creating Searching by tags function
tztzt Sep 30, 2018
e2c95f9
Try to add the limit command
OscarZeng Sep 30, 2018
a46e8c5
v0.9 FindTagsCommand Working - UG Not Done
tztzt Sep 30, 2018
253ea30
v0.91 FindTags - Changes to pass Travis Test
tztzt Sep 30, 2018
7af46fc
v0.92 FindTags - More minor changes to pass check test
tztzt Sep 30, 2018
e6c5ace
V0.93 - FindTags - More minor changes to pass check test
tztzt Sep 30, 2018
00fc01c
v0.94 FindTags - More minor changes to pass check test
tztzt Sep 30, 2018
6688c36
v0.95 FindTags - More minor changes to pass check test
tztzt Sep 30, 2018
7c20c77
Added tests for date validity check
tenvinc Sep 30, 2018
7e4a77c
Added list command details in user guide
tenvinc Sep 30, 2018
70719c3
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
tenvinc Sep 30, 2018
d622ad4
Merge pull request #3 from nguyenngoclinhchi/master
tenvinc Sep 30, 2018
bc86348
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
tenvinc Sep 30, 2018
13f2c4f
Updated Developer's guide for use case of listing history
tenvinc Sep 30, 2018
60afd4b
Updated the dev guide with the people in charge of each command
tenvinc Sep 30, 2018
035cba6
Corrected list command details in user guide
tenvinc Sep 30, 2018
0031cfa
Removed TODO for parsing moneyflow
tenvinc Sep 30, 2018
391ec00
Fixed checkstyle errors
tenvinc Sep 30, 2018
dbc2eea
fixed more checkstyle errors
tenvinc Sep 30, 2018
5a7983c
Fixed more checkstyle errors
tenvinc Sep 30, 2018
858d08d
Merge pull request #15 from OscarZeng/master
tztzt Sep 30, 2018
bd21be0
Fixed Junit tests. All verified to work
tenvinc Sep 30, 2018
1b1b17b
Merge pull request #14 from CS2113-AY1819S1-T09-4/Zhithon_Adding_Tags
tenvinc Sep 30, 2018
5c7ea9f
The dummy command working, the program can recognize the command but …
OscarZeng Oct 1, 2018
9922840
Some slight changes to the program, money and limit model added, some…
OscarZeng Oct 2, 2018
91fb230
Delete a dummy limit command
OscarZeng Oct 2, 2018
9b9352a
Updated User Guide
tztzt Oct 2, 2018
1266c5d
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
OscarZeng Oct 2, 2018
09167f5
Updated User Guide
tztzt Oct 2, 2018
6a0881d
Updated User Guide Again
tztzt Oct 2, 2018
ecaddea
Updated User Guide once Again
tztzt Oct 2, 2018
53ec107
Updated USER GUIDE
tztzt Oct 2, 2018
0f0ff2b
Merge pull request #16 from CS2113-AY1819S1-T09-4/Zhithon_Adding_Tags
tenvinc Oct 2, 2018
3b94ead
Pulled and merged master to list_modification
tenvinc Oct 2, 2018
4bd30d6
Working version with the limit command just return the failed infomat…
OscarZeng Oct 2, 2018
96510fb
Working limit command praser, which can tell the limit command but ca…
OscarZeng Oct 2, 2018
e5b4fd1
Merge pull request #18 from CS2113-AY1819S1-T09-4/master
tztzt Oct 2, 2018
b8c115f
Merge branch 'Vincent_list_modification' of https://github.com/CS2113…
OscarZeng Oct 2, 2018
014f84c
Working version with the limit command can be recognized but will rep…
OscarZeng Oct 3, 2018
35ff901
Modified Readme.adoc to look like the home page of Financial Planner
tenvinc Oct 3, 2018
2ffc942
Updated the title of the developer guide and github repo to "Financia…
tenvinc Oct 3, 2018
989e477
minor changes to pass the tests.
OscarZeng Oct 3, 2018
94c0840
Merge pull request #17 from tenvinc/Vincent_list_modification
OscarZeng Oct 4, 2018
7c09627
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
OscarZeng Oct 4, 2018
2d838f1
Merge branch 'Zhithon_Adding_Tags' of https://github.com/CS2113-AY181…
tztzt Oct 4, 2018
fe1650e
Updated UI Picture
tztzt Oct 4, 2018
5f89333
Updated UI Picture
tztzt Oct 4, 2018
e0fa2be
Updated UI Picture
tztzt Oct 4, 2018
9a3a32a
Updated UI Photo
tztzt Oct 4, 2018
6a57a84
Updated UI Test File
tztzt Oct 4, 2018
9f18f04
Added a new java fxml file for detailed panel UI
tenvinc Oct 4, 2018
44e2e36
Hooked up the new detailed Record panel with the existing UI
tenvinc Oct 4, 2018
437c8de
Merge pull request #36 from CS2113-AY1819S1-T09-4/Zhithon_Adding_Tags
OscarZeng Oct 5, 2018
506c91a
The LimitCommandParser is working, the command can be recognized when…
OscarZeng Oct 5, 2018
e5e03fa
Refactoring of all names addressbook to financialplanner
tztzt Oct 5, 2018
682f13d
Updated Checkstyle errors and more refactoring
tztzt Oct 5, 2018
d4750c8
Fix Checkstyle Errors #2
tztzt Oct 5, 2018
3545414
Fixed Checkstyle Errors #3
tztzt Oct 5, 2018
439c2c2
Combined income and expense into a single class MoneyFlow.
tenvinc Oct 5, 2018
816046b
Fixed checkstyle errors #1
tenvinc Oct 5, 2018
9acfa9d
Fixed the JUnit tests
tenvinc Oct 5, 2018
8c68eb9
Fixed minor naming error
tenvinc Oct 5, 2018
3746b8f
Merge pull request #38 from CS2113-AY1819S1-T09-4/ZT_Refactor_Address…
OscarZeng Oct 5, 2018
8344473
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
tenvinc Oct 5, 2018
936a266
Merge pull request #39 from CS2113-AY1819S1-T09-4/Vincent_combined_money
tenvinc Oct 5, 2018
29d9d34
Merge branch 'master' into Vincent_UI_matters
tenvinc Oct 5, 2018
40255e2
Updated DetailedRecordCard.java to follow new package name
tenvinc Oct 5, 2018
fd512a4
Fixed sizing errors with new UI
tenvinc Oct 5, 2018
aeb517f
Configured detail card to disappear when no record card is selected
tenvinc Oct 5, 2018
e6364b7
Merge branch 'Oscar_set_Limit' into Oscar_SimpleLimit
OscarZeng Oct 5, 2018
97a07e7
Some minor changes to better merge with the FP version
OscarZeng Oct 5, 2018
5442c59
Delete the class Money, the program and limit command still working.
OscarZeng Oct 5, 2018
8c38037
Added DetailedRecordCardHandle as a handle to DetailedRecordCard
tenvinc Oct 6, 2018
3dec34e
Fixed some JUnit tests by linking up DetailedRecordCardHandle with Fi…
tenvinc Oct 6, 2018
e059f2e
Changed tests in help system test to allow help window to be open whe…
tenvinc Oct 6, 2018
fdc7475
Removed BrowserPanelHandle, BrowserPanel, BrowserPanelTest
tenvinc Oct 6, 2018
68d24c8
Fixed checkstyle errors #1
tenvinc Oct 6, 2018
a18bf13
Fixed checkstyle errors #2
tenvinc Oct 7, 2018
99e3be4
Some minor changes
OscarZeng Oct 7, 2018
794b5d6
Merge pull request #42 from tenvinc/Vincent_UI_matters
OscarZeng Oct 7, 2018
8c531c1
Merge branch 'master' of https://github.com/CS2113-AY1819S1-T09-4/mai…
OscarZeng Oct 7, 2018
016587f
The limit Command now can calculate the sum of spend during the date …
OscarZeng Oct 7, 2018
eb92018
Problem noticed, the read in value date always read in the same date …
OscarZeng Oct 7, 2018
6c7f4d2
minor changes to make the logic of limit correct.
OscarZeng Oct 7, 2018
d43e4db
The LimitCommandPhaser bug fixed. Finally the LimitCommand (Simple ve…
OscarZeng Oct 7, 2018
dcc736e
Some minor changes to adjust the current working version.
OscarZeng Oct 7, 2018
cf72aab
Todo list updated
OscarZeng Oct 7, 2018
89a817a
limit command updated, the minus bugs fixed. Now the input of money c…
OscarZeng Oct 9, 2018
7ebf124
some minor changes about the checkstyle
OscarZeng Oct 9, 2018
443d31d
more minor changes to pass the checkstyle test
OscarZeng Oct 9, 2018
56c08e5
more minor changes about the checkstyle.
OscarZeng Oct 9, 2018
82b563d
Some minor changes about the output.
OscarZeng Oct 9, 2018
1a4953a
more minor changes to pass the checkstyle test
OscarZeng Oct 9, 2018
f0ce1df
minor changes again about the checkstyle errors.
OscarZeng Oct 9, 2018
bc434ba
more changes to pass the test again :(
OscarZeng Oct 9, 2018
35d7766
more minor changes again.....
OscarZeng Oct 9, 2018
25bb716
First version of my portfolio
OscarZeng Nov 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ script: >-

deploy:
skip_cleanup: true

provider: script
script: ./config/travis/deploy_github_pages.sh
on:
Expand Down
14 changes: 4 additions & 10 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
= Address Book (Level 4)
= Financial Planner
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://coveralls.io/github/CS2113-AY1819S1-T09-4/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/CS2113-AY1819S1-T09-4/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

Expand All @@ -15,26 +15,20 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* 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 https://github.com/se-edu/addressbook-level3[level 3]:
** 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 Financial Planner application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* This application is modified from AddressBook-Level4 project created by SE-EDU initiative at https://github.com/se-edu/
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_10
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.MainApp'
mainClassName = 'seedu.planner.MainApp'

sourceCompatibility = JavaVersion.VERSION_1_9
targetCompatibility = JavaVersion.VERSION_1_9
Expand Down Expand Up @@ -157,16 +157,16 @@ test {
}

if (runNonGuiTests) {
test.include 'seedu/address/**'
test.include 'seedu/planner/**'
}

if (runGuiTests) {
test.include 'systemtests/**'
test.include 'seedu/address/ui/**'
test.include 'seedu/planner/ui/**'
}

if (!runGuiTests) {
test.exclude 'seedu/address/ui/**'
test.exclude 'seedu/planner/ui/**'
}
}
}
Expand Down
36 changes: 14 additions & 22 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,38 @@ We are a team based in the http://www.comp.nus.edu.sg[School of Computing, Natio

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Oscar Zeng Hao
image::oscarzeng.png[width="150", align="left"]
{empty}[http://github.com/oscarzeng[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor
Role: Developer +
Responsibilities: UI

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Nguyen Ngoc Linh Chi
image::nguyenngoclinhchi.png[width="150", align="left"]
{empty}[http://github.com/nguyenngoclinhchi[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Teh Zhi Thon
image::tztzt.png[width="150", align="left"]
{empty}[http://github.com/tztzt[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Data

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Vincent Neo Guo Zhong
image::tenvinc.png[width="150", align="left"]
{empty}[http://github.com/tenvinc[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: UI

'''
Loading