Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
314 commits
Select commit Hold shift + click to select a range
0cb5799
Update JsonAdaptedOffer to match Offer
Mar 15, 2020
9e38c82
Change offers storage in JsonAdaptedPerson
Mar 15, 2020
b52d549
Update SampleDataUtil.java
Mar 15, 2020
b8ed356
Change Offer storage in PersonBuilder
Mar 15, 2020
f52cf20
Update test for Offer
Mar 15, 2020
7490f23
Change access modifier of splitOnLastWhitespace
Mar 15, 2020
522f23b
Change prefix for Tag to prefix for Offer
Mar 15, 2020
c48e659
Update edit command to use list of offers
Mar 15, 2020
6bb2a3c
Update parseTags method name to parseOffers
Mar 15, 2020
81e5cde
Update PersonUtil strings and storage for Offer
Mar 15, 2020
73a2b3e
Move getGoodPricePair parser method
Mar 15, 2020
0bc5258
Update storage of Offer in EditPersonDescription
Mar 15, 2020
1cf4d4c
Change Offer storage implementation in AddCommandParser
Mar 15, 2020
48b0628
Add Good class (#58)
FangShaoHua94 Mar 16, 2020
20d08ac
Merge and resolve conflicts
PangJiaDa Mar 16, 2020
714c76a
Incorporate Offer in UI
Mar 16, 2020
7ee8655
Fix bug in parsing offers
Mar 16, 2020
aa53bef
Update dummy Good class to truly accept any string
Mar 16, 2020
8b18dbb
Update JSON file to reflect offers instead of tags
Mar 16, 2020
c912d1d
Fix bug where only good is stored as JSON for offers
Mar 16, 2020
f69c888
Replace constants related to Tag to Offer equivalents
Mar 16, 2020
2e2e120
Replace tests for Tag with tests for Offer
Mar 16, 2020
f6c5ae9
Enhance BuyCommand to accept and echo parameters
PangJiaDa Mar 16, 2020
c1e5ef7
Remove references to Tag class
Mar 16, 2020
be381c5
Change Offer to be stored as Set
Mar 16, 2020
3fcb691
Add inventory (#63)
FangShaoHua94 Mar 17, 2020
fe646bf
Fix checkstyle violations for all main classes except Good
Mar 17, 2020
9eafa70
Add EOF newline in liuchao.adoc
Mar 17, 2020
08a9b90
Fix checkstyle violation for test classes
Mar 17, 2020
7815585
Merge with branch master
Mar 17, 2020
515264a
Merge pull request #62 from AY1920S2-CS2103-W14-2/create-profile-page…
FangShaoHua94 Mar 17, 2020
2d8a9c0
Merge pull request #65 from AY1920S2-CS2103-W14-2/nicholas/hotfix/fix…
FangShaoHua94 Mar 17, 2020
87ade6b
Link Offer to GoodName instead of Good
Mar 17, 2020
bba04ab
Merge branch 'master' into nicholas/feature/offer
Mar 17, 2020
f5e8206
Fix checkstyle violations in test classes
Mar 17, 2020
74ef068
Fix checkstyle violations in Good class
Mar 17, 2020
41407b5
Add GoodName testing in Offer tests
Mar 17, 2020
8299c86
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
PangJiaDa Mar 17, 2020
18ebd35
Merge branch 'master' into buy-command
PangJiaDa Mar 17, 2020
c1f80d0
Update field type in JsonAdaptedOffer
Mar 17, 2020
957ddb3
Add tests for JsonAdaptedOffer
Mar 17, 2020
2d6fd5f
Fix checkstyle violations
Mar 17, 2020
b9d6598
Fix bug in splitOnLastWhitespace
Mar 17, 2020
56797e3
implement buy command
PangJiaDa Mar 17, 2020
525c704
Add requireNonNull to parser methods
Mar 17, 2020
5a1c17c
Merge pull request #66 from AY1920S2-CS2103-W14-2/nicholas/feature/offer
FangShaoHua94 Mar 17, 2020
9516989
refactor BuyCommandParser and remove unecessary buy fields for v1.2 demo
PangJiaDa Mar 17, 2020
d2b3c7f
add BuyCommandParserTest test cases
PangJiaDa Mar 17, 2020
421bbec
fix checkstyle issues
PangJiaDa Mar 17, 2020
db8e8e8
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
PangJiaDa Mar 17, 2020
2b70581
resolve merge conflicts
PangJiaDa Mar 17, 2020
6f500c2
Add simplified Buy command (#67)
PangJiaDa Mar 17, 2020
e46db64
Resolve merge conflicts
PangJiaDa Mar 17, 2020
fb13b61
Implemented Sell command (#68)
PangJiaDa Mar 17, 2020
5942fe0
add supplier
LiuChao93 Mar 19, 2020
6b3c1d2
Refactor ReadOnlyInventory and ReadOnlyAddressBook into ReadOnlyList
NicholasCF Mar 20, 2020
ee13561
Fix checkstyle violations on main classes
NicholasCF Mar 20, 2020
39ed972
Fix checkstyle violations in test classes
NicholasCF Mar 20, 2020
7262bbf
Update data encryption under feature section
FangShaoHua94 Mar 24, 2020
80771a3
add listing all suppliers list-s
LiuChao93 Mar 24, 2020
1cb0765
Add ability to edit prices of goods
LiuChao93 Mar 24, 2020
fe8ab2c
add ability to delete a supplier
LiuChao93 Mar 24, 2020
4b49051
add ability to clear supplier list
LiuChao93 Mar 24, 2020
bc89288
add ability to locate suppliers by name
LiuChao93 Mar 24, 2020
e4ccf3a
Update Find supplier command
LiuChao93 Mar 24, 2020
3ff499d
update list supplier command
LiuChao93 Mar 24, 2020
a754098
improve on coding style
LiuChao93 Mar 24, 2020
3007f92
correct code according to checkstyle
LiuChao93 Mar 24, 2020
2d37b01
correct code in accordance to checkstyle
LiuChao93 Mar 24, 2020
a63ab6b
correct test case for delete supplier
LiuChao93 Mar 24, 2020
e837292
Merge pull request #71 from AY1920S2-CS2103-W14-2/branch-add-supplier
LiuChao93 Mar 24, 2020
d2e0001
Update undo section of developer guide (#89)
NicholasCF Mar 24, 2020
f260f72
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
PangJiaDa Mar 25, 2020
c85d032
Update DG
FangShaoHua94 Mar 25, 2020
f1456bd
Resolve merge conflicts with master
NicholasCF Mar 25, 2020
4b1530b
Update developer guide
LiuChao93 Mar 26, 2020
12785f5
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-2/main
PangJiaDa Mar 26, 2020
0790d96
Updated readme and developer guide
PangJiaDa Mar 26, 2020
9bc761b
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
PangJiaDa Mar 26, 2020
f3eb3cc
"Resolve merge conflicts"
PangJiaDa Mar 26, 2020
6fc9bca
Update GoodNameTest.java
PangJiaDa Mar 26, 2020
e4fab52
Update CommandTestUtil.java
PangJiaDa Mar 26, 2020
a02953c
Update GoodName.java
PangJiaDa Mar 26, 2020
8834f1d
Merge pull request #91 from AY1920S2-CS2103-W14-2/documentation
PangJiaDa Mar 26, 2020
82f0173
Add VersionedInventory and VersionedAddressBook
NicholasCF Mar 26, 2020
9993d1c
Update ModelStub
NicholasCF Mar 26, 2020
9867295
Add tests for undo and commit in model
NicholasCF Mar 26, 2020
eeac85e
Update test cases for versioned databases
NicholasCF Mar 27, 2020
4ca7ca7
Implement undo and commit in the model
NicholasCF Mar 27, 2020
05e3801
Add UndoCommand skeleton
NicholasCF Mar 27, 2020
892e96f
Add error message for undo
NicholasCF Mar 27, 2020
54d815d
Add success message for UndoCommand
NicholasCF Mar 27, 2020
7e920c3
Add tests for UndoCommand
NicholasCF Mar 27, 2020
e2c4c28
Add test for parsing UndoCommand
NicholasCF Mar 27, 2020
765db69
Add parsing for UndoCommand
NicholasCF Mar 27, 2020
2005e1b
Add new StateNotFoundException for undo methods
NicholasCF Mar 27, 2020
6ff6b8b
Update undo tests to use StateNotFoundException
NicholasCF Mar 27, 2020
e1009f1
Add stricter equality tests for testing versioned databases
NicholasCF Mar 27, 2020
d59eb28
Fix undo method
NicholasCF Mar 27, 2020
b9d2097
Add stricter equality testing for undo test in ModelManager
NicholasCF Mar 27, 2020
a7bd651
Add more test case to ModelManagerTest
NicholasCF Mar 27, 2020
0059a61
Update FilteredList during undo
NicholasCF Mar 27, 2020
ca6d5d2
Implement UndoCommand
NicholasCF Mar 27, 2020
c6b11e1
Add tests to ensure modifying commands call commit on Model
NicholasCF Mar 27, 2020
a7a1cf3
Add commit calls to modifying commands
NicholasCF Mar 27, 2020
7b01d33
Add transaction and transaction History (#83)
FangShaoHua94 Mar 29, 2020
4ebaf91
Merge from branch master
NicholasCF Mar 29, 2020
4646ea9
Add tests for VersionedTransactionHistory
NicholasCF Mar 29, 2020
1493849
Add VersionedTransactionHistory
NicholasCF Mar 29, 2020
c5e8f6c
Update ModelManagerTest
NicholasCF Mar 29, 2020
b215612
Use VersionedTransactionHistory in ModelManager
NicholasCF Mar 29, 2020
b55e80a
Make fields in versioned databases private
NicholasCF Mar 29, 2020
c2d17d1
Fix checkstyle errors on main java files
NicholasCF Mar 29, 2020
ef8ffff
Implement BuyCommandTest (#94)
PangJiaDa Mar 29, 2020
dbda94d
Fix checkstyle errors in test java files
NicholasCF Mar 29, 2020
05cdc0b
Implement SellCommandTest (#95)
PangJiaDa Mar 29, 2020
ea1d5c0
Merge branch 'master' into nicholas/feature/undo
NicholasCF Mar 29, 2020
b044ea5
Fix references to obsolete ReadOnly classes
NicholasCF Mar 29, 2020
143942f
Add commit tests for buy and sell commands
NicholasCF Mar 29, 2020
30fa335
Change javadoc divider for database classes
NicholasCF Mar 29, 2020
cefe274
Change test name for tests
NicholasCF Mar 29, 2020
a68ac76
Merge pull request #96 from AY1920S2-CS2103-W14-2/nicholas/feature/undo
PangJiaDa Mar 29, 2020
052bb30
Update assertCommandFailure to consider all databases
NicholasCF Mar 30, 2020
97cf560
Enable equality check between versioned and normal TransactionHistory
NicholasCF Mar 30, 2020
1e79c25
Merge pull request #99 from AY1920S2-CS2103-W14-2/nicholas/hotfix/ass…
FangShaoHua94 Mar 30, 2020
2a5ed2c
Add threshold warning to good (#97)
FangShaoHua94 Mar 30, 2020
2f72341
Update the edit-s function to enable editing good price pair
LiuChao93 Mar 30, 2020
c29c0bb
Merge branch 'branch-update-edit-s-function'
LiuChao93 Mar 30, 2020
b7ec64e
change supplierToEditOffer from public to private
LiuChao93 Mar 30, 2020
e12cfe2
Correct formatting
LiuChao93 Mar 30, 2020
67a241c
correct code formatting for checkstyle
LiuChao93 Mar 30, 2020
f343eb8
correct formating
LiuChao93 Mar 30, 2020
e17cec2
correct static variable order
LiuChao93 Mar 30, 2020
8f45fff
correct formatting
LiuChao93 Mar 30, 2020
88056c7
Commented away the test cases as the test cases will be updated later
LiuChao93 Mar 30, 2020
e7ed935
update formatting
LiuChao93 Mar 30, 2020
f8c149f
correct formatting
LiuChao93 Mar 30, 2020
319c40b
edit formatting
LiuChao93 Mar 30, 2020
9ccd107
correct formatting
LiuChao93 Mar 30, 2020
c3b4eba
correct formatting
LiuChao93 Mar 30, 2020
0de2dda
Enhance sell command to require selling price per unit sold
PangJiaDa Mar 31, 2020
1036fe4
Fix breaking sell command tests and checkstyle errors.
PangJiaDa Mar 31, 2020
ce4792a
Rename DeleteCommandParser to DeleteSupplierCommandParser
PangJiaDa Mar 31, 2020
7cb1b16
Create DeleteGoodCommand
PangJiaDa Mar 31, 2020
74120e3
Create DeleteGoodCommandParser
PangJiaDa Mar 31, 2020
4eb4b26
Hook DeleteGoodCommand into AddressBookParser
PangJiaDa Mar 31, 2020
54aad59
Implement DeleteSupplierCommandParserTest tests
PangJiaDa Mar 31, 2020
49c2eb0
added function to delete each good price pair in the supplier's list
LiuChao93 Mar 31, 2020
0e56cd7
correct formatting for checkstyle
LiuChao93 Mar 31, 2020
1aac7b2
Correct formatting for checkstyle
LiuChao93 Mar 31, 2020
3177c8d
Add DeleteGoodCommandTest tests.
PangJiaDa Mar 31, 2020
3d0bcb2
Update test case
LiuChao93 Mar 31, 2020
6e95c6c
Merge branch 'master' into branch-update-edit-s-function
LiuChao93 Mar 31, 2020
d04ae0a
Add index for github-pages redirection and stylesheet
NicholasCF Mar 31, 2020
3d9f0bc
Fix checkstyle errors
PangJiaDa Mar 31, 2020
b965f80
Merge pull request #108 from AY1920S2-CS2103-W14-2/nicholas/hotfix/gi…
PangJiaDa Mar 31, 2020
5d09217
Implement requested changes.
PangJiaDa Mar 31, 2020
e4adea1
Fix checkstyle errors
PangJiaDa Mar 31, 2020
06ff14d
Merge branch 'master' into jiada/feature/implement-deletegoodcommand
PangJiaDa Mar 31, 2020
dc184a6
Merge branch 'master' into branch-update-edit-s-function
LiuChao93 Mar 31, 2020
e885167
Merge branch 'master' into jiada/feature/enhance-sellcommand
NicholasCF Mar 31, 2020
6561b2d
Merge branch 'documentation' of https://github.com/AY1920S2-CS2103-W1…
FangShaoHua94 Mar 31, 2020
c5fcbc9
Implement redo (#98)
NicholasCF Mar 31, 2020
5bdd8ca
correct formatting
LiuChao93 Mar 31, 2020
e346904
Merge branch 'master' into Branch-Update-Delete-s
LiuChao93 Mar 31, 2020
8a8e9f9
Merge branch 'master' into branch-update-edit-s-function
NicholasCF Mar 31, 2020
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
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
3449de8
Refactor naming of AddressBookParser to InventoryManagerParser
FangShaoHua94 Apr 8, 2020
addfbc3
Merge pull request #151 from AY1920S2-CS2103-W14-2/Refactor_Address_Book
FangShaoHua94 Apr 8, 2020
34bb066
Included find supplier according to goods.
LiuChao93 Apr 8, 2020
e547e71
Correct Test Case
LiuChao93 Apr 9, 2020
b10a0dd
Add test cases for GoodSupplierPairContainsKeywordsPredicate
LiuChao93 Apr 9, 2020
b9df763
Correct test case for GoodSupplierPairContainsKeywordsPredicateTest
LiuChao93 Apr 9, 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.
22 changes: 14 additions & 8 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,9 +14,15 @@ 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

Expand All @@ -32,5 +37,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]] [<<nicholascristianfernando#, 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]] [<<liuchao#, 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]`
48 changes: 0 additions & 48 deletions docs/DevOps.adoc

This file was deleted.

Loading