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-T12-2] Grocery in Time #33

Open
wants to merge 527 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 240 commits
Commits
Show all changes
527 commits
Select commit Hold shift + click to select a range
c9fe1df
Fix more PED bugs
wallywallywally Apr 10, 2024
15f3841
Fix checkstyle issue
wallywallywally Apr 10, 2024
2bde7e6
Update NoSuchObject exceptions thrown with more information
wallywallywally Apr 10, 2024
f2ed673
Fix fatal del bug related to storage locations
wallywallywally Apr 10, 2024
e877ef9
Prevent duplicate groceries from being added
wallywallywally Apr 10, 2024
e55af58
Update tests to match new exceptions
wallywallywally Apr 10, 2024
49f85fd
Merge pull request #153 from wallywallywally/branch-Willson
LuoYu-uwu Apr 10, 2024
5643e96
Merge pull request #154 from wallywallywally/branch-more-PEDs
LuoYu-uwu Apr 10, 2024
5a122c1
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 11, 2024
9c9e94a
Trimmed Recipe output
SharlynLui Apr 11, 2024
5a82d2a
Amend my PPP
LuoYu-uwu Apr 11, 2024
6bfb05d
Merge pull request #155 from LuoYu-uwu/Branch-doc
wallywallywally Apr 11, 2024
3dbcf39
extracted RecipeUi from Ui
SharlynLui Apr 11, 2024
a7d3181
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 11, 2024
8800c7c
Shorten my PPP
wallywallywally Apr 11, 2024
cb79132
Add new features and documentation for Grocery in Time project
64-1 Apr 11, 2024
bcb3a7c
Merge pull request #157 from 64-1/v1-final
64-1 Apr 11, 2024
3caeb74
Added saveFile method for groceries, loadFile work in progress
luozihui2003 Apr 11, 2024
4248f24
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
luozihui2003 Apr 11, 2024
f9286f6
Add sequence diagram for calories and profile management
LuoYu-uwu Apr 11, 2024
8ed2025
Create luozihui2003.md
luozihui2003 Apr 11, 2024
ac55803
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
luozihui2003 Apr 11, 2024
e74febf
Add sequence diagram for executeCommand in parser
LuoYu-uwu Apr 11, 2024
1039cdf
Update user stories
LuoYu-uwu Apr 11, 2024
2d69dd1
Extracted profile, calories Ui from Ui.
SharlynLui Apr 11, 2024
2bd316e
Updated calories to be integer
SharlynLui Apr 11, 2024
207b56f
Merge pull request #159 from LuoYu-uwu/Branch-doc
64-1 Apr 11, 2024
5e4e5a5
Merge branch 'AY2324S2-CS2113-T12-2:master' into master
SharlynLui Apr 11, 2024
e169257
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 11, 2024
9e25724
Edit checks
SharlynLui Apr 11, 2024
4d175f7
Gradle check
SharlynLui Apr 11, 2024
d4befa7
Gradle Check
SharlynLui Apr 11, 2024
55d3988
Merge pull request #160 from SharlynLui/master
64-1 Apr 11, 2024
b0eb5dd
Add grocery command sequence diagram
LuoYu-uwu Apr 11, 2024
2dba80d
Merge pull request #161 from LuoYu-uwu/Branch-doc
SharlynLui Apr 11, 2024
59dd34c
Add save and load file function for grocery mode
luozihui2003 Apr 11, 2024
de48ac7
Merge branch 'master' into master
SharlynLui Apr 11, 2024
fe249a0
Merge pull request #156 from wallywallywally/branch-Willson
64-1 Apr 11, 2024
8152c18
Merge branch 'AY2324S2-CS2113-T12-2:master' into master
luozihui2003 Apr 11, 2024
e586b4a
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
luozihui2003 Apr 11, 2024
2f6560e
Merge remote-tracking branch 'origin/master'
luozihui2003 Apr 11, 2024
a1b3de5
gradle checks
luozihui2003 Apr 11, 2024
7db2696
gradle check: static final change to final static
luozihui2003 Apr 11, 2024
6c89239
gradle check: move FILE_PATH in front
luozihui2003 Apr 11, 2024
a93c1ea
gradle: change FILE_PATH to the path
luozihui2003 Apr 11, 2024
07806ed
gradle: changed expected.txt and removed print no saved groceries
luozihui2003 Apr 11, 2024
5a76900
gradle: changed expected.txt and removed print no saved groceries
luozihui2003 Apr 11, 2024
1d37809
Merge pull request #162 from luozihui2003/master
64-1 Apr 11, 2024
173cc6d
Add ADDMULTI command to GroceryCommand enum and implement promptAddMu…
64-1 Apr 11, 2024
31d27a8
Refactor GroceryList sortByExpiration method to handle groceries with…
64-1 Apr 11, 2024
68c94ca
Refactor GroceryList sortByExpiration method to handle groceries with…
64-1 Apr 11, 2024
bf5d8b9
Merge pull request #163 from 64-1/v1-final
64-1 Apr 11, 2024
b62341a
Include grocerymanagement sequence diagram in developer guide
LuoYu-uwu Apr 11, 2024
79a368b
Update code such that only "exit" will terminate program
LuoYu-uwu Apr 11, 2024
d501db7
Update code to print nothing when no food was consumed
LuoYu-uwu Apr 11, 2024
0be47be
Add sequence diagrams
LuoYu-uwu Apr 11, 2024
9baa8f3
Add class diagrams
LuoYu-uwu Apr 11, 2024
18cbce1
Update the old sequence diagram
LuoYu-uwu Apr 11, 2024
1631780
Merge pull request #164 from LuoYu-uwu/Branch-diagram
64-1 Apr 11, 2024
55bb7bf
Update UserInfo class diagram
LuoYu-uwu Apr 11, 2024
04d86d3
Merge pull request #165 from LuoYu-uwu/Branch-diagram
64-1 Apr 11, 2024
95697c0
Add save and load file for recipe
luozihui2003 Apr 11, 2024
5c401a4
gradle: style checks
luozihui2003 Apr 11, 2024
772b4f1
gradle: removed print
luozihui2003 Apr 11, 2024
30acf9a
Merge pull request #166 from luozihui2003/saveRecipe
64-1 Apr 11, 2024
2beef51
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 11, 2024
8100a45
PPP
SharlynLui Apr 11, 2024
de28661
Merge pull request #167 from SharlynLui/master
luozihui2003 Apr 11, 2024
d45c167
Updated PPP
SharlynLui Apr 11, 2024
a8218ed
Merge pull request #168 from SharlynLui/master
wallywallywally Apr 12, 2024
bea0894
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 12, 2024
6fe68bc
Fixed Ratings accepting 0 and Added View Grocery feature
SharlynLui Apr 12, 2024
b1450ca
Updated test cases
SharlynLui Apr 12, 2024
b4c6b0c
Fix Location bugs and update User Guide
wallywallywally Apr 12, 2024
d29a511
Merge pull request #169 from SharlynLui/master
SharlynLui Apr 12, 2024
565431f
Fix checkstyle issues
wallywallywally Apr 12, 2024
1374e9b
Resolve merge conflict related to store data
wallywallywally Apr 12, 2024
234b296
Add save UserInfo
luozihui2003 Apr 12, 2024
d4e81bf
Add save UserInfo
luozihui2003 Apr 12, 2024
835aa14
Add save to delete recipe
luozihui2003 Apr 12, 2024
b293cc1
Enable remark to be edtied.
SharlynLui Apr 12, 2024
4375da0
Merge branch 'AY2324S2-CS2113-T12-2:master' into master
SharlynLui Apr 12, 2024
8068f4b
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 12, 2024
79e3eb1
Gradle Check
SharlynLui Apr 12, 2024
fb47747
no message
SharlynLui Apr 12, 2024
bb5c971
Merge pull request #170 from wallywallywally/branch-Willson
SharlynLui Apr 12, 2024
21d6128
Merge pull request #171 from luozihui2003/saveProfile
SharlynLui Apr 12, 2024
b4b7042
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 12, 2024
ded4336
Gradle checks
SharlynLui Apr 12, 2024
12c3ed4
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 12, 2024
e7bedbb
gradle check
SharlynLui Apr 12, 2024
7858e0b
gradle checks
SharlynLui Apr 12, 2024
ee1ec7b
gradle check
SharlynLui Apr 12, 2024
d2f12ab
no changes... trying to pull
luozihui2003 Apr 12, 2024
23ec462
Fix exiring command and add email notification
64-1 Apr 12, 2024
57737af
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp …
64-1 Apr 12, 2024
849e87a
Merge pull request #173 from SharlynLui/master
wallywallywally Apr 12, 2024
ad94616
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp …
64-1 Apr 12, 2024
5408403
Merge pull request #174 from 64-1/v1-final
64-1 Apr 12, 2024
79eeca1
Remove some developer comments in Ui
wallywallywally Apr 12, 2024
6efc320
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 13, 2024
84f8aa6
Updated User Guide, help list. Organised User Guide commands for Groc…
SharlynLui Apr 13, 2024
6bfe1c1
Reorganise UG and updated UG
SharlynLui Apr 13, 2024
64658f6
Add more test code
64-1 Apr 13, 2024
647ff19
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp …
64-1 Apr 13, 2024
9a23360
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 13, 2024
b886879
Delete grocery
SharlynLui Apr 13, 2024
9bc047f
Merge pull request #175 from SharlynLui/master
wallywallywally Apr 13, 2024
2e62e34
Merge pull request #176 from 64-1/v1-final
wallywallywally Apr 13, 2024
30928a4
Merge branch 'master' into branch-Willson
wallywallywally Apr 13, 2024
76d9ad4
Update DG and UG
64-1 Apr 13, 2024
62c2233
Update jline library version to 3.20.0
64-1 Apr 13, 2024
3f23dcd
Update jline library version to 3.20.0
64-1 Apr 13, 2024
e85947f
Merge pull request #177 from 64-1/v1-final
64-1 Apr 13, 2024
0fd3c42
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 13, 2024
a540b5a
Update User Guide and clean up printGrocery
wallywallywally Apr 13, 2024
e5246f7
Merge branch 'master' into branch-Willson
wallywallywally Apr 13, 2024
d838331
Fix tests
wallywallywally Apr 13, 2024
fdaf42d
Merge pull request #178 from wallywallywally/branch-Willson
wallywallywally Apr 13, 2024
7f8d099
Delete data directory
wallywallywally Apr 13, 2024
8778db2
Add find recipe
SharlynLui Apr 13, 2024
769737e
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 13, 2024
70ea802
Disallow duplicates to be added recipe
SharlynLui Apr 13, 2024
5f0d79b
Edit Recipe
SharlynLui Apr 13, 2024
01adbfb
Gradle Check
SharlynLui Apr 13, 2024
ec06d46
Merge pull request #179 from SharlynLui/master
SharlynLui Apr 13, 2024
7bf5f58
Update README.md with new features and installation instructions
64-1 Apr 13, 2024
bc3e0cf
Update README.md with new features, build automation using Gradle, te…
64-1 Apr 13, 2024
2fd101a
Merge pull request #180 from 64-1/v1-final
wallywallywally Apr 13, 2024
9bd3ad8
Update User Guide and fix minor bugs
wallywallywally Apr 13, 2024
430e3f9
Update docs/README
wallywallywally Apr 13, 2024
e4fb583
Hide unfinished addmulti in User Guide
wallywallywally Apr 13, 2024
7b61506
Fix issues for multiple grocery names in promptAddMultipleMenu method
64-1 Apr 13, 2024
abea7b2
Merge pull request #182 from 64-1/v1-final
LuoYu-uwu Apr 13, 2024
91555a4
Add displayWelcomeMessage method to Ui class
64-1 Apr 13, 2024
b0ce1ba
Update README.md with new features, build automation using Gradle, te…
64-1 Apr 13, 2024
04b8ae8
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
wallywallywally Apr 13, 2024
41ccce9
Fix mistakes
64-1 Apr 13, 2024
03c2b41
Update welcome message in EXPECTED.TXT
64-1 Apr 13, 2024
75d2d1f
Restore addmulti in User Guide
wallywallywally Apr 13, 2024
555e67e
Fix checkstyle issues
wallywallywally Apr 13, 2024
c4f8cc7
Merge pull request #183 from 64-1/v1-final
wallywallywally Apr 13, 2024
c930aba
Merge pull request #181 from wallywallywally/master
wallywallywally Apr 13, 2024
14ae938
Fix issues for multiple grocery names in promptAddMultipleMenu method
64-1 Apr 13, 2024
64ec3b9
Update PPP
wallywallywally Apr 13, 2024
629b936
Merge pull request #184 from 64-1/v1-final
wallywallywally Apr 13, 2024
01cf507
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
wallywallywally Apr 13, 2024
89ff41d
Add sequence diagram for editCost and editThreshold
LuoYu-uwu Apr 13, 2024
64f6c5f
Edit error
LuoYu-uwu Apr 13, 2024
1fee5a6
Merge pull request #185 from LuoYu-uwu/Branch-DG3.0
LuoYu-uwu Apr 13, 2024
322a118
Load storage locations
wallywallywally Apr 13, 2024
ac56caf
Fix checkstyle issues
wallywallywally Apr 13, 2024
b1a7a4f
Fix checkstyle issues
wallywallywally Apr 13, 2024
7e3dc7e
Merge pull request #186 from wallywallywally/master
64-1 Apr 13, 2024
1a5cd0c
Wipes saved file if corrupted
luozihui2003 Apr 13, 2024
919df84
Resolve merge conflict between location edits and corrupt file
luozihui2003 Apr 13, 2024
b4fcded
Merge branch 'master' into saveProfile
luozihui2003 Apr 13, 2024
87b21ad
Add more testing
wallywallywally Apr 13, 2024
a8f99b7
Import user.UserInfo in Git.java
luozihui2003 Apr 13, 2024
34ae7b5
FIx User Guide formatting
wallywallywally Apr 13, 2024
47ee28d
gradle: stylecheck storage.java
luozihui2003 Apr 13, 2024
241a869
gradle: stylecheck storage again...
luozihui2003 Apr 13, 2024
b9cf987
Merge pull request #188 from wallywallywally/master
LuoYu-uwu Apr 14, 2024
e2b9a2e
Fix error in calculation of calories
LuoYu-uwu Apr 14, 2024
20afdde
Add some unit test and update sequence diagram
LuoYu-uwu Apr 14, 2024
20893f2
Add test to food
LuoYu-uwu Apr 14, 2024
7ac453a
Add test for userInfo
LuoYu-uwu Apr 14, 2024
f3dffc4
Fix checkstyle error
LuoYu-uwu Apr 14, 2024
7576010
Update user guide
LuoYu-uwu Apr 14, 2024
b80342e
Update PPP
LuoYu-uwu Apr 14, 2024
a7d8f9b
Update PPP
LuoYu-uwu Apr 14, 2024
8cd6496
Update PPP
LuoYu-uwu Apr 14, 2024
8fcb731
Merge branch 'master' into saveProfile
wallywallywally Apr 14, 2024
6d0bd17
Merge pull request #189 from luozihui2003/saveProfile
wallywallywally Apr 14, 2024
dfe6665
Merge pull request #190 from LuoYu-uwu/Branch-test
wallywallywally Apr 14, 2024
96768b9
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 14, 2024
48be00e
Add recipe tests
SharlynLui Apr 14, 2024
d8cadce
Gradle checks
SharlynLui Apr 14, 2024
16aab81
Merge pull request #191 from SharlynLui/master
wallywallywally Apr 14, 2024
df01ea9
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
wallywallywally Apr 14, 2024
719d557
Update exception handing for cost, list commands
wallywallywally Apr 14, 2024
59c2f83
Fix data loading issues and clean up loaded data
wallywallywally Apr 14, 2024
ae0efeb
Clean up checkstyle
wallywallywally Apr 14, 2024
d544799
Add test cases related to Storage functionalities
wallywallywally Apr 14, 2024
0751d8a
Fix checkstyle issues
wallywallywally Apr 14, 2024
5ac5683
Merge pull request #192 from wallywallywally/master
wallywallywally Apr 14, 2024
9ed2cb6
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 14, 2024
879b948
Add new test cases
SharlynLui Apr 14, 2024
56d82a3
Edit test case
SharlynLui Apr 14, 2024
d147cd2
Gradle Check
SharlynLui Apr 14, 2024
175289a
Update Dev Guide and add sample data for testers
wallywallywally Apr 14, 2024
532fa9a
Updated PPP (left DG and Repolink to be added)
SharlynLui Apr 14, 2024
0a97f0e
Update Dev Guide
wallywallywally Apr 14, 2024
612443e
Update Dev Guide and my PPP
wallywallywally Apr 14, 2024
44b8558
Update Dev Guide with editLocation
wallywallywally Apr 15, 2024
729c844
Update tests
wallywallywally Apr 15, 2024
04c961c
Merge pull request #193 from SharlynLui/master
wallywallywally Apr 15, 2024
e49e8f7
Resolve merge conflicts in User Guide
wallywallywally Apr 15, 2024
22afac6
Merge pull request #194 from wallywallywally/master
64-1 Apr 15, 2024
9019023
Use constants for category
luozihui2003 Apr 15, 2024
4c10a6a
Make return statement for promptforAmount more obvious, set limit to …
luozihui2003 Apr 15, 2024
0cdbe3d
gradle: move public static
luozihui2003 Apr 15, 2024
d9d4974
edit category
luozihui2003 Apr 15, 2024
844b26a
gradle: remove grams from tests
luozihui2003 Apr 15, 2024
58437a8
Modify readme.md and add sequence diagram
64-1 Apr 15, 2024
9dd042e
Add new features and improvements to Grocery in Time application
64-1 Apr 15, 2024
af9e7c6
Merge pull request #195 from luozihui2003/saveProfile
64-1 Apr 15, 2024
e6081c7
edit PPP
luozihui2003 Apr 15, 2024
6676d54
add imporvement to ppp
luozihui2003 Apr 15, 2024
7a5ff3c
Merge pull request #196 from 64-1/v1-final
64-1 Apr 15, 2024
d4805e8
Merge pull request #197 from luozihui2003/saveProfile
64-1 Apr 15, 2024
e2051c9
Update README
wallywallywally Apr 15, 2024
a8b0813
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
wallywallywally Apr 15, 2024
d082cea
Merge pull request #198 from wallywallywally/master
wallywallywally Apr 15, 2024
2ccefa7
Fix issue in AboutUs
wallywallywally Apr 15, 2024
a136367
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T12-2/tp
wallywallywally Apr 15, 2024
90f36f1
Merge pull request #199 from wallywallywally/master
wallywallywally Apr 15, 2024
1a40b79
Add validation for input number in GroceryUi.java
64-1 Apr 15, 2024
e1fcbcd
Merge pull request #200 from 64-1/v1-final
64-1 Apr 15, 2024
b6d0f1a
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 15, 2024
818da9e
Add License.md
64-1 Apr 15, 2024
fd7c4cf
PPP and DG
SharlynLui Apr 15, 2024
728120b
Minor edit
SharlynLui Apr 15, 2024
3ae8988
Add CONTRICUTING.md
64-1 Apr 15, 2024
72e2d91
Merge pull request #202 from SharlynLui/master
64-1 Apr 15, 2024
5b25698
Update README.md with link to CONTRIBUTING.md
64-1 Apr 15, 2024
58e3b83
Merge pull request #201 from 64-1/v1-final
64-1 Apr 15, 2024
9d5b73c
Edited Reposense Link
SharlynLui Apr 15, 2024
9c365c5
add to ppp
luozihui2003 Apr 15, 2024
8b2af63
Merge pull request #203 from SharlynLui/master
luozihui2003 Apr 15, 2024
9b59ff4
Update review/mentoring contributions in team/64-1.md
64-1 Apr 15, 2024
5830980
Merge pull request #204 from luozihui2003/saveProfile
SharlynLui Apr 15, 2024
386e51e
edit ppp again
luozihui2003 Apr 15, 2024
e045f10
PPP
SharlynLui Apr 15, 2024
32f4652
Merge branch 'AY2324S2-CS2113-T12-2:master' into master
SharlynLui Apr 15, 2024
6b08faa
PPP
SharlynLui Apr 15, 2024
2ca2e97
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 15, 2024
e1ccdf6
PPP
SharlynLui Apr 15, 2024
bdf6e45
Update 64-1.md
64-1 Apr 15, 2024
2eeae89
Merge pull request #206 from luozihui2003/saveProfile
SharlynLui Apr 15, 2024
be24e2b
Merge pull request #207 from SharlynLui/master
luozihui2003 Apr 15, 2024
8822ebd
Merge pull request #205 from 64-1/v1-final
64-1 Apr 15, 2024
3e72dd8
One full stop.
SharlynLui Apr 15, 2024
bf36428
Merge branch 'AY2324S2-CS2113-T12-2:master' into master
SharlynLui Apr 15, 2024
d932b66
Merge pull request #208 from SharlynLui/master
luozihui2003 Apr 15, 2024
eb728aa
UG
SharlynLui Apr 15, 2024
ed5201a
Merge branch 'master' of https://github.com/SharlynLui/tp
SharlynLui Apr 15, 2024
fbbcadd
Merge branch 'AY2324S2-CS2113-T12-2:master' into master
SharlynLui Apr 15, 2024
5edeab7
Merge pull request #209 from SharlynLui/master
64-1 Apr 15, 2024
2cdab08
Update .gitignore
wallywallywally Apr 15, 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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ bin/

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

GroceryList.log
GroceryList.log.lck

5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"markis.code-coverage"
]
}
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"
}
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Duke project template
# GiT

Grocery in Time !

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("git.Git")
}

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

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

run{
standardInput = System.in
enableAssertions = true;
}
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) | Luo Zi Hui | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Liu Siyi | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Willson Han Zhekai | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Sharlyn Lui | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Luo Yu | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
98 changes: 91 additions & 7 deletions docs/DeveloperGuide.md
Copy link

Choose a reason for hiding this comment

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

Looks neat and organized! Perhaps you can an overall sequence diagram for your whole program to show how it works overall.

Copy link

Choose a reason for hiding this comment

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

Also, class diagrams for classes like Ui, Parser, Grocery would better illustrate and complement your explanations

Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,107 @@

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

Choose a reason for hiding this comment

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

Better to re-iterate the value proposition of your app at the beginning of the design and implementation section.


### _Designs_
### 1. Calories Management Mode
![Commands for managing calories](./diagrams/CaloriesManagement.png)
* when `caloriesManagement` is executed in Parser, different actions will be carried out based on the commands.
* if `eat`, store the name and calories of the input food
* if `view`, display all the foods consumed

Choose a reason for hiding this comment

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

Overall well done! However, there are some missing full stops in the DG.

Choose a reason for hiding this comment

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

Instead of "if eat" and "if view", perhaps it would be clearer to mention which variable fulfils those conditions. It could be phrased as "if command == eat" and "if command == view".


### 1. View all groceries added

Choose a reason for hiding this comment

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

The numbering here is a bit confusing, I am not sure about how the DG is organized, because "Calories Management" was given index 1 earlier, so I am not sure how that fits in.

* First create a method in "Grocery" class that prints the grocery in a preferred format.\
e.g., NAME, AMOUNT, EXPIRATION, PRICE.
Copy link

Choose a reason for hiding this comment

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

Can you provide a sample of the formats for all those inputs? (I can see you have already specified the format of expiration, but maybe a sample for all is more intuitive for other developers)

* Then create a method in "GroceryList" class that prints all the groceries in the list.


### 2. List the groceries by price in descending order
* First, create a field in "Grocery" class that stores the cost of a grocery.
* When adding a grocery, prompt the user to enter the cost.
* Format the cost into 2 decimal places, remove the dollar sign and store it as a string.
* Second, the grocery's cost accordingly before adding it into the list.

Choose a reason for hiding this comment

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

I think there seems to be a grammatical error here which makes the meaning difficult to understand.

* When setting the cost, convert the cost from String into Double.
* Third, add method in "GroceryList" class to create a copy of the current grocery list, then sort the
new grocery list by price using lambda function. Reverse and print the new list.


### 3. Input category for each grocery added
* In Grocery class, modified the Grocery constructor to accept the 'category' parameter.

Choose a reason for hiding this comment

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

Perhaps it's better to phrase it this way, "the Grocery constructor was modified to accept the 'category' parameter".

* In Parser class executeCommand method, modified the add command to prompt the user for the category of the grocery. Passed the category as a parameter when creating a new Grocery object.
* In Ui class, added a new method promptForCategory to prompt the user for the category of the grocery.
* In Grocery class, modified the printGrocery method to include the category information in the output string.
Comment on lines +159 to +161

Choose a reason for hiding this comment

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

The same phrasing issue, try to phrase it in passive voice.



### 4. Input amount for each grocery added
* In Grocery class, modified the Grocery constructor to accept the 'amount' parameter.
* In Parser class executeCommand method, modified the add command to prompt the user for the amount of grocery. Passed the amount as a parameter when creating a new Grocery object.
* In Ui class, added a new method promptForAmount to prompt the user for the amount of grocery.
* In Grocery class, modified the printGrocery method to print different units of measurement for different categories.


### 5. Input the location of where each grocery is stored
* In Grocery class, modified the Grocery class to include location (String) as an attribute.

Choose a reason for hiding this comment

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

Could be clearer if "location" is formatted as code.

* In Grocery class, modified the Grocery constructor to accept the 'location' parameter.
* In Grocery class, under printGrocery, added locationString to format location.
Copy link

Choose a reason for hiding this comment

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

The explainations are relatively accurate and useful, excellant!

* In Parser class executeCommand method, modified the add command to prompt the user for where the grocery is stored. Passed the location as a parameter when creating a new Grocery object.
* In Ui class, added promptForLocation method to take in user input for location of the grocery.
* In Ui class, modified the printGrocery method to print the 'location' of the grocery alongside the grocery name.
* Alternative considered: Can possibly add location as enumeration however different people might store groceries in different places thus better to set as String so that user is free to input location details however specific they want.

### 6. Edit grocery amount after using a grocery
Copy link

Choose a reason for hiding this comment

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

Excellent work on UML, however could your show how the user exits the app?
image

* A `Grocery` stores its `amount` as an attribute. All `Grocery` objects are then stored in an ArrayList in `GroceryList`, which entirely handles the editing of the `amount`.
Copy link

Choose a reason for hiding this comment

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

Curious, is the amount: int referring to quantity of the grocery item? There is also a cost attribute in the Grocery class as mentioned in line 18.

Copy link

Choose a reason for hiding this comment

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

Diagrams are simplified and easy to understand. Well done!

Choose a reason for hiding this comment

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

The diagrams are quite clear and neat as well as carefully matches the UG. however some of the minor detail seems missing such as after playing the game how the user quite and is it possible to store the information?


![Grocery (showing amount) and GroceryList class diagram](./diagrams/GroceryAmtGroceryList.png)

* `GroceryList#editAmount()` is used to either decrease or directly set the `amount` of a `Grocery`. It takes in 2 parameters:
1. details: String — User input read from `Scanner`.
2. use: boolean — `true` decreases the `amount`, while `false` directly sets it.
* To edit the `amount` after using a `Grocery`, the user inputs `use GROCERY a/AMOUNT`.
Our app then executes `GroceryList#editAmount()` with parameter `use = true`, as illustrated by the following sequence diagram.

![useAmt sequence diagram](./diagrams/useAmt.png)

* Additional checks specific to `use` ensure that the user only inputs a valid `int`, or that the `amount` must not be 0 beforehand.
* Any exceptions thrown come with a message to help the user remedy their specific issue, as displayed by the `Ui`.

### 7. Input expiration date of each grocery when added
* In Grocery class, the expiration field in the Grocery class was changed from a String to a LocalDate to standardize date handling.
* In Grocery class, the setExpiration method was updated to accept a String input, convert it to a LocalDate using a specified format ("yyyy-MM-dd"), and then store this date.
* In UI class, the UI now includes a multi-step process to prompt the user for the year, month, and day of the grocery item's expiration date. This process ensures that the date is captured in a user-friendly manner and stored accurately.
* In GroceryList class, a new method, sortByExpiration, was added to allow sorting the list of groceries by their expiration dates in ascending order. This method utilizes the Collections.sort method with a lambda expression comparing the expiration dates of Grocery items.

### 8. Editing expiration date after it is added
* In GroceryList class, modified the editExpiration method to parse String into localdate.


## Product scope
### Target user profile

{Describe the target user profile}
Our target user is someone who regularly goes grocery shopping, and would like to track and manage their inventory of groceries.

### Value proposition

{Describe the value proposition: what problem does it solve?}
Grocery in Time aims to act as an easy-to-use central database for all the user's groceries. Managing many groceries stored at different locations around the house can get confusing,
therefore our app will allow users to track their groceries easily.

## User Stories
Users are able to edit and manage the category, amount, expiration date, and storage location of their groceries.
When groceries are running low, the app can generate a shopping list to remind users of what they need to buy.
Furthermore, the app can generate a list of items that are expiring soon, reminding users to consume their groceries as soon as possible.

|Version| As a ... | I want to ... | So that I can ...|
|--------|----------|---------------|------------------|
|v1.0|new user|see usage instructions|refer to them when I forget how to use the application|
|v2.0|user|find a to-do item by name|locate a to-do without having to go through the entire list|
## User Stories

| Version | As a ... | I want to ... | So that I can ... |
|---------|-------------------------------|---------------------------------------------|--------------------------------------------------------|
| v1.0 | new user | see instructions on how to use the app | refer to them when I forget how to use the application |
| v1.0 | user | add groceries to the app | manage all my groceries |
| v1.0 | user | view all my groceries | know what I have bought |
| v1.0 | user | delete groceries from the list | stop tracking those groceries |
| v1.0 | user | add the amount of a grocery | keep track of the amount of that item I have |
| v1.0 | user | add the expiration date of the grocery | keep track of when my items expire easily |
| v2.0 | financially-aware user | add the cost of the groceries | know how much I am spending |
| v2.0 | health-conscious user | categorise my groceries | know what types of groceries I have |
| v2.0 | user with many storage spaces | add the location of where an item is stored | see where I keep my groceries |
| v2.0 | user who consumes groceries | track the usage of my groceries | know how much I have left |
| v2.0 | user who cooks with recipes | create and keep my own version of recipes | refer to my own recipes when I cook
## Non-Functional Requirements

{Give non-functional requirements}
Expand Down
Loading
Loading