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

Fixed minor issues & added UI for readme #142

Open
wants to merge 656 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
656 commits
Select commit Hold shift + click to select a range
228c265
Merge pull request #17 from CS2103JAN2018-T09-B1/master
johnnychanjx Apr 6, 2018
f66ee40
Merge pull request #12 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 6, 2018
343a9ad
This is for the cca model so far.
chuakunhong Apr 6, 2018
7bcfa7e
edit some commands and userguide
TeyXinHui Apr 7, 2018
ebf33d8
Merge pull request #167 from TeyXinHui/master
TeyXinHui Apr 7, 2018
c126f28
fix unhandled exception for edit subject
TeyXinHui Apr 8, 2018
ae8cff9
Merge pull request #176 from TeyXinHui/master
TeyXinHui Apr 8, 2018
3075274
Some thing happened to my apache...
chuakunhong Apr 8, 2018
210a7ab
Settled checkstyle...
chuakunhong Apr 8, 2018
682469f
Added cca,
chuakunhong Apr 8, 2018
cee3d6a
Made cca and injuries history work.
chuakunhong Apr 8, 2018
ca5dbf2
Pass checkstyle! haha
chuakunhong Apr 9, 2018
6791774
able to add and delete injurieshistory.
chuakunhong Apr 9, 2018
6f968ed
Pass CheckStyle
chuakunhong Apr 9, 2018
d433741
Merge pull request #181 from chuakunhong/Week12
chuakunhong Apr 9, 2018
d4ad054
Updated deleteCca command and addCca command.
chuakunhong Apr 9, 2018
581755a
Trying to add nextOfKin to the software.
chuakunhong Apr 9, 2018
bfcc186
Managed to get the command parser to recognise the nextofkin command.
chuakunhong Apr 9, 2018
8e21c15
revert back SelectCommand
TeyXinHui Apr 9, 2018
d4cda54
Create a new StreamCommand
TeyXinHui Apr 9, 2018
f9b1e32
update and add new tests
TeyXinHui Apr 9, 2018
e7266c4
update userguide
TeyXinHui Apr 9, 2018
79376fa
fix checkstyle
TeyXinHui Apr 9, 2018
1bd922f
Merge pull request #13 from CS2103JAN2018-T09-B1/Week12Testing
TeyXinHui Apr 9, 2018
271c277
update person test case due to new person attributes
TeyXinHui Apr 9, 2018
aea695c
fix checkstyle
TeyXinHui Apr 9, 2018
545dce0
fix more checkstyle
TeyXinHui Apr 9, 2018
fb5177c
Merge pull request #183 from TeyXinHui/master
TeyXinHui Apr 9, 2018
bc45212
Merge pull request #18 from CS2103JAN2018-T09-B1/Week12Testing
johnnychanjx Apr 9, 2018
a4b2bff
Added editing page
johnnychanjx Apr 9, 2018
ccd6de9
Add more editing support
johnnychanjx Apr 9, 2018
4ae2c5c
Added many things
johnnychanjx Apr 9, 2018
2d2744c
Fixed Checkstyle
johnnychanjx Apr 10, 2018
54983c9
Merge pull request #184 from johnnychanjx/Week12
johnnychanjx Apr 10, 2018
c56d135
Merge pull request #14 from CS2103JAN2018-T09-B1/Week12Testing
TeyXinHui Apr 10, 2018
ab82da8
This is to add the cca.
chuakunhong Apr 10, 2018
47e3b1f
Tried next of kin...
chuakunhong Apr 10, 2018
84f7d53
Clear checkstyle
chuakunhong Apr 10, 2018
217abe9
Created new classes for Appointment panel
kengsengg Apr 10, 2018
4dcdada
Added fxml files for AppointmentList
kengsengg Apr 10, 2018
4a13f25
MainWindow: added appointmentListPanel
kengsengg Apr 10, 2018
17a61be
Implemented getFilteredAppointmentList() method
kengsengg Apr 10, 2018
3b3d7d8
MainWindow.fxml: created appointment panel on UI and adjusted settings
kengsengg Apr 10, 2018
4930921
Fixed tests
kengsengg Apr 10, 2018
0e4765f
Added XmlAdaptedAppointment
kengsengg Apr 11, 2018
ddd57a6
Added updateFilteredAppointmentList() method
kengsengg Apr 11, 2018
3907121
Saved AppointmentList data into file and show on UI
kengsengg Apr 11, 2018
90acbb7
Cca has name and position, pass checkstyle and pass testcases.
chuakunhong Apr 11, 2018
8c2449d
Merge pull request #21 from CS2103JAN2018-T09-B1/pr/185
chuakunhong Apr 11, 2018
2eb60df
Merge pull request #22 from CS2103JAN2018-T09-B1/Week12Testing
chuakunhong Apr 11, 2018
5d14852
Merge branch 'Testing' into Week12
chuakunhong Apr 11, 2018
ff25d38
Can pass test!
chuakunhong Apr 11, 2018
074fad4
Removed the element, cca position.
chuakunhong Apr 11, 2018
d7146a6
remove invalid subject combination exception
TeyXinHui Apr 11, 2018
8023384
forgot to stage these
TeyXinHui Apr 11, 2018
0f259fc
Trying to pass travis.
chuakunhong Apr 11, 2018
1037c54
Edited classes to include info attribute
kengsengg Apr 11, 2018
03bd564
UI Support for Jar creation
johnnychanjx Apr 11, 2018
82f3613
fix checkstyle
TeyXinHui Apr 11, 2018
c68a799
Merge pull request #186 from TeyXinHui/master
TeyXinHui Apr 11, 2018
9e31c08
Merge branch 'Week12Testing' into Week12
chuakunhong Apr 11, 2018
fc3d16d
Please pass travis...
chuakunhong Apr 11, 2018
4f3afe0
Merge pull request #188 from johnnychanjx/Week12
johnnychanjx Apr 11, 2018
363efca
Merge branch 'Week12' of https://github.com/chuakunhong/main into Week12
chuakunhong Apr 11, 2018
4d2353d
Merge branch 'Week12Testing' into Week12
chuakunhong Apr 11, 2018
c50984a
Please pass Travis...
chuakunhong Apr 11, 2018
fc94016
Please go away trailing white spaces..
chuakunhong Apr 11, 2018
2dc853f
Merge pull request #185 from chuakunhong/Week12
chuakunhong Apr 11, 2018
43b83c6
Fixed checkstyle and failed tests
kengsengg Apr 11, 2018
4e82a0b
SampleDataUtil: Added sample appointment data
kengsengg Apr 11, 2018
b7793e3
AddressBookChangedEvent: included appointments
kengsengg Apr 11, 2018
51a1c94
Collated files
kengsengg Apr 11, 2018
6b158aa
Updated the UserGuide on commands for InjuriesHistory and the Cca.
chuakunhong Apr 11, 2018
8719103
Merge pull request #15 from CS2103JAN2018-T09-B1/Week12Testing
TeyXinHui Apr 11, 2018
2ebd50d
Merge branch 'Week12Testing' into wk12
kengsengg Apr 11, 2018
24cd37c
Merge pull request #189 from kengsengg/wk12
kengsengg Apr 11, 2018
56e0a4b
Merge pull request #20 from CS2103JAN2018-T09-B1/Week12Testing
kengsengg Apr 11, 2018
3877193
created a new score attribute to the student(l1r5, l1b4a, l1b4b, l1b4…
TeyXinHui Apr 11, 2018
b876d78
fix conflicts
TeyXinHui Apr 11, 2018
a8248c5
fix checkstyle
TeyXinHui Apr 11, 2018
1876955
fix checkstyle?
TeyXinHui Apr 11, 2018
34ea734
checkstyle why
TeyXinHui Apr 11, 2018
60fd3b0
Merge pull request #190 from TeyXinHui/master
TeyXinHui Apr 11, 2018
a9c670c
print nok details method
TeyXinHui Apr 11, 2018
e48dcf1
checkstyle
TeyXinHui Apr 11, 2018
4ba0fb8
Merge pull request #191 from TeyXinHui/master
TeyXinHui Apr 11, 2018
51b6630
Merge pull request #21 from CS2103JAN2018-T09-B1/Week12Testing
johnnychanjx Apr 11, 2018
db5bb22
Added UI support for phone, l1r5,cca
johnnychanjx Apr 11, 2018
b581bc3
Updated UGDG, About Us and PPP
kengsengg Apr 11, 2018
e90b35e
Updated picture file name
kengsengg Apr 11, 2018
6d29ca6
Added whitespace for messages and adjusted settings for panel
kengsengg Apr 11, 2018
522daef
Updated UGDG
johnnychanjx Apr 11, 2018
eaa8574
Shows - when no L1R5 is out
johnnychanjx Apr 11, 2018
ac48eba
Merge pull request #192 from kengsengg/wk12testing
kengsengg Apr 11, 2018
51dd4b6
Fixed Checkstyle
johnnychanjx Apr 11, 2018
2b8c433
Merge pull request #194 from johnnychanjx/Week13
johnnychanjx Apr 11, 2018
2634b03
Use File Seperator to support multiple OSes
johnnychanjx Apr 11, 2018
85c7eb3
Merge pull request #195 from johnnychanjx/Week13
johnnychanjx Apr 11, 2018
2aacfb8
Merge pull request #21 from CS2103JAN2018-T09-B1/master
kengsengg Apr 11, 2018
ff99011
Merge branch 'wk12testing' into Week12Testing
kengsengg Apr 11, 2018
3f7f0e0
Merge pull request #22 from CS2103JAN2018-T09-B1/Week12Testing
kengsengg Apr 11, 2018
2e9d875
Merge pull request #196 from kengsengg/wk12testing
kengsengg Apr 11, 2018
ab19e5e
Need to keep this first
chuakunhong Apr 12, 2018
0351ed9
change colour theme for ui
TeyXinHui Apr 12, 2018
cd2aeaf
Merge pull request #197 from TeyXinHui/master
TeyXinHui Apr 12, 2018
b928f3c
Merge pull request #16 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 12, 2018
56d0eaf
remove score attribute
TeyXinHui Apr 12, 2018
2a52e52
checkstyle
TeyXinHui Apr 12, 2018
01151fb
missing import?
TeyXinHui Apr 12, 2018
5b68d21
checkstyle
TeyXinHui Apr 12, 2018
5c2494d
Merge pull request #198 from TeyXinHui/master
TeyXinHui Apr 12, 2018
efc3c9e
Pass test and checkstyle!
chuakunhong Apr 12, 2018
5afc34e
Merge branch 'Week12' of https://github.com/chuakunhong/main into Week12
chuakunhong Apr 12, 2018
055a444
Merge pull request #23 from CS2103JAN2018-T09-B1/master
chuakunhong Apr 12, 2018
8873a7b
Merge branch 'master' into Week12
chuakunhong Apr 12, 2018
608f39f
Merge pull request #199 from chuakunhong/Week12
chuakunhong Apr 12, 2018
191c4ee
Merge pull request #22 from CS2103JAN2018-T09-B1/Week12Testing
johnnychanjx Apr 12, 2018
cedef1f
Merge pull request #17 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 12, 2018
c7d1fe4
edit invalid messages
TeyXinHui Apr 12, 2018
1a286a1
add new editSubjectCommand
TeyXinHui Apr 12, 2018
b81287a
add editCommandTest
TeyXinHui Apr 12, 2018
be4a0df
add EditSubjectCommandTest
TeyXinHui Apr 12, 2018
dbdcadb
Merge pull request #201 from TeyXinHui/master
TeyXinHui Apr 12, 2018
86b97ab
Merge pull request #23 from CS2103JAN2018-T09-B1/master
johnnychanjx Apr 12, 2018
6495a93
Edited name for AppointmentCommand and fixed checkstyle
kengsengg Apr 12, 2018
9c26f85
Merge branch 'wk12testing'
kengsengg Apr 12, 2018
891e2ce
Added new Command to change Theme
johnnychanjx Apr 12, 2018
6eb3ad4
Update UGDG
johnnychanjx Apr 12, 2018
38d05e1
Add support for addnok command
johnnychanjx Apr 12, 2018
38a7563
Added UI support after undo command is called
johnnychanjx Apr 12, 2018
222cb44
Add newline to css files
johnnychanjx Apr 12, 2018
b302759
Merge pull request #203 from johnnychanjx/Week13
johnnychanjx Apr 12, 2018
601556a
Update UI
johnnychanjx Apr 12, 2018
2bb995b
Change Gender: to Relatationship:
johnnychanjx Apr 12, 2018
70f3277
Delete Ui.png
johnnychanjx Apr 12, 2018
f540a87
fixing merging problem
johnnychanjx Apr 12, 2018
c933eec
Merge pull request #204 from johnnychanjx/Week13
johnnychanjx Apr 12, 2018
f386673
fixing merging problem pt 2
johnnychanjx Apr 12, 2018
f820eb8
Merge pull request #205 from johnnychanjx/Week13
johnnychanjx Apr 12, 2018
613587a
Merge pull request #18 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 13, 2018
a8e8c24
Make remarks great again.
chuakunhong Apr 13, 2018
fabc04c
Merge pull request #24 from CS2103JAN2018-T09-B1/master
chuakunhong Apr 13, 2018
88398be
enhance parseSubjects to prevent the adding of duplicate subjects
TeyXinHui Apr 13, 2018
412e019
Updated the phone and email.
chuakunhong Apr 13, 2018
c4be66c
Merge pull request #207 from TeyXinHui/master
TeyXinHui Apr 13, 2018
cbb441c
add new method to return unmodifiable Set<subject>
TeyXinHui Apr 13, 2018
586f3fa
add new addSubjectCommand
TeyXinHui Apr 13, 2018
3dd1bd9
add test cases for AddSubjectCommand
TeyXinHui Apr 13, 2018
424bd83
checkstyle
TeyXinHui Apr 13, 2018
33e5d53
fix checkstyle
TeyXinHui Apr 13, 2018
6ebe840
checkstyle
TeyXinHui Apr 13, 2018
9f3c830
Merge pull request #209 from TeyXinHui/master
TeyXinHui Apr 13, 2018
2a0c255
fix unable to add subject when there is duplicate subject bug
TeyXinHui Apr 13, 2018
d702afc
Merge pull request #211 from TeyXinHui/master
TeyXinHui Apr 13, 2018
15e555b
Implemented DeleteAppointmentCommand
kengsengg Apr 13, 2018
726395b
Fixed header comments and failed tests
kengsengg Apr 13, 2018
e3399da
pass check style!
chuakunhong Apr 14, 2018
a10a3ad
Merge pull request #212 from chuakunhong/Week12
chuakunhong Apr 14, 2018
d7159d4
Updated addremarkcommand test.
chuakunhong Apr 14, 2018
0cb3a2b
Done with the addremark comman parser test!
chuakunhong Apr 14, 2018
2be52bc
update userguide
TeyXinHui Apr 14, 2018
6dfb97e
update project portfolio
TeyXinHui Apr 14, 2018
abe8c11
Merge pull request #213 from TeyXinHui/master
TeyXinHui Apr 14, 2018
4398370
DeleteRemarkCommand Test done!
chuakunhong Apr 14, 2018
612496f
Merge pull request #19 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 14, 2018
c5f1ea3
add more pictures/update pictures in ugdg
TeyXinHui Apr 14, 2018
7f77b59
Merge pull request #215 from TeyXinHui/master
TeyXinHui Apr 14, 2018
a5511c4
Implemented restrictions for adding of appointments
kengsengg Apr 14, 2018
7988f2b
update ugdg
TeyXinHui Apr 14, 2018
8adaf85
Merge pull request #216 from TeyXinHui/master
TeyXinHui Apr 14, 2018
9f07fe1
update ug and pp again
TeyXinHui Apr 14, 2018
01df10a
create tests for nextOfKinCommand
TeyXinHui Apr 14, 2018
94fc11e
Merge pull request #217 from TeyXinHui/master
TeyXinHui Apr 14, 2018
ce53b38
Added the name attribute to appointment
kengsengg Apr 14, 2018
5efbe2b
create tests for nokcommandparser
TeyXinHui Apr 14, 2018
a9cd863
Merge pull request #218 from TeyXinHui/master
TeyXinHui Apr 14, 2018
975212c
add new tests cases for addccacommandparser
TeyXinHui Apr 15, 2018
5befdd2
checkstyle
TeyXinHui Apr 15, 2018
fe5c35c
Merge pull request #219 from TeyXinHui/master
TeyXinHui Apr 15, 2018
71b0d25
Pass test for deleteremarks command and parser and addinjuries parser.
chuakunhong Apr 15, 2018
cfb4694
Able to add and delete event on calendar based on given ID
kengsengg Apr 15, 2018
1f9b5ec
Updated the test for injuries!
chuakunhong Apr 15, 2018
a4a3141
Pass checkstyle!
chuakunhong Apr 15, 2018
a43aee2
Merge branch 'master' into Week12
chuakunhong Apr 15, 2018
7ea8915
Update CommandTestUtil.java
chuakunhong Apr 15, 2018
d926529
Able to view calendar but unable to pass in user input
kengsengg Apr 15, 2018
e4cb585
Merge pull request #220 from chuakunhong/Week12
chuakunhong Apr 15, 2018
5f82d1a
Merge branch 'wk13testing' into master
kengsengg Apr 15, 2018
432cc0b
Merge pull request #23 from CS2103JAN2018-T09-B1/master
kengsengg Apr 15, 2018
1c89035
Merge pull request #25 from CS2103JAN2018-T09-B1/master
chuakunhong Apr 15, 2018
6bd7bdd
getting rid of delete cca
chuakunhong Apr 15, 2018
593f957
Merge branch 'Week12'
chuakunhong Apr 15, 2018
1ccf6db
Merge branch 'wk13testing' into wk13
kengsengg Apr 15, 2018
97275c0
Merge pull request #24 from kengsengg/wk13
kengsengg Apr 15, 2018
f1180b8
Change to make the command look better.
chuakunhong Apr 15, 2018
22bdd5f
Added AddAppointmentCommandTest class, collated files and fixed messages
kengsengg Apr 15, 2018
8f744c7
fixed eof error
kengsengg Apr 15, 2018
b5e5c8d
Merge pull request #221 from kengsengg/wk13testing
kengsengg Apr 15, 2018
99daaf3
Merge pull request #24 from CS2103JAN2018-T09-B1/master
johnnychanjx Apr 15, 2018
4fd2d09
Add Change Theme Tests
johnnychanjx Apr 15, 2018
f84cde0
Merge pull request #222 from johnnychanjx/Week13
johnnychanjx Apr 15, 2018
c6c73dd
Merge pull request #20 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 15, 2018
24bc88b
Updated the user guide. Still missing some pictures inside.
chuakunhong Apr 15, 2018
8086059
Implemented ViewCommand with working Google Calendar page
kengsengg Apr 15, 2018
f0889fe
Updated the dg.
chuakunhong Apr 15, 2018
4e1e8e0
Merge branch 'master' into master
chuakunhong Apr 15, 2018
b3a2f75
update ug
TeyXinHui Apr 15, 2018
d4fd7b7
Update AddressBookParser.java
chuakunhong Apr 15, 2018
bac809f
Update AddressBookParser.java
chuakunhong Apr 15, 2018
e5b2acf
Merge pull request #224 from TeyXinHui/master
TeyXinHui Apr 15, 2018
e2a454a
Merge pull request #223 from chuakunhong/master
chuakunhong Apr 15, 2018
d799665
Merge pull request #21 from CS2103JAN2018-T09-B1/master
TeyXinHui Apr 15, 2018
c69c39d
update ug
TeyXinHui Apr 15, 2018
c79ed57
Updated PPP
johnnychanjx Apr 15, 2018
4924459
Merge branch 'master' of https://github.com/TeyXinHui/main
TeyXinHui Apr 15, 2018
3085b99
solve adding of people witho duplicate ic
TeyXinHui Apr 15, 2018
39092b7
solve test and prevent adding of duplicate ic from editcommand
TeyXinHui Apr 15, 2018
dfe1068
Merge pull request #225 from TeyXinHui/master
TeyXinHui Apr 15, 2018
6670c6f
Updated the user guide part for adding and deleting of injuries.
chuakunhong Apr 15, 2018
302ad78
Updated UG and tests
kengsengg Apr 15, 2018
b90d3e0
solves some test for editcommand
TeyXinHui Apr 15, 2018
2812972
checkstyle
TeyXinHui Apr 15, 2018
f548635
Fixed checkstyle
kengsengg Apr 15, 2018
2e07d8c
Merge pull request #226 from TeyXinHui/master
TeyXinHui Apr 15, 2018
7f658bc
solves the failed tests
TeyXinHui Apr 15, 2018
41bf0ab
Merge pull request #227 from TeyXinHui/master
TeyXinHui Apr 15, 2018
d48c4e6
Updated ugdg
chuakunhong Apr 15, 2018
728562c
Merge branch 'master' of https://github.com/chuakunhong/main
chuakunhong Apr 15, 2018
2ff5734
Merge branch 'master' into wk13testing
kengsengg Apr 15, 2018
a6477ca
Merge pull request #228 from kengsengg/wk13testing
kengsengg Apr 15, 2018
1163b9d
update ugdg
TeyXinHui Apr 15, 2018
406595d
Merge pull request #229 from TeyXinHui/master
TeyXinHui Apr 15, 2018
26d4c7b
Merge pull request #230 from chuakunhong/master
chuakunhong Apr 15, 2018
7cd2e3d
Merge pull request #26 from CS2103JAN2018-T09-B1/master
chuakunhong Apr 15, 2018
bde67c8
Collated properly.
chuakunhong Apr 15, 2018
30bc55b
Merge pull request #231 from johnnychanjx/Week13
johnnychanjx Apr 15, 2018
265a690
Updated UGDG
chuakunhong Apr 15, 2018
c83ac98
Merge pull request #232 from chuakunhong/master
chuakunhong Apr 15, 2018
e9d73e4
Added collate stuff
johnnychanjx Apr 15, 2018
3a47692
Merge pull request #233 from johnnychanjx/Week13
johnnychanjx Apr 15, 2018
564de36
collate stuff
johnnychanjx Apr 15, 2018
94b7258
Merge pull request #234 from johnnychanjx/Week13
johnnychanjx Apr 15, 2018
f3d10ab
Merge pull request #27 from CS2103JAN2018-T09-B1/master
chuakunhong Apr 15, 2018
8f55e3d
For collation!
chuakunhong Apr 15, 2018
e550c1a
Merge pull request #235 from chuakunhong/master
chuakunhong Apr 15, 2018
55de18f
updated about us
johnnychanjx Apr 15, 2018
4d0e3a7
Merge pull request #236 from johnnychanjx/Week13
johnnychanjx Apr 15, 2018
06ca329
collate stuff
johnnychanjx Apr 15, 2018
c118f13
Updated user guide
johnnychanjx Apr 15, 2018
55a2e7d
Merge branch 'master' into Week13
johnnychanjx Apr 15, 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
  •  
  •  
  •  
23 changes: 9 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
= Address Book (Level 4)
= EduBuddy

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://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]]
https://travis-ci.org/CS2103JAN2018-T09-B1/main[image:https://travis-ci.org/CS2103JAN2018-T09-B1/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/kengsengg/main[image:https://ci.appveyor.com/api/projects/status/imspkq3b5pvh5p1d?svg=true[Build status]]
https://coveralls.io/github/CS2103JAN2018-T09-B1/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-T09-B1/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/kengsengg/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103JAN2018-T09-B1/main&amp;utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/aa9351de0bd0451596b55bf5839464d9[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,24 +15,19 @@ 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 student profiling 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 secondary school teachers while using Java as the main programming language.

== Site Map

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

== Acknowledgements

* The source code for this application is adapted from https://github.com/se-edu/addressbook-level4[AddressBook-Level 4 Project] created by SE-EDU initiative.
* 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_.
* Libraries used: https://github.com/TomasMikula/EasyBind[EasyBind], 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/junit4[JUnit4]
Expand Down
15 changes: 11 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ plugins {
id "com.github.johnrengelman.shadow" version '1.2.3'
id 'org.asciidoctor.convert' version '1.5.6'
id 'application'

}

// Specifies the entry point of the application
Expand Down Expand Up @@ -46,6 +47,11 @@ dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
compile group: 'com.google.guava', name: 'guava', version: '19.0'
//https://mvnrepository.com/artifact/commons-io/commons-io
compile group: 'commons-io', name: 'commons-io', version: '2.6'
compile 'com.google.api-client:google-api-client:1.23.0'
compile 'com.google.oauth-client:google-oauth-client-jetty:1.23.0'
compile 'com.google.apis:google-api-services-calendar:v3-rev304-1.23.0'

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.testfx', name: 'testfx-core', version: testFxVersion
Expand All @@ -57,9 +63,9 @@ dependencies {
}

shadowJar {
archiveName = "addressbook.jar"
archiveName = "EduBuddy.jar"

destinationDir = file("${buildDir}/jar/")
destinationDir = file("${buildDir}")
}

task wrapper(type: Wrapper) {
Expand Down Expand Up @@ -193,12 +199,13 @@ task deployOfflineDocs(type: Copy) {
include 'stylesheets/*'
include 'images/*'
include 'UserGuide.html'
include 'StudentPage/*'
}
}

task copyDummySearchPage(type: Copy) {
from 'docs/DummySearchPage.html'
into "${buildDir}/docs/html5"
from '/StudentPage/template.html'
into "${buildDir}"
}

deployOfflineDocs.dependsOn asciidoctor
Expand Down
Loading