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

[CS2103-W14-2] Inventory Manager #31

Open
wants to merge 480 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
480 commits
Select commit Hold shift + click to select a range
9a0af29
Merge pull request #104 from AY1920S2-CS2103-W14-2/Branch-Update-Dele…
LiuChao93 Mar 31, 2020
271ab60
Merge branch 'master' into branch-update-edit-s-function
LiuChao93 Mar 31, 2020
d264b14
Update Design
FangShaoHua94 Mar 31, 2020
fa78c54
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
LiuChao93 Mar 31, 2020
2f82548
Merge pull request #100 from AY1920S2-CS2103-W14-2/branch-update-edit…
LiuChao93 Mar 31, 2020
38de903
Merge branch 'master' into jiada/feature/implement-deletegoodcommand
PangJiaDa Mar 31, 2020
d414bab
Merge branch 'master' into shaohua/docs/DG
NicholasCF Mar 31, 2020
79fc7da
Merge branch 'jiada/feature/implement-deletegoodcommand' of https://g…
PangJiaDa Mar 31, 2020
2f6fb64
Add Data encryption under Implementation
FangShaoHua94 Mar 31, 2020
6347626
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/mai…
FangShaoHua94 Mar 31, 2020
2d46ffb
Merge branch 'shaohua/docs/DG' of https://github.com/AY1920S2-CS2103-…
FangShaoHua94 Mar 31, 2020
61952f8
Merge branch 'master' into jiada/feature/enhance-sellcommand
PangJiaDa Mar 31, 2020
e52379c
Merge pull request #106 from AY1920S2-CS2103-W14-2/jiada/feature/impl…
PangJiaDa Mar 31, 2020
e34d9ce
Editted DG for edit-s and delete-s functions
LiuChao93 Mar 31, 2020
9ace3ee
Merge branch 'master' into jiada/feature/enhance-sellcommand
PangJiaDa Mar 31, 2020
74709ec
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
LiuChao93 Mar 31, 2020
809cd9d
Merge branch 'master' into Branch-Update-DG
LiuChao93 Mar 31, 2020
6620fcb
Update formatting
LiuChao93 Mar 31, 2020
345935b
Merge pull request #103 from AY1920S2-CS2103-W14-2/jiada/feature/enha…
FangShaoHua94 Mar 31, 2020
269178d
Merge branch 'master' into Branch-Update-DG
LiuChao93 Mar 31, 2020
d61d580
Merge branch 'master' into shaohua/docs/DG
NicholasCF Mar 31, 2020
6e73441
Merge pull request #110 from AY1920S2-CS2103-W14-2/Branch-Update-DG
LiuChao93 Mar 31, 2020
e460f38
Jiada/feature/enhance buycommand (#102)
PangJiaDa Mar 31, 2020
3307451
Add use case for undo and redo (#111)
NicholasCF Apr 2, 2020
f6f4009
Merge branch 'master' into shaohua/docs/DG
NicholasCF Apr 2, 2020
727a2f2
Shaohua/docs/dg (#109)
FangShaoHua94 Apr 2, 2020
20b6612
Add user guide for undo and redo commands (#116)
NicholasCF Apr 2, 2020
4aa74fe
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
LiuChao93 Apr 2, 2020
889ffb0
Update UserGuide
FangShaoHua94 Apr 2, 2020
ed505be
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 2, 2020
de33f9a
Update PUML diagrams
FangShaoHua94 Apr 2, 2020
e3a5cb2
Update UG
LiuChao93 Apr 2, 2020
75ca542
Merge pull request #120 from AY1920S2-CS2103-W14-2/Branch-LC-Update-UG
LiuChao93 Apr 2, 2020
6bab2d4
Update PUML diagrams for models
FangShaoHua94 Apr 2, 2020
c5a1e14
Update model section
FangShaoHua94 Apr 2, 2020
acd945b
Update model section
FangShaoHua94 Apr 2, 2020
306eabd
Merge branch 'documentation' into shaohua/docs/DG
FangShaoHua94 Apr 2, 2020
6eb1ea5
Merge pull request #122 from AY1920S2-CS2103-W14-2/shaohua/docs/DG
FangShaoHua94 Apr 2, 2020
2985fd6
Update UG sections on buy and sell command for PE dry run.
PangJiaDa Apr 2, 2020
e6a41be
List overrides in Version explicitly
NicholasCF Apr 3, 2020
873f77c
Add FindTransactionCommand
FangShaoHua94 Apr 3, 2020
3fec9b6
Add listing transaction history command
FangShaoHua94 Apr 3, 2020
c4f11aa
Fix bug on null pointer error
FangShaoHua94 Apr 3, 2020
85b6a0e
Add more defensive checks
FangShaoHua94 Apr 3, 2020
7b8ebab
Merge pull request #124 from AY1920S2-CS2103-W14-2/documentation
FangShaoHua94 Apr 3, 2020
b5ea002
Add list transaction test
FangShaoHua94 Apr 3, 2020
30fd3c5
Add transaction predicate test
FangShaoHua94 Apr 3, 2020
35a8162
Add find transaction command test
FangShaoHua94 Apr 4, 2020
4da85ff
Resolve checkstyle error
FangShaoHua94 Apr 4, 2020
281aa14
Add FindTransactionCommandParser test
FangShaoHua94 Apr 4, 2020
ec70e48
Refine code quality
FangShaoHua94 Apr 5, 2020
ee439e4
Merge pull request #126 from AY1920S2-CS2103-W14-2/Add-Transaction-Li…
PangJiaDa Apr 5, 2020
c79ad02
Fix delete-s for undo (#127)
LiuChao93 Apr 6, 2020
eae6d93
Add Copyable interface
NicholasCF Apr 7, 2020
89d8569
Add class for versioning using linear list
NicholasCF Apr 7, 2020
008a068
Implement Copyable in AddressBook
NicholasCF Apr 7, 2020
8e26d9b
Merge branch 'master' into nicholas/refactor/models
NicholasCF Apr 7, 2020
1b16636
Refactor VersionedAddressBook to mostly delegate
NicholasCF Apr 7, 2020
6a6865a
Implement Copyable in Inventory
NicholasCF Apr 7, 2020
038661c
Refactor VersionedInventory to mostly delegate
NicholasCF Apr 7, 2020
7842ac4
Implement Copyable in TransactionHistory
NicholasCF Apr 7, 2020
501490e
Refactor VersionedTransactionHistory to mostly delegate
NicholasCF Apr 7, 2020
58b3316
Update javadoc
NicholasCF Apr 7, 2020
a4c6b1c
Fix resetData method
NicholasCF Apr 7, 2020
12c0e40
Shorten constructor of versioned databases
NicholasCF Apr 7, 2020
1d23593
Move classes to new package
NicholasCF Apr 7, 2020
513ce4e
Fix checkstyle violations
NicholasCF Apr 7, 2020
7b6508f
Rename some fields
NicholasCF Apr 8, 2020
dce4c2f
Add assertions
NicholasCF Apr 8, 2020
55fc358
Change contact number tag from p/ to c/
NicholasCF Apr 8, 2020
8855ba5
Remove commands from summary that are missing from features list
NicholasCF Apr 8, 2020
d632cf8
Fix wrong command to set threshold in summary
NicholasCF Apr 8, 2020
b3a37c6
Mark source command as to be implemented
NicholasCF Apr 8, 2020
c4ac57f
Fix warn command format in summary
NicholasCF Apr 8, 2020
b4c6ff0
Update summary for buy command
NicholasCF Apr 8, 2020
d9ce19c
Remove friend tag in add supplier example
NicholasCF Apr 8, 2020
39dd025
Add tips for opening file in Mac OS
NicholasCF Apr 8, 2020
4a2f4cc
Add specification for multiple parameter values
NicholasCF Apr 8, 2020
24db562
Merge pull request #146 from AY1920S2-CS2103-W14-2/nicholas/docs/fix-…
FangShaoHua94 Apr 8, 2020
389aacf
Fix more user guide bugs for v1.3 (#147)
NicholasCF Apr 8, 2020
ec8c207
Change log messages to say Inventory Manager
NicholasCF Apr 8, 2020
40f1139
Change application version number in log
NicholasCF Apr 8, 2020
ca7b7ec
Update build.gradle
NicholasCF Apr 8, 2020
2954463
Fix help URL
NicholasCF Apr 8, 2020
3b4c159
Change window title
NicholasCF Apr 8, 2020
5be6f08
Change app logo
NicholasCF Apr 8, 2020
671ced2
Merge pull request #129 from AY1920S2-CS2103-W14-2/nicholas/refactor/…
FangShaoHua94 Apr 8, 2020
d72d307
Fix name that be fully number (#149)
FangShaoHua94 Apr 8, 2020
0efd917
Merge pull request #150 from AY1920S2-CS2103-W14-2/nicholas/fix/appli…
FangShaoHua94 Apr 8, 2020
3d51b7d
Update UG
FangShaoHua94 Apr 8, 2020
3449de8
Refactor naming of AddressBookParser to InventoryManagerParser
FangShaoHua94 Apr 8, 2020
c053f57
Update DG
FangShaoHua94 Apr 8, 2020
a03fd5f
Merge remote-tracking branch 'origin/documentation' into shaohua/docs/DG
FangShaoHua94 Apr 8, 2020
addfbc3
Merge pull request #151 from AY1920S2-CS2103-W14-2/Refactor_Address_Book
FangShaoHua94 Apr 8, 2020
0ea88c7
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 8, 2020
0c46b3e
Merge branch 'documentation' into shaohua/docs/DG
FangShaoHua94 Apr 8, 2020
2af3155
Refactor buy command to purchase from supplier at displayed index.
PangJiaDa Apr 8, 2020
d26b431
Merge branch 'master' into documentation
NicholasCF Apr 9, 2020
2336426
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 9, 2020
e0ad4e9
Merge remote-tracking branch 'origin/documentation' into shaohua/docs/DG
FangShaoHua94 Apr 9, 2020
95635c4
Refactor inventory.hasGood to use GoodName instead of Good.
PangJiaDa Apr 9, 2020
f9a219a
Fix MainWindow.fxml indentation
NicholasCF Apr 9, 2020
14b1a90
Enhance buy command to create transaction history entry.
PangJiaDa Apr 9, 2020
9f3c910
Ensure app grows vertically to fill in whitespace
NicholasCF Apr 9, 2020
829afb0
Update buy command error message.
PangJiaDa Apr 9, 2020
051b495
Rename project portfolio page file name for Nicholas(#156)
NicholasCF Apr 9, 2020
3c837ae
Reverse using GoodName to check existence of good in inventory.
PangJiaDa Apr 9, 2020
0058e9c
Fix breaking buy command tests.
PangJiaDa Apr 9, 2020
871c896
Merge pull request #155 from AY1920S2-CS2103-W14-2/nicholas/fix/ui-wh…
FangShaoHua94 Apr 9, 2020
0ae11be
Refactor Sell command and Good constructors.
PangJiaDa Apr 9, 2020
0e3e5d1
Fix breaking BuyCommandTest and BuyCommandParserTest tests.
PangJiaDa Apr 9, 2020
fc616d4
Fix breaking SellCommandParserTest tests
PangJiaDa Apr 9, 2020
58c5f4c
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 9, 2020
705edd8
Merge branch 'documentation' into shaohua/docs/DG
FangShaoHua94 Apr 9, 2020
28e26a8
Include find supplier according to goods. (#153)
LiuChao93 Apr 9, 2020
9c55853
Fix errors in the UML diagrams
FangShaoHua94 Apr 9, 2020
e5b113c
Fix breaking SellCommandTest tests
PangJiaDa Apr 9, 2020
71cf231
Extract ModelStub into new file to reduce code duplicate.
PangJiaDa Apr 9, 2020
1109216
Fix minor grammar mistake
NicholasCF Apr 9, 2020
662b5e8
Update Sellcommand usage message
PangJiaDa Apr 9, 2020
e95c03f
Shaohua/docs/dg (#152)
FangShaoHua94 Apr 9, 2020
cf04cb6
Fix checkstyle errors.
PangJiaDa Apr 9, 2020
26c11fd
Merge branch 'master' into refactor-buy-sell-command
PangJiaDa Apr 9, 2020
5616a33
Update InventoryManager version in developer guide
NicholasCF Apr 9, 2020
8122394
Update the introduction to undo and redo feature
NicholasCF Apr 9, 2020
91ab812
Merge pull request #161 from AY1920S2-CS2103-W14-2/refactor-buy-sell-…
FangShaoHua94 Apr 9, 2020
b34ad5a
Update plant uml styling
NicholasCF Apr 9, 2020
0505d26
Add class diagram for version
NicholasCF Apr 9, 2020
286dc64
Add class diagram for LinearHistory
NicholasCF Apr 10, 2020
7e16001
Update undo sequence diagram
NicholasCF Apr 10, 2020
349faee
Correct the delete supplier command
LiuChao93 Apr 10, 2020
90fa45b
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 10, 2020
58a39eb
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 10, 2020
f6585b7
Update step 1 of undo usage scenario
NicholasCF Apr 10, 2020
717d4e1
Update 2nd step of undo usage scenario
NicholasCF Apr 10, 2020
551c2e0
Update step 3 of undo usage scenario
NicholasCF Apr 10, 2020
3d5b582
Update step 4 of undo usage scenario
NicholasCF Apr 11, 2020
268fa2c
Update notes in undo-redo feature
NicholasCF Apr 11, 2020
35af09d
Update step 5 of undo usage scenario
NicholasCF Apr 11, 2020
3749b75
Update step 6 of undo usage scenario
NicholasCF Apr 11, 2020
d761cf5
Update design considerations of undo redo feature
NicholasCF Apr 11, 2020
8f0f674
Fix checkstyle violations
NicholasCF Apr 11, 2020
ee907a0
Edited delete gp command test and parser test
LiuChao93 Apr 11, 2020
5546e8e
Correct CheckStyle
LiuChao93 Apr 11, 2020
a97b048
Correct check style
LiuChao93 Apr 11, 2020
da4630c
Update FindTransactionActivityDiagram with sequence and activity diag…
FangShaoHua94 Apr 11, 2020
dc81494
Update degisn consideration for find transaction in DG
FangShaoHua94 Apr 11, 2020
e81c373
Update shaohua PPP
FangShaoHua94 Apr 11, 2020
9306182
Update SetThreshold for DG
FangShaoHua94 Apr 11, 2020
b728926
Merge pull request #163 from AY1920S2-CS2103-W14-2/nicholas/docs/upda…
FangShaoHua94 Apr 11, 2020
15537fe
Update Edit Supplier Test (#162)
LiuChao93 Apr 11, 2020
f38ef1d
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 11, 2020
2a0962f
Merge branch 'documentation' into shaohua/docs/DG
FangShaoHua94 Apr 11, 2020
b238875
Correct coding style
LiuChao93 Apr 11, 2020
b1e1247
Merge pull request #164 from AY1920S2-CS2103-W14-2/Branch-LC-Correct-…
LiuChao93 Apr 11, 2020
be45240
Update PPP on contribution to UG and DG
FangShaoHua94 Apr 12, 2020
136a774
Fix EOF error
FangShaoHua94 Apr 12, 2020
a3affa3
Fix sell command message bug (#166)
PangJiaDa Apr 12, 2020
4ac8a7a
Fix style error
FangShaoHua94 Apr 12, 2020
cf2d030
Write DG buy command section.
PangJiaDa Apr 12, 2020
3fc2c02
Update model class diagram (#168)
NicholasCF Apr 12, 2020
06a5513
Prevent versioned databases from exposing their database
NicholasCF Apr 12, 2020
d9bd500
Write DG sell command section.
PangJiaDa Apr 12, 2020
d5dfaee
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
PangJiaDa Apr 12, 2020
cb2c8e6
Update DG BuySequenceDiagram.
PangJiaDa Apr 12, 2020
06f1aff
Make method inline to avoid confusion
NicholasCF Apr 12, 2020
a8f071e
Make call to superclass explicit for versioned classes to avoid confu…
NicholasCF Apr 12, 2020
7ee8775
Fix javadoc to remove inner implementation details
NicholasCF Apr 12, 2020
b7f5a1c
Fix checkstyle violation
NicholasCF Apr 12, 2020
be554c0
Add javadoc for empty constructors
NicholasCF Apr 12, 2020
bc57a2f
Touch up on Supplier part
LiuChao93 Apr 12, 2020
b48b526
Update DG proposed Auto expire feature.
PangJiaDa Apr 12, 2020
5847552
Update UG buy and sell command format.
PangJiaDa Apr 12, 2020
65933cc
Update PPP.
PangJiaDa Apr 12, 2020
db91525
Update PPP.
PangJiaDa Apr 12, 2020
87a0a8a
Update PPP.
PangJiaDa Apr 12, 2020
9392e8e
Merge pull request #154 from AY1920S2-CS2103-W14-2/documentation
PangJiaDa Apr 12, 2020
bda7834
Update PPP.
PangJiaDa Apr 12, 2020
86ead9b
Update model class diagram (#172)
NicholasCF Apr 13, 2020
8ff97f5
Remove Github Pages header related to SE-Edu (#173)
NicholasCF Apr 13, 2020
95b0581
Re-add missing documentation pages (#174)
NicholasCF Apr 13, 2020
8bf0400
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 13, 2020
0734c60
Merge pull request #169 from AY1920S2-CS2103-W14-2/nicholas/fix/add-d…
FangShaoHua94 Apr 13, 2020
ece48df
Merge branch with documentation
FangShaoHua94 Apr 13, 2020
89e1033
Merge pull request #165 from AY1920S2-CS2103-W14-2/shaohua/docs/DG
FangShaoHua94 Apr 13, 2020
2290d01
Merge pull request #170 from AY1920S2-CS2103-W14-2/Branch-LC-Supplier…
FangShaoHua94 Apr 13, 2020
617925d
Update DG
LiuChao93 Apr 13, 2020
ae2f785
Add testing guide for undo and redo
NicholasCF Apr 13, 2020
c46f5c8
Clean up other testing guides
NicholasCF Apr 13, 2020
1a52c65
Merge pull request #177 from AY1920S2-CS2103-W14-2/nicholas/docs/add-…
FangShaoHua94 Apr 13, 2020
c0214af
Merge pull request #176 from AY1920S2-CS2103-W14-2/Branch-LC-UpdateDG
FangShaoHua94 Apr 13, 2020
ff8d948
Updated UG
LiuChao93 Apr 13, 2020
6e69d08
Update test guide
FangShaoHua94 Apr 13, 2020
35cfc8b
Delete data encryption
FangShaoHua94 Apr 13, 2020
5682e78
Merge pull request #179 from AY1920S2-CS2103-W14-2/shaohua/docs/DG
FangShaoHua94 Apr 13, 2020
16a87a2
Update undo redo diagrams (#180)
NicholasCF Apr 13, 2020
1f3ef16
Merge branch 'master' into documentation
FangShaoHua94 Apr 13, 2020
d7240c7
Fix typos.
PangJiaDa Apr 13, 2020
095453a
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
PangJiaDa Apr 13, 2020
74091d8
Merge branch 'documentation' into Branch-LC-UpdateUG-Now
LiuChao93 Apr 13, 2020
29937ca
Merge pull request #175 from AY1920S2-CS2103-W14-2/documentation
LiuChao93 Apr 13, 2020
1e78eb5
Merge pull request #182 from AY1920S2-CS2103-W14-2/Branch-LC-UpdateUG…
LiuChao93 Apr 13, 2020
54a5bcd
Update undo redo feature (#181)
NicholasCF Apr 13, 2020
7ab78f5
Resolve sequence diagram too small
FangShaoHua94 Apr 13, 2020
e52961e
Update common classes term that refer to ab3
FangShaoHua94 Apr 13, 2020
b1be94a
Update author for DG features.
FangShaoHua94 Apr 13, 2020
e75749f
Update keyword for find-t command in UG
FangShaoHua94 Apr 13, 2020
b82707f
Merge pull request #184 from AY1920S2-CS2103-W14-2/shaohua/docs/DG
FangShaoHua94 Apr 13, 2020
2c9cf26
UpdateUG
LiuChao93 Apr 13, 2020
a3d83ad
Update undo redo user guide (#183)
NicholasCF Apr 13, 2020
89dba0a
Merge pull request #185 from AY1920S2-CS2103-W14-2/Branch-LC-UpdateUG…
LiuChao93 Apr 13, 2020
be5142c
Fix PlantUML guide file name (#187)
NicholasCF Apr 13, 2020
3e45211
Update DeveloperGuide.adoc
NicholasCF Apr 13, 2020
76e70b3
Update UG.
PangJiaDa Apr 13, 2020
0d47b0e
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
PangJiaDa Apr 13, 2020
ca69189
Documentation (#186)
FangShaoHua94 Apr 13, 2020
3e47fcd
Update DG
LiuChao93 Apr 13, 2020
53827b1
Demarcate the documentation contributions
NicholasCF Apr 13, 2020
6f55bb2
Merge pull request #188 from AY1920S2-CS2103-W14-2/Branch-LC-UpdateDG
LiuChao93 Apr 13, 2020
ec2eaf5
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 13, 2020
18fe412
Merge pull request #189 from AY1920S2-CS2103-W14-2/shaohua/docs/DG
FangShaoHua94 Apr 13, 2020
e32a3b8
Update UG
LiuChao93 Apr 13, 2020
65d1740
Merge pull request #190 from AY1920S2-CS2103-W14-2/Branch-LC-Update-U…
LiuChao93 Apr 13, 2020
ba9744b
Update documentation.
PangJiaDa Apr 13, 2020
51dc16c
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
PangJiaDa Apr 13, 2020
9bbb4b7
Update documentation.
PangJiaDa Apr 13, 2020
380157c
Add effort section (#191)
NicholasCF Apr 13, 2020
1be8598
UpdateDG
LiuChao93 Apr 13, 2020
4af5225
Add project portfolio page for Nicholas (#192)
NicholasCF Apr 13, 2020
5f5fad6
Merge pull request #193 from AY1920S2-CS2103-W14-2/Branch-LC-Update-D…
LiuChao93 Apr 13, 2020
1183b4c
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 13, 2020
42fe56f
Merge remote-tracking branch 'origin/documentation' into shaohua/docs/DG
FangShaoHua94 Apr 13, 2020
415beb5
Update PPP.
PangJiaDa Apr 13, 2020
f0f04ac
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
PangJiaDa Apr 13, 2020
67a6277
Update effort section (#194)
NicholasCF Apr 13, 2020
e2bda27
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Apr 13, 2020
06861a9
Merge pull request #196 from AY1920S2-CS2103-W14-2/documentation
PangJiaDa Apr 13, 2020
8fcecba
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/mai…
FangShaoHua94 Apr 13, 2020
885510a
Update error in UG
FangShaoHua94 Apr 13, 2020
e02fb99
Remove non-existent list-g command (#197)
NicholasCF Apr 13, 2020
74b7561
Merge pull request #198 from AY1920S2-CS2103-W14-2/shaohua/docs/DG
FangShaoHua94 Apr 13, 2020
762bac3
Fix user guide errors (#199)
NicholasCF Apr 13, 2020
1a9c1b0
Update documentation (#200)
NicholasCF Apr 13, 2020
b0686dc
Fix asciidoc violations
NicholasCF Apr 13, 2020
bb6d5b2
Merge pull request #201 from AY1920S2-CS2103-W14-2/nicholas/hotfix/as…
FangShaoHua94 Apr 13, 2020
782583f
Update PPP
LiuChao93 Apr 13, 2020
3ba2b09
Merge branch 'documentation' into Branch-LC-PPP
LiuChao93 Apr 13, 2020
8409550
Merge pull request #202 from AY1920S2-CS2103-W14-2/Branch-LC-PPP
LiuChao93 Apr 13, 2020
183b6fa
Merge branch 'master' into documentation
LiuChao93 Apr 13, 2020
2268c8b
Merge pull request #203 from AY1920S2-CS2103-W14-2/documentation
PangJiaDa Apr 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ src/main/resources/docs/
# IDEA files
/.idea/
/out/
/*.iml
**/*.iml

# Storage/log files
/data/
Expand All @@ -19,3 +19,8 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

# Custom Windows / Shell scripts
*.bat


Empty file modified LICENSE
100644 → 100755
Empty file.
23 changes: 14 additions & 9 deletions README.adoc
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
= Address Book (Level 3)
= Inventory Manager
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://travis-ci.org/AY1920S2-CS2103-W14-2/main[image:https://travis-ci.org/AY1920S2-CS2103-W14-2/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/CS2103-W14-2/main[image:https://ci.appveyor.com/api/projects/status/rlr0xji2vhij1016?svg=true[Build status]]
https://coveralls.io/github/AY1920S2-CS2103-W14-2/main?branch=master[image:https://coveralls.io/repos/github/AY1920S2-CS2103-W14-2/main/badge.svg?branch=master[Coverage Status]]


ifdef::env-github[]
Expand All @@ -15,15 +14,20 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* This is a desktop Inventory Manager application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It facilitates easily management of stocks, which includes:
** warning when supplies are
low
** easy sourcing of suppliers for selected goods
** expiry management
** seamless updating of inventory upon procurement and sales transactions
* This application is optimized for fast-typists. If you are comfortable with the keyboard,
Inventory Manager will be a joy to use!

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

Expand All @@ -32,5 +36,6 @@ endif::[]
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* This project is an extension of AddressBook-Level3 project codebase created by https://se-education.org[SE-EDU initiative]

== Licence : link:LICENSE[MIT]
Empty file modified _config.yml
100644 → 100755
Empty file.
Empty file modified appveyor.yml
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'inventorymanager.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,8 +133,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-name': 'InventoryManager',
'site-githuburl': 'https://github.com/AY1920S2-CS2103-W14-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
Empty file modified config/checkstyle/checkstyle.xml
100644 → 100755
Empty file.
Empty file modified config/checkstyle/suppressions.xml
100644 → 100755
Empty file.
5 changes: 2 additions & 3 deletions copyright.txt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob

Copyright by Susumu Yoshida - http://www.mcdodesign.com/
- address_book_32.png
- AddressApp.ico
Copyright by Iconfactory - https://iconfactory.com/
- inventory_manager_32.png

Copyright by Jan Jan Kovařík - http://glyphicons.com/
- calendar.png
Expand Down
45 changes: 17 additions & 28 deletions docs/AboutUs.adoc
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,42 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Nicholas Cristian Fernando
image::nicholascf.png[width="150", align="left"]
{empty}[https://github.com/NicholasCF[github]] [<<nicholascf#, portfolio>>]

Role: Project Advisor

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Suppliers

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Pang Jia Da
image::pangjiada.png[width="150", align="left"]
{empty}[https://github.com/PangJiaDa[github]] [<<pangjiada#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Transactions

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Fang Shao Hua
image::fangshaohua94.png[width="150", align="left"]
{empty}[https://github.com/FangShaoHua94[github]] [<<fangshaohua94#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Inventory

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Liu Chao
image::liuchao93.png[width="150", align="left"]
{empty}[https://github.com/LiuChao93[github]] [<<liuchao93#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Suppliers

'''
8 changes: 6 additions & 2 deletions docs/ContactUs.adoc
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103-W14-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at
** `[email protected]`
** `[email protected]`
** `[email protected]`
** `[email protected]`
10 changes: 3 additions & 7 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= InventoryManager - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand All @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S2-CS2103-W14-2/main/tree/master

== Build Automation

Expand All @@ -26,10 +26,6 @@ We use https://travis-ci.org/[Travis CI] and https://www.appveyor.com/[AppVeyor]

We use https://coveralls.io/[Coveralls] to track the code coverage of our projects. See <<UsingCoveralls#, UsingCoveralls.adoc>> for more details.

== Documentation Previews

When a pull request has changes to asciidoc files, you can use https://www.netlify.com/[Netlify] to see a preview of how the HTML version of those asciidoc files will look like when the pull request is merged. See <<UsingNetlify#, UsingNetlify.adoc>> for more details.

== Making a Release

Here are the steps to create a new release.
Expand All @@ -41,7 +37,7 @@ Here are the steps to create a new release.

== Managing Dependencies

A project often depends on third-party libraries. For example, Address Book depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
A project often depends on third-party libraries. For example, InventoryManager depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:

[loweralpha]
. Include those libraries in the repo (this bloats the repo size)
Expand Down
Loading