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

Made constructors more defensive for Course Package #89

Open
wants to merge 697 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
697 commits
Select commit Hold shift + click to select a range
f075563
Delete checkstyle-idea-configuration.png
lshwayne96 Apr 4, 2019
046e15b
Delete checkstyle-idea-scan-scope.png
lshwayne96 Apr 4, 2019
f8e68f3
Delete chrome_save_as_pdf.png
lshwayne96 Apr 4, 2019
acbd24c
Delete crumpledpaper.png
lshwayne96 Apr 4, 2019
843d989
Delete flick_repository_switch.png
lshwayne96 Apr 4, 2019
4404549
Delete generate_token.png
lshwayne96 Apr 4, 2019
39ece04
Delete getting-started-ui-result-after.png
lshwayne96 Apr 4, 2019
d5d84f9
Delete getting-started-ui-result-before.png
lshwayne96 Apr 4, 2019
c1c2078
Delete getting-started-ui-status-after.png
lshwayne96 Apr 4, 2019
863fbca
Delete getting-started-ui-status-before.png
lshwayne96 Apr 4, 2019
c4a3ebb
Delete getting-started-ui-tag-after.png
lshwayne96 Apr 4, 2019
2596d6d
Delete getting-started-ui-tag-before.png
lshwayne96 Apr 4, 2019
b804d87
Delete github_repo_settings.png
lshwayne96 Apr 4, 2019
dc30f1f
Delete grant_access.png
lshwayne96 Apr 4, 2019
d136c70
Delete lshwayne96.png
lshwayne96 Apr 4, 2019
bd6aa04
Delete monikernemo.png
lshwayne96 Apr 4, 2019
42ecc46
Delete recommend.png
lshwayne96 Apr 4, 2019
720b3fa
Delete request_access.png
lshwayne96 Apr 4, 2019
e53d68b
Delete review_and_add.png
lshwayne96 Apr 4, 2019
64d8971
Delete signing_in.png
lshwayne96 Apr 4, 2019
9ef4cf7
Delete travis_add_token.png
lshwayne96 Apr 4, 2019
66d7aca
Delete travis_build.png
lshwayne96 Apr 4, 2019
cd6eaf7
newline at course.json
lshwayne96 Apr 4, 2019
4557925
Delete course.json
lshwayne96 Apr 4, 2019
26f4617
Add files via upload
lshwayne96 Apr 4, 2019
7a4b1b4
Delete course.json
lshwayne96 Apr 4, 2019
bc1d00c
Add files via upload
lshwayne96 Apr 4, 2019
3f254bf
Merge pull request #97 from lshwayne96/master
lshwayne96 Apr 4, 2019
9af1e25
Merge branch 'master' of https://github.com/lshwayne96/main
lshwayne96 Apr 4, 2019
c8090a8
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
lshwayne96 Apr 4, 2019
8eeed7d
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
alexchong711 Apr 4, 2019
4680b98
start with empty gradtrak when user data not found
lshwayne96 Apr 4, 2019
f740da3
removed sampledatatest
lshwayne96 Apr 4, 2019
f957888
Merge pull request #99 from lshwayne96/master
lshwayne96 Apr 4, 2019
c7d3b84
changed regex for GER and GEQ, small changes to strings
lshwayne96 Apr 4, 2019
f364ff5
newline
lshwayne96 Apr 4, 2019
621f560
Merge pull request #100 from lshwayne96/master
lshwayne96 Apr 4, 2019
1f8bfa9
cklimit results printable to browser panel
alexchong711 Apr 4, 2019
4971fcf
Merge pull request #101 from alexchong711/master
alexchong711 Apr 4, 2019
f3c38ee
default workload populating
alexchong711 Apr 4, 2019
6aa28a5
Merge pull request #102 from alexchong711/master
alexchong711 Apr 4, 2019
0b32645
fixed default data for jar file
alexchong711 Apr 4, 2019
9dc1b2b
Merge pull request #103 from alexchong711/master
alexchong711 Apr 4, 2019
1aa988d
fixed error messages for set limit command
alexchong711 Apr 5, 2019
b41b5cc
Merge pull request #104 from alexchong711/master
alexchong711 Apr 5, 2019
37eeb1b
some javadocs and clisyntax changes
alexchong711 Apr 5, 2019
0e3570d
made error correction
Anand270294 Apr 5, 2019
bba02df
fix cklimit to get a full filtered list
alexchong711 Apr 5, 2019
a8d298e
Merge pull request #105 from Anand270294/v1.2base
Anand270294 Apr 5, 2019
cd1fc75
Merge pull request #106 from alexchong711/master
alexchong711 Apr 5, 2019
38b41b8
fixed clear command clearing the sem limits
alexchong711 Apr 5, 2019
db62211
Merge pull request #107 from alexchong711/master
alexchong711 Apr 5, 2019
3f715cb
added validation for grades on add and edit. fixed limit check
alexchong711 Apr 5, 2019
65cadf7
fixed adding default sem limits
alexchong711 Apr 5, 2019
2d8407a
Merge pull request #108 from alexchong711/master
alexchong711 Apr 5, 2019
cad1398
fixed cklimit gui panel and help for cursem
alexchong711 Apr 5, 2019
1c32bba
Merge pull request #109 from alexchong711/master
alexchong711 Apr 5, 2019
b5eb020
fixed adding too many semesters on jar startup
alexchong711 Apr 6, 2019
213fc4f
Merge pull request #145 from alexchong711/master
alexchong711 Apr 6, 2019
3136077
workload and MCs populated from moduleinfo on add/edit
alexchong711 Apr 6, 2019
ffffafa
removed empty if blocks
alexchong711 Apr 6, 2019
2dd2758
Merge pull request #146 from alexchong711/master
alexchong711 Apr 6, 2019
8316574
updated UG
Anand270294 Apr 6, 2019
3b2448f
update UG2
Anand270294 Apr 6, 2019
ba7d1ec
updated UG3
Anand270294 Apr 6, 2019
340db5c
update UG4
Anand270294 Apr 6, 2019
5c93998
ug update IV
Anand270294 Apr 6, 2019
e556209
updateUG
Anand270294 Apr 6, 2019
7ecd9c7
update UG V
Anand270294 Apr 6, 2019
711c573
update UG VI
Anand270294 Apr 6, 2019
cad563d
update UG VII
Anand270294 Apr 6, 2019
16fd180
update UG VIII
Anand270294 Apr 6, 2019
f86a4fd
Merge pull request #147 from Anand270294/v1.2base
Anand270294 Apr 6, 2019
f4f3497
update DG I
Anand270294 Apr 6, 2019
8c73322
refactored the boolean in grades to make it clearer
alexchong711 Apr 6, 2019
3730356
Merge pull request #148 from alexchong711/master
alexchong711 Apr 6, 2019
1bf7202
fixed limit checker indexes
alexchong711 Apr 6, 2019
03afcb4
javadocs and clearing wordings
alexchong711 Apr 7, 2019
b21c65b
new tests for RecModule
lshwayne96 Apr 7, 2019
520122d
some changes to code list
monikernemo Apr 8, 2019
3b7891b
updates to UG and rec tests
lshwayne96 Apr 9, 2019
6468d97
changed behaviour of browser panel: when running commands without pan…
lshwayne96 Apr 9, 2019
f9971ad
setlimitcommandparser tests
alexchong711 Apr 9, 2019
044fa98
fixed sem limit command parser test
alexchong711 Apr 9, 2019
bdcd640
checkstyle fixes
alexchong711 Apr 9, 2019
45716ca
Merge pull request #149 from alexchong711/master
alexchong711 Apr 9, 2019
0643291
fixed bugs I hope
Anand270294 Apr 9, 2019
9ec1a3e
updated DG for rec
lshwayne96 Apr 9, 2019
0428bc6
small changes to diagrams
lshwayne96 Apr 9, 2019
b9e53ed
Merge pull request #150 from Anand270294/v1.2base
Anand270294 Apr 9, 2019
e975e76
SetSemLimitCommandTest
alexchong711 Apr 9, 2019
3f48dee
Merge pull request #151 from alexchong711/master
alexchong711 Apr 9, 2019
deed1e5
width change for png
lshwayne96 Apr 9, 2019
cd671a0
checkstyle
lshwayne96 Apr 9, 2019
38e4034
Merge pull request #152 from lshwayne96/master
lshwayne96 Apr 9, 2019
f998ffe
Updated Developer's Guide
monikernemo Apr 10, 2019
00e480b
updates to DG for rec
lshwayne96 Apr 10, 2019
0346662
minor changes to DG
lshwayne96 Apr 10, 2019
b28aa4f
More DG changes
monikernemo Apr 10, 2019
e5e3673
Merge pull request #154 from lshwayne96/master
lshwayne96 Apr 11, 2019
3ea8b08
added assertions
lshwayne96 Apr 11, 2019
b8a2693
removed extra diagram, updated some diagrams in DG
lshwayne96 Apr 11, 2019
99c5bae
Merge pull request #155 from lshwayne96/master
lshwayne96 Apr 11, 2019
4697e2c
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
monikernemo Apr 11, 2019
05fad43
Updates to DG
monikernemo Apr 11, 2019
3c3573e
changes to DG
monikernemo Apr 11, 2019
6db7e36
Update DG
monikernemo Apr 12, 2019
53ab123
dg,ug,ppp
lshwayne96 Apr 12, 2019
6c7f1ca
updated UG
monikernemo Apr 12, 2019
ea7731f
added method in GradTrak to get missing prereq
lshwayne96 Apr 12, 2019
3ca0edb
ppp
lshwayne96 Apr 12, 2019
fee8dd7
keep emp first
lshwayne96 Apr 12, 2019
c79bf5b
Merge pull request #156 from lshwayne96/master
lshwayne96 Apr 12, 2019
757a8fb
updates to rec, eligiblemodulepredicate not working yet
lshwayne96 Apr 12, 2019
442a10a
Merge pull request #157 from lshwayne96/master
lshwayne96 Apr 12, 2019
00784c3
ppp update
lshwayne96 Apr 12, 2019
6c5a16f
slight changes to docs
lshwayne96 Apr 12, 2019
7930c60
Refactored SemLimit to SemesterLimit
alexchong711 Apr 13, 2019
0d0d0e3
Refactored SemLimit to SemesterLimit
alexchong711 Apr 13, 2019
973e534
Merged with main repo
alexchong711 Apr 13, 2019
a3e1c52
fixed import order. renamed SemLimit to SemesterLimit
alexchong711 Apr 13, 2019
32b04c2
fixed line too long
alexchong711 Apr 13, 2019
564314f
Merge pull request #158 from alexchong711/master
alexchong711 Apr 13, 2019
3b48533
updated rec tests
lshwayne96 Apr 13, 2019
737828f
Increased test coverage for Course package
monikernemo Apr 13, 2019
1a90ab4
renamed SemLimit to SemesterLimit
alexchong711 Apr 13, 2019
6fbfb58
fixed long line
alexchong711 Apr 13, 2019
6939471
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
alexchong711 Apr 13, 2019
ac70d1c
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
monikernemo Apr 13, 2019
4f1c998
Fixed some test errors
monikernemo Apr 13, 2019
3cf16a9
fixed checkstyle error
monikernemo Apr 13, 2019
ef79f26
Merge pull request #160 from monikernemo/master
monikernemo Apr 13, 2019
f43d7ba
merged conflicts
alexchong711 Apr 13, 2019
8dbae1b
Merge pull request #159 from alexchong711/master
alexchong711 Apr 13, 2019
5ccf8e9
updated UGDG
alexchong711 Apr 13, 2019
061d880
Merge pull request #163 from alexchong711/master
alexchong711 Apr 13, 2019
b62f750
updated some tests
lshwayne96 Apr 13, 2019
3c03787
attempt to fix prereq stuff
lshwayne96 Apr 13, 2019
d41b138
Merge pull request #164 from lshwayne96/master
lshwayne96 Apr 13, 2019
a96d2fb
fixed default modules
alexchong711 Apr 13, 2019
52cbc39
fixed default modules
alexchong711 Apr 13, 2019
1e9d441
Merge pull request #165 from alexchong711/master
alexchong711 Apr 13, 2019
8dc3763
fixed limitchecker printing and editcommand grades finalizing
alexchong711 Apr 13, 2019
ba7377d
Merge pull request #166 from alexchong711/master
alexchong711 Apr 13, 2019
c277a25
userguide changes
alexchong711 Apr 14, 2019
6686f21
Merge pull request #167 from alexchong711/master
alexchong711 Apr 14, 2019
f7e58f7
UG,DG,PPP changes
alexchong711 Apr 14, 2019
1bc4dd0
Merge pull request #168 from alexchong711/master
alexchong711 Apr 14, 2019
722155a
some changes to UG,DG
lshwayne96 Apr 14, 2019
1011756
added some use cases for find and rec
lshwayne96 Apr 14, 2019
75e5200
Merge pull request #169 from lshwayne96/master
lshwayne96 Apr 14, 2019
ce35a46
updated diagrams in DG
lshwayne96 Apr 14, 2019
17f6279
small changes to UG
lshwayne96 Apr 14, 2019
a3fe129
DG update
lshwayne96 Apr 14, 2019
4cbc8cf
Merge pull request #170 from lshwayne96/master
lshwayne96 Apr 14, 2019
082c462
changes to UGDG
monikernemo Apr 14, 2019
129d7d6
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
monikernemo Apr 14, 2019
6c54e09
added LimitCheckerTest. updated PPP
alexchong711 Apr 14, 2019
5a22764
changes to science requirements; hopefully i fixed the check prereq bug
lshwayne96 Apr 14, 2019
2a7dd58
updated LimitCheckerTest
alexchong711 Apr 14, 2019
8f32773
added newline at EOF
alexchong711 Apr 14, 2019
1979a3d
ppp
lshwayne96 Apr 14, 2019
75dace3
Merge pull request #171 from alexchong711/master
alexchong711 Apr 14, 2019
aa84c9b
Merge pull request #172 from lshwayne96/master
lshwayne96 Apr 14, 2019
954c58c
updated DG
Anand270294 Apr 14, 2019
477fba8
updated DG II
Anand270294 Apr 14, 2019
93c4bd1
updated UG III
Anand270294 Apr 14, 2019
74a5f78
Updated UG, DG, PPP.
monikernemo Apr 14, 2019
41a92a0
test DG
Anand270294 Apr 14, 2019
447e61a
updated DG
Anand270294 Apr 14, 2019
97aceed
update DG IV
Anand270294 Apr 14, 2019
6f17756
Merge branch 'master' into v1.2base
Anand270294 Apr 14, 2019
485f68c
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
monikernemo Apr 14, 2019
527dae5
Merge pull request #173 from Anand270294/v1.2base
Anand270294 Apr 14, 2019
a7ba883
refactored the classforprinting, DG,PPP updates
alexchong711 Apr 14, 2019
ae7d8b4
merged conflicts in DG
alexchong711 Apr 14, 2019
940f92e
PPP
Anand270294 Apr 14, 2019
0b342fc
Merge branch 'v1.2base' of https://github.com/Anand270294/main into v…
Anand270294 Apr 14, 2019
219f0ec
ppp
Anand270294 Apr 14, 2019
158d37a
PPP updates
alexchong711 Apr 14, 2019
a20622e
fixed line too long
alexchong711 Apr 14, 2019
43c7bb6
fixed errors
Anand270294 Apr 14, 2019
50241f5
Merge pull request #174 from alexchong711/master
alexchong711 Apr 14, 2019
461b872
added test
lshwayne96 Apr 14, 2019
06f0d7a
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
lshwayne96 Apr 14, 2019
667bb07
check prereq now treats modules with/out letter as equivalents; remov…
lshwayne96 Apr 14, 2019
48956a8
added new tests for coursestorage packages
monikernemo Apr 14, 2019
2127a77
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
monikernemo Apr 14, 2019
9cffafe
fixed hasParent() in Node
lshwayne96 Apr 14, 2019
8d5699a
Merge pull request #175 from Anand270294/v1.2base
monikernemo Apr 14, 2019
be09450
add new line at EOF for DG
monikernemo Apr 14, 2019
7020c2b
Merge pull request #176 from monikernemo/master
monikernemo Apr 14, 2019
55268db
Update README.adoc
monikernemo Apr 14, 2019
4623262
fixed line too long
alexchong711 Apr 14, 2019
329f3ee
added new lines
alexchong711 Apr 14, 2019
54a0590
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
alexchong711 Apr 14, 2019
67cb766
changed user to student to standardize actor name
alexchong711 Apr 14, 2019
6dec48a
rec no longer displays UE mods; updated UG,DG,tests
lshwayne96 Apr 14, 2019
2d59ba5
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
lshwayne96 Apr 14, 2019
9d4634b
Merge pull request #177 from alexchong711/master
alexchong711 Apr 14, 2019
6c2fd8f
removed CS3213 from course.json and SampleCourseRequirement
lshwayne96 Apr 14, 2019
4e43607
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
lshwayne96 Apr 14, 2019
b2163fa
Merge pull request #178 from lshwayne96/master
lshwayne96 Apr 14, 2019
5e293ba
ug dg update
lshwayne96 Apr 15, 2019
6a0cd53
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
lshwayne96 Apr 15, 2019
38079b4
module code, semester, grade now case-insensitive (change made in Par…
lshwayne96 Apr 15, 2019
9388b1c
Merge pull request #179 from lshwayne96/master
lshwayne96 Apr 15, 2019
4cdbc43
Merge pull request #5 from cs2103-ay1819s2-w14-4/master
Anand270294 Apr 15, 2019
96fc21f
changed recmodulepredicate and eligiblemodulepredicate to take in Rea…
lshwayne96 Apr 15, 2019
1e110b4
checkstyle
lshwayne96 Apr 15, 2019
54d2620
DG updates and javadoc changes
alexchong711 Apr 15, 2019
1c44419
Merge pull request #180 from lshwayne96/master
lshwayne96 Apr 15, 2019
722cac5
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
alexchong711 Apr 15, 2019
bfbcc87
added 2 test
Anand270294 Apr 15, 2019
a1131a9
Merge branch 'v1.2base' of https://github.com/Anand270294/main into v…
Anand270294 Apr 15, 2019
19d1ce3
UG,DG,PPP changes
alexchong711 Apr 15, 2019
4b4b0a7
Merge pull request #181 from alexchong711/master
alexchong711 Apr 15, 2019
90d8954
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
alexchong711 Apr 15, 2019
78df818
DG fix
alexchong711 Apr 15, 2019
f5ed63f
Merge pull request #182 from alexchong711/master
alexchong711 Apr 15, 2019
1bf985e
UG changes
alexchong711 Apr 15, 2019
fea0d87
Merge pull request #183 from alexchong711/master
alexchong711 Apr 15, 2019
66228f7
added some test
Anand270294 Apr 15, 2019
bdc6773
Merge pull request #184 from Anand270294/v1.2base
Anand270294 Apr 15, 2019
b270ca2
added additional test
Anand270294 Apr 15, 2019
812ee31
shifted a level check to gradtrak
lshwayne96 Apr 15, 2019
7360f40
Merge pull request #185 from lshwayne96/master
lshwayne96 Apr 15, 2019
f545149
added reccommand test
lshwayne96 Apr 15, 2019
11f33a0
Revert "UG changes"
alexchong711 Apr 15, 2019
abe353c
weightedgradetest added
alexchong711 Apr 15, 2019
5327c5f
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w14-4/main
lshwayne96 Apr 15, 2019
19225bc
updated some test
Anand270294 Apr 15, 2019
5e5e757
edited error in test case
Anand270294 Apr 15, 2019
f3a357e
Merge pull request #187 from Anand270294/v1.2base
Anand270294 Apr 15, 2019
b8a1e23
added test case for codecontainskeywordpredicate
Anand270294 Apr 15, 2019
4ebdbb8
added more mods to a level regex
lshwayne96 Apr 15, 2019
8a8c1c4
Merge pull request #188 from Anand270294/v1.2base
Anand270294 Apr 15, 2019
a612af5
checkstyle
lshwayne96 Apr 15, 2019
7c528dc
Pushing test cases to the limit
Anand270294 Apr 15, 2019
8eab9a3
Merge pull request #189 from lshwayne96/master
lshwayne96 Apr 15, 2019
1717391
edited some errors
Anand270294 Apr 15, 2019
84742fa
Merge pull request #190 from Anand270294/v1.2base
Anand270294 Apr 15, 2019
5f3e860
updated geq regex
lshwayne96 Apr 15, 2019
ddf5394
parserTest
Anand270294 Apr 15, 2019
9248a70
changed checkstyle
Anand270294 Apr 15, 2019
0b1509e
fixed checkstyle
Anand270294 Apr 15, 2019
a773839
test update for geq regex
lshwayne96 Apr 15, 2019
3033dcd
Merge pull request #191 from Anand270294/v1.2base
Anand270294 Apr 15, 2019
bc52b18
Merge pull request #192 from lshwayne96/master
lshwayne96 Apr 15, 2019
2df46bc
renamed annotated-UI.PNG to annotated-ui.png
monikernemo Apr 15, 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
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ classes/
/bin/
src/main/resources/docs/
out/
src/main/resources/userinfo.json
src/main/resources/gradtrak.json
userinfo.json
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit modulesTaken to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
46 changes: 33 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
= Address Book (Level 4)
= GradTrak
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://travis-ci.org/cs2103-ay1819s2-w14-4/main[image:https://travis-ci.org/cs2103-ay1819s2-w14-4/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/monikernemo/main[image:https://ci.appveyor.com/api/projects/status/5gj2bbi8m22402im?svg=true[Build status]]
https://coveralls.io/github/cs2103-ay1819s2-w14-4/main?branch=master[image:https://coveralls.io/repos/github/cs2103-ay1819s2-w14-4/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/crumpledpaper/main?utm_source=github.com&utm_medium=referral&utm_content=cs2103-ay1819s2-w14-4/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/8252478d5ba54270b64ad69074a826b8[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -14,19 +14,35 @@ 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.

NUS graduation tracker is an application to aid School of Computing students to track their graduation progress. GradTrak is implemented to aid students in alleviating the hardships of module planning to tracking C.A.P scores so that students can focus on “student-ing”. Not to mention with the tremendous amount of uncollated information required to keep track of the graduation requirements, GradTrak is the one stop solution to solve all of these problems.

== Requirements
* GradTrak is written in *_java_* and uses *_JDK 9_* library.

== Plan Modules
* Plan when to take modules throughout your undergraduate studies
* Recommends which modules to read based on module prerequisites and specialization

== Managing C.A.P
* Tracks your C.A.P. for each semester
* Set goals for your C.A.P.
* Calculates minimum expected, maximum C.A.P. based on expected grades

== Managing Workload
* Tracks your workload for each semester
* Tracks the amount of time you spent on lecture, preparation, project and many others!

== Specializations
* Choose your course of study from one of the following three Computer Science Major programs:
** Computer Science Algorithms
** Computer Science Artificial Intelligence
** Computer Science Software Engineering

== Site Map

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

Expand All @@ -35,5 +51,9 @@ 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_.
* 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]
* This project is based-off AddressBook 4 by: https://github.com/se-edu/[SE-EDU]


== Licence : link:LICENSE[MIT]


7 changes: 3 additions & 4 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 = 'gradtrak.jar'

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

options['template_dirs'].each {
Expand Down
23 changes: 9 additions & 14 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!--
This configuration file enforces rules for a modified version of the module's code standard at
Expand Down Expand Up @@ -55,11 +55,11 @@
4. THIRD_PARTY_PACKAGE: defined as com imports
-->
<module name="CustomImportOrder">
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
</module>

<!-- Checks for redundant import statements.
Expand All @@ -82,7 +82,7 @@
NAMING CHECKS
-->

<!-- Validate abbreviations (consecutive capital letters) length in identifier name -->
<!-- Validate abbreviations (consecutive capital letters) length in type name -->
<module name="AbbreviationAsWordInName">
<property name="ignoreFinal" value="false"/>
<property name="allowedAbbreviationLength" value="1"/>
Expand Down Expand Up @@ -192,13 +192,10 @@
<module name="NeedBraces">
<!--
if (true) return 1; // Not allowed

if (true) { return 1; } // Not allowed

else if {
return 1; // else if should always be multi line
}

if (true)
return 1; // Not allowed
-->
Expand All @@ -220,7 +217,7 @@
some other variants which we don't publicized to promote consistency).
-->
<property name="reliefPattern"
value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
</module>

<module name="MissingSwitchDefault"/>
Expand Down Expand Up @@ -362,14 +359,12 @@
-->
<module name="SingleSpaceSeparator">
<!-- Validate whitespace surrounding comments as well.

a = 1; // Allowed (single space before start of comment)
a = 1; /* Allowed (single space before start of comment) */
/* Allowed (single space after end of comment) */ a = 1;
a = 1; // Not allowed (more than one space before start of comment)
a = 1; /* Not allowed (more than one space before start of comment) */
/* Not allowed (more than one space after end of comment) */ a = 1;

This doesn't validate whitespace within comments so a comment /* like this */ is allowed.
-->
<property name="validateComments" value="true"/>
Expand Down
4 changes: 2 additions & 2 deletions config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">

<suppressions>
<suppress checks="JavadocType" files=".*Test\.java"/>
Expand Down
47 changes: 24 additions & 23 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,54 @@
: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.}_ +
GradTrak is a module tracker that is able to track the academic progress of students to help them plan for modules for graduation. It is developed by the https://github.com/orgs/cs2103-ay1819s2-w14-4/teams/developers[W14-4] team. +
{empty} +
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>>]
=== T Anandakkoomar
image::anand270294.png[width="150", align="left"]
{empty}[http://github.com/Anand270294[github]] [<<Anand270294#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities: User interface

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Display user information

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Lee Yi Quan
image::monikernemo.png[width="150", align="left"]
{empty}[https://github.com/monikernemo[github]] [<<monikernemo#, portfolio>>]


Role: Developer +
Responsibilities: Data
Responsibilities: Course, Course Requirement of GradTrak

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Lim Shao Hong
image::lshwayne96.png[width="150", align="left"]
{empty}[http://github.com/lshwayne96[github]] [<<lshwayne96#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Display module information

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Additional commands

'''
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/cs2103-ay1819s2-w14-4/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 `e0176751 [at] u.nus.edu`
Loading