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-3] MagusStock #39

Open
wants to merge 707 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
707 commits
Select commit Hold shift + click to select a range
fd14107
Modify filter category function and revert category (list/table)
Ng-YZ Apr 4, 2023
19b8649
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
Ng-YZ Apr 4, 2023
dbca6a6
Merge pull request #203 from firwer/master
firwer Apr 4, 2023
932d40d
Fix merge conflict
Ng-YZ Apr 4, 2023
38893f8
Update category-related UG information
Ng-YZ Apr 4, 2023
871787f
User Guide reformatting for Sell/Restock/Dashboard Command.
ngkaiwen123 Apr 4, 2023
cecc15e
UG: Update sample outputs for anything printed in tables
Ng-YZ Apr 4, 2023
028c0f8
Merge branch 'master' into master
ngkaiwen123 Apr 4, 2023
d0648e8
Edit 'Uncategorized' to 'uncategorized' to pass tests
Ng-YZ Apr 4, 2023
f159db7
no message
ngkaiwen123 Apr 4, 2023
c22039f
Edit UG
Ng-YZ Apr 4, 2023
14c6199
Add printing of alert warnings when alerts are created
ysl-28 Apr 4, 2023
aff2771
Clean up category code
Ng-YZ Apr 4, 2023
d80495d
-Edit command added OutfRange Checking Capability.
ngkaiwen123 Apr 4, 2023
c1abed6
Simplify remove function, edit junit tests with RemoveCommand used
Ng-YZ Apr 4, 2023
cdd98a4
-Added assertions for edit command testing
ngkaiwen123 Apr 4, 2023
5900520
modify UG anchors
Ng-YZ Apr 4, 2023
f0649cd
Merge pull request #213 from ysl-28/master
ysl-28 Apr 4, 2023
24577dc
Simplify remove command further, remove redundant ui methods, add fil…
Ng-YZ Apr 4, 2023
a1af74b
Fix merge conflict, clean up redundant ui variables
Ng-YZ Apr 4, 2023
f399e19
-Updating PPP document
ngkaiwen123 Apr 4, 2023
34952e8
Update tables in UG to show index column
ysl-28 Apr 4, 2023
5a36b15
Update help function's list of commands
Ng-YZ Apr 4, 2023
cea43a5
Append category table formatting
Ng-YZ Apr 4, 2023
90ba4da
Fix merge conflicts
Ng-YZ Apr 4, 2023
cd266fb
Checkstyle: align indentation
Ng-YZ Apr 4, 2023
332f4cd
Merge pull request #212 from Ng-YZ/master
Ng-YZ Apr 4, 2023
f65436b
-Editing Test Codes, further updates to user guide.
ngkaiwen123 Apr 4, 2023
4584017
Further updates to user guide
ngkaiwen123 Apr 4, 2023
d994b14
Merge branch 'master' into master
ngkaiwen123 Apr 4, 2023
b610d76
Merge pull request #194 from ngkaiwen123/master
ngkaiwen123 Apr 4, 2023
eebbd9f
Further changes to user guide
ngkaiwen123 Apr 4, 2023
2f927cb
Merge pull request #214 from ngkaiwen123/master
ngkaiwen123 Apr 4, 2023
2f5ba7f
Update tables in UG to include index column
ysl-28 Apr 4, 2023
8cfcba8
Merge pull request #216 from ysl-28/master
ysl-28 Apr 4, 2023
9cf673b
Add handling of invalid input for list command
ysl-28 Apr 4, 2023
2239f0d
Merge pull request #217 from ysl-28/master
ysl-28 Apr 4, 2023
7edf3a7
Fix search message appearing randomly when loading the program.
ArtemiszenN Apr 5, 2023
fd95656
checkstyle grrrr
ArtemiszenN Apr 5, 2023
4f123d9
Change filter command help table thing
ArtemiszenN Apr 5, 2023
3eba63e
Merge pull request #218 from ArtemiszenN/newMaster
ArtemiszenN Apr 5, 2023
642a4d7
PPP, Invalid input standardisation and Minor UG edits
firwer Apr 5, 2023
d6c1b4e
PPP update
firwer Apr 5, 2023
5d85945
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
firwer Apr 5, 2023
1e565ef
Add maximum range enforcement for alert adding
ysl-28 Apr 5, 2023
9cd7ec0
Remove unused comment
ysl-28 Apr 5, 2023
2cea44d
-Edits to the User Guide, Developer Guide
ngkaiwen123 Apr 5, 2023
9a67999
Merge pull request #221 from ngkaiwen123/master
ngkaiwen123 Apr 5, 2023
dce686f
refactor: name of PPP
firwer Apr 5, 2023
d5917e6
Merge branch 'master' of https://github.com/firwer/tp
firwer Apr 5, 2023
c8cb237
Edit alert regex to reject extra whitespace
ysl-28 Apr 5, 2023
a335278
Edit warning message for OutOfRangeException
ysl-28 Apr 5, 2023
4e1ee44
Update AddParserTest
ysl-28 Apr 5, 2023
83bc7d7
Merge branch 'master' into master
firwer Apr 5, 2023
264e1bb
Add support for punctuations to add command
firwer Apr 5, 2023
cd5a761
Merge branch 'master' of https://github.com/firwer/tp
firwer Apr 5, 2023
755d453
docs: Further improvement to UG
firwer Apr 5, 2023
a4d984f
Edit addWordWithoutWrap function to print sufficient spaces
Ng-YZ Apr 5, 2023
f8213a1
Append ui function to display '[]' in help table
Ng-YZ Apr 5, 2023
4b83d6c
Merge pull request #222 from Ng-YZ/master
Ng-YZ Apr 5, 2023
8593765
Fix typo in minimum alert warning and add more AddAlertCommand tests
ysl-28 Apr 5, 2023
b353cf0
Standardise printing of maximum quantity limit
ysl-28 Apr 5, 2023
d77f8ac
Merge pull request #220 from ysl-28/master
ysl-28 Apr 5, 2023
c4d538f
Merge branch 'master' into master
firwer Apr 5, 2023
10262fa
Merge pull request #219 from firwer/master
firwer Apr 5, 2023
abd4e3b
weipin why'd you merge when it can't compile ASKDLJHASKLJDH
ArtemiszenN Apr 5, 2023
1e4595a
Merge pull request #223 from ArtemiszenN/newMaster
ArtemiszenN Apr 5, 2023
846a204
Add javadoc comments
ysl-28 Apr 5, 2023
2409e6b
Fix formatting of help table in UG
ysl-28 Apr 5, 2023
c2e1083
Resolve merge conflict
ysl-28 Apr 5, 2023
6b0e92b
Merge pull request #224 from ysl-28/master
ysl-28 Apr 6, 2023
3b38723
Update PPP
ysl-28 Apr 6, 2023
c2850db
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 6, 2023
362685e
Merge pull request #231 from ysl-28/master
ysl-28 Apr 6, 2023
1756b62
-Fixes to edit command
ngkaiwen123 Apr 6, 2023
361c5b3
Minor edits to DG
ngkaiwen123 Apr 6, 2023
ffdc040
Small revamp of edit command test
ngkaiwen123 Apr 6, 2023
b5c39d3
Merge pull request #232 from ngkaiwen123/master
ngkaiwen123 Apr 6, 2023
5091eea
Harden session csv
ArtemiszenN Apr 6, 2023
77ddebd
Merge pull request #233 from ArtemiszenN/newMaster
ArtemiszenN Apr 6, 2023
bcfcd70
change readme to work with about us page
ArtemiszenN Apr 6, 2023
643ab1c
Merge pull request #234 from ArtemiszenN/newMaster
ArtemiszenN Apr 6, 2023
2f4bc04
Move benchmark data to data
ArtemiszenN Apr 7, 2023
24e2190
Merge pull request #235 from ArtemiszenN/newMaster
ArtemiszenN Apr 7, 2023
5424857
checkstyle
ArtemiszenN Apr 7, 2023
1f04561
Merge pull request #236 from ArtemiszenN/newMaster
ArtemiszenN Apr 7, 2023
e080872
Developer Guide Update for UML Diagrams for both Edit and Restock Com…
ngkaiwen123 Apr 7, 2023
342a5ce
Merge branch 'master' of https://github.com/ngkaiwen123/tp
ngkaiwen123 Apr 7, 2023
42b9707
Reedited the UML Diagrams for Developer Guide.
ngkaiwen123 Apr 7, 2023
090c80f
Developer Guide edits
ngkaiwen123 Apr 7, 2023
3d267fe
Documentation again
ngkaiwen123 Apr 7, 2023
2e1b7a5
Add more alert tests
ysl-28 Apr 7, 2023
da29999
-More test cases to ensure edit command is 99.999999999999999999% bug…
ngkaiwen123 Apr 7, 2023
2f5d1cb
Merge pull request #237 from ngkaiwen123/master
ngkaiwen123 Apr 7, 2023
62a7a6c
Update UG with example of alert warning message
ysl-28 Apr 7, 2023
7412be8
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 7, 2023
e020551
Merge pull request #238 from ysl-28/master
ysl-28 Apr 7, 2023
9d3b4e5
Add ppp for arty
ArtemiszenN Apr 7, 2023
4462098
Merge remote-tracking branch 'upstream/master' into newMaster
ArtemiszenN Apr 7, 2023
a23bfd2
Merge pull request #239 from ArtemiszenN/newMaster
ArtemiszenN Apr 7, 2023
f8a6918
ppp ppp ppp
ArtemiszenN Apr 7, 2023
9921525
Merge pull request #240 from ArtemiszenN/newMaster
ArtemiszenN Apr 7, 2023
beaead2
docs: DG improv
firwer Apr 8, 2023
e16c30f
merge conflict fix
firwer Apr 8, 2023
224703e
Update command summary
ysl-28 Apr 8, 2023
cfee4de
Update PPP
ysl-28 Apr 8, 2023
13bd6d7
fix: checkstyle & lowercase for add func
firwer Apr 9, 2023
27dc416
fix: checkstyle
firwer Apr 9, 2023
e1783a3
fix: checkstyle again
firwer Apr 9, 2023
4977698
merge conflict
firwer Apr 9, 2023
4bfbc8b
print category name with first letters of important words capitalised
Ng-YZ Apr 9, 2023
35e914a
Edit function now updates categoryHash
Ng-YZ Apr 9, 2023
cb898a9
Remove debugging printing statements
Ng-YZ Apr 9, 2023
ec7b311
extract variables to be static final variables
Ng-YZ Apr 9, 2023
eb81b30
Update AlertParser diagram
ysl-28 Apr 9, 2023
91606f0
Small touchups
Ng-YZ Apr 9, 2023
c7fbb0f
Fix checkstyle
Ng-YZ Apr 9, 2023
8cab233
Modify tests' expected categories
Ng-YZ Apr 9, 2023
4146af5
oops missed some expected outputs
Ng-YZ Apr 9, 2023
ce47396
Merge pull request #243 from Ng-YZ/master
Ng-YZ Apr 9, 2023
abf490d
Update Add/RemoveAlertCommand diagrams
ysl-28 Apr 9, 2023
ab3d0ae
Add PPP, add tests
Ng-YZ Apr 9, 2023
6016e4d
Update DG and alert diagrams
ysl-28 Apr 9, 2023
6325d28
Update PPP
ysl-28 Apr 9, 2023
7d4fc30
Add on to PPP
Ng-YZ Apr 9, 2023
9f6ddbb
Merge pull request #244 from Ng-YZ/master
Ng-YZ Apr 9, 2023
6937833
Resolve merge conflict
ysl-28 Apr 9, 2023
26488b6
Merge pull request #245 from ysl-28/master
ysl-28 Apr 9, 2023
79ee1b4
Add a new test to try and find the elusive remove bug
ArtemiszenN Apr 9, 2023
ab25e06
add category to the test
ArtemiszenN Apr 9, 2023
0e03bf9
Merge pull request #246 from ArtemiszenN/newMaster
ArtemiszenN Apr 9, 2023
40ec11f
Harden csv for rare bug
ArtemiszenN Apr 9, 2023
a60722f
-Slight edits to user guide, fix category for edit command
ngkaiwen123 Apr 9, 2023
6b3606a
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 9, 2023
55f5549
change ppp file name for artemis to match github name
ArtemiszenN Apr 9, 2023
1e26485
Merge pull request #247 from ArtemiszenN/newMaster
ArtemiszenN Apr 9, 2023
2684a74
Merge pull request #248 from ngkaiwen123/master
ngkaiwen123 Apr 9, 2023
c643eb6
Merge branch 'master' into master
firwer Apr 9, 2023
ff12415
fix: checkstyle
firwer Apr 9, 2023
01e231c
Merge pull request #242 from firwer/master
firwer Apr 9, 2023
294e64d
style thingies
ArtemiszenN Apr 9, 2023
572c8bf
Merge remote-tracking branch 'upstream/master' into newMaster
ArtemiszenN Apr 9, 2023
80f74c0
-DG Fix
ngkaiwen123 Apr 9, 2023
a738c4b
no message
ArtemiszenN Apr 9, 2023
2549cc2
Edit parser conditions to check for empty string
ysl-28 Apr 9, 2023
a3681de
Modify uml diagrams for remove and category
Ng-YZ Apr 9, 2023
d1cccdd
Add line of code to UML diagrams to follow format on website
Ng-YZ Apr 9, 2023
f9ed3af
Anchor links are now working
ngkaiwen123 Apr 9, 2023
877c5b7
Merge pull request #253 from ngkaiwen123/master
ngkaiwen123 Apr 9, 2023
f9b365e
Add line of code and titles to rest of UML to standardise
Ng-YZ Apr 9, 2023
312fc73
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
Ng-YZ Apr 9, 2023
beb95e1
Forgot to add line of code to overall sd oops
Ng-YZ Apr 9, 2023
3ebc729
Update RemoveAlert uml 'coz opt block was misplaced :(
Ng-YZ Apr 9, 2023
d42e3ea
Add maximum qty value of 99999999 to Types
ysl-28 Apr 9, 2023
fb7a265
Updated PPP
Ng-YZ Apr 9, 2023
91ccced
Standardise case of parameters in UG
ysl-28 Apr 9, 2023
4346faf
Missed a few other stuff, modified.
Ng-YZ Apr 9, 2023
e01fa16
Fix one typo
Ng-YZ Apr 9, 2023
43c8bbe
Edit UG with extremely minor standardisation
ysl-28 Apr 9, 2023
7b306f6
Edit UG with extremely minor standardisation
ysl-28 Apr 9, 2023
8c816f9
Resolve merge conflict
ysl-28 Apr 9, 2023
43c9323
Merge pull request #255 from Ng-YZ/master
Ng-YZ Apr 9, 2023
a5bf775
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 9, 2023
0867bbf
Update sequence diagrams for ListCommand and AlertParser
ysl-28 Apr 9, 2023
a6b138c
Update images for sequence diagrams
ysl-28 Apr 9, 2023
ec772d6
Merge remote-tracking branch 'upstream/master' into newMaster
ArtemiszenN Apr 9, 2023
b83197e
Merge pull request #252 from ArtemiszenN/newMaster
ArtemiszenN Apr 9, 2023
a0ed0d2
changed potential incorrect output for edit command, developer guide …
ngkaiwen123 Apr 9, 2023
f9b24b1
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 9, 2023
1284ce8
-More additions to DG Manual Testing Section. All that is left is ale…
ngkaiwen123 Apr 9, 2023
eac1109
Edits to Filter section of manual testing.
ngkaiwen123 Apr 9, 2023
e456b0d
Merge pull request #258 from ngkaiwen123/master
ngkaiwen123 Apr 9, 2023
6eb3520
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 10, 2023
55caf62
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
Ng-YZ Apr 10, 2023
cfa09e2
DG: add manual testing cases for alert, history and filter category
Ng-YZ Apr 10, 2023
4e3842a
-DG,PPP Edits
ngkaiwen123 Apr 10, 2023
df9c09a
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 10, 2023
8ddb64b
Merge pull request #260 from Ng-YZ/master
Ng-YZ Apr 10, 2023
1f2698b
Merge branch 'master' into master
Ng-YZ Apr 10, 2023
55d6c04
Update PPP
Ng-YZ Apr 10, 2023
d19f37a
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
Ng-YZ Apr 10, 2023
e0bb644
Update alert UML diagrams
ysl-28 Apr 10, 2023
505c0b2
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 10, 2023
be067b1
Merge pull request #256 from ysl-28/master
ysl-28 Apr 10, 2023
63c2487
Merge pull request #259 from ngkaiwen123/master
ngkaiwen123 Apr 10, 2023
34171d3
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
Ng-YZ Apr 10, 2023
7faa64c
Update About us
Ng-YZ Apr 10, 2023
fa6d67e
Merge pull request #261 from Ng-YZ/master
Ng-YZ Apr 10, 2023
fde0855
-More formatting fix to DG, ensure that website shows correct formatt…
ngkaiwen123 Apr 10, 2023
c12ea35
About Us edit
ngkaiwen123 Apr 10, 2023
debdd84
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 10, 2023
c4ffb59
no message
ngkaiwen123 Apr 10, 2023
c1ce9db
Merge branch 'master' of https://github.com/ngkaiwen123/tp
ngkaiwen123 Apr 10, 2023
ba28dc0
price / qty can now be 0 in save file
ArtemiszenN Apr 10, 2023
f06daea
Merge pull request #262 from ngkaiwen123/master
ngkaiwen123 Apr 10, 2023
2abe49d
Merge pull request #263 from ArtemiszenN/newMaster
ArtemiszenN Apr 10, 2023
18c7b97
page break dg
ArtemiszenN Apr 10, 2023
23554f0
Merge pull request #264 from ArtemiszenN/newMaster
ArtemiszenN Apr 10, 2023
0927fc8
-Added UG QnA section
ngkaiwen123 Apr 10, 2023
c0b2f2f
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 10, 2023
b95c88d
filter lowercase
ArtemiszenN Apr 10, 2023
4a7b7c9
Merge pull request #266 from ArtemiszenN/newMaster
ArtemiszenN Apr 10, 2023
1c8d070
Merge pull request #265 from ngkaiwen123/master
ngkaiwen123 Apr 10, 2023
4bd1e1a
Update CategoryFormatException.java
Ng-YZ Apr 10, 2023
8fac566
Update HistoryErrorException.java
Ng-YZ Apr 10, 2023
c4db0fc
Update MissingParametersException.java
Ng-YZ Apr 10, 2023
da80b05
Update SearchFilterErrorException.java
Ng-YZ Apr 10, 2023
60307a8
-Fix to Cat
ngkaiwen123 Apr 10, 2023
3c1a9fd
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 10, 2023
45327cd
Merge pull request #268 from ngkaiwen123/master
ngkaiwen123 Apr 10, 2023
67a4115
Update MissingParametersException.java
Ng-YZ Apr 10, 2023
84e7004
Merge pull request #267 from Ng-YZ/master
ysl-28 Apr 10, 2023
bcccb06
Update EditCommand.java
Ng-YZ Apr 10, 2023
1d12b33
Merge branch 'master' into master
Ng-YZ Apr 10, 2023
0c81920
Integrate alert with storage
ArtemiszenN Apr 10, 2023
041d229
Update CategoryCommand.java
Ng-YZ Apr 10, 2023
f4d45f9
Fix corrupt/empty alert file message
ArtemiszenN Apr 10, 2023
ab4e7bd
Update EditCommand.java
Ng-YZ Apr 10, 2023
5601200
fix typo in edit warning
ArtemiszenN Apr 10, 2023
6a3b8f6
Merge pull request #275 from ArtemiszenN/newMaster
ArtemiszenN Apr 10, 2023
dc895a7
Merge pull request #274 from Ng-YZ/master
ysl-28 Apr 10, 2023
0c88260
add add and alert sample formats
ArtemiszenN Apr 10, 2023
76ff073
small new line fix
ArtemiszenN Apr 10, 2023
f73ceb0
fix test
ArtemiszenN Apr 10, 2023
64444ae
Merge pull request #277 from ArtemiszenN/newMaster
ArtemiszenN Apr 10, 2023
e947791
DG: Edit UML diagram
Ng-YZ Apr 10, 2023
cd4a605
Update PPP
ngkaiwen123 Apr 10, 2023
36fc343
Merge branch 'master' of https://github.com/ngkaiwen123/tp
ngkaiwen123 Apr 10, 2023
c21a10e
Merge pull request #278 from Ng-YZ/master
Ng-YZ Apr 10, 2023
dc906cf
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
ngkaiwen123 Apr 10, 2023
e6feee6
Sync db storage status with actual status
ArtemiszenN Apr 10, 2023
6c449d4
Merge pull request #279 from ngkaiwen123/master
ngkaiwen123 Apr 10, 2023
9ff8e4c
DG Spacing
firwer Apr 10, 2023
648d7d8
Merge branch 'master' of https://github.com/firwer/tp
firwer Apr 10, 2023
048c4b6
Merge pull request #280 from ArtemiszenN/newMaster
ArtemiszenN Apr 10, 2023
069d133
DG update
firwer Apr 10, 2023
41e2a24
Merge branch 'AY2223S2-CS2113-W12-3:master' into master
firwer Apr 10, 2023
a65c090
PPP addon
firwer Apr 10, 2023
35052c6
PPP edit 2.0
firwer Apr 10, 2023
ed82c65
Merge pull request #281 from firwer/master
firwer Apr 10, 2023
6f1a77b
docs add profile pic
firwer Apr 10, 2023
4a0927f
Merge pull request #282 from firwer/master
firwer Apr 10, 2023
20a976e
Update PPP
ysl-28 Apr 10, 2023
7460a4c
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 10, 2023
7c51e04
Merge pull request #283 from ysl-28/master
ysl-28 Apr 10, 2023
44803da
Update PPP
ysl-28 Apr 10, 2023
1a24d73
Update PPP
ysl-28 Apr 10, 2023
13537e1
Fix checkstyle and javadoc
ysl-28 Apr 10, 2023
d3783ed
Merge branch 'master' of https://github.com/AY2223S2-CS2113-W12-3/tp
ysl-28 Apr 10, 2023
6105262
Merge pull request #284 from ysl-28/master
ysl-28 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ src/main/resources/docs/
*.iml
bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
data/InventoryData.csv
data/AlertData.csv
17 changes: 17 additions & 0 deletions .gitignore.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# IDEA files
/.idea/
/out/
/*.iml

# Gradle build files
/.gradle/
/build/
src/main/resources/docs/

# MacOS custom attributes files created by Finder
.DS_Store
*.iml
bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ test {
}

application {
mainClass = "seedu.duke.Duke"
mainClass = "seedu.duke.MagusStock"
}

shadowJar {
archiveBaseName = "duke"
archiveBaseName = "magusstock"
archiveClassifier = null
}

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

run{
standardInput = System.in
}
enableAssertions = true
assert 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) | Yong Shan Ling | [Github](https://github.com/ysl-28) | [Portfolio](team/shanling.md) |
| ![](https://via.placeholder.com/100.png?text=Photo) | Yan Zhen | [Github](https://github.com/Ng-YZ) | [Portfolio](team/yanzhen.md) |
| ![](https://avatars.githubusercontent.com/u/88386677?s=400&v=4) | Ng Kai Wen | [Github](https://github.com/ngkaiwen123) | [Portfolio](team/ngkaiwen.md) |
| ![](https://via.placeholder.com/100.png?text=Photo) | Poh Wei Pin | [Github](https://github.com/firwer) | [Portfolio](team/pohwp.md) |
| ![](https://avatars.githubusercontent.com/u/24601679?s=400&u=4ff44cf4bbd34ac299fd550ce267a884df4043a7&v=4) | Artemis Ngoh | [Github](https://github.com/ArtemiszenN) | [Portfolio](team/artemis.md) |
Binary file added docs/ArchitectureDiagram.png

Choose a reason for hiding this comment

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

This architecture diagram is clear and easy to understand!

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
426 changes: 419 additions & 7 deletions docs/DeveloperGuide.md

Large diffs are not rendered by default.

23 changes: 19 additions & 4 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
# Duke

{Give product intro here}
![Magnus Stock Logo](logo.jpg)

MagusStock is a Java command-line interface (CLI) application designed for inventory management. With MagusStock, you can perform CRUD operations on inventory items, generate history reports, and read/write inventory data in CSV format.

## Features

- Inventory management with CSV read/write
- CRUD operations
- History reports

## Documentation

For more information on how to use MagusStock, please refer to the following documents:

Useful links:
* [User Guide](UserGuide.md)
* [Developer Guide](DeveloperGuide.md)
* [About Us](AboutUs.md)

## About Us

We are a team of CS2113 developers dedicated to creating high-quality software. For more information on our team and our projects, please refer to the [About Us](AboutUs.md) document.

---
Binary file added docs/SequenceDiagram.png

Choose a reason for hiding this comment

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

A clear diagram here! I have a small question, why after the user calls the run function in MagusStock the MagusStock still call the run function to itself?

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions docs/SequenceDiagram.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

@startuml
title MagusStock Class

actor User
participant MagusStock
participant Ui
participant SessionManager
participant Inventory
participant ParserHandler
User -> MagusStock: run()
activate MagusStock
MagusStock -> Ui: greetUser()
activate Ui
Ui --> MagusStock:
deactivate Ui
MagusStock -> SessionManager: getSession()
activate SessionManager
SessionManager --> MagusStock:
deactivate SessionManager
MagusStock -> SessionManager: getSessionAlerts()
activate SessionManager
SessionManager --> MagusStock:
deactivate SessionManager
MagusStock -> Inventory: setAlertList()
activate Inventory
Inventory --> MagusStock:
deactivate Inventory
MagusStock -> ParserHandler: <<create>>
activate ParserHandler
ParserHandler --> MagusStock:
deactivate ParserHandler
MagusStock -> MagusStock: run()
MagusStock -> ParserHandler: run()
activate ParserHandler
ParserHandler --> MagusStock:
deactivate ParserHandler


@enduml
Binary file added docs/UML/Add/AddCommand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions docs/UML/Add/AddCommand.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@

@startuml
title AddCommand Class

participant AddParser
participant AddCommand
AddParser -> AddCommand: run()

activate AddCommand
AddCommand -> Command:Command(inventory)
activate Command
Command -->AddCommand:
deactivate Command
participant Inventory
participant Ui
AddCommand -> AddCommand: addItem()
alt upcCodes.containsKey(item.getUpc())
AddCommand -> Ui: printDuplicateAdd()
activate Ui
Ui -->AddCommand:
deactivate Ui
else
ref over AddCommand,Inventory:Store Item's UPC code into upcCodes
ref over AddCommand,Inventory:Store Item into itemInventory
AddCommand -> Ui: printSuccessAdd()
activate Ui
Ui -->AddCommand:
deactivate Ui
participant Trie
loop iterate all item name in itemNames
AddCommand -> Trie:add(itemName)
activate Trie
Trie --> AddCommand:
deactivate Trie
end
participant SessionManager
participant Storage
opt SessionManager.getAutoSave()
AddCommand ->SessionManager:writeSession(inventory)
activate SessionManager
SessionManager->Storage:writeCSV(inventory)
activate Storage
Storage -->SessionManager:
deactivate Storage
SessionManager -->AddCommand:
deactivate SessionManager
end
end
AddCommand --> AddParser:
destroy AddCommand


@enduml
Binary file added docs/UML/Add/AddParser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions docs/UML/Add/AddParser.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

@startuml
title AddParser Class

participant ParserHandler
participant AddParser
ParserHandler -> AddParser: run()

activate AddParser
participant Ui
opt rawInput == null
AddParser -> MissingParametersException:throw missingAddItemParameters

end

opt !matcher.matches
AddParser -> Ui:printInvalidAddCommand()
Ui --> User:
end
AddParser -> Item: Item()
activate Item
Item -->AddParser:
deactivate Item

AddParser -> AddCommand: AddCommand(inventory, newItem)
activate AddCommand
AddCommand -->AddParser:
deactivate AddCommand

AddParser -> AddCommand: run()
activate AddCommand

AddCommand -> Command:Command(inventory)
activate Command
Command -->AddCommand:
deactivate Command

AddCommand -->AddParser:
deactivate AddCommand

AddParser -> Command: run()
activate Command
Command -->AddParser:
deactivate Command

AddParser --> ParserHandler:
destroy AddParser
@enduml
Binary file added docs/UML/Alert/AlertParser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions docs/UML/Alert/AlertParser.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
@startuml
'https://plantuml.com/sequence-diagram

actor User
User -> AlertParser

group sd [AddAlertCommand running]
alt first word of input == "add"
AlertParser -> AddAlertCommand: run()
activate AddAlertCommand
participant AddAlertCommand
AddAlertCommand -> AddAlertCommand: run()
end
alt first word of input == "remove"
AlertParser -> RemoveAlertCommand: run()
activate RemoveAlertCommand
RemoveAlertCommand -> RemoveAlertCommand: run()
end
participant SessionManager
participant Storage
opt SessionManager.getAutoSave()
AddAlertCommand ->SessionManager:writeSession(alertList)
activate SessionManager
SessionManager->Storage:writeCSV(alertList)
activate Storage
Storage --> SessionManager:
deactivate Storage
SessionManager -->AddAlertCommand:
deactivate SessionManager
destroy AddAlertCommand
destroy RemoveAlertCommand
end



@enduml
Binary file added docs/UML/Alert/AlertStep1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions docs/UML/Alert/AlertStep1.puml
Copy link

Choose a reason for hiding this comment

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

need to replace the square with -

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@startuml
'https://plantuml.com/object-diagram

object AlertParser{
- rawInput = "add upc/012341 min/50"
- Inventory = inventory
}

@enduml
Binary file added docs/UML/Alert/AlertStep3Add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions docs/UML/Alert/AlertStep3Add.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@startuml
'https://plantuml.com/object-diagram

object AlertParser{
- rawInput = "add upc/012341 min/50"
- Inventory = inventory
}

object AddAlertCommand {
- Inventory = inventory
- Alert = newAlert
- AlertList = inventory.getAlertList()
}

AlertParser -> AddAlertCommand

@enduml
Binary file added docs/UML/Alert/AlertStep3Remove.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions docs/UML/Alert/AlertStep3Remove.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@startuml
'https://plantuml.com/object-diagram

object AlertParser{
- rawInput = "add upc/012341 min/50"
- Inventory = inventory
}

object RemoveAlertCommand {
- Inventory = inventory
- Alert = newAlert
- AlertList = inventory.getAlertList()
}

AlertParser -> RemoveAlertCommand
@enduml
Binary file added docs/UML/Category/CategoryParser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions docs/UML/Category/CategoryParser.puml
Copy link

Choose a reason for hiding this comment

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

The diagram is a bit hard to read. Perhaps you can omit some of the details

Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
@startuml
'https://plantuml.com/sequence-diagram


actor User
User -> CategoryParser**
activate CategoryParser
User -> CategoryParser: run()
alt categoryCommandType is not 'list'
else categoryCommandType is not 'table'
else categoryCommandType length is 0
ref over CategoryParser
Handle input error
end ref
CategoryParser --> User
else rawInput is valid

CategoryParser -> CategoryCommand**
activate CategoryCommand
CategoryParser -> CategoryCommand: run()
activate CategoryCommand #cyan
ref over CategoryCommand
retrieve categoryHash from inventory and process rawInput
end ref
participant Ui
alt rawInput equals 'list'
CategoryCommand --> CategoryCommand: listAllCategories()
CategoryCommand --> Ui: printCategoryList(categoryHash)
activate Ui
ref over Ui
print list of categories
end ref
return
else rawInput equals 'table'
CategoryCommand --> CategoryCommand: listCategoriesAndItems()
alt categoryHash is empty
CategoryCommand --> CategoryCommand: null
else categoryHash is not empty
CategoryCommand --> Ui : printCategory(categoryHash)
activate Ui
ref over Ui
print all categories and its items
end ref
return
end
else find category from rawInput
CategoryCommand --> CategoryCommand: findCategory(rawInput)
alt categoryHash contains category
CategoryCommand --> Ui : printCategory(filteredCategoryHash)
activate Ui
ref over Ui
print all categories and its items
end ref
return
else
CategoryCommand --> CategoryCommand: error
end
end
return
end
return
destroy CategoryCommand
return
destroy CategoryParser
@enduml
Binary file added docs/UML/Filter/FilterPrice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading