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

[W13-2] ClubManager #45

Open
wants to merge 679 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
679 commits
Select commit Hold shift + click to select a range
19f61c0
Merge pull request #187 from joel0111/member-v1.4
ivyyangyq Apr 8, 2019
b538db6
Merge branch 'master' into Member-v1.4-branch
ivyyangyq Apr 8, 2019
60482b2
Merge branch 'master' into activity1.4
ivyyangyq Apr 8, 2019
a98aaef
Merge pull request #186 from ivyyangyq/activity1.4
ivyyangyq Apr 8, 2019
19b96ba
fix merge conflict
ivyyangyq Apr 8, 2019
b1750f7
fix activity conflict with master
ivyyangyq Apr 8, 2019
2e30ee1
Merge pull request #195 from ivyyangyq/member
ivyyangyq Apr 8, 2019
ed95715
Merge pull request #196 from ivyyangyq/activity_fix
ivyyangyq Apr 8, 2019
8604f9d
Merge pull request #193 from cs2103-ay1819s2-w13-2/activity1.4
ivyyangyq Apr 8, 2019
8968836
Merge branch 'Member-v1.4-branch' into memDelete
ivyyangyq Apr 8, 2019
f3bf754
fix merge conflict
ivyyangyq Apr 8, 2019
6786c38
Merge pull request #197 from ivyyangyq/fix
ivyyangyq Apr 8, 2019
3d5564f
Merge branch 'master' into Member-v1.4-branch
ivyyangyq Apr 8, 2019
8131adb
Remove redundant commands
ivyyangyq Apr 8, 2019
ab19fce
Merge pull request #198 from ivyyangyq/fix
ivyyangyq Apr 8, 2019
ec85ac5
Merge branch 'master' into Userguide
ivyyangyq Apr 8, 2019
7646138
Merge pull request #182 from melkwx/Userguide
ivyyangyq Apr 8, 2019
fe46958
Change structure of export, implement format resource
A0143487X-Kevin Apr 8, 2019
d847d84
Update UI and Sample Data with attending list
ivyyangyq Apr 8, 2019
8f31050
Edited to have deeper table of content
ivyyangyq Apr 8, 2019
ee70139
Merge pull request #199 from ivyyangyq/update
ivyyangyq Apr 8, 2019
8c6fcd6
Fix activityEdit command usage
minernchan Apr 8, 2019
8fec0cc
Checkstyle changes
A0143487X-Kevin Apr 8, 2019
e95eb8c
Merge pull request #200 from minernchan/activity
minernchan Apr 8, 2019
39dcccd
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/mai…
minernchan Apr 8, 2019
f40ff33
checkstyle resources
A0143487X-Kevin Apr 8, 2019
cba13d2
Merge pull request #201 from A0143487X-Kevin/RestructureExport
A0143487X-Kevin Apr 8, 2019
50476ae
Merge pull request #202 from cs2103-ay1819s2-w13-2/RestructureExport
A0143487X-Kevin Apr 8, 2019
22da70e
Clear command updates mode UI
A0143487X-Kevin Apr 8, 2019
03885a5
Update Developer Guide and PPP
ivyyangyq Apr 8, 2019
71fa0c2
add ActivityExport Function and formatting
A0143487X-Kevin Apr 8, 2019
0d4965b
Change checkstyle, fix clear command test
A0143487X-Kevin Apr 8, 2019
aa03480
Made important fixes for v1.4
joel0111 Apr 8, 2019
08f8eee
Updated Tests
joel0111 Apr 8, 2019
f939ca4
Updated PersonListPanelTest
joel0111 Apr 8, 2019
722de51
memberEdit cannot edit matric num
melkwx Apr 8, 2019
0231298
Fixed datetime input
ivyyangyq Apr 8, 2019
ea62c36
Merge pull request #203 from A0143487X-Kevin/enhanceExportFunction_up…
A0143487X-Kevin Apr 8, 2019
0947d3c
Merge pull request #204 from joel0111/master
A0143487X-Kevin Apr 8, 2019
c6bea67
test updates
melkwx Apr 8, 2019
6b531e1
Merge pull request #207 from cs2103-ay1819s2-w13-2/final-member-branch
A0143487X-Kevin Apr 8, 2019
ff7384c
Update UG DG
A0143487X-Kevin Apr 8, 2019
d5ff99e
Merge pull request #208 from A0143487X-Kevin/enhanceExportFunction_up…
A0143487X-Kevin Apr 8, 2019
70bc312
Rename part 1
A0143487X-Kevin Apr 8, 2019
612277d
Rename pt 2 extension
A0143487X-Kevin Apr 8, 2019
047efef
Update Portfolio and UG
A0143487X-Kevin Apr 8, 2019
6ec3952
Merge pull request #209 from A0143487X-Kevin/enhanceExportFunction_up…
A0143487X-Kevin Apr 8, 2019
cd36b33
memberEdit test
melkwx Apr 8, 2019
5aefc09
Fix bugs in activity add and delete member
minernchan Apr 8, 2019
6c6b4de
Merge branch 'master' into activity
minernchan Apr 8, 2019
cd99da8
Merge branch 'activity1.4' into activity
minernchan Apr 8, 2019
620fe02
Added command alias feature
A0143487X-Kevin Apr 9, 2019
081ed17
Change indentation of case statement
A0143487X-Kevin Apr 9, 2019
cfa9a0d
Change indentation
A0143487X-Kevin Apr 9, 2019
cae00b8
Merge pull request #206 from ivyyangyq/activity1.4
ivyyangyq Apr 9, 2019
111615c
Merge pull request #210 from minernchan/activity
ivyyangyq Apr 9, 2019
546a2b0
update Userguide.adoc memberEdit, memberFind
melkwx Apr 9, 2019
9c2959c
Removed obsolete field
ivyyangyq Apr 9, 2019
a64197a
Test cases mode modeparser memberexportparser
A0143487X-Kevin Apr 9, 2019
6e3a645
Merge pull request #213 from ivyyangyq/activity1.4
ivyyangyq Apr 9, 2019
1d660ef
Merge pull request #212 from cs2103-ay1819s2-w13-2/activity1.4
A0143487X-Kevin Apr 9, 2019
ab9a79a
Merge pull request #211 from A0143487X-Kevin/commandAlias
A0143487X-Kevin Apr 9, 2019
5e900c1
Small fix to catch nonpositive input to ActivityFilter
ivyyangyq Apr 9, 2019
0f687a6
Merge pull request #215 from ivyyangyq/activity1.4
ivyyangyq Apr 9, 2019
daf4783
Merge pull request #216 from cs2103-ay1819s2-w13-2/activity1.4
ivyyangyq Apr 9, 2019
a372137
Updated dev guide for activity list feature and user guide for activ…
ivyyangyq Apr 10, 2019
a367f2a
Updated User Guide
joel0111 Apr 11, 2019
2089414
updated UserGuide
joel0111 Apr 11, 2019
4830672
Updated userguide
joel0111 Apr 12, 2019
5282f53
Merge pull request #219 from joel0111/master
A0143487X-Kevin Apr 12, 2019
07634af
Merge pull request #214 from A0143487X-Kevin/enhanceExportFunction_up…
A0143487X-Kevin Apr 12, 2019
55f71b8
Merge pull request #217 from ivyyangyq/activity1.4
ivyyangyq Apr 12, 2019
5281da1
Corrected error
joel0111 Apr 12, 2019
74f7e2f
corrected name
joel0111 Apr 12, 2019
f50cd39
Corrected error
joel0111 Apr 12, 2019
c3fe517
Updated UserGuide
joel0111 Apr 12, 2019
a5a38ff
Renamed PNG to png
joel0111 Apr 12, 2019
acc24ed
Merge pull request #220 from joel0111/master
ivyyangyq Apr 12, 2019
1e0070f
Updated Gender Class: Message Constraints
joel0111 Apr 12, 2019
e358642
Created statistics for members
joel0111 Apr 12, 2019
7fce6cd
Updated Userguide
joel0111 Apr 12, 2019
c5fca5e
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/main
joel0111 Apr 12, 2019
dbaf894
Revert "Updated Userguide"
joel0111 Apr 12, 2019
ba5bda4
Merge branch 'master' of https://github.com/joel0111/main
joel0111 Apr 12, 2019
615f4e4
Adjust length of ppp and minor modification
ivyyangyq Apr 13, 2019
51a2ec3
Merge pull request #223 from ivyyangyq/activity1.4
ivyyangyq Apr 13, 2019
baa5a7c
Merge pull request #224 from cs2103-ay1819s2-w13-2/activity1.4
ivyyangyq Apr 13, 2019
9815133
Corrected Arithmetic error
joel0111 Apr 13, 2019
085738b
Updated Sample Data
joel0111 Apr 13, 2019
f94f0e6
Merge pull request #222 from joel0111/master
ivyyangyq Apr 13, 2019
bc5c5e8
Merge pull request #225 from cs2103-ay1819s2-w13-2/final-member-branch
ivyyangyq Apr 13, 2019
f299acf
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/mai…
melkwx Apr 13, 2019
7157175
Created Person Attributes Tests
joel0111 Apr 13, 2019
280099a
Updated Member Tests
joel0111 Apr 13, 2019
1dc6156
Corrected Checkstyle
joel0111 Apr 13, 2019
54e0203
Update sample activities
ivyyangyq Apr 13, 2019
f1623ff
Merge pull request #227 from ivyyangyq/activity1.4
ivyyangyq Apr 13, 2019
5f3027a
small edits
melkwx Apr 13, 2019
644a3ff
Refactored MemberSortCommand
joel0111 Apr 13, 2019
73783da
update tests
melkwx Apr 13, 2019
c8a58fd
Updated MemberSortCommand and its related tests
joel0111 Apr 13, 2019
3fbdb88
Corrected errors
joel0111 Apr 13, 2019
47c910b
Updated test
joel0111 Apr 13, 2019
6bd0324
Update Activity Tests
minernchan Apr 13, 2019
fe264c7
Add label
A0143487X-Kevin Apr 13, 2019
2c97370
Merge pull request #228 from cs2103-ay1819s2-w13-2/activity1.4
ivyyangyq Apr 13, 2019
e527db4
Merge pull request #205 from melkwx/memberEdit
ivyyangyq Apr 13, 2019
bfef5fb
Merge pull request #229 from minernchan/activity
ivyyangyq Apr 13, 2019
65ae9a2
Corrected Checkstyle
joel0111 Apr 13, 2019
729ed91
Created Tests for MemberFilterCommand
joel0111 Apr 13, 2019
55f66fd
Deleted irrelevant file
joel0111 Apr 13, 2019
2cf9ba9
Add author tags for my previous commits
minernchan Apr 13, 2019
d230447
Updated UserGuide, DeveloperGuide, and PPP
joel0111 Apr 14, 2019
7f6cecf
Updated DeveloperGuide
joel0111 Apr 14, 2019
2634a88
Corrected Checkstyle error
joel0111 Apr 14, 2019
d4223af
Merge pull request #233 from minernchan/activity
ivyyangyq Apr 14, 2019
40c2a4d
Merge pull request #230 from A0143487X-Kevin/some_ui_change
ivyyangyq Apr 14, 2019
7c35fdd
Merge pull request #226 from joel0111/master
ivyyangyq Apr 14, 2019
48c50b2
Merge pull request #232 from cs2103-ay1819s2-w13-2/activity1.4
ivyyangyq Apr 14, 2019
7a1c8b6
Merge pull request #234 from cs2103-ay1819s2-w13-2/final-member-branch
ivyyangyq Apr 14, 2019
b506442
Merge pull request #231 from cs2103-ay1819s2-w13-2/Member-v1.4-branch
ivyyangyq Apr 14, 2019
d0b7a07
Refactored MemberFilterCommand and related classes and resolved singl…
joel0111 Apr 14, 2019
d624b1e
Corrected minor error
joel0111 Apr 14, 2019
223cfdf
Implemented filtering by tags
joel0111 Apr 14, 2019
b9e44b8
Made minor change to memberDetailPanel
joel0111 Apr 14, 2019
859da19
Merge pull request #235 from joel0111/master
A0143487X-Kevin Apr 14, 2019
9b063a8
Updated Developer Guide and PPP
joel0111 Apr 14, 2019
ad1480c
Merge branch 'master' of https://github.com/melkwx/main
melkwx Apr 14, 2019
e3f2892
Merge branch 'memberEdit'
melkwx Apr 14, 2019
0bdd024
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/main
melkwx Apr 14, 2019
5e8d144
updated Developer Guide
joel0111 Apr 14, 2019
63c2433
Merge pull request #236 from cs2103-ay1819s2-w13-2/final-member-branch
ivyyangyq Apr 14, 2019
96eb8fa
Update Ui photos
ivyyangyq Apr 14, 2019
bd087a9
Merge pull request #238 from ivyyangyq/master
ivyyangyq Apr 14, 2019
89e5f45
change description to wrap
A0143487X-Kevin Apr 14, 2019
f72ccb2
Merge remote-tracking branch 'upstream/master' into ui_edit_wrap
A0143487X-Kevin Apr 14, 2019
44bcfca
Updated Developer Guide
joel0111 Apr 14, 2019
b0247bb
Updated PPP and developer guide
joel0111 Apr 14, 2019
d8bb494
Updated PPP
joel0111 Apr 14, 2019
9c77731
Updated PPP and Developer Guide
joel0111 Apr 15, 2019
af20da8
Updated Developer Guide
joel0111 Apr 15, 2019
26bc2c9
Updated developer guide and PPP
joel0111 Apr 15, 2019
761e832
Updated Developer Guide
joel0111 Apr 15, 2019
2c872a1
created a sequence diagram
joel0111 Apr 15, 2019
f562a09
checkstyle
A0143487X-Kevin Apr 15, 2019
3424623
Updated Developer Guide and PPP
joel0111 Apr 15, 2019
6a677cc
Updated User Guide
joel0111 Apr 15, 2019
e703169
Merge pull request #239 from A0143487X-Kevin/ui_edit_wrap
ivyyangyq Apr 15, 2019
f7c0068
Merge pull request #237 from joel0111/master
A0143487X-Kevin Apr 15, 2019
05014fd
Merge pull request #240 from joel0111/master
A0143487X-Kevin Apr 15, 2019
6805c17
Update documentation
minernchan Apr 15, 2019
e11b552
Cutting down on PPP
joel0111 Apr 15, 2019
3b3187f
Cutting down on PPP
joel0111 Apr 15, 2019
0150987
Updated PPP
joel0111 Apr 15, 2019
ed9cd01
Update ppp
minernchan Apr 15, 2019
5fccfd6
Resolve checkstyle
minernchan Apr 15, 2019
a4ca38a
Merge pull request #241 from joel0111/master
joel0111 Apr 15, 2019
fb3c74b
Resolve checkstyle
minernchan Apr 15, 2019
80996c2
Merge pull request #242 from cs2103-ay1819s2-w13-2/final-member-branch
A0143487X-Kevin Apr 15, 2019
c751b6f
Merge pull request #243 from minernchan/documentation
minernchan Apr 15, 2019
71ba933
Fix date format
minernchan Apr 15, 2019
e6cf6a1
memEdit fix gender edit bug
melkwx Apr 15, 2019
3ae2f43
Updated PPP and relevant Documents
joel0111 Apr 15, 2019
da28314
Undo change for Gender class
joel0111 Apr 15, 2019
c940e07
Merge pull request #246 from minernchan/documentation
minernchan Apr 15, 2019
7fd6c0d
Merge pull request #244 from cs2103-ay1819s2-w13-2/activity1.4
ivyyangyq Apr 15, 2019
b87ea75
Fix date format
minernchan Apr 15, 2019
a28c4fd
Add more documentation
A0143487X-Kevin Apr 15, 2019
16fe144
Merge pull request #249 from minernchan/documentation
minernchan Apr 15, 2019
1947d26
checkstyle
A0143487X-Kevin Apr 15, 2019
eccaae5
Updated Developer Guide
joel0111 Apr 15, 2019
264a98b
Fix wrong tag for PPP
minernchan Apr 15, 2019
21aed9b
Merge pull request #250 from A0143487X-Kevin/ppp_ugdg_fightWotherPplF…
A0143487X-Kevin Apr 15, 2019
b25a1cc
resize
A0143487X-Kevin Apr 15, 2019
716a752
Merge pull request #248 from joel0111/master
joel0111 Apr 15, 2019
8a57d44
Merge pull request #251 from minernchan/documentation
ivyyangyq Apr 15, 2019
a6d97de
added image description for DG
A0143487X-Kevin Apr 15, 2019
8d5fda6
Cutting PPP
joel0111 Apr 15, 2019
1122c6a
Merge pull request #252 from A0143487X-Kevin/ppp_ugdg_fightWotherPplF…
A0143487X-Kevin Apr 15, 2019
d1a358a
Merge pull request #247 from melkwx/memEdit
ivyyangyq Apr 15, 2019
c434d42
Updated Developer Guide
joel0111 Apr 15, 2019
6a2344e
Merge branch 'master' into final-member-branch
ivyyangyq Apr 15, 2019
cee3144
Fix wrong tag for PPP
minernchan Apr 15, 2019
0fdd529
Updated PPP and Developer Guide
joel0111 Apr 15, 2019
efbed53
Merge pull request #256 from minernchan/documentation
minernchan Apr 15, 2019
dc0b2fc
Updated Developer Guide
joel0111 Apr 15, 2019
ee51f14
Merge pull request #253 from joel0111/master
joel0111 Apr 15, 2019
8667d12
Merge pull request #257 from cs2103-ay1819s2-w13-2/activity1.4
minernchan Apr 15, 2019
f5817ab
Updated file
joel0111 Apr 15, 2019
dfbc5b7
Merge pull request #258 from joel0111/master
joel0111 Apr 15, 2019
22f25d5
Merge pull request #254 from cs2103-ay1819s2-w13-2/final-member-branch
ivyyangyq Apr 15, 2019
a610f10
Updated Reposense's link date
joel0111 Apr 15, 2019
3f2058f
Updated PPP
joel0111 Apr 15, 2019
c234882
Edit diagram
minernchan Apr 15, 2019
f1a0b57
Merge pull request #259 from joel0111/master
joel0111 Apr 15, 2019
c3b1cb9
Merge pull request #260 from minernchan/documentation
minernchan Apr 15, 2019
d41cbeb
Merge pull request #261 from cs2103-ay1819s2-w13-2/activity1.4
minernchan Apr 15, 2019
b8fce50
Make changes to headers
minernchan Apr 15, 2019
087d54e
Update Developer Guide
joel0111 Apr 15, 2019
5bd258f
Merge pull request #263 from joel0111/master
joel0111 Apr 15, 2019
7c15deb
Updated Developer Guide and User Guide
joel0111 Apr 15, 2019
e44da66
update ppp
ivyyangyq Apr 15, 2019
21de1c5
Merge pull request #262 from minernchan/documentation
minernchan Apr 15, 2019
7bb2535
Merge pull request #265 from ivyyangyq/master
ivyyangyq Apr 15, 2019
1dc6f5e
Merge pull request #264 from joel0111/master
joel0111 Apr 15, 2019
6d61d30
dg, ug, ppp
melkwx Apr 15, 2019
800b7df
Merge pull request #266 from cs2103-ay1819s2-w13-2/activity1.4
minernchan Apr 15, 2019
889a916
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/mai…
melkwx Apr 15, 2019
08737d2
update developer guide
joel0111 Apr 15, 2019
9de8dce
Updated UserGuide
joel0111 Apr 15, 2019
10bcd72
Merge pull request #268 from joel0111/master
joel0111 Apr 15, 2019
4314b74
Updated User guide
joel0111 Apr 15, 2019
fb3eef4
Trimmed PPP
joel0111 Apr 15, 2019
9effa2c
Merge pull request #269 from joel0111/master
joel0111 Apr 15, 2019
bc7f2ad
dg edits
melkwx Apr 15, 2019
baeb6ee
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/mai…
melkwx Apr 15, 2019
f5a6431
Merge pull request #267 from melkwx/ug_dg_ppp
ivyyangyq Apr 15, 2019
17076a5
Manual testing instruction
ivyyangyq Apr 15, 2019
dc09024
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/main
ivyyangyq Apr 15, 2019
8cbe662
Merge pull request #270 from ivyyangyq/master
ivyyangyq Apr 15, 2019
f6ec89a
Updated UserGuide and Developer Guide
joel0111 Apr 15, 2019
65515ed
fix typo
ivyyangyq Apr 15, 2019
853e943
fixed bug in activityFindCommand parser
ivyyangyq Apr 15, 2019
edf3f47
Merge pull request #271 from joel0111/master
joel0111 Apr 15, 2019
82b3d4b
manual testing part
melkwx Apr 15, 2019
fa17495
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w13-2/mai…
melkwx Apr 15, 2019
307f339
Add manual testing instructions
minernchan Apr 15, 2019
b7e4025
Merge pull request #272 from ivyyangyq/master
ivyyangyq Apr 15, 2019
01b4062
remove trailing whitespace
melkwx Apr 15, 2019
a1fb5f9
Add manual testing instructions
minernchan Apr 15, 2019
2be710f
Reformat instructions
minernchan Apr 15, 2019
11bae35
Merge pull request #273 from melkwx/manual_test_mel
ivyyangyq Apr 15, 2019
5a8a150
Merge branch 'master' into documentation
minernchan Apr 15, 2019
cbf5fe1
Updated Developer for Appendix Manual Testing
joel0111 Apr 15, 2019
7bf90c9
Merge pull request #274 from minernchan/documentation
ivyyangyq Apr 15, 2019
92643f9
DG Testing
A0143487X-Kevin Apr 15, 2019
ba97171
Merge pull request #275 from joel0111/master
ivyyangyq Apr 15, 2019
96148fe
Merge remote-tracking branch 'upstream/master'
A0143487X-Kevin Apr 15, 2019
e83da43
Merge pull request #277 from A0143487X-Kevin/dgTest
ivyyangyq Apr 15, 2019
ca5fbf7
Adding DG contribution to PPP
melkwx Apr 20, 2019
5767ffb
Merge pull request #278 from melkwx/PPP
melkwx Apr 20, 2019
efa6fcf
edit tags on dg
melkwx Apr 20, 2019
5082b83
Merge pull request #279 from melkwx/PPP
melkwx Apr 20, 2019
3c43e73
Update AboutUs.adoc
joel0111 Aug 17, 2019
d824f61
Delete joel0111.png
joel0111 Nov 7, 2019
f894b54
Welcome back
minernchan Nov 8, 2019
6b82239
Good luck for finals
minernchan Nov 8, 2019
4ce0f0b
Merge pull request #280 from minernchan/master
minernchan Nov 8, 2019
43a2f16
delete delete
joel0111 Nov 19, 2019
1207dd0
Merge pull request #281 from cs2103-ay1819s2-w13-2/deleteagain
joel0111 Nov 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added --stack
Empty file.
50 changes: 39 additions & 11 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
= Address Book (Level 4)

= ClubManager
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]]
ifdef::env-github[]
image::docs/images/clubmanager.png[width="200"]
endif::[]

ifndef::env-github[]
image::images/clubmanager.png[width="200"]
endif::[]


https://travis-ci.org/cs2103-ay1819s2-w13-2/main[image:https://travis-ci.org/cs2103-ay1819s2-w13-2/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,24 +24,42 @@ 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.
ifdef::env-github[]
image::docs/images/Ui2.png[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui2.png[width="600"]
endif::[]

== What is ClubManager?
* ClubManager is an *exciting and revolutionary* desktop application for CCA management. It comes with a GUI but
most of the user interactions takes place on the CLI (Command Line Interface) provided.

== Our Target Users
* ClubManager is specially designed for *CCA main committee members* to manage their CCA data.
It is the go-to application for CCA leaders who are looking for a software that
allows them to *seamlessly manage their members and activities*.

== Features
* This app comes with a laconic UI and the following features:
** Switch from Member Management Mode to Activity Mode.
** Add, delete, edit, filter, find, list, select, sort and manage members' information.
** Add, delete, filter, find, list, select, update, and manage activities.
** Add and delete member from activity
** Display activities attended by member.
** Export.


== Site Map

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

== Acknowledgements

* This application is based on https://github.com/nus-cs2103-AY1819S1/addressbook-level4[AddressBook Level 4].
* 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/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'clubmanager.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -202,8 +202,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': 'Club-Manager',
'site-githuburl': 'https://github.com/cs2103-ay1819s2-w13-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
64 changes: 36 additions & 28 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,61 @@
: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} +
ClubManager was developed by team w13-2. This application builds on the existing work of the
https://se-edu.github.io/docs/Team.html[se-edu] team. +
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>>]
=== Chan Ming En Minern
image::minernchan.png[width="150", align="left"]
{empty}[http://github.com/minernchan[github]] [<<minernchan#, portfolio>>]

Role: Project Advisor
Role: Developer (Testing) +
Responsibilities:

'''
* In charge of Model.
* Working on Activity Management feature.

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

Role: Team Lead +
Responsibilities: UI
=== Joel

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Kevin Yeong Yu Heng
image::A0143487X-Kevin.png[width="150", align="left"]
{empty}[http://github.com/A0143487X-Kevin[github]] [<<A0143487X-Kevin#, portfolio>>]

Role: Developer (Integrator) +
Responsibilities:

Role: Developer +
Responsibilities: Data
* In charge of UI.
* Development of mode of operation architecture and feature.
* Working on file handling and export features.

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Melissa Khoo Wan Xuan
image::melkwx.png[width="150", align="left"]
{empty}[http://github.com/melkwx[github]] [<<melkwx#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Developer (Code Quality) +
Responsibilities:

* In charge of Logic.
* Working on Member Management feature.

'''

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

Role: Team Lead +
Responsibilities:

Role: Developer +
Responsibilities: UI
* In charge of Storage.
* Working on Activity Management feature.

'''
Loading