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

[CS2113-W15-1] LifeTracker #94

Open
wants to merge 548 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
548 commits
Select commit Hold shift + click to select a range
68671ee
Merge pull request #121 from MingEn82/master
MingEn82 Mar 31, 2023
5792300
test
MingEn82 Mar 31, 2023
6411442
prev commit
MingEn82 Mar 31, 2023
7720aeb
Merge branch 'master' of https://github.com/MingEn82/tp into branch-M…
MingEn82 Mar 31, 2023
15ca2b8
fixed bugs
MingEn82 Mar 31, 2023
e65413e
removed dependencies
MingEn82 Mar 31, 2023
84927de
Merge pull request #122 from MingEn82/branch-MingEn
MingEn82 Mar 31, 2023
c937583
Add Motivational exercise message Feature
Koh-Jing-Jie-Marcus Apr 1, 2023
feb14dd
Merge pull request #166 from Koh-Jing-Jie-Marcus/Branch-Motivate
Koh-Jing-Jie-Marcus Apr 1, 2023
ecef301
Add Target Weight Feature
Koh-Jing-Jie-Marcus Apr 1, 2023
97f1b14
Merge pull request #168 from Koh-Jing-Jie-Marcus/branch-TargetWeight
Koh-Jing-Jie-Marcus Apr 1, 2023
9684541
Fix bugs ('List' command for exercises)
MustafaAH10 Apr 1, 2023
a9a72df
Add functionality to delete exercise
MustafaAH10 Apr 1, 2023
fe3e6c0
Try and fix gradle errors
MustafaAH10 Apr 1, 2023
766de35
Merge pull request #169 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 1, 2023
985e9be
Update userData
Koh-Jing-Jie-Marcus Apr 1, 2023
fcb06c3
Fix target weight implementation
Koh-Jing-Jie-Marcus Apr 2, 2023
79ebd07
Merge pull request #170 from Koh-Jing-Jie-Marcus/branch-FixTarget
Koh-Jing-Jie-Marcus Apr 2, 2023
2abfef4
Add meal exercises examples
Koh-Jing-Jie-Marcus Apr 2, 2023
e62f9c8
Merge pull request #171 from Koh-Jing-Jie-Marcus/branch-CommonExercises
Koh-Jing-Jie-Marcus Apr 2, 2023
d964189
Fix bugs (Exercise Storage issue)
MustafaAH10 Apr 2, 2023
1dcf7cb
Merge pull request #172 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 2, 2023
ecd548f
add exampledata
Koh-Jing-Jie-Marcus Apr 2, 2023
0ccad35
Merge pull request #174 from Koh-Jing-Jie-Marcus/branch-CommonExercises
Koh-Jing-Jie-Marcus Apr 2, 2023
ff763ff
Help Command
TJ-Hoo Apr 2, 2023
940e607
bug fixes
MingEn82 Apr 2, 2023
a76ccab
bug fixes
MingEn82 Apr 2, 2023
990341e
bug fixes
MingEn82 Apr 2, 2023
9256c04
bug fixes
MingEn82 Apr 2, 2023
f95e991
bug fixes
MingEn82 Apr 2, 2023
5cb87eb
runtest fix?
MingEn82 Apr 2, 2023
ef1e703
fixed filter
MingEn82 Apr 2, 2023
f6ff9bd
Merge pull request #176 from MingEn82/branch-MingEn
MingEn82 Apr 2, 2023
74680c6
Help command
TJ-Hoo Apr 2, 2023
758573b
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp …
TJ-Hoo Apr 2, 2023
29ef3f4
Fixed gradle
TJ-Hoo Apr 2, 2023
eb6be5c
Merge pull request #178 from TJ-Hoo/branch-TJHoo
TJ-Hoo Apr 2, 2023
9b2a5d0
Added Nasi Padang food data
TJ-Hoo Apr 2, 2023
973b3e0
Merge pull request #179 from TJ-Hoo/branch-TJHoo
TJ-Hoo Apr 2, 2023
c2ef483
Create TJ-Hoo.md
TJ-Hoo Apr 3, 2023
9988d8a
Add ExampleUi
Koh-Jing-Jie-Marcus Apr 3, 2023
ee1bea1
Merge pull request #180 from Koh-Jing-Jie-Marcus/branch-CommonExercises
Koh-Jing-Jie-Marcus Apr 3, 2023
87599ec
Update filter command
Koh-Jing-Jie-Marcus Apr 4, 2023
ffe9798
Merge pull request #181 from Koh-Jing-Jie-Marcus/branch-Marcus
Koh-Jing-Jie-Marcus Apr 4, 2023
df16d98
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 4, 2023
299f00f
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 4, 2023
3af9afd
fix bug issues on viewing null input
Masahiro21 Apr 4, 2023
f4144f3
update userGuide
Masahiro21 Apr 4, 2023
9420b1d
Merge pull request #182 from Masahiro21/branch-Hamada
Masahiro21 Apr 4, 2023
aba11c6
Create Koh-Jing-Jie-Marcus.md
Koh-Jing-Jie-Marcus Apr 4, 2023
630439d
Update Koh-Jing-Jie-Marcus.md
Koh-Jing-Jie-Marcus Apr 4, 2023
94f8f74
Fix nutrition command
TJ-Hoo Apr 4, 2023
e31b07d
Fix spacing
TJ-Hoo Apr 4, 2023
98602b1
Merge pull request #184 from TJ-Hoo/branch-TJHoo
TJ-Hoo Apr 4, 2023
fad21f3
Create tj-hoo.md
TJ-Hoo Apr 5, 2023
9fafd11
Delete TJ-Hoo.md
TJ-Hoo Apr 5, 2023
fac96d9
Create koh-jing-jie-marcus.md
TJ-Hoo Apr 5, 2023
2643c88
Delete Koh-Jing-Jie-Marcus.md
TJ-Hoo Apr 5, 2023
e054d0e
Add test cases for ExamplesCommand
Koh-Jing-Jie-Marcus Apr 5, 2023
750ab5c
Merge pull request #194 from Koh-Jing-Jie-Marcus/branch-Marcus
Koh-Jing-Jie-Marcus Apr 5, 2023
eb334d8
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 5, 2023
df6922d
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 5, 2023
2012063
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 5, 2023
bf9eb89
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 5, 2023
0d09b60
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 5, 2023
a194d5f
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 5, 2023
e5b6858
Update UserGuide.md
Koh-Jing-Jie-Marcus Apr 5, 2023
db10c32
Update UserGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
4d57f3b
Update UserGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
543c7ba
Add filter and examples PNG
Koh-Jing-Jie-Marcus Apr 6, 2023
d8f41ab
Merge pull request #195 from Koh-Jing-Jie-Marcus/branch-Marcus
Koh-Jing-Jie-Marcus Apr 6, 2023
4f5a758
Update UserGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
7af0c97
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
75b6b57
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
39ed8c2
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
18ba6a2
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
98cf395
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
81da149
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
c52688b
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
bfc33f0
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
8eb5d49
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
b1ff01a
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
b5439fc
Update tj-hoo.md
TJ-Hoo Apr 6, 2023
63cf08f
Delete koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
55e2578
Create koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
146f4fb
Add functionality to track history within specified dates
MustafaAH10 Apr 6, 2023
5698b2f
Merge commit '55e2578507b6e9e6b750a0b2f11f7850c94e928b' into branch-M…
MustafaAH10 Apr 6, 2023
5e225c5
Added PPP [Mustafa]
MustafaAH10 Apr 6, 2023
c74f1a7
fix checkstyle errors
MustafaAH10 Apr 6, 2023
a92955b
Merge pull request #196 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 6, 2023
b0f2337
Update DeveloperGuide.md
TJ-Hoo Apr 6, 2023
77be37f
fixed bugs and added UG/DG
MingEn82 Apr 6, 2023
2bed52a
fixed bugs and added UG/DG
MingEn82 Apr 6, 2023
c41cca9
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp …
MingEn82 Apr 6, 2023
2572e7b
fixed bugs and added UG/DG
MingEn82 Apr 6, 2023
13d0e13
added uml pptx
MingEn82 Apr 6, 2023
99fb4b9
fixed gradle
MingEn82 Apr 6, 2023
e562782
fixed gradle
MingEn82 Apr 6, 2023
d1b9acd
fixed gradle
MingEn82 Apr 6, 2023
8e17d1c
Merge pull request #197 from MingEn82/branch-MingEn
MingEn82 Apr 6, 2023
40573f9
Create DeveloperGuide.md
TJ-Hoo Apr 6, 2023
48549a9
Update DeveloperGuide.md
TJ-Hoo Apr 6, 2023
c4fdf4e
Update DeveloperGuide.md
TJ-Hoo Apr 6, 2023
6879fd5
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
824992f
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
9ab74dc
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 6, 2023
7678900
updated mingen82.md
MingEn82 Apr 6, 2023
adca157
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp …
MingEn82 Apr 6, 2023
2068f88
Merge pull request #198 from MingEn82/branch-MingEn
MingEn82 Apr 6, 2023
2217f9e
Update DeveloperGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
ccad539
updated readmes
MingEn82 Apr 6, 2023
ad0e453
Merge pull request #199 from MingEn82/branch-MingEn
MingEn82 Apr 6, 2023
253a327
Update DeveloperGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
464bfaf
Update DeveloperGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
476264d
Update DeveloperGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
249ac57
Add UML for filter and examples
Koh-Jing-Jie-Marcus Apr 6, 2023
871bb36
Merge pull request #200 from Koh-Jing-Jie-Marcus/branch-Marcus
Koh-Jing-Jie-Marcus Apr 6, 2023
1dd4855
Update DeveloperGuide.md
Koh-Jing-Jie-Marcus Apr 6, 2023
c218684
Add UML
Koh-Jing-Jie-Marcus Apr 6, 2023
8010476
Update test
Koh-Jing-Jie-Marcus Apr 6, 2023
68951b9
log
Koh-Jing-Jie-Marcus Apr 6, 2023
e0dd9fb
Merge pull request #201 from Koh-Jing-Jie-Marcus/branch-Marcus
Koh-Jing-Jie-Marcus Apr 6, 2023
6502c77
update logfile
Masahiro21 Apr 6, 2023
7399cc4
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 6, 2023
e0566d3
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 6, 2023
f3ae540
add draft-PPP
Masahiro21 Apr 6, 2023
f815dc3
Merge pull request #202 from Masahiro21/branch-Hamada
Masahiro21 Apr 6, 2023
33916a4
fix data parsing invalid date issues
Masahiro21 Apr 6, 2023
b4ebf70
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 6, 2023
7630fb4
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 6, 2023
6e171d2
Update tj-hoo.md
TJ-Hoo Apr 7, 2023
46089c4
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
eaef4c6
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
0d5357e
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
d97347d
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
58729a1
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
80e57cb
Add files via upload
TJ-Hoo Apr 7, 2023
2073005
change ViewUserCommand and UpdateUserCommand to take in single line i…
Masahiro21 Apr 7, 2023
fa539ef
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
8a75d9a
abstract helpCommand output into GeneralUi and change CommandParser i…
Masahiro21 Apr 7, 2023
48f4234
add exceptions for ViewUserCommand and UpdateUserCommand
Masahiro21 Apr 7, 2023
a787285
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 7, 2023
de7fe24
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 7, 2023
d0ae7da
Merge pull request #203 from Masahiro21/branch-Hamada
Masahiro21 Apr 7, 2023
17ddb78
Update tj-hoo.md
TJ-Hoo Apr 7, 2023
c5fb4e2
Update DeveloperGuide.md
TJ-Hoo Apr 7, 2023
eea62f4
Update UserGuide.md
TJ-Hoo Apr 7, 2023
86a765d
change UpdateUserCommand to accept one liner inputs
Masahiro21 Apr 7, 2023
963b456
Merge pull request #209 from Masahiro21/branch-Hamada
Masahiro21 Apr 7, 2023
f1b2756
update draft PPP
Masahiro21 Apr 7, 2023
e05d41c
Merge pull request #210 from Masahiro21/branch-Hamada
Masahiro21 Apr 7, 2023
34219cc
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp …
Masahiro21 Apr 7, 2023
bc20d5d
update viewUserCommand to take in field names instead of numbers
Masahiro21 Apr 7, 2023
7281bd7
update UG images and details as well as help command
Masahiro21 Apr 7, 2023
ab7e84a
Merge pull request #211 from Masahiro21/branch-Hamada
Masahiro21 Apr 7, 2023
b9941c0
Fix date input issue
MustafaAH10 Apr 8, 2023
3362722
Add Junit test for Track Calorie Command
MustafaAH10 Apr 8, 2023
1d0340f
Fix gradle errors
MustafaAH10 Apr 8, 2023
5c23b32
Update JUnit for delete command
MustafaAH10 Apr 8, 2023
2573025
Add JUnit test for exit command
MustafaAH10 Apr 8, 2023
6b50f96
Add Junit test for list command
MustafaAH10 Apr 8, 2023
0ce2fe7
Fix gradle
MustafaAH10 Apr 8, 2023
73bc851
Fix gradle
MustafaAH10 Apr 8, 2023
b8143ef
Merge pull request #212 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 8, 2023
2555d87
Fix bug which doesn't save deleted exercises on exit
MustafaAH10 Apr 8, 2023
4a66c82
Merge pull request #213 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 8, 2023
b898f8a
Update DG and track calories command
MustafaAH10 Apr 8, 2023
4726521
Merge pull request #214 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 8, 2023
f2fb193
Add files via upload
TJ-Hoo Apr 9, 2023
e164c58
Update DeveloperGuide.md
TJ-Hoo Apr 9, 2023
c54c765
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 9, 2023
68ce70a
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 9, 2023
bf4f0bf
Update DeveloperGuide.md
TJ-Hoo Apr 9, 2023
25aaf3d
Update DeveloperGuide.md
TJ-Hoo Apr 9, 2023
d4036e7
Update UserGuide.md
TJ-Hoo Apr 9, 2023
57ca5cd
Update UserGuide.md
TJ-Hoo Apr 9, 2023
3a2762c
Update UserGuide.md
TJ-Hoo Apr 9, 2023
8cbf0d2
Update UG and DG
MustafaAH10 Apr 9, 2023
b170eae
Update PPP
MustafaAH10 Apr 9, 2023
b5c64a6
Merge commit '3a2762c18086d72df65ef3599a68aeb84967afef' into branch-M…
MustafaAH10 Apr 9, 2023
cd1f33a
Merge pull request #215 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 9, 2023
18c20b2
Update README.md
TJ-Hoo Apr 9, 2023
aefd412
updated main page readme
MingEn82 Apr 9, 2023
dc09bad
fix issue with viewUserCommand diagram
Masahiro21 Apr 9, 2023
5d6a748
add diagrams for updateUserCommand
Masahiro21 Apr 9, 2023
d5c9c53
Merge pull request #218 from Masahiro21/branch-Hamada
Masahiro21 Apr 9, 2023
3209900
Merge pull request #217 from MingEn82/branch-MingEn
TJ-Hoo Apr 10, 2023
84d4308
Update DeveloperGuide.md
TJ-Hoo Apr 10, 2023
deaed0e
Update DeveloperGuide.md
TJ-Hoo Apr 10, 2023
46d4e9e
Update DeveloperGuide.md
TJ-Hoo Apr 10, 2023
6304c80
Update DeveloperGuide.md
TJ-Hoo Apr 10, 2023
a07c504
Update UserGuide.md
TJ-Hoo Apr 10, 2023
c947f9e
Update tj-hoo.md
TJ-Hoo Apr 10, 2023
6e76eba
update changes
Masahiro21 Apr 10, 2023
8fd51ae
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 10, 2023
9e8c2a7
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 10, 2023
d6c1adb
fixed empty meals added
MingEn82 Apr 10, 2023
2463983
updated config.yaml
MingEn82 Apr 10, 2023
d159964
Merge pull request #225 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
ccfc96b
Add files via upload
TJ-Hoo Apr 10, 2023
5dc6063
added PPP links
MingEn82 Apr 10, 2023
7446c27
Merge pull request #226 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
1c536ec
Update DeveloperGuide.md
TJ-Hoo Apr 10, 2023
d2b4187
fixed table in DG
MingEn82 Apr 10, 2023
9dbed41
Update DeveloperGuide.md
TJ-Hoo Apr 10, 2023
70cdfeb
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp …
MingEn82 Apr 10, 2023
04dee89
Merge pull request #227 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
416efb7
Update UserGuide.md
TJ-Hoo Apr 10, 2023
e0654a0
fixed table in DG
MingEn82 Apr 10, 2023
4f6cd6d
Merge pull request #228 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
dd4cfd0
fixed DG table
MingEn82 Apr 10, 2023
7f914b7
Merge pull request #229 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
1579739
fix UpdateUserCommand accepting special characters for name and absur…
Masahiro21 Apr 10, 2023
7a4e19f
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 10, 2023
424c755
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 10, 2023
273b5d9
Merge pull request #230 from Masahiro21/branch-Hamada
Masahiro21 Apr 10, 2023
ce9e69c
added exception tracking for FilterCalorieCommand
MingEn82 Apr 10, 2023
ffeac2a
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp …
MingEn82 Apr 10, 2023
f77e8c4
Merge pull request #231 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
79f708b
Fix gradle errors
MustafaAH10 Apr 10, 2023
00c3a9d
Merge pull request #232 from MustafaAH10/branch-Mustafa
MustafaAH10 Apr 10, 2023
82b2389
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 10, 2023
ed40657
Update UserGuide.md
MustafaAH10 Apr 10, 2023
33f7bcc
Update README.md
TJ-Hoo Apr 10, 2023
a569d55
Update UserGuide.md
TJ-Hoo Apr 10, 2023
35992c0
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 10, 2023
6a5d5aa
Update koh-jing-jie-marcus.md
Koh-Jing-Jie-Marcus Apr 10, 2023
8486ed7
Update tj-hoo.md
TJ-Hoo Apr 10, 2023
4ed9a71
Update UserGuide.md
MustafaAH10 Apr 10, 2023
2e06bcc
Update UserGuide.md
MustafaAH10 Apr 10, 2023
308e454
Update UserGuide.md
MustafaAH10 Apr 10, 2023
5c7c2fe
Update README.md
MustafaAH10 Apr 10, 2023
7354b64
Update tj-hoo.md
TJ-Hoo Apr 10, 2023
112236d
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 10, 2023
0f0c95f
update DG manual testing section and PPP
Masahiro21 Apr 10, 2023
29e19f6
Merge pull request #233 from Masahiro21/branch-Hamada
Masahiro21 Apr 10, 2023
9507e52
move ppp to docs folder
Masahiro21 Apr 10, 2023
9d8eaa1
fixed table in UG
MingEn82 Apr 10, 2023
f4a37a8
Merge pull request #234 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
57a8e32
fixed typo
MingEn82 Apr 10, 2023
af31091
Merge pull request #236 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
89f5702
remove ppp from docs folder
Masahiro21 Apr 10, 2023
e7888f2
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 10, 2023
3da4d49
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 10, 2023
f7759b9
updated about us page
MingEn82 Apr 10, 2023
5557572
Merge pull request #237 from MingEn82/branch-MingEn
MingEn82 Apr 10, 2023
1e1246f
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W15-1/tp
Masahiro21 Apr 10, 2023
e23189c
Merge branch 'master' into branch-Hamada
Masahiro21 Apr 10, 2023
129821d
fixed bug in updateUserCommand to trim any additional spaces between …
Masahiro21 Apr 10, 2023
57bd5fc
Merge pull request #238 from Masahiro21/branch-Hamada
Masahiro21 Apr 10, 2023
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
2 changes: 1 addition & 1 deletion data/userData.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Name,Weight,Height,Age,Gender,TargetWeight
test,65.0,175.0,21,Male,50.0
test,65.0,175.0,21,male,50.0
293 changes: 192 additions & 101 deletions docs/DeveloperGuide.md

Large diffs are not rendered by default.

Binary file modified docs/UG-images/update-example.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/UG-images/view-example.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 50 additions & 45 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,34 @@ The app also allows users to keep track of their daily exercises to compute thei

Their net calorie gain/loss can then be viewed.

- [Quick Start](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#quick-start)
- [Features](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#features-v20)
- [Viewing User Profile](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#viewing-user-profile-view)
- [Updating User Profile](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#updating-user-profile-update)
- [Adding a meal](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#adding-a-meal-add)
- [Listing foods](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#listing-foods-list)
- [Listing meals](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#listing-meals-list)
- [Listing exercises](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#listing-exercises-list)
- [Deleting meals](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#deleting-meals-delete)
- [Filtering foods](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#filtering-foods-filter)
- [Viewing nutrition content of foods](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#view-nutrition-content-of-food-nutrition)
- [Adding an exercise](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#adding-an-exercise-exercise)
- [Tracking net calorie intake](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#tracking-net-calorie-intake-track)
- [Displaying examples of meals and exercises](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#displaying-examples-of-meals-and-exercises-examples)
- [Exiting the application](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#exiting-the-application-bye)
- [FAQ](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#faq)
- [Command Summary](https://github.com/AY2223S2-CS2113-W15-1/tp/blob/master/docs/UserGuide.md#command-summary)

## Quick Start


1. Ensure that you have Java 11 or above installed.
2. Down the latest version of `LifeTracker` from [here](https://github.com/AY2223S2-CS2113-W15-1/tp).
3. Copy the file to the folder you want ot use as the home folder for your LifeTracker.
4. Open a command terminal, cd into the folder you put the jar file in, and use the java -jar lifetracker.jar command to run the application.
5. Type the command in the command box and press Enter to execute it.
6. Refer to the features below for details of each command.

## Features v2.0
## Features

* View and Update user profile
* Add meal
Expand All @@ -35,63 +51,52 @@ Their net calorie gain/loss can then be viewed.
### Viewing User Profile: `view`

To view user's profile.
User will come across a menu that shows them what information they can choose to view
,and they will input the number in order to view the information they want to see.

User can also choose to back out of the menu in the event that they have entered the view
command by accident. They can do so by inputting the number 8.

Format: `view`
User can simply input a single line command to view the specific information in their user profile using the format
below.

Menu Output:
Format: `view /[fieldName]`

![view-menu](./UG-images/view-menu.PNG)
Here is a table of the information that the user can choose to view alongside the field name of it:

User can input a value from **1 to 9** to view their current profile:

1. Name
2. Weight
3. Height
4. Age
5. Gender
6. Daily Caloric Limit
7. Calories Remaining for today
8. View Target Weight
9. Exit
| Information | /[fieldName] |
|------------------------------|---------------|
| Name | /name |
| Weight | /weight |
| Height | /height |
| Age | /age |
| Gender | /gender |
| Daily caloric limit | /caloricLimit |
| Calories remaining for today | /caloriesLeft |
| Target weight | /targetWeight |

Example:

![view-example](./UG-images/view-example.PNG)

User then can input **1** to continue viewing their profile or **2** to exit

### Updating User Profile: `update`

Allows the user to update any of their information.
User will come across a menu that shows them what information they can choose to update, they will need
to input the number in order to update the specific information they want to change.

Format: `update`
User can simply input a single line command to update the specific information in their user profile using the format
below.

Menu Output:
Format: `update /[fieldName] [newInfo]`

![update-menu](./UG-images/update-menu.PNG)
Here is a table of the information that the user can choose to update alongside the field name of it:

User can input a value from **1 to 6** to customise their profile:
1. Name
2. Weight
3. Height
4. Age
5. Gender
6. Target Weight
7. Exit
| Information | /[fieldName] |
|---------------|---------------|
| Name | /name |
| Weight | /weight |
| Height | /height |
| Age | /age |
| Gender | /gender |
| Target weight | /targetWeight |

Example:

![update-example](./UG-images/update-example.PNG)

User then can input **1** to continue updating their profile or **2** to exit

### Adding a meal: `add`

Adds a new meal to database
Expand Down Expand Up @@ -173,7 +178,7 @@ Format: `filter [lower_bound] [upper_bound]`
Example:
![filter-example](./UG-images/filter-example.PNG)

### View Nutrition Content of food: `nutrition`
### View nutrition content of food: `nutrition`

For users to view the nutrition content of the food. The user first needs to search for the food, then the nutrition content of the food will be printed.

Expand All @@ -186,7 +191,7 @@ Format: `nutrition`
Example:
![nutrition-example](./UG-images/nutrition-example.PNG)

### Add Exercise: `exercise`
### Adding an exercise: `exercise`

For user to input the exercise done previously

Expand All @@ -199,7 +204,7 @@ Format: `exercise /type [exercise name] /description [exercise description] /cal
Example:
![exercise-example](./UG-images/exercise-example.PNG)

### Track net calorie intake: `track`
### Tracking net calorie intake: `track`

For user to track their previous net calorie intake

Expand All @@ -213,7 +218,7 @@ Format: `track /start [start date] /end [end date]`
Output:
![track-example](./UG-images/track-example.PNG)

### Display examples for meals and exercises: `examples`
### Displaying examples of meals and exercises: `examples`

For the user to gain some inspiration on exercises to do, as well as some idea on the meals that they can eat.

Expand All @@ -222,8 +227,8 @@ Format: `examples [meal/exercise]`
Example:
![examples-example](./UG-images/examples-example.PNG)

### Exiting the program: `bye`
Allows user to exit the program.
### Exiting the application: `bye`
Allows user to exit the application.

Format: `bye`

Expand Down
44 changes: 29 additions & 15 deletions docs/team/masahiro21.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,49 @@ he has consumed as well as the exercises that he has done.

In doing so, the user can better manage his daily calorie gain in order to meet their particular needs.

Given below are my contributions to the project.

## Summary of Contributions

### Code Contributed

[RepoSense](https://nus-cs2113-ay2223s2.github.io/tp-dashboard/?search=&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&checkedFileTypes=docs~functional-code~test-code~other&since=2023-02-17&tabOpen=true&tabType=authorship&tabAuthor=Masahiro21&tabRepo=AY2223S2-CS2113-W15-1%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code&authorshipIsBinaryFileTypeChecked=false&authorshipIsIgnoredFilesChecked=false)

### Commands
Commands are the ways in which the user interacts with our program, through the usage of particular inputs that are defined as commands.
These are the main commands and entities that I worked on.
Our project implements a variety of command which allows the user to input and keep track of their information
via the CLI. They form the backbone of our project, and it is the key to it functioning smoothly. Below are the list of
commands I have worked on.

`view` command
* Allows the user to view their information via a simple lookup
`view` command: Allows the user to view their information.
* Implemented the code to allow users to view their information

`update` command
* Allows the user to update their information stored.
`update` command: Allows the user to update their information stored.
* Added methods to allow update command to handle updates to name, age and gender

`user` entity
* The entity that initialises all the user's information.
`help` command: Allows the user to view a help menu that gives them a quick guide on how to use the program.
* Abstracted print statements into UI

### Database
### Entity
`user` entity: The entity that initialises all the user's information.
* Expanded the information that the entity holds to include age and gender
* Implemented getter and setter methods for newly added information
* Modified calculateCaloricNeeds method to factor in age and gender

### Contribution to team-based tasks
Implemented the Ui for the indivdual commands. The Ui is used to improve the accessibility of the program to any potential users,
to ulimately make the program easier to use by streamlining the process for the user. The Ui consists of:
* General Ui - Handle the general commands as well as start up and exit of the program
- Created and implemented the `view` command

### Enhancement to existing features
* Modified `view` command to be able to take in one-liner inputs from the user to view their information
* Shortens the process of user viewing their information

* Modified `update` command to be able to take in one-liner inputs from the user to view their information
* Shortens the process of user updating their information

## Project Management
* Managed release `v2.0` on GitHub

## UG/DG
* Added the introduction to the UG as well as a framework of explanation for the other members to build off
* Added Documentation for the `view` command
* Added Documentation for the `view` command and `update` command
* Added explanation of program and user stories

## Code Contributed
[RepoSense Link](https://nus-cs2113-ay2223s2.github.io/tp-dashboard/?search=&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&checkedFileTypes=docs~functional-code~test-code~other&since=2023-02-17&tabOpen=true&tabType=authorship&tabAuthor=Masahiro21&tabRepo=AY2223S2-CS2113-W15-1%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code&authorshipIsBinaryFileTypeChecked=false&authorshipIsIgnoredFilesChecked=false)
15 changes: 9 additions & 6 deletions docs/team/tj-hoo.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,29 @@ Given below are my contributions to the project.
## Enhancements implemented:

### Commands
- 'Nutrition': Allows user to see the nutritional data of foods in the database.
- 'Help': Allows user to see the list of available commands for this application.
- `Nutrition`: Allows user to see the nutritional data of foods in the database.
- `Help`: Allows user to see the list of available commands for this application.

### Database
- Updated some wrong values in 'FoodData'.
- Added data from Nasi Padang stall to 'FoodData'.
- Updated some wrong values in `FoodData`.
- Added data from Nasi Padang stall to `FoodData`.

### Other
- Updated 'Food' within entities and 'FoodStorage' within storage to be able to return nutritional data.
- Created 'CaloricIntake' entity to hold the calculation of the user's the daily caloric intake.
- Updated `Food` within entities and `FoodStorage` within storage to be able to return nutritional data.
- Created `CaloricIntake` entity to hold the calculation of the user's the daily caloric intake.

## Contributions to the UG:

## Contributions to the DG:
- Added documentation for `Nutrition` command.
- Instructions for manual testing section.
- Design and considerations for all proposed implementations.

## Contributions to team-based tasks:
- Target user profile of DG.
- Non-Functional Requirements section of DG.
- Update user stories of DG.
- Content page for both DG and UG.

## Review/mentoring contributions:
- Fixed gradle errors.
Binary file added docs/uml/Command-class-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/uml/UI-class-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/uml/UML.pptx
Binary file not shown.
19 changes: 1 addition & 18 deletions myLogFile.log
Original file line number Diff line number Diff line change
@@ -1,19 +1,2 @@
<<<<<<< HEAD
Apr 04, 2023 2:49:27 PM seedu.logger.LogFileHandler logInfo
Apr 07, 2023 10:15:01 PM seedu.logger.LogFileHandler logInfo
INFO: User exited the programme.
=======
Apr 06, 2023 1:00:47 PM seedu.logger.LogFileHandler logInfo
INFO: Lunch was consumed on 1/1/2023
Total Calories are: 1447.0
Here are the foods you ate:
1) Chicken Ngoyang from Nasi Padang
2) Curry Chicken Noodles from Chicken Rice
3) Cuttlefish Ball from Mala

Apr 06, 2023 1:01:19 PM seedu.logger.LogFileHandler logInfo
INFO: Lunch was consumed on 1/1/2023
Total Calories are: 238.0
Here are the foods you ate:
1) Chicken Rendang from Nasi Padang

>>>>>>> master
Empty file removed myLogFile.log.lck
Empty file.
11 changes: 9 additions & 2 deletions src/main/java/seedu/commands/AddExerciseCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.format.ResolverStyle;

import seedu.constants.DateConstants;
import seedu.entities.Exercise;
Expand Down Expand Up @@ -35,7 +36,7 @@ public AddExerciseCommand(String commandWord, String userInput) {
@Override
public void execute(GeneralUi ui, FoodStorage foodStorage, MealStorage mealStorage, UserStorage userStorage,
ExerciseStorage exerciseStorage) throws LifeTrackerException {
dtf = DateConstants.PARSE_DTF;
this.dtf = DateConstants.PARSE_DTF;
this.parseCommand();
Exercise newExercise = new Exercise(exerciseName, exerciseDescription, calorieBurnt, date);
exerciseStorage.saveExercise(newExercise);
Expand Down Expand Up @@ -84,9 +85,15 @@ private void parseCommand() throws LifeTrackerException {
} catch (NumberFormatException e) {
throw new InvalidArgumentsException(commandWord, calorieBurntIdentifier);
}

dateString = userInput.substring(dateIndex+dateIdentifier.length()).trim();
try {
date = LocalDate.parse(dateString, dtf);
if (dateString.matches("\\d{1,2}/")) {
throw new InvalidDateException(dateString);
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/uuuu")
.withResolverStyle(ResolverStyle.STRICT);
date = LocalDate.parse(dateString, formatter);
} catch (DateTimeParseException e) {
throw new InvalidDateException(dateString);
}
Expand Down
Loading