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-W12-1] HealthMate #1

Open
wants to merge 537 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
537 commits
Select commit Hold shift + click to select a range
50c7b7e
Remove unecessary import
ryan-txn Nov 2, 2024
0e762dc
Update user dummy data
ryan-txn Nov 2, 2024
dd0acbc
Merge pull request #109 from ryan-txn/Implement_Single_User_TimeStamp
ryryry-3302 Nov 2, 2024
cbfbe7b
Create recommender package
ryryry-3302 Nov 2, 2024
54f06e1
Merge branch 'AY2425S1-CS2113-W12-1:master' into 66-add-meal-option-r…
ryryry-3302 Nov 2, 2024
899fd30
create recipe map
ryryry-3302 Nov 2, 2024
6308bc2
create meal recommendations
ryryry-3302 Nov 2, 2024
35425f9
Test: create test cases
ryryry-3302 Nov 2, 2024
b04154b
Fix styles
ryryry-3302 Nov 2, 2024
d37a045
Add: Update commands
ryryry-3302 Nov 2, 2024
5d1758c
Feat: Add Weight timeline display
ryryry-3302 Nov 2, 2024
8cb9313
Test: Weight Entry Display test
ryryry-3302 Nov 2, 2024
3369dc2
Merge pull request #123 from ryryry-3302/66-add-meal-option-recommend…
kennethSty Nov 3, 2024
0be62b8
Bug fix historicCalories Test
Nov 3, 2024
9a4e6a4
update DG and UG
Nov 3, 2024
93ad68d
Fix test
Nov 3, 2024
5495e50
Merge pull request #126 from AY2425S1-CS2113-W12-1/updateDG
ryryry-3302 Nov 3, 2024
2329171
Merge branch 'master' into 60-timeline-of-weight-history
ryryry-3302 Nov 3, 2024
e4bf14c
Fix timestamp bug
Dri-water Nov 3, 2024
54bf3bb
Style: fix styling issue
ryryry-3302 Nov 3, 2024
c374167
Merge branch '60-timeline-of-weight-history' of https://github.com/ry…
ryryry-3302 Nov 3, 2024
c21e54c
Merge branch 'master' into fixTest
ryryry-3302 Nov 3, 2024
925c942
Merge pull request #124 from AY2425S1-CS2113-W12-1/fixTest
ryryry-3302 Nov 3, 2024
ce070d2
Merge pull request #128 from Dri-water/fix-timestamp
ryryry-3302 Nov 3, 2024
bc46d28
Merge branch 'master' into 60-timeline-of-weight-history
ryryry-3302 Nov 3, 2024
c67b0e2
Add JavaDoc header comments
Dri-water Nov 3, 2024
2e990a8
Merge pull request #127 from ryryry-3302/60-timeline-of-weight-history
Dri-water Nov 3, 2024
d5df415
Merge pull request #129 from Dri-water/header-comments
ryryry-3302 Nov 3, 2024
fb9612b
Docs: Claiming Worked on Code Lines
DarkDragoon2002 Nov 4, 2024
a378c40
Task: Add Assertions to make ChatParser more Defensive
DarkDragoon2002 Nov 4, 2024
641981e
Task: Abstracted Chat Parser and shifted Code to respective Commands
DarkDragoon2002 Nov 4, 2024
46016dc
Docs: JavaDoc Comments for all the Command Classes
DarkDragoon2002 Nov 4, 2024
5e38daf
Bug: Minor Bug Fix
DarkDragoon2002 Nov 4, 2024
32bcded
Test: Added Tests for Delete Commands and Today Calories
DarkDragoon2002 Nov 4, 2024
e7114fc
Fix: CheckStyle fixes
DarkDragoon2002 Nov 4, 2024
f028cef
Fix: Testing Bug Fix
DarkDragoon2002 Nov 4, 2024
8e5e077
Add author tags to UserHistoryTracker
Nov 5, 2024
4dcba5b
Make code more readable
Nov 5, 2024
d5173f6
Merge pull request #130 from DarkDragoon2002/Defensive-Coding
kennethSty Nov 5, 2024
219e6f7
Add more logging and make use of user stub in chatparser tests
Nov 5, 2024
b6e16d7
Add test for extracting timestamp from user input
Nov 5, 2024
64b8666
Add fail assertion to portion test
Nov 5, 2024
67fc0e3
Fix checkstyle issue
Nov 5, 2024
46d20a0
Fix import checkstyle violation
Nov 5, 2024
dfc79de
Add author tags
Nov 5, 2024
a12bf8c
Merge branch 'master' into addAuthorTags
kennethSty Nov 5, 2024
6bda28f
Resolve more conflicts for divergent upstream and local branch
Nov 5, 2024
acfd3e7
Merge pull request #131 from AY2425S1-CS2113-W12-1/addAuthorTags
Dri-water Nov 5, 2024
f75c538
Merge pull request #133 from AY2425S1-CS2113-W12-1/AddTags
Dri-water Nov 5, 2024
1c4fefa
Merge branch 'master' into PolishCode
Dri-water Nov 5, 2024
d7a19ed
Merge pull request #132 from AY2425S1-CS2113-W12-1/PolishCode
Dri-water Nov 5, 2024
df662b3
Add JavaDoc Comments
ryan-txn Nov 5, 2024
f048242
Merge pull request #134 from ryan-txn/AddJavaDocComments
kennethSty Nov 6, 2024
1dffc40
Remove unnecessary double reference to history trackers
Nov 6, 2024
7620fe0
Clean up ChatParser
Nov 6, 2024
dd22f5a
Add javadoc comments
Nov 6, 2024
b3fa7a5
Remove duplication and SLAP UserHistoryTracker methods
Nov 6, 2024
fd04c78
Update SD to create a new user profile
Nov 6, 2024
b9d0bb1
Fix checkstyle
Nov 6, 2024
b80da2d
Apply single responsibility principle to User class
Nov 6, 2024
cd9d0ba
Do houskeeping on core classes
Nov 6, 2024
30f97b6
Add User History Tracker Test class
ryan-txn Nov 6, 2024
b06ee56
Merge pull request #135 from AY2425S1-CS2113-W12-1/updateSQD
ryan-txn Nov 6, 2024
4de0401
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W12-1/tp …
ryan-txn Nov 6, 2024
d5da8bf
Add javadoc comments and author tags
ryan-txn Nov 6, 2024
e348782
Improve Cohesion and add updated class diagram
Nov 6, 2024
877a304
Update DG
Nov 6, 2024
1f48b06
Delete unused import
Nov 6, 2024
e42b46f
Add Loading userEntryList JUnit test
ryan-txn Nov 6, 2024
98f7016
Update PPP
Nov 6, 2024
e404cfa
Merge pull request #136 from AY2425S1-CS2113-W12-1/updateHighLevelClassD
ryan-txn Nov 6, 2024
ef2e659
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W12-1/tp …
ryan-txn Nov 6, 2024
10ee94c
Fix Checkstyle
ryan-txn Nov 6, 2024
fb11201
Merge pull request #137 from ryan-txn/AddUserDataJUnitTests
ryryry-3302 Nov 6, 2024
13538f5
Delete docs/images/askForUserDataSD.png
ryryry-3302 Nov 6, 2024
ab22833
Add files via upload
ryryry-3302 Nov 6, 2024
a1cf48b
Update DeveloperGuide.md
ryryry-3302 Nov 6, 2024
1d5fe39
Delete docs/images/readUserDataFromFileSD.png
ryryry-3302 Nov 6, 2024
eca1057
Update DeveloperGuide.md
ryryry-3302 Nov 6, 2024
ebf5969
Test: make code more defensive
ryryry-3302 Nov 6, 2024
cedea1c
Bug: fix for save meal
ryryry-3302 Nov 6, 2024
7a8c690
style
ryryry-3302 Nov 6, 2024
6393e43
Styling
ryryry-3302 Nov 6, 2024
077a8b1
Merge pull request #138 from AY2425S1-CS2113-W12-1/121-issue-in-askfo…
ryan-txn Nov 6, 2024
cf8123e
Merge pull request #140 from ryryry-3302/139-fix-and-misc-bugs
ryan-txn Nov 6, 2024
2635d44
Add Load User Entries SD
ryan-txn Nov 6, 2024
302a7f6
Add CurrentUserDataCommand
ryan-txn Nov 6, 2024
464a531
Update CommandMap test case
ryan-txn Nov 6, 2024
0d0641c
Merge pull request #142 from ryan-txn/AddCurrentUserDataCommand
ryryry-3302 Nov 7, 2024
047b7bd
Merge pull request #141 from ryan-txn/AddLoadUserEntryListSD
ryryry-3302 Nov 7, 2024
aeace06
Release: plus fix
ryryry-3302 Nov 7, 2024
5277018
Release
ryryry-3302 Nov 7, 2024
92fccfd
Fix
ryryry-3302 Nov 7, 2024
a9f1b66
Merge pull request #144 from ryryry-3302/143-make-release
kennethSty Nov 7, 2024
9e2e33a
Update UG
ryryry-3302 Nov 7, 2024
6e0932b
Add new commands and fix errors
Nov 7, 2024
6f7898f
Merge pull request #146 from ryryry-3302/145-update-userguide
kennethSty Nov 7, 2024
31a403d
Clean data files
Nov 7, 2024
1a64751
Add CreateFilleIfNotExists SD
ryan-txn Nov 7, 2024
8f8720b
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W12-1/tp …
ryan-txn Nov 7, 2024
e6ce804
Merge pull request #148 from ryan-txn/AddCreateFileIfNotExistsSD
ryryry-3302 Nov 7, 2024
135c76a
Fix ug
ryryry-3302 Nov 7, 2024
5d6aab2
Replace special characters to be stable in windows
Nov 7, 2024
260e1c7
Merge branch 'master' into AddNewCommandsUG
kennethSty Nov 7, 2024
ec37221
Merge pull request #147 from AY2425S1-CS2113-W12-1/AddNewCommandsUG
ryryry-3302 Nov 7, 2024
afe2093
Fix mealMenu sequence diagram
Dri-water Nov 7, 2024
06b980a
Merge branch 'master' into 145-update-userguide
ryryry-3302 Nov 7, 2024
75ba58d
Merge pull request #150 from Dri-water/mealMenuSD-update
ryryry-3302 Nov 7, 2024
b78db00
Merge pull request #149 from ryryry-3302/145-update-userguide
Dri-water Nov 7, 2024
e95db68
Fix: add identation
ryryry-3302 Nov 7, 2024
b853cc1
Merge pull request #151 from ryryry-3302/145-update-userguide
kennethSty Nov 7, 2024
c899c91
add sequence diagram
ryryry-3302 Nov 7, 2024
6e462c6
Update dg
ryryry-3302 Nov 7, 2024
bae1274
Bug: Gender Check Bug Fix in User Creation
DarkDragoon2002 Nov 7, 2024
ca48e46
Bug: Delete Commands gave wrong Error when file was empty
DarkDragoon2002 Nov 7, 2024
7081ffa
Fix: Fixed Testcases for delete commands
DarkDragoon2002 Nov 7, 2024
ed99cf3
Bug: Fixed add mealEntry with empty label
DarkDragoon2002 Nov 7, 2024
ba957ba
Bug + Doc: Fixed bug that allowed meal/mealEntry with "," to be saved…
DarkDragoon2002 Nov 7, 2024
147449d
Doc: Replaced And symbol with "and"
DarkDragoon2002 Nov 7, 2024
8642984
Update DeveloperGuide.md
DarkDragoon2002 Nov 7, 2024
3bf2cb5
Merge pull request #153 from ryryry-3302/152-update-dg
DarkDragoon2002 Nov 7, 2024
e7b3c32
Merge pull request #154 from DarkDragoon2002/Update-SD-and-Bug-Fix
ryryry-3302 Nov 7, 2024
fbe5acf
Fix issue 197
ryryry-3302 Nov 9, 2024
e161ff7
Fix typo in #182
ryryry-3302 Nov 9, 2024
4a1d1a5
Add silent load for syncing data across multiple runs
Nov 9, 2024
258fc74
Fix: #181
ryryry-3302 Nov 9, 2024
adf7334
Fix todayCalorieProgress test by ensuring implicit empty meal assumpt…
Nov 9, 2024
fd5fe8a
Fix: #189 non updating user data
ryryry-3302 Nov 9, 2024
e091bf1
Merge pull request #207 from AY2425S1-CS2113-W12-1/FixMultipleInstanc…
ryryry-3302 Nov 9, 2024
f9e2854
Merge branch 'master' into 197-fixing-easy-cosmetic-issues
ryryry-3302 Nov 9, 2024
25f0807
Merge pull request #208 from ryryry-3302/197-fixing-easy-cosmetic-issues
ryryry-3302 Nov 9, 2024
afce6aa
Fix: #172
ryryry-3302 Nov 9, 2024
ee236c2
Add max exceptions for height, weight and age
ryan-txn Nov 9, 2024
ec10e42
Fix data corruption bug
Nov 9, 2024
036b59c
Merge pull request #209 from ryan-txn/AddRealisticUserParams
kennethSty Nov 9, 2024
a29ac1b
Merge pull request #210 from AY2425S1-CS2113-W12-1/FixDataManipulatio…
ryan-txn Nov 9, 2024
d38d9e0
Fix 0 portion bug
Nov 9, 2024
a4ce2e7
Save log
Nov 9, 2024
6cc9640
Merge master into BugFix branch
Nov 9, 2024
d0494b6
Fix checkstyle issue
Nov 9, 2024
bc2251e
Delete unused import
Nov 9, 2024
e5e70bb
Merge pull request #211 from AY2425S1-CS2113-W12-1/FixZeroPortionsBug
Dri-water Nov 9, 2024
eae29b0
Add lower limit to HistoricCalorieProgressCommand number of days
ryan-txn Nov 9, 2024
4197e71
Fix Calories Bug
Nov 9, 2024
32d91b7
Improve duplicate meal option feedback and make duplication detection…
Nov 9, 2024
9006e10
Update UG
Nov 9, 2024
f9f7a38
Merge pull request #212 from ryan-txn/AddHistoricCalorieProgressComma…
kennethSty Nov 9, 2024
a82ee74
Merge pull request #213 from AY2425S1-CS2113-W12-1/CapitalLetterAndCa…
ryryry-3302 Nov 9, 2024
10bc07f
Update UG with correct log meals output
Nov 9, 2024
83b3fab
Fix HistoryTracker error messages
Dri-water Nov 9, 2024
9b490dd
Merge pull request #214 from AY2425S1-CS2113-W12-1/TimeFormatBug
ryryry-3302 Nov 9, 2024
f265ca3
Fix: #179
ryryry-3302 Nov 9, 2024
d964dcb
Bug: fix small bug related to #179
ryryry-3302 Nov 9, 2024
d990a20
Add early return if no csv file in HistoryTracker
Dri-water Nov 9, 2024
dbeb925
Merge pull request #215 from Dri-water/fix-HistoryTracker-error
Dri-water Nov 9, 2024
9fd14ac
Decentralize asking for user data to enable quicker recovery from fal…
Nov 9, 2024
9f47dcc
Fix userHistoryTracker test
Nov 9, 2024
0c72cb0
Fix: #180
ryryry-3302 Nov 9, 2024
d0a216b
Merge branch 'master' into ImproveAskForUserData
kennethSty Nov 9, 2024
2c73f87
Fix merge conflict
ryryry-3302 Nov 9, 2024
e39786d
Merge branch 'master' into 172-pe-dtester-a-explanation-too-brief-for…
ryryry-3302 Nov 9, 2024
00edf4f
Remove unused imports
Nov 9, 2024
0dee1f5
Test run
Nov 9, 2024
b0f37fd
Fix merge conflict
ryryry-3302 Nov 9, 2024
89ed662
Merge branch 'master' into 172-pe-dtester-a-explanation-too-brief-for…
ryryry-3302 Nov 9, 2024
9aff242
Merge pull request #216 from AY2425S1-CS2113-W12-1/ImproveAskForUserData
Dri-water Nov 9, 2024
c57f5ce
Merge branch 'master' into 172-pe-dtester-a-explanation-too-brief-for…
ryryry-3302 Nov 9, 2024
f115860
Fix
ryryry-3302 Nov 9, 2024
9ebe1ef
Merge pull request #217 from ryryry-3302/172-pe-dtester-a-explanation…
ryryry-3302 Nov 9, 2024
5e6d8a6
Add fallsback if progressbar characters unknown
Nov 9, 2024
d3072b7
Make progressbar universally stable by choosing standard characters
Nov 9, 2024
b35ce38
Merge branch 'master' into ProgressBarFallback
kennethSty Nov 9, 2024
62724be
Fix tests
Nov 9, 2024
24ea698
Merge pull request #218 from AY2425S1-CS2113-W12-1/ProgressBarFallback
ryryry-3302 Nov 9, 2024
e31c803
Add SQD, make UI system specific
Nov 9, 2024
f5a3f0e
Delete unused imports
Nov 9, 2024
3563dfa
Include user file for IO test
Nov 9, 2024
23930c4
Fix IO redirection test
Nov 9, 2024
7982dba
Merge pull request #219 from AY2425S1-CS2113-W12-1/UpdateSDDG_ProgUG
ryryry-3302 Nov 9, 2024
62fd932
Add User Guide Content Page
ryan-txn Nov 10, 2024
44f7432
Correct example used
ryan-txn Nov 10, 2024
3151c7d
Fix: Increase resolution of graph and add note in ug
ryryry-3302 Nov 10, 2024
cd81cd5
Merge pull request #220 from ryan-txn/AddUserGuideContentsPage
ryryry-3302 Nov 10, 2024
5f86f53
Fix: #196
ryryry-3302 Nov 10, 2024
c7e43c7
Fix: #193
ryryry-3302 Nov 10, 2024
38abeab
Fix: #168
ryryry-3302 Nov 10, 2024
0c51384
Style
ryryry-3302 Nov 10, 2024
49f85d2
Make name Optional for MealEntries for fast typists
Nov 11, 2024
4035591
Merge pull request #223 from AY2425S1-CS2113-W12-1/MakeNameOptionalAgain
ryryry-3302 Nov 11, 2024
9ab7f79
Merge pull request #222 from ryryry-3302/185-pe-dtester-a-the-feature…
kennethSty Nov 11, 2024
55288e2
Merge pull request #221 from ryryry-3302/183-pe-dtester-c-weight-time…
kennethSty Nov 11, 2024
810e22b
update PPP
ryryry-3302 Nov 11, 2024
94e9f84
Merge pull request #226 from ryryry-3302/224-ryan-update-ppp
kennethSty Nov 11, 2024
2eb86a0
Improve user feedback when user profile corrupted
Nov 11, 2024
3c44908
Update IO test
Nov 11, 2024
b9db32d
Strengthen User Data Parsing
ryan-txn Nov 11, 2024
22538b3
Merge pull request #227 from AY2425S1-CS2113-W12-1/RecoverUserAfterMo…
ryan-txn Nov 11, 2024
e97a3f8
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W12-1/tp …
ryan-txn Nov 11, 2024
c6a9c2f
Touch up message formats
ryan-txn Nov 11, 2024
75d2720
Remove unneeded imports, Reorder static variables
ryan-txn Nov 11, 2024
b8a2c0a
Merge pull request #228 from ryan-txn/StrengthenUserDataParsingCode
ryryry-3302 Nov 11, 2024
1ea665f
Add PPP
ryan-txn Nov 11, 2024
c270a25
Add Clear User Data Command
ryan-txn Nov 11, 2024
61fdb81
Fix mealMenu SD
Dri-water Nov 11, 2024
c590c8b
Merge pull request #229 from ryan-txn/AddRyanTxnPPP
ryryry-3302 Nov 11, 2024
f47d100
Merge pull request #231 from Dri-water/fix-mealMenuSD
ryryry-3302 Nov 11, 2024
fd91def
Bug: Added Max Desc Length Check to meals and mealEntries
DarkDragoon2002 Nov 11, 2024
8196a47
Fix: #192
ryryry-3302 Nov 11, 2024
ac83d12
Fix:
ryryry-3302 Nov 11, 2024
31071cd
Bug: Fixed target calories to be integer + more user friendly input f…
DarkDragoon2002 Nov 11, 2024
78bf295
Style: fix checkstyle
ryryry-3302 Nov 11, 2024
e6b6b7a
Bug: Disallowed Future Dates from being added in mealEntry
DarkDragoon2002 Nov 11, 2024
062d70c
Bug + Docs: Fixed ordering list commands and updated User Guide
DarkDragoon2002 Nov 11, 2024
f8848ec
Remove unused import
ryan-txn Nov 11, 2024
46c2560
Merge remote-tracking branch 'upstream/master' into AddClearUserDataC…
ryan-txn Nov 11, 2024
9572101
Fix: CheckStyle Fixes
DarkDragoon2002 Nov 11, 2024
32caf9c
Merge pull request #232 from ryryry-3302/make-commands-user-friendly-…
ryan-txn Nov 11, 2024
05a543b
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W12-1/tp …
ryan-txn Nov 11, 2024
d0a6311
Merge pull request #230 from ryan-txn/AddClearUserDataCommand
ryan-txn Nov 11, 2024
2bfdf20
Merge branch 'master' into Bug-Fixes-+-Update-Docs
DarkDragoon2002 Nov 11, 2024
61cf54a
Update Jonas PPP
Dri-water Nov 11, 2024
86b0001
Fix: Text-ui-test fixed
DarkDragoon2002 Nov 11, 2024
4af913a
Merge branch 'Bug-Fixes-+-Update-Docs' of https://github.com/DarkDrag…
DarkDragoon2002 Nov 11, 2024
76f8405
Fix PPP formatting
Dri-water Nov 11, 2024
d274c71
Merge pull request #234 from Dri-water/update-Jonas-PPP
ryryry-3302 Nov 11, 2024
d20204b
Fix: Fixed user_data.csv
DarkDragoon2002 Nov 11, 2024
52f047e
Merge pull request #233 from DarkDragoon2002/Bug-Fixes-+-Update-Docs
ryryry-3302 Nov 11, 2024
3af84a4
Fix: add documentation to add meal entry
ryryry-3302 Nov 11, 2024
c7063e4
Update PPP
Nov 11, 2024
dd6d71e
Docs: Updated Docs
DarkDragoon2002 Nov 11, 2024
56f3d10
Merge pull request #236 from ryryry-3302/235-add-mealentry-command-mi…
kennethSty Nov 11, 2024
8fb0631
Merge branch 'master' into UpdatePPPKenneth
kennethSty Nov 11, 2024
7489534
Merge pull request #238 from AY2425S1-CS2113-W12-1/UpdatePPPKenneth
ryryry-3302 Nov 11, 2024
2697e33
Merge pull request #237 from DarkDragoon2002/Update-Docs
ryryry-3302 Nov 11, 2024
984cade
change team name to lowercase
Nov 11, 2024
45a7adf
Fix: Renamed PPP according to submission guidelines
DarkDragoon2002 Nov 11, 2024
d417185
Fix: PPP Formatting
DarkDragoon2002 Nov 11, 2024
a92fd78
Shorten PPP
Nov 11, 2024
47a19f6
Merge pull request #239 from DarkDragoon2002/Update-Docs
kennethSty Nov 11, 2024
2797182
Merge pull request #240 from AY2425S1-CS2113-W12-1/makeNameLower
ryryry-3302 Nov 11, 2024
e99cff8
Fix final errors in PPP
Nov 11, 2024
6aa01d2
Add short description to HP
Nov 11, 2024
c50a65f
Merge pull request #241 from AY2425S1-CS2113-W12-1/makeNameLower
kennethSty Nov 12, 2024
859d76e
Fix formatting UG
Nov 12, 2024
cabe637
Correct errors, added details
Nov 12, 2024
5b5f4f1
Merge pull request #242 from AY2425S1-CS2113-W12-1/UpdateDGKenneth
ryryry-3302 Nov 12, 2024
1af38f0
Fix
ryryry-3302 Nov 12, 2024
060a260
Fix style
ryryry-3302 Nov 12, 2024
e42a2fa
Update test
ryryry-3302 Nov 12, 2024
c661dd8
Merge pull request #243 from ryryry-3302/235-add-mealentry-command-mi…
ryryry-3302 Nov 12, 2024
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
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ src/main/resources/docs/
*.iml
bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: HealthMate

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke project template
# HealthMate

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.

Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ test {
}

application {
mainClass.set("seedu.duke.Duke")
mainClass.set("seedu.healthmate.HealthMate")
}

shadowJar {
archiveBaseName.set("duke")
archiveBaseName.set("healthmate")
archiveClassifier.set("")
}

Expand All @@ -43,4 +43,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}
Empty file added data/meal_entries.csv
Empty file.
Empty file added data/meal_options.csv
Empty file.
5 changes: 5 additions & 0 deletions data/user_data.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
180.0
80.0
true
20
BULKING
14 changes: 7 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# About us

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)
Display | Name | Github Profile | Portfolio
--------|:---------------:|:-------------------------------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | Ryan Tan | [Github](https://github.com/ryan-txn) | [Portfolio](docs/team/ryan-txn.md)
![](https://via.placeholder.com/100.png?text=Photo) | Jonas Seet | [Github](https://github.com/dri-water) | [Portfolio](https://github.com/dri-water)
![](https://via.placeholder.com/100.png?text=Photo) | Ryan Leong | [Github](https://github.com/ryryry-3302) | [Portfolio](https://github.com/ryryry-3302)
![](https://via.placeholder.com/100.png?text=Photo) | Kenneth Styppa | [Github](https://github.com/kennethSty) | [Portfolio](https://github.com/kennethSty)
![](https://via.placeholder.com/100.png?text=Photo) | Deepan Krishnaa | [Github](https://github.com/DarkDragoon2002) | [Portfolio](https://github.com/DarkDragoon2002)
268 changes: 259 additions & 9 deletions docs/DeveloperGuide.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke
# HealthMate

{Give product intro here}

Expand Down
271 changes: 238 additions & 33 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,247 @@
# User Guide
# User Guide for HealthMate

## Introduction

{Give a product intro}

## Quick Start

{Give steps to get started quickly}

1. Ensure that you have Java 17 or above installed.
1. Down the latest version of `Duke` from [here](http://link.to/duke).

## Features

{Give detailed description of each feature}

### Adding a todo: `todo`
Adds a new item to the list of todo items.

Format: `todo n/TODO_NAME d/DEADLINE`

* The `DEADLINE` can be in a natural language format.
* The `TODO_NAME` cannot contain punctuation.

Example of usage:

`todo n/Write the rest of the User Guide d/next week`

`todo n/Refactor the User Guide to remove passive voice d/13/04/2020`
**HealthMate** is a meal and calorie tracking application designed to help users manage their dietary intake, monitor their weight, and track their overall health goals. The app enables users to log meals, track calories, and observe their progress towards a healthier lifestyle.

## Quick Start Guide

Welcome to HealthMate! Follow these steps to get started quickly:

**Entering the App**
- Open CLI and Navigate to location of `HealthMate.jar`
- Run the following Command: `java -jar HealthMate.jar`
-
**Create your user profile**
Input data about yourself needed to compute your ideal daily calorie intake.
This includes:
- Your height in cm (e.g. 180)
- Your weight in kg (e.g. 80)
- Your gender (either male or female)
- Your age in years (e.g. 20)
- Your personal ealth goal (either WEIGHT_LOSS, STEADY_STATE, BULKING)

**Log Your First Meal**
- Enter the meal name and calories.
- Example: `add mealEntry grapes /c400`
- The printed consumption bar shows you how much more (or less) you should consume to reach your health goal.

**Get an overview on your calorie consumption**
- Use the "Log Meals" feature to view your meal entries and track your daily caloric intake.
- Example: Add your first mealEntry and then use `log meals` to assess the meals tracked so far.
```
add mealEntry burger /c300
_____________________________________________________________________________
Tracked: burger with 300 calories (at: 2024-10-29T22:00)
_____________________________________________________________________________
% of Expected Calorie Intake Consumed:
███░░░░░░░░░░░░░░░░░░░░░░░░░░| 11% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-29)
_____________________________________________________________________________
log meals
_____________________________________________________________________________
1: burger with 300 calories (at: 2024-10-29T22:00)
_____________________________________________________________________________
```

**Track your daily progress**
- Based on your user data and your health goal we computed your ideal daily calorie intake.
- When you add (or delete) a mealEntry, we print a consumption bar showing how much more/less you should consume.
- Interpreting the consumption bar:
- The percentage in the middle shows how much percent of your ideal calorie consumption you have consumed so far.
- The date on the right shows you the date for which this percentage is calculated.
- Example: On the 29th of October 2024 you have consumed 11% of your ideal calorie intake.
```
% of Expected Calorie Intake Consumed:
███░░░░░░░░░░░░░░░░░░░░░░░░░░| 11% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-29)
```



**Store Common Meals**
- Save frequently eaten meals to your meal menu for quick access
- Example: `save meal pizza /c800` saves pizza with 800 calories to your meal menu
- Add meals from the meal menu without specifying the calories
- Example: `add mealEntry pizza`

**Track Meal Menu**
- Use the `meal menu` command to view your saved meal options
- Example: `meal menu`



Enjoy your journey towards a healthier lifestyle with HealthMate!
## Features
### Legend
[] = optional parameter
{} = parameter
### List Commands
Use the `list commands [{command}]` command to view all valid commands and their formats.
- Example usage to list all commands
```
list commands
_____________________________________________________________________________
Use `list commands <command>` to view a command's syntax
_____________________________________________________________________________
list commands
_____________________________________________________________________________
show todayCalories
_____________________________________________________________________________
update userdata
_____________________________________________________________________________
show historicCalories
_____________________________________________________________________________
save meal
_____________________________________________________________________________
log meals
_____________________________________________________________________________
meal menu
_____________________________________________________________________________
delete mealEntry
_____________________________________________________________________________
add mealEntry
_____________________________________________________________________________
delete meal
_____________________________________________________________________________
```
List Commands with command parameter
```
list commands delete meal
_____________________________________________________________________________
Command: delete meal
Format: delete meal {index of meal in meal menu}
Description: Deletes meal option at the specified index from the meal menu
```

### Meal Management Commands:

#### Save Meal to Meal Menu: `save meal {Name of Meal} /c{Number of calories}`
- Allows user to store a meal with its calories to be used with the add mealEntry command
- Example usage to store a meal of grapes with 400 calories
```
save meal grapes /c400
_________________________________________________________________________
Added to options: grapes with 400 calories
_________________________________________________________________________
```

#### Add Meal Entry for Tracking: `add mealEntry {meal} /c{Number of calories}` or `add mealEntry {meal from meal menu}`
- Adds a meal from the saved meal options to your daily caloric intake.
- After adding the meal, the app will show how the meal affects your progress towards your daily caloric goal.

```
add mealEntry grapes /c400

Tracked: grapes with 400 calories (at: 2024-10-06T19:44:21.662257300)
_________________________________________________________________________
```
```
add mealEntry pizza
Getting info from meal options...
_________________________________________________________________________
Tracked: pizza with 400 calories (at: 2024-10-14T18:00)
_________________________________________________________________________
```

#### Delete meal from meal menu: `delete meal {index of meal in meal menu}`
- Deletes meal option from the meal menu at the specified index
- Example usage
```
delete meal 1
_________________________________________________________________________
Deleted option: pizza with 400 calories
_________________________________________________________________________
```
#### Show List of Available Meal Options: `meal menu`
- Lists all the saved meal options for quick selection when logging your meals.
```
meal menu
_________________________________________________________________________
1: pizza with 400 calories
2: ciffbar with 300 calories
_________________________________________________________________________
```

### Log Commands:
#### Show Meal History: `log meals`
- Displays the history of the meals you've eaten over the chosen timespan.
log meals
- Example Usage
```
log meals
_________________________________________________________________________
1: burger with 300 calories (at: 2024-10-14T15:00)
2: pizza with 400 calories (at: 2024-10-14T15:00)
_________________________________________________________________________
```
#### Delete meal from meal log: `delete mealEntry {index of meal in the meal log}`
- Deletes meal entry from the meal log at the specified index
- Example Usage
```
delete mealEntry 1
_____________________________________________________________________________
Deleted entry: Cheeseburger with 900 calories (at: 2024-10-30T11:00)
_____________________________________________________________________________
_____________________________________________________________________________
Ideal Daily Caloric Intake: 2865
_____________________________________________________________________________
Current Calories Consumed: 500
% of Expected Calorie Intake Consumed:
█████░░░░░░░░░░░░░░░░░░░░░░░░| 18% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-30)
_____________________________________________________________________________
```
### Calorie Progress Commands:
#### Show Calorie Progress for Today: `show todayCalories`
- Prints a Calorie Progress Bar to represent Today Calorie Progress
- Example Usage:
```
show todayCalories
_____________________________________________________________________________
Ideal Daily Caloric Intake: 2865
_____________________________________________________________________________
Current Calories Consumed: 900
% of Expected Calorie Intake Consumed:
█████████░░░░░░░░░░░░░░░░░░░░| 32% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-29)
_____________________________________________________________________________

```
#### Show Historic Calorie Progress: `show historicCalories {Number of Days inclu. Today}`
- Prints Calorie Progress Bars & Various Stats to represent Historical Calorie Progress
- Example Usage:
```
show historicCalories 3
_____________________________________________________________________________
Ideal Daily Caloric Intake: 2865
_____________________________________________________________________________
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░| 0% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-27)
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░| 0% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-28)
█████████░░░░░░░░░░░░░░░░░░░░| 32% |░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ (2024-10-29)
Stats over past 3 days
Total Calories Consumed: 900
Total Ideal Calories: 8595
Percent Target Consumed: 10%
Day with Max Calories Consumed: 2024-10-29
Calories Consumed: 900
Percent Target Consumed: 31%
_____________________________________________________________________________
```

## FAQ
## Command Summary

**Q**: How do I transfer my data to another computer?

**A**: {your answer here}
### Legend
[] = optional parameter
{} = parameter

## Command Summary
| Command | Syntax | Description |
|-------------------------------------|--------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
| List all commmands | `list commands` or `list commands [{command}]` | Lists all available commands and the proper formatting.
| Save meal to meal options | `save meal {meal} /c{Number of calories}` | Prompts for meal name, calories, then confirms saving the meal. |
| Add meal entry for tracking | `add mealEntry {meal} [/c{Number of calories}] [/p{Number of portions}] [/t{timestamp in YYYY-MM-DD HH:MM}]` | Adds meal to daily caloric intake and shows progress toward goal. |
| Show list of available meal options | `meal menu` | Prints all available meals from the saved options list. |
| Show meal history | `log meals` | Displays history of meals with timestamp and calories. |
| Delete meal from meal menu | `delete meal {index of meal in meal menu}` | Deletes meal option from the meal menu at the specified index. |
| Delete meal entry from meal log | `delete mealEntry {index of meal in the meal log` | Deletes meal entry from the meal log at the specified index and shows effect on the days progress toward goal. |
| Show Calorie Progress for Today | `show todayCalories` | Prints a Calorie Progress Bar to represent Today Calorie Progress |
| Show Historic Calorie Progress | `show historicCalories {Number of Days inclu. Today}` | Prints Calorie Progress Bars & Various Stats to represent Historical Calorie Progress |

{Give a 'cheat sheet' of commands here}

* Add todo `todo n/TODO_NAME d/DEADLINE`
Binary file added docs/images/UserClassDiagram.jpg
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/images/addMeal.png

Choose a reason for hiding this comment

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

Should the sequence diagram omit program execution prior to when add meal command is detected?

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/images/askForUserDataSD.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/images/highLevelClassDiagram.jpg
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/images/mealMenuSD.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/images/readUserDataFromFileSD.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/images/setHealthGoalSD.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/images/userSequenceDiagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading