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

[CS2113T-F11-2] CEGMods #51

Open
wants to merge 306 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 74 commits
Commits
Show all changes
306 commits
Select commit Hold shift + click to select a range
b517c48
Add Ui, printWelcomeMessage, and printHelpMessage
Oct 26, 2020
9a3170e
Merge pull request #30 from ZhongNingmou/ZhongNingmou_tp
ZhongNingmou Oct 26, 2020
6dec1fa
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
gy716 Oct 26, 2020
9bc1ad5
add ProjectTask and projectManager
Oct 26, 2020
5fbdef0
Merge pull request #31 from ZhongNingmou/ZhongNingmou_tp
ZhongNingmou Oct 26, 2020
b6ddb74
ui exception
JinYixuan-Au Oct 26, 2020
cceab1d
ui
JinYixuan-Au Oct 26, 2020
dea4918
ui exception
JinYixuan-Au Oct 26, 2020
4cbf80b
exception
JinYixuan-Au Oct 26, 2020
b61361c
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Oct 27, 2020
f152f0a
edit task class,tasklist,timetable and add storage
zhangcaicai123 Oct 27, 2020
eae8800
edit task class,tasklist,timetable and add storage
zhangcaicai123 Oct 27, 2020
f98ec1d
Merge pull request #32 from zhangcaicai123/master
zhangcaicai123 Oct 27, 2020
0c5475e
edit javadoc
zhangcaicai123 Oct 27, 2020
2e1f413
Merge pull request #33 from zhangcaicai123/master
zhangcaicai123 Oct 27, 2020
e452ada
api first try
gy716 Oct 27, 2020
21266b1
add api, change module class, timetable still need change
gy716 Oct 27, 2020
fd560b0
add api, change module class, timetable still need change modify style
gy716 Oct 27, 2020
ce438ff
Merge pull request #34 from gy716/master
gy716 Oct 27, 2020
3d267a3
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Oct 28, 2020
ba885b4
add command class to make code more oop
Oct 28, 2020
11e4b28
Merge pull request #35 from ZhongNingmou_tp
ZhongNingmou Oct 28, 2020
6486d2d
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Oct 28, 2020
540f63d
fix LocalTime parser issue and add check event confilct and module co…
zhangcaicai123 Oct 29, 2020
8e72854
Merge pull request #36 from zhangcaicai123/master
zhangcaicai123 Oct 29, 2020
b365fef
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Oct 29, 2020
8083838
add storage module
Oct 29, 2020
a345e00
add module storage, solve some bugs and improve code quality
Oct 29, 2020
8cc3dfd
Merge pull request #37 from ZhongNingmou_tp
ZhongNingmou Oct 29, 2020
b1ef34e
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Oct 29, 2020
67dc23e
exception, ui
JinYixuan-Au Oct 29, 2020
8b1e491
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Oct 29, 2020
981ad7a
solve the conflict
JinYixuan-Au Oct 29, 2020
96adc8f
Merge pull request #38 from JinYixuan-Au/master
JinYixuan-Au Oct 29, 2020
6d7b7bb
fix time conflict bug and add print task list method
zhangcaicai123 Oct 29, 2020
ae84284
change help message
zhangcaicai123 Oct 29, 2020
87cf32e
Merge branch 'master' into master
zhangcaicai123 Oct 29, 2020
4c78a51
Merge pull request #39 from zhangcaicai123/master
zhangcaicai123 Oct 29, 2020
ba60195
Added additional instructions for add mod and touppercase for add mod…
jessicazhang617 Oct 29, 2020
8ea3c4a
Merge branch 'master' into master
jessicazhang617 Oct 29, 2020
ea5ffbe
Merge pull request #40 from jessicazhang617/master
jessicazhang617 Oct 29, 2020
1ffc276
version 2
gy716 Oct 29, 2020
9cf945d
Added some formatting to help and make data into gitignore
jessicazhang617 Oct 29, 2020
96b5245
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
jessicazhang617 Oct 29, 2020
bb9e7dd
Merge pull request #41 from jessicazhang617/master
jessicazhang617 Oct 29, 2020
be7a286
Added delete and done task
jessicazhang617 Oct 29, 2020
ea47da6
Merge pull request #42 from jessicazhang617/master
jessicazhang617 Oct 29, 2020
a902c49
Updated user guide
jessicazhang617 Oct 29, 2020
095cb4a
Merge pull request #43 from jessicazhang617/master
jessicazhang617 Oct 29, 2020
ef0f198
Update UserGuide.md
jessicazhang617 Oct 29, 2020
4ba83f2
Merge pull request #44 from AY2021S1-CS2113T-F11-2/userguideUpdates
jessicazhang617 Oct 29, 2020
b5cc93b
fix time conflict issue about same module lec and tut slot conflict
zhangcaicai123 Oct 31, 2020
9327a74
fix checkstyle issue
zhangcaicai123 Oct 31, 2020
bb59df9
Merge pull request #90 from zhangcaicai123/master
zhangcaicai123 Oct 31, 2020
f251884
temp
gy716 Nov 1, 2020
482343d
check repeated module, check isModuleExist when add project task, and…
Nov 2, 2020
d16030a
Merge pull request #92 from ZhongNingmou_tp
ZhongNingmou Nov 2, 2020
06cfd06
temp
gy716 Nov 2, 2020
bbf4566
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
gy716 Nov 2, 2020
f619519
fix the bug that jar file cannot read json
gy716 Nov 3, 2020
48a0f05
Merge pull request #93 from gy716/master
gy716 Nov 3, 2020
d32af4e
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 4, 2020
43e9304
edit module structure and add second lecture choice
zhangcaicai123 Nov 4, 2020
7ef8c40
Merge pull request #94 from zhangcaicai123/master
zhangcaicai123 Nov 4, 2020
955a605
fix storage issue
zhangcaicai123 Nov 4, 2020
a48aea6
Merge pull request #95 from zhangcaicai123/master
zhangcaicai123 Nov 4, 2020
79f3700
improve code quality
Nov 4, 2020
0d53564
improve code quality
Nov 4, 2020
e69739e
fix isModuleExist problem
Nov 4, 2020
3c65f80
fix checkstyle problem
Nov 4, 2020
9b48c5f
Merge pull request #96 from ZhongNingmou_tp
ZhongNingmou Nov 4, 2020
9ef9f91
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 4, 2020
6c0e96e
improve code structure
Nov 5, 2020
0b62403
add some timetabletests
Nov 5, 2020
5ff8d35
solve checkstyle problem
Nov 5, 2020
7ab05b9
fix checkstyleTest problem
Nov 5, 2020
971b66d
improve code quality
Nov 5, 2020
1df04a9
Merge pull request #98 from ZhongNingmou_tp
ZhongNingmou Nov 5, 2020
c063cd8
Added comments
jessicazhang617 Nov 5, 2020
12d12d1
Merge branch 'userguideUpdates' of https://github.com/AY2021S1-CS2113…
jessicazhang617 Nov 5, 2020
41ccb19
Merge branch 'master' into master
jessicazhang617 Nov 5, 2020
68f7524
Removed extra "
jessicazhang617 Nov 5, 2020
c920679
Delete repeated method
jessicazhang617 Nov 5, 2020
a8e9baa
Update comment accuracy
jessicazhang617 Nov 5, 2020
2981cb5
Update indentation
jessicazhang617 Nov 5, 2020
53702f2
Add space to indentation
jessicazhang617 Nov 5, 2020
acd6fad
Update indentation
jessicazhang617 Nov 5, 2020
693197d
Add period for javadoc
jessicazhang617 Nov 5, 2020
311ce9a
Merge pull request #99 from jessicazhang617/master
jessicazhang617 Nov 5, 2020
96db777
Delete repeated portion
jessicazhang617 Nov 5, 2020
6a76761
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
jessicazhang617 Nov 5, 2020
1d8b840
Update ASCII font art for welcome message
jessicazhang617 Nov 6, 2020
b5e30a2
Merge pull request #100 from jessicazhang617/master
jessicazhang617 Nov 6, 2020
dc5fde8
modify exception
Nov 6, 2020
44f67b6
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp…
Nov 6, 2020
dadff1f
add NoSuchElementException
Nov 6, 2020
ec77b48
add IllegalStateException
Nov 6, 2020
b9c5b07
delete EmptyIndexException
Nov 6, 2020
2c60b43
Modify NoSuchElementException
Nov 6, 2020
e93012b
Merge pull request #101 from ZhongNingmou_tp
ZhongNingmou Nov 6, 2020
5070b5a
Format and color welcome and help message
jessicazhang617 Nov 6, 2020
7802055
Merge branch 'master' into master
jessicazhang617 Nov 6, 2020
5fe8bc9
Update wrong spacing
jessicazhang617 Nov 6, 2020
a8a54e7
Merge pull request #102 from jessicazhang617/master
jessicazhang617 Nov 6, 2020
4c82b14
Format UG Command Summary
jessicazhang617 Nov 6, 2020
2fc01d5
Merge branch 'master' of https://github.com/jessicazhang617/tp
jessicazhang617 Nov 6, 2020
4743e7a
Merge pull request #103 from jessicazhang617/master
jessicazhang617 Nov 6, 2020
fc074f4
Format alignment of sector headers
jessicazhang617 Nov 6, 2020
340de88
Merge pull request #104 from jessicazhang617/master
jessicazhang617 Nov 6, 2020
29b887e
improve code quality
Nov 6, 2020
9341a9b
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp…
Nov 6, 2020
12bd532
modify help message
Nov 6, 2020
edd8a0e
add CommandTest
Nov 6, 2020
b443145
solve checkstyle problem
Nov 6, 2020
34997e5
Merge pull request #106 from ZhongNingmou
ZhongNingmou Nov 6, 2020
c7c8d87
Update command summary
jessicazhang617 Nov 6, 2020
51cdfcb
Merge pull request #107 from AY2021S1-CS2113T-F11-2/UserGuide_Shenjia
jessicazhang617 Nov 6, 2020
73aff55
update ignore files
gy716 Nov 7, 2020
8a11176
update ignore correctly
gy716 Nov 7, 2020
2d61a56
update ignore files
gy716 Nov 7, 2020
ed89a59
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
gy716 Nov 7, 2020
3f41c63
fix the event loading problem
gy716 Nov 8, 2020
8c3cfaa
Merge pull request #108 from gy716/master
gy716 Nov 8, 2020
9e5c23a
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 8, 2020
71de78c
fix deadline print issue
zhangcaicai123 Nov 8, 2020
f34e428
Merge pull request #109 from zhangcaicai123/master
zhangcaicai123 Nov 8, 2020
a527b2f
add find feature, fix UI output and update UG
JinYixuan-Au Nov 8, 2020
7146008
whitespace
JinYixuan-Au Nov 8, 2020
1ebc63c
fix project manager bugs and command format issues
gy716 Nov 9, 2020
cef1fea
fix project manager bugs and command format issues after checkstyle
gy716 Nov 9, 2020
7f5ae47
Merge pull request #110 from gy716/master
gy716 Nov 9, 2020
3f16ef0
fix dayvalue input issue
zhangcaicai123 Nov 9, 2020
e5e169a
Merge branch 'master' into master
zhangcaicai123 Nov 9, 2020
68eb833
Merge pull request #111 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
2c7727e
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 9, 2020
9fcc7d9
fix the superlink, add faq in UG
JinYixuan-Au Nov 9, 2020
a8b2466
Update summary table formatting for github pages
jessicazhang617 Nov 9, 2020
ba8c87d
Update UserGuide.md
jessicazhang617 Nov 9, 2020
69f1c4e
Update command this week timetable in command summary
jessicazhang617 Nov 9, 2020
dc78605
Merge pull request #112 from AY2021S1-CS2113T-F11-2/UG_CommandSummary
jessicazhang617 Nov 9, 2020
228fb1b
Update time format consistency in UG
jessicazhang617 Nov 9, 2020
c908c87
Merge pull request #113 from AY2021S1-CS2113T-F11-2/UG_TimeFormat
jessicazhang617 Nov 9, 2020
4535a17
fix get task bugs
gy716 Nov 9, 2020
b550583
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
gy716 Nov 9, 2020
f818a6d
Correct time format in instructions
jessicazhang617 Nov 9, 2020
d56eabe
Merge pull request #114 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
dd024b8
fix superlink in UG
JinYixuan-Au Nov 9, 2020
a62f78c
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Nov 9, 2020
8d6e32e
add view different types of task list feature and add remaing time in…
zhangcaicai123 Nov 9, 2020
c7a2fc5
fix checkstyle issue
zhangcaicai123 Nov 9, 2020
47a571d
Merge pull request #115 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
4022ce9
update DG
JinYixuan-Au Nov 9, 2020
930c4b7
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Nov 9, 2020
39419e8
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 9, 2020
cf2b4eb
Merge pull request #116 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
9ab95ce
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 9, 2020
e644971
add check modules, complete help, fix getTask,getTime
gy716 Nov 9, 2020
b1a6c29
add check modules, complete help, fix getTask,getTime
gy716 Nov 9, 2020
e4b02c2
add check modules, complete help, fix getTask,getTime, after checkstyle
gy716 Nov 9, 2020
3d01fff
Merge pull request #117 from gy716/master
gy716 Nov 9, 2020
0b5aa87
edit java doc and add show current event feature
zhangcaicai123 Nov 9, 2020
0cde1a1
Merge pull request #118 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
e8aa1ff
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 9, 2020
0d4e3fc
Add Tasktest and Todotest
jessicazhang617 Nov 9, 2020
177bc06
update DG
zhangcaicai123 Nov 9, 2020
d0710e2
Merge pull request #119 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
666e949
Merge pull request #121 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
dd23e9c
improve code quality
Nov 9, 2020
141a177
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp…
Nov 9, 2020
82b7b52
edit UG
zhangcaicai123 Nov 9, 2020
f315435
Merge pull request #122 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
6df36ac
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp…
Nov 9, 2020
00af317
Merge pull request #123 from ZhongNingmou
ZhongNingmou Nov 9, 2020
594c41e
Update hyperlinks
jessicazhang617 Nov 9, 2020
37f69dc
Format table for github pages
jessicazhang617 Nov 9, 2020
9fca5d1
Merge pull request #124 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
4d5b741
Update command summary
jessicazhang617 Nov 9, 2020
82d0c04
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 9, 2020
fb5b28f
update UG and DG, add PPP
JinYixuan-Au Nov 9, 2020
701b4e2
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Nov 9, 2020
801648c
Merge pull request #125 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
2026aa1
update ppp
JinYixuan-Au Nov 9, 2020
ab22de0
rename
JinYixuan-Au Nov 9, 2020
2e45d6b
Update commands in help
jessicazhang617 Nov 9, 2020
ce479ad
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
jessicazhang617 Nov 9, 2020
7e9a78e
Merge pull request #126 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
224e560
Merge pull request #127 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
379f434
Added some missing commands in UG
jessicazhang617 Nov 9, 2020
273f616
Merge pull request #128 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
5d33988
Merge remote-tracking branch 'upstream/master'
zhangcaicai123 Nov 9, 2020
251c211
Update hyperlinks
jessicazhang617 Nov 9, 2020
cce268b
add portfolio
gy716 Nov 9, 2020
43f4bed
Merge pull request #129 from AY2021S1-CS2113T-F11-2/UG_Hyperlinks
jessicazhang617 Nov 9, 2020
29c97d9
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
gy716 Nov 9, 2020
3c61709
Update README.md
jessicazhang617 Nov 9, 2020
f23f223
Merge pull request #130 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
66ee552
update aboutus
JinYixuan-Au Nov 9, 2020
6c6515a
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Nov 9, 2020
1453c0a
update readme file
JinYixuan-Au Nov 9, 2020
f3d9764
Merge pull request #131 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
0b4a251
fix project task bug
zhangcaicai123 Nov 9, 2020
53ac028
Merge pull request #132 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
0deae09
update DG, fix superlinks
JinYixuan-Au Nov 9, 2020
8951702
Merge pull request #133 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
49d6de3
add zhang danrui's PPP
zhangcaicai123 Nov 9, 2020
563f8cd
Merge pull request #134 from zhangcaicai123/master
zhangcaicai123 Nov 9, 2020
fa4e894
Update zhangcaicai123.md
zhangcaicai123 Nov 9, 2020
8407027
Rename docs/zhangcaicai123.md to docs/team/zhangcaicai123.md
zhangcaicai123 Nov 9, 2020
b70abfe
Merge pull request #135 from gy716/master
gy716 Nov 9, 2020
b09b5ed
add protfolio
Nov 9, 2020
5028307
Merge pull request #136 from ZhongNingmou/ZhongNingmou_tp
ZhongNingmou Nov 9, 2020
af69429
update DG
JinYixuan-Au Nov 9, 2020
9114bf8
Merge pull request #137 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
571a746
rename PPP
JinYixuan-Au Nov 9, 2020
2e5fd4e
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp
JinYixuan-Au Nov 9, 2020
c094e8d
Merge pull request #138 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
c46c58f
Update DeveloperGuide.md
zhangcaicai123 Nov 9, 2020
78b342e
Add Shenjia's PPP
jessicazhang617 Nov 9, 2020
a41e100
Edit spacing for PPP
jessicazhang617 Nov 9, 2020
7e53df4
Merge pull request #139 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
85e06c4
add author
Nov 9, 2020
2332f9d
Merge pull request #140 from jessicazhang617/master
jessicazhang617 Nov 9, 2020
e123906
Merge pull request #141 from ZhongNingmou/ZhongNingmou_tp
ZhongNingmou Nov 9, 2020
b2ca9f0
Update AboutUs.md
zhangcaicai123 Nov 9, 2020
b2e363f
Update AboutUs.md
zhangcaicai123 Nov 9, 2020
c5a65e4
update help feature
JinYixuan-Au Nov 9, 2020
1ff8101
Merge pull request #142 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
04937e5
Create image
zhangcaicai123 Nov 9, 2020
67adff1
Add files via upload
zhangcaicai123 Nov 9, 2020
5d97791
update PPP
JinYixuan-Au Nov 9, 2020
37cbbe1
Update AboutUs.md
zhangcaicai123 Nov 9, 2020
735b6f3
Update AboutUs.md
zhangcaicai123 Nov 9, 2020
b176ec3
Merge branch 'master' into master
JinYixuan-Au Nov 9, 2020
4db3e70
Merge pull request #143 from JinYixuan-Au/master
JinYixuan-Au Nov 9, 2020
07e4957
Update AboutUs.md
zhangcaicai123 Nov 9, 2020
f038ed1
Added new edits
jessicazhang617 Nov 13, 2020
5b03e75
Add edits for UG
jessicazhang617 Nov 13, 2020
9aeb0d1
Update other files
jessicazhang617 Nov 13, 2020
2e27610
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-2/tp…
jessicazhang617 Nov 13, 2020
7d3a26e
Merge pull request #145 from jessicazhang617/UG_2101Formatting
jessicazhang617 Nov 13, 2020
679c5f7
Edit spacing
jessicazhang617 Nov 13, 2020
dbd36cc
Edit spacing
jessicazhang617 Nov 13, 2020
b6ed8f9
Update div
jessicazhang617 Nov 13, 2020
00505ff
Update div 2
jessicazhang617 Nov 13, 2020
351fc19
Add div
jessicazhang617 Nov 13, 2020
7949ffe
Update div
jessicazhang617 Nov 13, 2020
33126a8
Correct minor grammar
jessicazhang617 Nov 13, 2020
6cd2a0d
Remove s
jessicazhang617 Nov 13, 2020
f17eab6
Update some changes
jessicazhang617 Nov 13, 2020
f8449fa
Remove extra \
jessicazhang617 Nov 13, 2020
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
34 changes: 34 additions & 0 deletions .github/workflows/basicTest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: basic gradle tests

on: [push, pull_request]

jobs:
build:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Set up repository
uses: actions/checkout@master

- name: Set up repository
uses: actions/checkout@master
with:
ref: master

- name: Merge to master
run: git checkout --progress --force ${{ github.sha }}

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1

- name: Setup JDK 11
uses: actions/setup-java@v1
with:
java-version: '11'
java-package: jdk+fx

- name: Build and check with Gradle
run: ./gradlew check
3 changes: 2 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ jobs:
if: always() && runner.os == 'Windows'
working-directory: ${{ github.workspace }}/text-ui-test
shell: cmd
run: runtest.bat
run: runtest.bat

3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ repositories {
dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'

}

test {
Expand Down Expand Up @@ -43,4 +45,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}
3 changes: 3 additions & 0 deletions data/duke.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
T | 0 | lab report
D | 0 | assignment | Sunday
D | 0 | assignment | hahaha
15 changes: 10 additions & 5 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@

Display | Name | Github Profile | Portfolio
--------|:----:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)

![](https://via.placeholder.com/100.png?text=Photo) | Yu Geng | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)

![](https://via.placeholder.com/100.png?text=Photo) | Zhong Ningmou | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)

![](https://via.placeholder.com/100.png?text=Photo) | Jin Yixuan | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)

![](https://via.placeholder.com/100.png?text=Photo) | Zhang Shenjia | [Github](https://github.com/) | [Portfolio](docs/team/shenjia.md)

![](https://via.placeholder.com/100.png?text=Photo) | Zhang Danrui | [Github](https://github.com/zhangcaicai123) | [Portfolio](docs/team/zhangdanrui.md)
177 changes: 158 additions & 19 deletions docs/DeveloperGuide.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,173 @@
# Developer Guide

## Design & implementation
# Developer Guide
## Table of content
### [1. Introduction](#1-Introduction1)
#### [1.1 Software Overview](#11-Software-Overview1)
#### [1.2 Purpose](#12-Purpose1)
#### [1.3 Scope](#13-Scope1)
### [2. Setting up and getting started](#2-Setting-up-and-getting-started1)
### [3. Design](#3-Design1)
#### [3.1 Architecture](#31-Architecture1)
#### [3.2 Classes](#32-Classes1)
##### [3.2.1 Ui class](#321-Ui-class1)
##### [3.2.2 Parser class](#322-Parser-class1)
##### [3.2.3 Module class](#323-Module-class1)
##### [3.2.4 Task class](#324-Task-class1)
##### [3.2.5 TimeTable class](#325-TimeTable-class1)
### [4. Implementation](#4-Implementation1)
### [5. Testing](#5-Testing1)
### [6. Appendix: Requirements](#6-Appendix-Requirements1)
#### [6.1 Product scope](#61-Product-scope1)
#### [6.1.1 Target user profile](#611-Target-user-profile1)
#### [6.1.2 Value proposition](#612-Value-proposition1)
#### [6.2 User stories](#62-User-stories1)

{Describe the design and implementation of the product. Use UML diagrams and short code snippets where applicable.}


## Product scope
### Target user profile
## 1. Introduction
### 1.1 Software Overview
CEGMods is a command line (CLI) application that helps computer engineering (CEG) students to manage their modules, tasks and projects.

{Describe the target user profile}
CEGMods will allow students to categorize their tasks based on their modules and automatically help prioritize them by deadlines. It will also help students manage project deadlines by splitting them into mini-milestones.
### 1.2 Purpose
This document describes the architecture and software design of CEGMods. The goal of this document is to cover the high-level system architecture and design.

### Value proposition
The document is divided into three main parts: design, implementation and documantation. The design includes the architecture diagram and the introduction of each class. The implementation describes some details on how certain features are implemented. The documentation details the logging, testing and configuration of CEGMods. It also includes the requirement and the instructions for manual testing in the appendices.
### 1.3 Scope
The intended audience of this document is the developers, designers, and software testers of CEGMods.

{Describe the value proposition: what problem does it solve?}
## 2. Setting up and getting started
Setting up the project in your computer
> <font color=#FF5733>Caution: </font> <font color=#00000><font color=#00000> **Please follow each steps in the guide carefully.** </font>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution and Note are not displaying properly.


## User Stories
#### Before you start:
Please ensure you have Java 11 installed in you computer.

|Version| As a ... | I want to ... | So that I can ...|
|--------|----------|---------------|------------------|
|v1.0|new user|see usage instructions|refer to them when I forget how to use the application|
|v2.0|user|find a to-do item by name|locate a to-do without having to go through the entire list|
1. Fork this repo from this [link](https://github.com/AY2021S1-CS2113T-F11-2/tp.git)
2. Clone the fork to your own computer. You are highly recommended to use Git tool (like Sourcetree) to track your work.
3. Use your own IDEA to program. You are highly recommended to use IntelliJ IDEA. Please check whether you have correct JDK version (JDK 11) in your computer and congiure the JDK.

## Non-Functional Requirements
If you are using IntelliJ IDEA:
- Open IntelliJ
- Set up JDK 11 for Gradle
1. Click `Configure` -> `Project Defaults` -> `Project Structure`
2. Click `New...` and set it to the directory of the JDK 11 installed
4. Import the project as a Gradle project.
> <font color=#FF5733>Note: </font> <font color=#00000> It is different from importing a normal Java project.</font>

{Give non-functional requirements}
If you are using IntelliJ IDEA:
- Click `Import Project` (or `Open or Import` in newer version of Intellij).
- Locate the `build.gradle` file (not the root folder as you would do in a normal importing) and select it. Click `OK`.
- Click `OK` to accept the default settings but do ensure that the selected version of `Gradle JVM` matches the JDK being used for the project.
- Wait for importing process to complete
5. Do the testing. Please follow the testing guide

## 3. Design
### 3.1 Architecture
The ***Architecture diagram*** given below shows the major components, and explains the structure of the software system.
[![Architecture diagram](https://iili.io/3Ei2Vf.md.png)](https://freeimage.host/i/3Ei2Vf)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps there should be a Command class handling the operations like print, add and delete, instead handled by Parser class?

Copy link

@QX-CHEN QX-CHEN Oct 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Storage class is missing from the architecture diagram, or the app data not stored?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps could combine Timetable, Module and Task into a data model component?

Copy link

@Colin386 Colin386 Oct 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the diagram looks alright. One suggestiong would be perhaps to link your parser to your UI with an arrow linking from parser to UI? The UI sends commands to parser while the parser may send things to UI to print perhaps?
image


## Glossary
### 3.2 Classes

* *glossary item* - Definition
The CEGMods consists of six classes:
* `Main`
* `Ui`
* `Parser`
* `Module`
* `Task`
* `TimeTable`

#### 3.2.1 Ui class
The Ui class reads the uses's input and response relevant messages.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps you may want to elaborate how the ui works with the parser module over here. The explanation could perhaps be improved by elaborating on the relation between the ui and the parser

#### 3.2.2 Parser class
The `Parser` class deals with making sense of the user's command and execute the command relevantly:
- add new `Module` into `Timetable`.
- delte `Module` from `Timetable`.
- add new `Task` into tasklist.
- delete `Task` from tasklist.
- print out `Timetable` of a certain day or one week.

#### 3.2.3 Module class
The Module class contains the information of a module, including the title, description, and time slots of lectures, tutorials and labs.
#### 3.2.4 Task class
The `Task` class contains the information of a task, including the todo, event and deadline tasks.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps you may wanna add some UML diagrams for illustrating the module class and the task class components. This may assist you in explaining what these components contain


#### 3.2.5 TimeTable class
The `Timetable` class shows the timetable for all the module slots and tasks. It also stores `Module` details in an arraylist and checks whether there is a time conflict between two classes.


## 4. Implementation
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can add a few more UML diagram for Design and Implementation.

This section provides details on the implementations of certain features.

### Feature: Add a module

The user type in command in `module mod/<MODULE_CODE> lec/<LECTURE_DAY> <LECTURE_TIME> tut/<TUTORIAL_DAY> <TUTORIAL_TIME> lab/<LAB_DAY> <LAB_TIME>` this form to add a module into the timetable. The time slot of lab is optional. The program will detect whether the user command is in this form, and store module data in arraylist `modules` in `Timetable` class after Ui passing command and calling `addModule()` in Parser class.

The ***sequence diagram*** below shows the interaction between these classes when the user adds a module.
[![3GRaM7.md.png](https://iili.io/3GRaM7.md.png)](https://freeimage.host/i/3GRaM7)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider reaplacing the input from user to ui with the actual input, instead of "add a module".

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the diagram is pretty simple. It helps to show step by step how a module is added. So far no violation of any UML notations.


### Feature: Delete a module
The user enters the command: `delete m/<MODULE_CODE>` to delete a module in the timetable. The `Parser` class will make sense of the command and enable the `deleteModule()` method in the `TimeTable` class.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If possible, perhaps adding a diagram for explaining how a module is deleted would be good? I think the diagram that you can use here can be similar to that used for the add module diagram


## 5. Testing
- Running tests
- Types of tests

Running tests
-
There are two ways to run tests.

- **Method 1: Using IntelliJ JUnit test runner**
- To run all tests, you can click `src` -> `test`, right-click on the `java` folder and choose `Run 'Tests in 'tp.test''`
- To run a subset of tests, you can click `src` -> `test` -> `java` and right-click on a test package, test class, or a test and choose `Run 'ABC'`
- **Method 2: Using Gradle**
- Click `Terminal` to open a new console and type in the command `gradlew clean test` to run a test (Mac/Linux: ./gradlew clean test)

Types of tests
-
This project has three types of tests: ...

## 6. Appendix: Requirements
### 6.1 Product scope
#### 6.1.1 Target user profile
This application is intended for users who
- are NUS Computer Engineering Students
- have a large variety of lesson (lab, tutorial, lecture, webcast) and commitment types (CCA, external commitments)
- have a certain type of homework based on standard formats (pre-lecture/ post-lecture/ pre-tutorial/ post-tutorial/ pre-lab/ post-lab)
- have various projects ongoing at the same time (individual, team, for technical modules and non-technical modules)
- are reasonably comfortable using CLI apps
#### 6.1.2 Value proposition
- Manages Tasks based on:
- the module: eg. CS2113T, CG2271, CS2101 (can be colour-coded according to modules)
- tasks unrelated to modules can be placed under “others”
- the deadline of the task: eg.pre-lecture/ post-lecture/ pre-tutorial/ post-tutorial/ pre-lab/ post-lab
- urgency: a chronological list of what is due the earliest
- the amount of time taken for the task: range of 30min-3hours
- Manages Schedule based on:
- NUSMods schedule, ie. modules
- Webcast option, ie. can be shifted around
- Team meetings (regular scheduled and ad hoc)
- Manages Project based on:
- Deadlines of subtasks (subclass of task but for projects)
- Percentage of completion
### 6.2 User stories

| Priority level| As a/an | I want to | so that I can
| -------- | -------- | -------- |-------- |
| must-have | new user | add my modules |I can categorise my tasks and schedule
|must-have | new user|add my lecture slots|I can plan my timetable
|must-have|new user|add tutorial slots|I can plan my timetable
|must-have|user|add lab slots|I can plan my timetable
|must-have|user|view my timetable |I can go about my day following the planned timetable
|nict-to-have|user|view my project progress|I can manage my project
|must-have|user|add subtasks of project |I can divide whole project in various subtasks and record them
|nice-to-have|user|create daily or weekly to-do list |I can view all the tasks to be completed
|must-have|user|add deadline to tasks(assignment, tutorials)|I can know when to complete
|must-have|user|prioritize tasks in to-do list by urgency level|I can plan what to do first
|must-have|user|mark tasks as done or delete them|
|nice-to-have|user|add alarm to remind the upcoming event|I won't forget or miss relevant events
|nice-to-have|user|add periodic zoom links for online lectures/tutorials|I can join the zoom session quickly before the class
|nice-to-have|user|share project schedule and details with teammates|I can cooperate with my teammate better

## Instructions for manual testing

{Give instructions on how to do a manual product testing e.g., how to load sample data to be used for testing}
1 change: 1 addition & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
6 changes: 6 additions & 0 deletions docs/team/shenjia.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Zhang Shenjia - Project Portfolio Page

## Overview


### Summary of Contributions
Loading