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-F14-3] CLI.ckFit #51

Open
wants to merge 960 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
960 commits
Select commit Hold shift + click to select a range
cb5bba5
Merge pull request #249 from pragyan01/master
pragyan01 Nov 4, 2021
b8b653e
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 4, 2021
57ef886
Gradle fixes
Nov 4, 2021
3cbcba2
Change saving of schedule and workout
arvejw Nov 4, 2021
bd492ab
Merge pull request #250 from pragyan01/master
pragyan01 Nov 4, 2021
ed2e646
Add PPP for ivy
Nov 4, 2021
dfa0db4
PPP base
teoziyiivy Nov 4, 2021
9315386
PPP content
teoziyiivy Nov 4, 2021
11e791e
Merge pull request #252 from pragyan01/master
pragyan01 Nov 4, 2021
247af43
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 4, 2021
969b8b2
Merge pull request #251 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 4, 2021
d6475fc
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 4, 2021
96795ac
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 5, 2021
fe06b78
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 5, 2021
9453b9e
Java docs
Nov 5, 2021
b35efc8
Merge pull request #253 from pragyan01/master
pragyan01 Nov 5, 2021
b6976a5
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 5, 2021
c953fd4
Refactoring and Java docs added
VishalJeyaram Nov 5, 2021
0388f69
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 5, 2021
9c0601e
Merge pull request #254 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 5, 2021
0949bd4
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 5, 2021
e7b89b0
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 5, 2021
cdb39ca
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 5, 2021
003152b
Java docs and code claim
Nov 5, 2021
bba2a3a
Merge pull request #255 from pragyan01/master
pragyan01 Nov 5, 2021
f66faba
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 5, 2021
7864e2d
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 5, 2021
c076485
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 5, 2021
d4767f4
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
arvejw Nov 5, 2021
8b683a3
Merge branch 'master' into Jiewen-FinalCountdown
arvejw Nov 5, 2021
552ec61
Add new exception for duplicate rescheduled workout
arvejw Nov 5, 2021
495b4bc
Merge pull request #256 from arvejw/Jiewen-FinalCountdown
arvejw Nov 5, 2021
69dcb2a
Merge branch 'master' of github.com:AY2122S1-CS2113T-F14-3/tp
Nov 5, 2021
06119b5
Merge branch 'master' into EdwardZYWang-V2
Nov 5, 2021
5a87c59
add java docs
Nov 5, 2021
448ad11
fixed gradle for javadocs
Nov 5, 2021
a22b3ac
Merge pull request #257 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 5, 2021
c2b3c62
add junits
Nov 5, 2021
ebedcb4
Merge pull request #258 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 5, 2021
ee1331b
Merge branch 'EdwardZYWang-V2'
Nov 5, 2021
7b5ce55
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 5, 2021
e86c330
Fluid logging & asserions & exceptions done
Nov 5, 2021
fe3876c
Fluid exceptions, JUnit testing
Nov 5, 2021
6d27a03
Merge pull request #259 from pragyan01/master
pragyan01 Nov 5, 2021
4309765
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 5, 2021
abc5c8a
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
9b8edce
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
2e55e0a
Fluid Junit tests and fluid DG
Nov 6, 2021
6a3fef5
Merge pull request #260 from pragyan01/master
pragyan01 Nov 6, 2021
54bc6c8
fluid DG
Nov 6, 2021
c3eeff0
Fluid Junit
Nov 6, 2021
21f8d5a
Merge pull request #261 from pragyan01/master
pragyan01 Nov 6, 2021
b39002c
JUnit testing and Javadocs done
VishalJeyaram Nov 6, 2021
459001d
Merge pull request #262 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
f3e790c
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
41c62f4
Java doc
Nov 6, 2021
12bf664
Merge pull request #263 from pragyan01/master
pragyan01 Nov 6, 2021
060bbb9
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
240f4b7
removed dead code for fluid class
Nov 6, 2021
2a0c982
Merge pull request #264 from pragyan01/master
pragyan01 Nov 6, 2021
0de0a16
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
f6f0fdd
Add code claim
Nov 6, 2021
44bb44a
Merge pull request #265 from pragyan01/master
pragyan01 Nov 6, 2021
dbe1abc
UG Claim
teoziyiivy Nov 6, 2021
4242228
Merge pull request #266 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 6, 2021
1b22416
Merge branch 'master' of github.com:AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
41eaa48
Refactor some code
arvejw Nov 6, 2021
186e246
Merge branch 'master' into EdwardZYWang-V2
Nov 6, 2021
8522952
edit UG
Nov 6, 2021
3fcf0ec
Merge pull request #267 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 6, 2021
ef719c9
Merge branch 'master' into Jiewen-FinalCountdown
arvejw Nov 6, 2021
00809bd
Split UG share
arvejw Nov 6, 2021
c36e704
Merge pull request #268 from arvejw/Jiewen-FinalCountdown
arvejw Nov 6, 2021
c1ee769
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
32b9ae1
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
9bbc3d0
UG updated
VishalJeyaram Nov 6, 2021
707bcfc
Merge pull request #269 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
42fa287
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
acae35a
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
80a102f
Gradle bugs fixed
VishalJeyaram Nov 6, 2021
796366c
Fluidtest errors fixed
VishalJeyaram Nov 6, 2021
7475e2b
Fluidtest errors fixed
VishalJeyaram Nov 6, 2021
221b4c2
Fluidtest errors fixed
VishalJeyaram Nov 6, 2021
6dc98d8
Merge pull request #270 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
8ac040c
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
b0ea09f
Fix UG text wrapping issues
arvejw Nov 6, 2021
bfa4862
Merge pull request #271 from arvejw/Jiewen-FinalCountdown
arvejw Nov 6, 2021
65944dd
Fix more UG text wrapping
arvejw Nov 6, 2021
5b93624
Merge pull request #272 from arvejw/Jiewen-FinalCountdown
arvejw Nov 6, 2021
7b7e107
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
bcf16bb
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
60822df
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
dd8ddc8
UG
Nov 6, 2021
d2e4883
Merge pull request #273 from pragyan01/master
pragyan01 Nov 6, 2021
6fcb08e
Bugs fixed and user guide updated
VishalJeyaram Nov 6, 2021
3da982b
userguide starting prompt updated
VishalJeyaram Nov 6, 2021
58eea99
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
ded9cf7
Merge pull request #274 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
0a07ff2
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
0ae237e
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
97f7f45
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
511671b
Remove johndoe's PPP
arvejw Nov 6, 2021
b88219a
Tweak message
arvejw Nov 6, 2021
9bfa2be
Minor logic changes to workout classes
arvejw Nov 6, 2021
ae76245
Add more JUnit
arvejw Nov 6, 2021
f45b4ac
Reformat and edit UG and DG
arvejw Nov 6, 2021
584d3c2
Merge pull request #275 from arvejw/Jiewen-FinalCountdown
arvejw Nov 6, 2021
d0b1a36
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
0937639
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
6beac24
DG for fluid
Nov 6, 2021
32f6b68
Merge pull request #276 from pragyan01/master
pragyan01 Nov 6, 2021
03810ef
DG updated
VishalJeyaram Nov 6, 2021
daaca9a
DG Updated with more diagrams
VishalJeyaram Nov 6, 2021
79f90ff
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
4d28371
Merge pull request #277 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
bcd9a01
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
52127c3
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
ebff1f8
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
71a963b
DG+Junit for FoodBank & Fluid
Nov 6, 2021
062691c
Merge pull request #278 from pragyan01/master
pragyan01 Nov 6, 2021
abeca4d
JUnit testing and DG complete
VishalJeyaram Nov 6, 2021
0a00d5c
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
5ae0389
Merge pull request #279 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
6746cc3
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 6, 2021
d1c0359
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
37682ec
Gradle bugs fixed
VishalJeyaram Nov 6, 2021
acee7b8
bugs fixed
VishalJeyaram Nov 6, 2021
71510b1
Merge pull request #280 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 6, 2021
edf7da6
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
eec5fe2
JUnit fixes
Nov 6, 2021
b08e4e7
Merge pull request #281 from pragyan01/master
pragyan01 Nov 6, 2021
161a4b1
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 6, 2021
20c4fcc
Code fixes and DG for fluid class
Nov 7, 2021
0450301
Merge pull request #282 from pragyan01/master
pragyan01 Nov 7, 2021
42220ca
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 7, 2021
4e3aa0c
Merge branch 'master' of github.com:AY2122S1-CS2113T-F14-3/tp into Ed…
Nov 7, 2021
0f94757
Add javadocs and remove unused imports
teoziyiivy Nov 7, 2021
6e4082b
Add expected output to UG and add kg to WeightTracker
teoziyiivy Nov 7, 2021
db41593
Add 'kg'
teoziyiivy Nov 7, 2021
fd34973
Update DG
teoziyiivy Nov 7, 2021
e22c538
Fix Gradle
teoziyiivy Nov 7, 2021
ff59579
add link
teoziyiivy Nov 7, 2021
f74ea71
Fix Gradle
teoziyiivy Nov 7, 2021
c5db093
Add junits
teoziyiivy Nov 7, 2021
0baff3b
build
teoziyiivy Nov 7, 2021
25a23ab
Merge pull request #283 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 7, 2021
b1ed3ed
Zikun fixes
teoziyiivy Nov 7, 2021
ecb50ce
Merge pull request #284 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 7, 2021
951706c
Update PPP and some minor changes
arvejw Nov 7, 2021
07bc61c
Add more JUnit
arvejw Nov 7, 2021
c5f7fed
Merge pull request #285 from arvejw/Jiewen-FinalCountdown
arvejw Nov 7, 2021
8ac316f
Fix DG bugs
teoziyiivy Nov 7, 2021
8067356
Added javadoc
teoziyiivy Nov 7, 2021
21e6c4f
Fix heading anchor in DG
arvejw Nov 7, 2021
f222214
PPP updates
teoziyiivy Nov 7, 2021
c0127f5
Add line to Duke class
teoziyiivy Nov 7, 2021
fef244a
Merge pull request #286 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 7, 2021
0ce2966
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 7, 2021
05b32b9
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 7, 2021
b2035a0
Update docs
arvejw Nov 7, 2021
63a7f8f
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
arvejw Nov 7, 2021
08ba06e
Merge branch 'master' into Jiewen-FinalCountdown
arvejw Nov 7, 2021
7f69f5a
Merge pull request #287 from arvejw/Jiewen-FinalCountdown
arvejw Nov 7, 2021
358ef69
Fix hyperlink in DG
arvejw Nov 7, 2021
f5ca673
Merge pull request #288 from arvejw/Jiewen-FinalCountdown
arvejw Nov 7, 2021
3402b83
Add intro section to DG
arvejw Nov 7, 2021
e2a9d55
Merge pull request #289 from arvejw/Jiewen-FinalCountdown
arvejw Nov 7, 2021
83077f4
Fix some text wrap issues in DG
arvejw Nov 7, 2021
1e71b60
Merge pull request #290 from arvejw/Jiewen-FinalCountdown
arvejw Nov 7, 2021
caf02a0
Fix minor issue in DG
arvejw Nov 7, 2021
3745cf4
Merge pull request #291 from arvejw/Jiewen-FinalCountdown
arvejw Nov 7, 2021
d05c04f
edit DG and pic
Nov 7, 2021
2ebb216
Merge pull request #292 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 7, 2021
07777ad
Merge branch 'master' of github.com:AY2122S1-CS2113T-F14-3/tp into Ed…
Nov 7, 2021
13c5ceb
DG and Foodbank updared
VishalJeyaram Nov 7, 2021
d74fe71
Merge pull request #293 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 7, 2021
4ccb1b2
edit DG and PPP
Nov 7, 2021
66f2507
Merge pull request #294 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 7, 2021
f03aa73
Merge branch 'master' of github.com:AY2122S1-CS2113T-F14-3/tp into Ed…
Nov 7, 2021
db0a327
edit PPP
Nov 8, 2021
1f8d076
Merge pull request #295 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 8, 2021
60499dc
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 8, 2021
0f7d7c9
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 8, 2021
8ad2cbd
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
5a1e0fe
Updates to DG
teoziyiivy Nov 8, 2021
c698822
Add junit tests
teoziyiivy Nov 8, 2021
8c7d57f
Merge pull request #296 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 8, 2021
62839e7
Add PPP
Nov 8, 2021
028603a
Code fixes for fluid
Nov 8, 2021
0147125
Merge pull request #297 from pragyan01/master
pragyan01 Nov 8, 2021
90b0fc6
PPP complete
VishalJeyaram Nov 8, 2021
6f50499
Merge pull request #298 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
2a8b403
Fix reposense link in PPP
arvejw Nov 8, 2021
0ea3822
Merge branch 'master' into Jiewen-FinalCountdown
arvejw Nov 8, 2021
e11dc9b
Merge branch 'master' of github.com:AY2122S1-CS2113T-F14-3/tp into Ed…
Nov 8, 2021
de57094
Edit PPP
arvejw Nov 8, 2021
6455370
Merge pull request #299 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
dea24af
edit PPP, DG, AND DIAGRAM
Nov 8, 2021
da71c60
Merge pull request #300 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 8, 2021
44ef6ad
edit PPP
Nov 8, 2021
511c2ab
Merge pull request #301 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 8, 2021
28e37c9
DG commands for meal and foodbank added
VishalJeyaram Nov 8, 2021
0b76d03
Set theme jekyll-theme-cayman
EdwardZYWang Nov 8, 2021
e73db27
Merge pull request #302 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
22ba75c
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
Nov 8, 2021
ac04312
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 8, 2021
18921b4
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
0863571
Tweak UG DG
arvejw Nov 8, 2021
221856e
Merge branch 'master' into Jiewen-FinalCountdown
arvejw Nov 8, 2021
c86d9ba
edit PPP
Nov 8, 2021
184ec57
Merge pull request #303 from EdwardZYWang/EdwardZYWang-V2
EdwardZYWang Nov 8, 2021
c923339
Merge pull request #304 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
a88a044
Add to DG
teoziyiivy Nov 8, 2021
0e322ac
Added to PPP
teoziyiivy Nov 8, 2021
ad54f1c
Merge pull request #305 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 8, 2021
65f47bb
Fix formatting
teoziyiivy Nov 8, 2021
c1cdef7
Merge pull request #306 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 8, 2021
2a65626
Add page break for PPP
teoziyiivy Nov 8, 2021
8c363bd
bugfixes + DG
Nov 8, 2021
00e5194
bug fixes + DG
Nov 8, 2021
409a4fb
Merge pull request #307 from teoziyiivy/teoziyiivy-PPP
teoziyiivy Nov 8, 2021
4845225
Merge branch 'master' into master
pragyan01 Nov 8, 2021
afae3d7
Merge pull request #308 from pragyan01/master
pragyan01 Nov 8, 2021
b21173c
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 8, 2021
20c74b9
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
67aa9c1
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
arvejw Nov 8, 2021
d41e94a
DG fixed
VishalJeyaram Nov 8, 2021
0dd539a
Edit UML class diag
arvejw Nov 8, 2021
fa1d5b4
DG fixed
VishalJeyaram Nov 8, 2021
033984d
DG class diagrams fixed
VishalJeyaram Nov 8, 2021
6589dad
Merge pull request #309 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
14e5639
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
VishalJeyaram Nov 8, 2021
9983c54
Merge branch 'master' into VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
ba6dab2
Final bugs and errors fixed. Due for submission.
VishalJeyaram Nov 8, 2021
6066ed0
Final bugs fixed
VishalJeyaram Nov 8, 2021
6775dce
Merge pull request #310 from VishalJeyaram/VishalJeyaram-v2.1
VishalJeyaram Nov 8, 2021
3ecd26f
Merge branch 'master' of https://github.com/AY2122S1-CS2113T-F14-3/tp
arvejw Nov 8, 2021
390526c
Merge branch 'master' into Jiewen-FinalCountdown
arvejw Nov 8, 2021
9b26784
Update UG
arvejw Nov 8, 2021
e0ed04f
Merge pull request #311 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
aff63b7
Fix text wrapping DG
arvejw Nov 8, 2021
981e3bb
Merge pull request #312 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
c2bf178
Fix text wrapping DG
arvejw Nov 8, 2021
6203668
Merge pull request #313 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
18326cc
Fix text wrapping
arvejw Nov 8, 2021
b1b4ed3
Merge pull request #314 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
e96a111
Update readme
arvejw Nov 8, 2021
1f41df1
Merge pull request #315 from arvejw/Jiewen-FinalCountdown
arvejw Nov 8, 2021
68954a1
Edit UG for CS2101
arvejw Nov 12, 2021
4dfe1a9
Merge pull request #316 from arvejw/Jiewen-FinalCountdown
arvejw Nov 12, 2021
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ bin/

/text-ui-test/ACTUAL.txt
text-ui-test/EXPECTED-UNIX.TXT
Workout.txt
Schedule.txt
Food.txt
FoodBank.txt
Weight.txt
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@ checkstyle {
}

run{
enableAssertions = true
standardInput = System.in
}
33 changes: 33 additions & 0 deletions diagrams/Fluid.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
@startuml
'https://plantuml.com/class-diagram
skinparam classAttributeIconSize 0

abstract class Tracker {
}

class Fluid {
#fluidArray: ArrayList<String>
#fluidNumber: int
#description: String
#calories: int
#volume: int
#date: String
#time: String
#totalCalories: int
#totalVolume: int

+generateFluidParameters(inputArguments: String): void
+addFluid(inputArguments: String): void
+deleteFluid(inputArguments: String): void
+listFluid(date: String): void
+getCalories(date: String): int
+getVolume(date: String): int
}

class FluidExceptions {
}

FluidExceptions --|> Fluid
Fluid --|> "<<extends>>" Tracker

@enduml
24 changes: 24 additions & 0 deletions diagrams/Fluid_AddFluid_Sequence.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@startuml
'https://plantuml.com/sequence-diagram
|||
participant "fluid:Fluid"

->"fluid:Fluid" : addFluid(inputArguments: String)
activate "fluid:Fluid" #FFBBBB

"fluid:Fluid"->"fluid:Fluid" : generateFluidParameters(inputArguments: String)
activate "fluid:Fluid" #DarkSalmon
return
|||
alt no fluid description \n or description has \n separators
else else
"fluid:Fluid"->"fluid:Fluid" : fluidArray.add(inputArguments: String)
activate "fluid:Fluid" #IndianRed
return
|||
end
note left : if block only throws an exception
|||
deactivate "fluid:Fluid"
|||
@enduml
28 changes: 28 additions & 0 deletions diagrams/Meal.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
@startuml
'https://plantuml.com/class-diagram

class Meal

abstract class Tracker {
}

class Meal {
protected ArrayList<String> meals;
#mealNumber: int
#calories: int
#description: String
#date: String
#time: String
#totalCalories: int
- {static} logger: Logger
+generateWeightParameters(inputArguments: String): void
+addMeal(inputArguments: String): void
+deleteMeal(inputArguments: String): void
+listMeals(inputArguments: String): void
+getCalories(date: String): int
}

Meal --|> "<<extends>>" Tracker


@enduml
31 changes: 31 additions & 0 deletions diagrams/Meal_ListMeals_sequence.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
@startuml
'https://plantuml.com/sequence-diagram
participant "meal:Meal"
->"meal:Meal" : "listMeals(date: String)"
activate "meal:Meal" #FFBBBB
alt date.equals("all")
|||
loop Until no more meals
"meal:Meal"->"meal:Meal" : generateMealParameters(inputArguments: String)
activate "meal:Meal" #FFBBBB
return
|||
end
|||
else
|||
loop Until no more meals
|||
opt meal.contains(date)
"meal:Meal"->"meal:Meal" : generateMealParameters(inputArguments: String)
activate "meal:Meal" #FFBBBB
return
|||
end
|||
end
|||
end
deactivate "meal:Meal"
|||
@enduml
55 changes: 55 additions & 0 deletions diagrams/ScheduleTracker_add_sequence.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
@startuml
'https://plantuml.com/sequence-diagram
participant ":ScheduleTracker"

->":ScheduleTracker" : addScheduledWorkout(inputArguments: String)
activate ":ScheduleTracker" #FFBBBB

":ScheduleTracker"->":ScheduleTracker" : generateParameters(inputArguments: String)
activate ":ScheduleTracker" #DarkSalmon
return generatedParameters: String[]

create ":ScheduledWorkout"
":ScheduleTracker"->":ScheduledWorkout" : scheduledWorkouts.add(scheduledWorkout: ScheduledWorkout)
activate ":ScheduledWorkout"
":ScheduledWorkout"-->":ScheduleTracker"
deactivate ":ScheduledWorkout"

":ScheduleTracker"->":ScheduleTracker" : cleanUpScheduleList()

activate ":ScheduleTracker" #DarkSalmon

loop \tno more overdue workouts\t
note left : Take note that a workout is "overdue" \nif its scheduled date is before the current date
":ScheduleTracker"->":ScheduleTracker" : updateOrDeleteScheduledWorkout(\n\tscheduledWorkout: ScheduledWorkout,\n\tcurrentDate: LocalDate)
activate ":ScheduleTracker" #IndianRed
alt \tisRecurringWorkout\t
":ScheduleTracker"->":ScheduleTracker" : rescheduleRecurringWorkout(\n\tscheduledWorkout: ScheduledWorkout,\n\tcurrentDate: LocalDate)
activate ":ScheduleTracker" #LightSalmon
":ScheduleTracker"->":ScheduledWorkout" : incrementWorkoutDate(days: long)
|||
activate ":ScheduledWorkout"
return
return
|||
else else
":ScheduleTracker"->":ScheduleTracker" : deleteWorkout()
activate ":ScheduleTracker" #LightSalmon
":ScheduleTracker"->":ScheduledWorkout" : scheduledWorkouts.remove(\n\tscheduledWorkout: ScheduledWorkout)
activate ":ScheduledWorkout"
destroy ":ScheduledWorkout"
return
return
|||
end
end

":ScheduleTracker"->":ScheduleTracker" : sortScheduleList()
activate ":ScheduleTracker" #LightSalmon
return

return
return
return

@enduml
41 changes: 41 additions & 0 deletions diagrams/ScheduleTracker_class.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
@startuml
'https://plantuml.com/class-diagram
skinparam classAttributeIconSize 0


class ScheduleTracker {
+ScheduleTracker()
+addScheduledWorkout(inputArguments: String):void
+deleteScheduledworkout(inputArguments: String): void
+listScheduledWorkouts(): void
}

note bottom of ScheduledWorkout : Basic getter methods for attributes omitted
class ScheduledWorkout {
-workoutDescription: String
-workoutDate: String
-workoutTime: String
-workoutDateTime: LocalDateTime
-isRecurring: boolean

+ScheduledWorkout(workoutDescription: String, \n\tworkoutDate: String, workoutTime: String, \n\tactivityMap: Map<String, ArrayList<Integer>> \n\tisRecurring: boolean)
+incrementWorkoutDate(): void
}

note top of WorkoutActivity : Basic getter methods for attribute omitted
class WorkoutActivity {
private String activityDescription;
-boolean isDistanceActivity = false;
-activityDistance: int
-activitySets: int
-activityReps: int

+WorkoutActivity(activityDescription: String,
\tactivityQuantifier: ArrayList<Integer>,\n\tisDistanceActivity: boolean)
}

ScheduleTracker --> "[0..*] scheduledWorkouts" ScheduledWorkout
ScheduledWorkout --> "\t\t\n\n\n\n[0..*] activities" WorkoutActivity


@enduml
29 changes: 29 additions & 0 deletions diagrams/Ui.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
@startuml
'https://plantuml.com/class-diagram
skinparam classAttributeIconSize 0

class Ui {
+welcomeMessage():void
+getInfo():void
+memoryStartup():void
+sex:String
+weight:int
+height:int
+age:int
+activityLevel:int
}

note bottom of Calculator : Prints out BMI of the user and his/her recommended caloric intake
class Calculator {
+getBmi():void
+getIdealCalories():void
+sex:String
+weight:int
+height:int
+age:int
+activityLevel:int
}

Ui --> "1" Calculator

@enduml
32 changes: 32 additions & 0 deletions diagrams/WeightTracker_add_sequence.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@startuml
'https://plantuml.com/sequence-diagram


participant ":WeightTracker"
participant ":WeightTrackerMessages"

->":WeightTracker" : weightTracker.addWeights(input: String)
activate ":WeightTracker" #Salmon
":WeightTracker"->":WeightTracker" : generateWeightParameters(inputArguments: String)
activate ":WeightTracker" #LightSalmon
return
alt typical input
":WeightTracker"->":WeightTrackerMessages" : printAddWeightResponse(weight: int, date: String)
activate ":WeightTracker" #LightSalmon
activate ":WeightTrackerMessages" #Tomato
return
deactivate ":WeightTrackerMessages"
return
else missing date
":WeightTracker"->":WeightTrackerMessages" : printAddWeightResponse(weight: int, date: String)
activate ":WeightTracker" #LightSalmon
activate ":WeightTrackerMessages"#Tomato
return
deactivate ":WeightTrackerMessages"
<--":WeightTracker"
deactivate ":WeightTracker"
else exception
<--":WeightTracker" : AddWeightException()
end

@enduml
54 changes: 54 additions & 0 deletions diagrams/WeightTracker_class.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
@startuml
'https://plantuml.com/class-diagram
skinparam classAttributeIconSize 0

abstract class Tracker {
}

class WeightTracker {
#weightsArray: ArrayList<String>
#numberOfWeights: int
#weight: int
#date: String
- {static} logger: Logger
+WeightTracker()
+generateWeightParameters(inputArguments: String): void
+addWeight(input: String): void
+deleteWeight(input: String): void
+printWeight(input: String): void
+listWeights(input: String): void
+listSpecificWeights(input: String): void
+listAllWeights(): void
}

class AddWeightException {
+getMessage():String
}
class DeleteWeightException {
+getMessage():String
}
class DeleteWeightIndexException {
+getMessage():String
}
class NoWeightsException {
+getMessage():String
}
class WeightException {
+getMessage():String
}
class WeightTrackerMessages {
+printAddWeightResponse(weight: double, date: String):void
+printDeleteWeightResponse(weight: double, date: String):void
}
WeightTracker --> WeightTrackerMessages
WeightTracker ..> "<<throws>>" AddWeightException
WeightTracker ..> "<<throws>>" DeleteWeightException
WeightTracker ..> "<<throws>>" DeleteWeightIndexException
WeightTracker ..> "<<throws>>" NoWeightsException
WeightTracker --|> Tracker
AddWeightException --|> WeightException
DeleteWeightException --|> WeightException
DeleteWeightIndexException --|> WeightException
NoWeightsException --|> WeightException

@enduml
6 changes: 6 additions & 0 deletions diagrams/welcomeMessage.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@startuml
'https://plantuml.com/sequence-diagram
participant "welcomeMesage"


@enduml
10 changes: 5 additions & 5 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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)
![Imgur](https://i.imgur.com/3ubqQJI.jpg) | Edward Wang | [Github](https://github.com/EdwardZYWang) | [Portfolio](https://www.linkedin.com/in/edward-w-220218206/)
![](https://user-images.githubusercontent.com/69446495/135881811-957f79eb-0afe-48dd-94f0-d237edce256a.jpg) | Samal Sthitipragyan | [Github](https://github.com/pragyan01) | [Portfolio](https://www.linkedin.com/in/pragyan01/)
![](https://avatars0.githubusercontent.com/arvejw?s=100) | Teh Jiewen | [Github](https://github.com/arvejw) | [Portfolio](www.linkedin.com/in/jiewen-teh)
![](https://avatars0.githubusercontent.com/teoziyiivy?s=100) | Teo Ziyi Ivy | [Github](https://github.com/teoziyiivy) | [Portfolio](https://www.linkedin.com/in/teoziyiivy/)
![](https://via.placeholder.com/100.png?text=Photo) | Vishal Jeyaram | [Github](https://github.com/VishalJeyaram) | [Portfolio](https://www.linkedin.com/in/vishal-j-a43b581a2)
Loading