Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
463 commits
Select commit Hold shift + click to select a range
6638557
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
dominic2017 Apr 6, 2019
f512cfb
fix bug
dominic2017 Apr 6, 2019
1f3a3cf
fix bug
dominic2017 Apr 6, 2019
131d2b4
Merge pull request #108 from frankquekch/master
dominic2017 Apr 6, 2019
9bfa69d
Checkstyle fixes
yushao2 Apr 7, 2019
ca9541c
Checkstyle fixes
yushao2 Apr 7, 2019
1d1b7eb
ug update
dominic2017 Apr 7, 2019
ccea351
fixed merge
Apr 7, 2019
be4e03c
Merge pull request #109 from jacobhan/master
jacobhan Apr 7, 2019
ca6e144
ug update
dominic2017 Apr 7, 2019
c86d67b
ug update
dominic2017 Apr 7, 2019
c0309a1
fixing api call
Apr 7, 2019
1515149
ug update
dominic2017 Apr 7, 2019
57195d6
Merge pull request #107 from yushao2/master
yushao2 Apr 7, 2019
9131273
Merge pull request #110 from frankquekch/master
yushao2 Apr 7, 2019
1fd608a
added stock command
Apr 7, 2019
1c47258
Merge pull request #111 from jacobhan/master
jacobhan Apr 7, 2019
8a74cc0
Fixed report by removing bitcoin
yushao2 Apr 7, 2019
4359ec1
Merge branch 'master' into master
yushao2 Apr 7, 2019
728c920
Merge pull request #112 from yushao2/master
yushao2 Apr 7, 2019
6ada0ef
Improved performance for the crypto commands -- reduced lagging
yushao2 Apr 7, 2019
5addb86
Crypto Commands code cleanup
yushao2 Apr 7, 2019
1474ce2
Merge pull request #113 from yushao2/master
yushao2 Apr 7, 2019
06e3b5a
Removed Incorrectly implemented features and tests
yushao2 Apr 7, 2019
2d2db12
Merge pull request #114 from yushao2/master
yushao2 Apr 7, 2019
629c2f8
Increased interval for crypto price refresh
yushao2 Apr 7, 2019
9ff2ad2
fixed report command
yushao2 Apr 7, 2019
3579f82
fixed report command
yushao2 Apr 7, 2019
e6fdf58
Merge pull request #115 from yushao2/master
yushao2 Apr 7, 2019
90ffcd0
ug update
dominic2017 Apr 7, 2019
d19d0c5
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
dominic2017 Apr 7, 2019
7e92ffe
checkstyle fixes
yushao2 Apr 7, 2019
fa56a15
checkstyle fix
yushao2 Apr 7, 2019
7415129
Added on to DG
yushao2 Apr 7, 2019
3c058a5
Checkstyle fixes
yushao2 Apr 7, 2019
4b7af1b
Refactored names
yushao2 Apr 8, 2019
1fbd84c
Merge pull request #117 from yushao2/master
yushao2 Apr 8, 2019
03a1882
Added Seq Diagram for Report in DG
yushao2 Apr 8, 2019
6542f75
Merge pull request #118 from yushao2/master
yushao2 Apr 8, 2019
1301690
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
dominic2017 Apr 8, 2019
9aed436
Merge pull request #116 from frankquekch/master
dominic2017 Apr 8, 2019
306fb66
stock command includes total
Apr 8, 2019
e96da4c
reposense
Apr 8, 2019
c3c81c5
Merge pull request #119 from jacobhan/master
jacobhan Apr 8, 2019
f3d0d8c
Fixed all checkstyles
yushao2 Apr 8, 2019
4412d4f
Fixed checkstyles for Tests
yushao2 Apr 8, 2019
b6d605e
Added export command
kaicongng-glitch Apr 9, 2019
7c97a93
Deleted extra files
kaicongng-glitch Apr 9, 2019
e5de56c
ug
dominic2017 Apr 9, 2019
c0544d1
Fixing ExportExcelCommand
kaicongng-glitch Apr 9, 2019
a74cf61
Added ExcelCommandParser and other minor add ons
kaicongng-glitch Apr 9, 2019
fb6b69f
Update ExcelUtil
kaicongng-glitch Apr 9, 2019
cae7ae6
Added dependencies onto gradle.build
kaicongng-glitch Apr 9, 2019
b89c2bb
ug dg update
dominic2017 Apr 9, 2019
8c0fd08
Fixed checkstyles, testcases
yushao2 Apr 9, 2019
62ee47f
Merge branch 'master' into master
yushao2 Apr 9, 2019
69024b8
Merge pull request #120 from yushao2/master
yushao2 Apr 9, 2019
daa13ca
Fixed Checkstyles
yushao2 Apr 9, 2019
3da4ae5
fixed checkstyles
yushao2 Apr 9, 2019
0741b7f
fixed checkstyles
yushao2 Apr 9, 2019
e999f4a
ugdg
dominic2017 Apr 9, 2019
5319ac8
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
dominic2017 Apr 9, 2019
2f574f0
Merge pull request #121 from yushao2/master
yushao2 Apr 9, 2019
1b3e3a0
Bug fixes and removals
kaicongng-glitch Apr 9, 2019
3acd8ed
Revert "ug and merge"
jacobhan Apr 9, 2019
0329a4f
fixed website
yushao2 Apr 9, 2019
562860e
Merge pull request #125 from yushao2/master
yushao2 Apr 9, 2019
6205c2e
Merge pull request #124 from cs2113-ay1819s2-t11-3/revert-122-master
jacobhan Apr 9, 2019
0448766
fixed stock name
Apr 9, 2019
b1c5dd7
Merge pull request #127 from jacobhan/master
jacobhan Apr 9, 2019
72f3e68
changes to tests
Apr 9, 2019
94b3be6
checkstyle
Apr 9, 2019
4417615
checkstyle
Apr 9, 2019
8ba8657
checkstyle
Apr 9, 2019
6fbfaf7
checkstyle
Apr 9, 2019
1cca704
Merge pull request #128 from jacobhan/master
jacobhan Apr 9, 2019
4b45f21
stock and ug
Apr 9, 2019
a66511d
checkstyle
Apr 9, 2019
8199641
checkstyle
Apr 9, 2019
11ee5b3
checkstyle
Apr 9, 2019
2322bcc
Merge pull request #130 from jacobhan/master
jacobhan Apr 9, 2019
1ca4617
Updated Working ExportExportCommand
kaicongng-glitch Apr 9, 2019
a893b4c
Refinements to ExportExcelCommand
kaicongng-glitch Apr 9, 2019
060b995
Deleted unnecessary files
kaicongng-glitch Apr 9, 2019
a0e2263
Merge branch 'master' of github.com:cs2113-ay1819s2-t11-3/main
kaicongng-glitch Apr 9, 2019
b60ad1b
Added files for command to work
kaicongng-glitch Apr 9, 2019
34f8b03
updated ug
kaicongng-glitch Apr 9, 2019
2e99f55
update ug
kaicongng-glitch Apr 9, 2019
c034001
Improvements to exportExcelCommand
kaicongng-glitch Apr 9, 2019
00fa05b
Deleted unnecessary files
kaicongng-glitch Apr 9, 2019
bd8998f
dg updates
kaicongng-glitch Apr 10, 2019
a204445
Added ExportExcelCommand Tests.
kaicongng-glitch Apr 10, 2019
16302f9
Added ExportExcelCommand Parser
kaicongng-glitch Apr 10, 2019
3dc35a4
Added ExportExcelCommand Parser
kaicongng-glitch Apr 10, 2019
f9e6374
Updated checkstyle
kaicongng-glitch Apr 10, 2019
4dcab85
Checkstyle updated
kaicongng-glitch Apr 10, 2019
bdd8bca
Checkstyle changes
kaicongng-glitch Apr 10, 2019
8a59271
Checkstyle changes
kaicongng-glitch Apr 10, 2019
1b513a7
Merge pull request #129 from frankquekch/master
dominic2017 Apr 10, 2019
a40dcce
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
kaicongng-glitch Apr 10, 2019
9097622
Checkstyles changes
kaicongng-glitch Apr 10, 2019
1670f84
PPP
dominic2017 Apr 12, 2019
6ea3c67
merge conflicts solved
dominic2017 Apr 12, 2019
272c7bd
update PPP
dominic2017 Apr 12, 2019
5f5067c
Merge pull request #133 from frankquekch/master
dominic2017 Apr 12, 2019
c7ddbdc
fixed stock command and added tests
Apr 12, 2019
093c872
checkstyle
Apr 12, 2019
b435484
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
kaicongng-glitch Apr 12, 2019
a49fd05
About us update
kaicongng-glitch Apr 13, 2019
750bc02
Merge pull request #134 from jacobhan/master
jacobhan Apr 13, 2019
476fb98
ug update
Apr 13, 2019
e23e2a2
Merge pull request #135 from jacobhan/master
jacobhan Apr 13, 2019
c4c1420
stock change
Apr 13, 2019
ee507b9
fix bug
dominic2017 Apr 13, 2019
1f26d8d
ppp
Apr 13, 2019
c742874
checkstyle
Apr 13, 2019
87a093c
checkstyle
Apr 13, 2019
50d360e
cleaned up stock command
Apr 13, 2019
2bbe72f
checkstyle
Apr 13, 2019
772ddaa
Merge pull request #136 from jacobhan/master
jacobhan Apr 13, 2019
d82ecc8
suggestions
Apr 13, 2019
b2dd22c
added crypto command
Apr 13, 2019
ebb8fb7
crypto command working
Apr 13, 2019
6fbf5ea
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
kaicongng-glitch Apr 13, 2019
7a2478b
adjust crypto command
Apr 13, 2019
9579f48
checkstyles
Apr 13, 2019
b6481bd
checkstyle
Apr 13, 2019
26a80bb
checkstyle
Apr 13, 2019
49cec18
checkstyles
Apr 13, 2019
62ce960
ug
Apr 13, 2019
40c7277
checkstyle
Apr 13, 2019
d26fbd2
checkstyle
Apr 13, 2019
b5ca754
checkstyles
Apr 13, 2019
465cc4b
Merge pull request #137 from jacobhan/master
jacobhan Apr 13, 2019
1f1feb6
Update ug, team doc
kaicongng-glitch Apr 13, 2019
18da85d
update dg
kaicongng-glitch Apr 13, 2019
2a22bbc
update dg
kaicongng-glitch Apr 13, 2019
63a6c00
team docs update
kaicongng-glitch Apr 13, 2019
b9787a7
team docs
kaicongng-glitch Apr 13, 2019
0509f07
team docs
kaicongng-glitch Apr 13, 2019
f7cdfb0
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
kaicongng-glitch Apr 13, 2019
a385b9f
team docs
kaicongng-glitch Apr 13, 2019
6bc125a
travis fix
kaicongng-glitch Apr 13, 2019
2fbea91
Merge pull request #140 from ngkaicong/master
ngkaicong Apr 13, 2019
7c92a15
Undo fixes
kaicongng-glitch Apr 13, 2019
9fb7e82
aboutus
kaicongng-glitch Apr 13, 2019
ee91902
Merge pull request #141 from ngkaicong/master
ngkaicong Apr 13, 2019
f5c86ff
PPP
yushao2 Apr 13, 2019
70d9820
Merge branch 'master' into master
yushao2 Apr 13, 2019
6592717
crypto test and ug
Apr 13, 2019
e68a130
ppp
Apr 13, 2019
2f3973a
ppp
Apr 13, 2019
a746827
ppp
Apr 13, 2019
87c0cba
checkstyles
Apr 13, 2019
ced140e
Merge pull request #142 from yushao2/master
yushao2 Apr 13, 2019
e730984
merge
yushao2 Apr 13, 2019
665cb87
merge
yushao2 Apr 13, 2019
87062f1
dg update
dominic2017 Apr 13, 2019
a31bb88
Merge pull request #144 from frankquekch/master
dominic2017 Apr 13, 2019
3863801
Merge pull request #145 from yushao2/master
yushao2 Apr 13, 2019
6324bfc
ug
Apr 13, 2019
edceca6
ppp
Apr 13, 2019
09e7685
uncommented
Apr 13, 2019
b714de2
Merge branch 'master' into master
jacobhan Apr 13, 2019
34580cb
Merge pull request #143 from jacobhan/master
jacobhan Apr 13, 2019
44ef08f
ppp
Apr 13, 2019
317dd9d
ppp
Apr 13, 2019
c70353f
ppp
Apr 13, 2019
d5a9a8d
Merge pull request #148 from jacobhan/master
jacobhan Apr 13, 2019
e4f02df
Changed PPP
yushao2 Apr 14, 2019
7b049ea
Merge branch 'master' into master
yushao2 Apr 14, 2019
9f02961
Merge pull request #149 from yushao2/master
yushao2 Apr 14, 2019
057b65f
Update README
dominic2017 Apr 14, 2019
8bb43f9
PPP
yushao2 Apr 14, 2019
cb93f9f
ppp
yushao2 Apr 14, 2019
366ae3b
Merge pull request #150 from yushao2/master
yushao2 Apr 14, 2019
4197b88
Website fix
yushao2 Apr 14, 2019
17e62a6
Merge pull request #151 from yushao2/master
yushao2 Apr 14, 2019
4326f0b
Website fix
yushao2 Apr 14, 2019
9e4e85c
Merge pull request #152 from yushao2/master
yushao2 Apr 14, 2019
4246c94
Fixed developer guide
yushao2 Apr 14, 2019
d8bd27e
Merge pull request #153 from yushao2/master
yushao2 Apr 14, 2019
8497493
Fixed website
yushao2 Apr 14, 2019
15219a9
Merge pull request #154 from yushao2/master
yushao2 Apr 14, 2019
c437683
Refactoring
yushao2 Apr 14, 2019
0e18a6c
Merge pull request #155 from yushao2/master
yushao2 Apr 14, 2019
4730123
Edited website
yushao2 Apr 14, 2019
34c9146
Merge pull request #156 from yushao2/master
yushao2 Apr 14, 2019
c8d2ab0
Refactored DG
yushao2 Apr 14, 2019
4ee7d87
refactor
yushao2 Apr 14, 2019
06e701b
Merge pull request #157 from yushao2/master
yushao2 Apr 14, 2019
c3efa1a
refactoring
yushao2 Apr 14, 2019
e33ca51
Merge pull request #158 from yushao2/master
yushao2 Apr 14, 2019
5c9d83e
diagrams update
dominic2017 Apr 14, 2019
e0975cd
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
dominic2017 Apr 14, 2019
4ae6711
Merge pull request #159 from frankquekch/master
dominic2017 Apr 14, 2019
2b55a30
small changes
Apr 14, 2019
85bc7db
crypto changes
Apr 14, 2019
67729c6
checkstyles
Apr 14, 2019
92b8bc6
Merge pull request #161 from jacobhan/master
jacobhan Apr 14, 2019
90ee9e3
invest command
Apr 14, 2019
71a0726
invest command
Apr 14, 2019
bc92ac0
added Number
Apr 14, 2019
7ca4cc8
fixed number class
Apr 14, 2019
bd3a73e
fixed number
Apr 14, 2019
51094c9
fixed invest command
Apr 14, 2019
199fa89
added suggestion
Apr 14, 2019
3771fc1
invest tests
Apr 14, 2019
0294eb6
uncommented excel
Apr 14, 2019
994036f
checkstyles
Apr 14, 2019
dce0e74
checkstyle
Apr 14, 2019
6c1d8fe
checkstyle
Apr 14, 2019
211eeb8
checkstyles
Apr 14, 2019
c49b212
Merge pull request #162 from jacobhan/master
jacobhan Apr 14, 2019
af4f29f
ug
Apr 14, 2019
faea184
dg
Apr 14, 2019
3207050
more dg
Apr 14, 2019
a9e29e0
more dg
Apr 14, 2019
3f3f249
more dg
Apr 14, 2019
bb24003
dg
Apr 14, 2019
d2b02c7
dg
Apr 14, 2019
2e4bce0
ppp
Apr 14, 2019
3012242
checkstyle
Apr 14, 2019
1964d80
dg
Apr 14, 2019
57cf8eb
Merge pull request #163 from jacobhan/master
jacobhan Apr 14, 2019
67f4331
dg png
Apr 14, 2019
20e6a76
Merge pull request #164 from jacobhan/master
jacobhan Apr 14, 2019
8e1fdfa
ppp
Apr 14, 2019
baf9307
Merge pull request #165 from jacobhan/master
jacobhan Apr 14, 2019
3e47187
ug
dominic2017 Apr 15, 2019
494ca08
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
dominic2017 Apr 15, 2019
7275124
ug
dominic2017 Apr 15, 2019
173c020
ug
dominic2017 Apr 15, 2019
80cca5f
fixes
yushao2 Apr 15, 2019
37fff62
bug fixes
yushao2 Apr 15, 2019
179e530
checkstyle fixes
yushao2 Apr 15, 2019
306a889
removed browsertest
yushao2 Apr 16, 2019
b086ccc
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t11-3/main
yushao2 Apr 16, 2019
dd2072e
fixed checkstyle
yushao2 Apr 16, 2019
e35ce4b
dg update
kaicongng-glitch Apr 16, 2019
eca358e
ug
kaicongng-glitch Apr 16, 2019
fe00a57
Merge branch 'master' of github.com:cs2113-ay1819s2-t11-3/main
kaicongng-glitch Apr 16, 2019
d816b81
Added tags
kaicongng-glitch Apr 27, 2019
b3ffbda
Update DeveloperGuide.adoc
kaicongng-glitch Apr 27, 2019
fb35a19
Added RepoSense tags
kaicongng-glitch Apr 27, 2019
8571980
Update kaicong.adoc
kaicongng-glitch Apr 30, 2019
02d389e
Update kaicong.adoc
kaicongng-glitch Apr 30, 2019
9bc532c
Update kaicong.adoc
kaicongng-glitch Apr 30, 2019
c7780fc
Update ExcelUtil.java
kaicongng-glitch Apr 30, 2019
d828e66
linechart edits
kaicongng-glitch Apr 30, 2019
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lib/*
*.log
*.log.*
*.csv
config.json
/config.json
src/test/data/sandbox/
preferences.json
.DS_Store
Expand Down
Binary file added ENTRIES_ALL.xlsx
Binary file not shown.
35 changes: 26 additions & 9 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Address Book (Level 4)
= Budgeter
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://travis-ci.org/cs2113-ay1819s2-t11-3/main[image:https://travis-ci.org/cs2113-ay1819s2-t11-3/main.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://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]]
Expand All @@ -14,13 +14,29 @@ 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).

*This app is mainly for users who want to:*

* Understand and reconcile their financial entries to make better financial decisions
* Organise their financial information using mostly CLI
* Have a visual representation of their financial data
* Store and retrieve their financial data efficiently

*This app is mainly written in an OOP fashion.* +

*What’s good about this project:*

* The app has a sophisticated GUI that includes a list panel, a table panel and also report panels

* The app has the ability to show detailed visual representations of the financial spendings and income data stored in the application.

* The app has suggestive command UI built in to aid in the typing.

* Contains many test cases, including automated GUI testing.

* Supports for Build Automation using Gradle and for Continuous Integration using Travis CI.


== Site Map

Expand All @@ -34,6 +50,7 @@ endif::[]

* 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://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
25 changes: 25 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"authors":
[
{
"githubId": "frankquekch",
"displayName": "DOM...HAO",
"authorNames": ["frankquekch"]
},
{
"githubId": "jacobhan",
"displayName": "HAN...WOO",
"authorNames": ["jacobhan", "Jacob Han"]
},
{
"githubId": "ngkaicong",
"displayName": "NG ...ONG",
"authorNames": ["ngkaicong"]
},
{
"githubId": "yushao2",
"displayName": "PAN...HAO",
"authorNames": ["yushao2"]
}
]
}
58 changes: 52 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ plugins {
id 'com.github.johnrengelman.shadow' version '2.0.3'
id 'org.asciidoctor.convert' version '1.5.6'
id 'application'
id 'org.jetbrains.kotlin.jvm' version '1.3.21'
//id 'org.apache.poi'
}

if (JavaVersion.current() == JavaVersion.VERSION_1_10
Expand All @@ -28,7 +30,7 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_10
}

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

sourceCompatibility = JavaVersion.VERSION_1_9
targetCompatibility = JavaVersion.VERSION_1_9
Expand All @@ -55,12 +57,21 @@ test {
}

dependencies {

compile 'org.json:json:20171018'
compile 'com.googlecode.json-simple:json-simple:1.1.1'

String testFxVersion = '4.0.12-alpha'
String jUnitVersion = '5.1.0'

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
implementation group: 'com.google.guava', name: 'guava', version: '19.0'
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.8'
implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
implementation group: 'javax.activation', name: 'activation', version: '1.1.1'


testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion, {
Expand All @@ -74,6 +85,31 @@ dependencies {
testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-9+181'
testRuntimeOnly group:'org.junit.vintage', name:'junit-vintage-engine', version: jUnitVersion
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

// https://mvnrepository.com/artifact/org.apache.poi/poi
compile group: 'org.apache.poi', name: 'poi', version: '3.17'

// https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml
compile group: 'org.apache.poi', name: 'poi-ooxml', version: '3.17'

// https://mvnrepository.com/artifact/org.apache.poi/poi-scratchpad
compile group: 'org.apache.poi', name: 'poi-scratchpad', version: '3.17'

// https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas
compile group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: '3.17'

// https://mvnrepository.com/artifact/org.apache.poi/ooxml-schemas
compile group: 'org.apache.poi', name: 'ooxml-schemas', version: '1.1'

// https://mvnrepository.com/artifact/org.apache.poi/poi-excelant
compile group: 'org.apache.poi', name: 'poi-excelant', version: '3.17'

// https://mvnrepository.com/artifact/org.apache.poi/poi-contrib
compile group: 'org.apache.poi', name: 'poi-contrib', version: '3.6'

// https://mvnrepository.com/artifact/org.apache.poi/poi-examples
compile group: 'org.apache.poi', name: 'poi-examples', version: '3.9'
}

shadowJar {
Expand Down Expand Up @@ -152,16 +188,16 @@ test {
}

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

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

if (!runGuiTests) {
test.exclude 'seedu/address/ui/**'
test.exclude 'seedu/budgeteer/ui/**'
}
}
}
Expand Down Expand Up @@ -202,8 +238,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-name': 'Financial Savior',
'site-githuburl': 'https://github.com/cs2113-ay1819s2-t11-3/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down Expand Up @@ -235,3 +271,13 @@ deployOfflineDocs.dependsOn asciidoctor
processResources.dependsOn deployOfflineDocs

defaultTasks 'clean', 'headless', 'allTests', 'coverage', 'asciidoctor'
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
53 changes: 26 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,52 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
Budgeteer was developed by T11/3.

We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== 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>>]

Role: Project Advisor
=== Pang Yu Shao
image::yushao2.png[width="150", align="left"]
{empty}[https://github.com/yushao2[github]]
{empty}[https://cs2113-ay1819s2-t11-3.github.io/main/team/yushao.html[portfolio]]

'''
Role: Developer, QA +

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[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>>]
=== Dominic
image::frankquekch.png[width="150", align="left"]
{empty}[http://github.com/frankquekch[github]]
{empty}[https://cs2113-ay1819s2-t11-3.github.io/main/team/dominic.html[portfolio]]


Role: Developer +
Responsibilities: Data


'''
//@@author ngkaicong

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Ng Kai Cong
image::ngkaicong.png[width="150", align="left"]
{empty}[http://github.com/ngkaicong[github]]
{empty}[https://cs2113-ay1819s2-t11-3.github.io/main/team/kaicong.html[portfolio]]

Role: Developer +
Responsibilities: Dev Ops + Threading
//@@author

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Jacob
image::jacobhan.png[width="150", align="left"]
{empty}[http://github.com/jacobhan[github]]
{empty}[https://cs2113-ay1819s2-t11-3.github.io/main/team/jacobhan.html[portfolio]]


Role: Developer +
Responsibilities: UI


'''

4 changes: 2 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/cs2113-ay1819s2-t11-3/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at `kaicong@gmail.com`, `p.yushao2@gmail.com`, `frankquekch@gmail.com`, 'jacobhan1013@gmail.com'
Loading