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

[W12-4] FrozenBook #35

Open
wants to merge 574 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
574 commits
Select commit Hold shift + click to select a range
80b2eae
ImportDrinkCommand: added, linked to model
bluein-green Oct 30, 2018
21db1bf
ImportDrinkCommand and Parser added
bluein-green Oct 30, 2018
4ed307d
Add javadoc comments
bluein-green Oct 30, 2018
0c6d001
ImportDrinkCommandParser: edited variable names
bluein-green Oct 30, 2018
9c7eaf8
Analysis, AnalysisManager: added
bluein-green Oct 30, 2018
dfcdb26
Replaced DummySearchPage with an incomplete Drink page
Lunastryke Oct 30, 2018
26cefd7
Fixed Import and Sell commands to be more LoD compliant + show transa…
bluein-green Oct 30, 2018
3425f4a
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Oct 30, 2018
f40e7af
Misc things to fix nullPointerException
Lunastryke Oct 30, 2018
fec6215
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Oct 30, 2018
5af37c9
Edited updateBatchTransaction to take in Quantity object instead
Lunastryke Oct 30, 2018
f55b441
Added newline at EOF
Lunastryke Oct 30, 2018
d314058
Merge pull request #90 from Lunastryke/master
Lunastryke Oct 30, 2018
81a87ba
AnalyseCosts command and functionality added
bluein-green Oct 30, 2018
8a699b4
loginInfoManager EOF
bluein-green Oct 30, 2018
7c03ed2
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
bluein-green Oct 30, 2018
e2a7f4f
use new Logic classes
bluein-green Oct 30, 2018
696134f
fixed for checkstyle
bluein-green Oct 30, 2018
ac4d1c2
WIP: drink card
bluein-green Oct 30, 2018
dd21201
edited for checkstyle
bluein-green Oct 30, 2018
3c91ff6
edited MainWindow and DrinkCard
bluein-green Oct 30, 2018
96ca004
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
bluein-green Oct 30, 2018
444e4e7
fixed EOF checkstyle for loginInfoManager
bluein-green Oct 30, 2018
35439e8
fixed checkstyle for tests
bluein-green Oct 30, 2018
12bcb99
DeveloperGuide.adoc: Fixed formatting errors
Lunastryke Oct 30, 2018
1974c8a
Fixed TransactionTypeTest due to update on TransactionType toString()
bluein-green Oct 30, 2018
3d6e14e
fixed typo
bluein-green Oct 30, 2018
1849adb
Merge pull request #86 from bluein-green/uiMorph
bluein-green Oct 30, 2018
82d19c7
Merge branch 'master' into transactionV1
bluein-green Oct 30, 2018
dcb0f7d
Merge pull request #57 from bluein-green/transactionV1
bluein-green Oct 30, 2018
5fd434c
UserGuide: added transactions section
bluein-green Oct 30, 2018
5dbde40
UserGuide: fixed formatting
bluein-green Oct 30, 2018
abe060c
UserGuide: fixed formatting
bluein-green Oct 30, 2018
4cc0fac
UserGuide: fixed formatting
bluein-green Oct 30, 2018
94912ac
UserGuide: fixed formatting
bluein-green Oct 30, 2018
588103d
UserGuide: fix formatting
bluein-green Oct 30, 2018
5734b01
UserGuide: edited formatting, add view costs
bluein-green Oct 30, 2018
30c3fa0
UserGuide: edit for checkstyle
bluein-green Oct 30, 2018
cdb1824
Merge pull request #93 from bluein-green/updateUG
bluein-green Oct 30, 2018
80f79d4
MainApp: edit version
bluein-green Oct 30, 2018
64bbcdc
UserGuide.adoc: Edited contents
Lunastryke Oct 30, 2018
b579beb
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Oct 31, 2018
c09a6a4
Formatting
Lunastryke Oct 31, 2018
f7fd2ea
UserGuide.adoc: Changed formatting
Lunastryke Oct 31, 2018
6e84c08
Merge pull request #94 from Lunastryke/documentation
Lunastryke Oct 31, 2018
67ffb88
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/main
bluein-green Oct 31, 2018
f3f8ca9
Fix a bug that cause multiple instance of event after logout login (#91)
LIU-TIANHANG Oct 31, 2018
0baad22
UG: updated preface about roles
bluein-green Oct 31, 2018
f3d84ab
Commented out some parts
bluein-green Oct 31, 2018
692298e
UG: added viewTrans
bluein-green Oct 31, 2018
1de63fe
UG: added comming in v1.4 tags
bluein-green Oct 31, 2018
a7b64d9
UG: AddDrink command part added
bluein-green Oct 31, 2018
3c68639
Merge pull request #97 from bluein-green/updateUGDG
bluein-green Oct 31, 2018
015aa6a
change command into their respective command (#98)
LIU-TIANHANG Nov 1, 2018
1dcd70d
ListCommand.java: Changed success message
Lunastryke Nov 1, 2018
2b77aca
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 1, 2018
4ac6261
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 1, 2018
d4f84f5
update on ppp, ug, dg (#99)
LIU-TIANHANG Nov 1, 2018
c752e78
Revert "Merge branch 'master' of https://github.com/CS2113-AY1819S1-W…
Lunastryke Nov 1, 2018
79d5be7
update ppp bug (#100)
LIU-TIANHANG Nov 1, 2018
b70fead
update on ppp (#101)
LIU-TIANHANG Nov 1, 2018
84b8e4e
Revert "Revert "Merge branch 'master' of https://github.com/CS2113-AY…
Lunastryke Nov 1, 2018
9b4cd41
BrowserPanel.java: Fixed bug that prevented browser panel from loadin…
Lunastryke Nov 1, 2018
733cf9c
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 1, 2018
54be241
ppp updates on bug (#102)
LIU-TIANHANG Nov 1, 2018
1ef8021
BrowserPanel.java: Checkstyle
Lunastryke Nov 1, 2018
7f28b9f
Merge pull request #103 from Lunastryke/master
Lunastryke Nov 1, 2018
e99c0d9
update on bottom status bar, confirmation message and import to "buy"…
LIU-TIANHANG Nov 1, 2018
8f353e3
change Help window html file from /docs to /help (#106)
LIU-TIANHANG Nov 1, 2018
14bf787
To add DrinkTest
bluein-green Nov 1, 2018
c0cbec4
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
bluein-green Nov 1, 2018
1521ccb
Testing temporary fix for browser panel
Lunastryke Nov 1, 2018
22855de
SellDrinkCommand: Added Exception Handling
Lunastryke Nov 1, 2018
63a098b
Checkstyle
Lunastryke Nov 1, 2018
e2eb953
UniqueBatchList.java: Commented out failing test due to changing beha…
Lunastryke Nov 2, 2018
f66a159
Unused imports removed
Lunastryke Nov 2, 2018
897a537
Merge pull request #107 from Lunastryke/master
Lunastryke Nov 2, 2018
619f7c0
Testing FXML page
Lunastryke Nov 2, 2018
8a6df6f
Updated changes @bluein-green made to user guide
Lunastryke Nov 2, 2018
e34f922
Add new line at EOF
Lunastryke Nov 2, 2018
6303cfd
Merge pull request #111 from Lunastryke/master
Lunastryke Nov 2, 2018
673783a
Changed app description bar name
Lunastryke Nov 2, 2018
faab3d5
last minute check (#110)
LIU-TIANHANG Nov 3, 2018
fd6067d
new stuff?
bluein-green Nov 4, 2018
ec40a7d
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
bluein-green Nov 4, 2018
6266359
DrinkBuilder added
bluein-green Nov 4, 2018
b244815
TypicalDrinks and drinktestutil added
bluein-green Nov 4, 2018
a6d4036
edited Drink equals() method to account for new attributes
bluein-green Nov 4, 2018
b83a8fd
DrinkTest, CommandTestUtil, TypicalDrinks updated to test drinks
bluein-green Nov 4, 2018
cec1bf9
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 4, 2018
42632c9
Merge branch 'documentation'
Lunastryke Nov 4, 2018
d783e81
Name and Price tests added
bluein-green Nov 4, 2018
0ec1c3e
Edited Price to ensure values are less than Float.MAX_VALUE, edited P…
bluein-green Nov 4, 2018
495c20c
edited tests names and comments for checkstyle
bluein-green Nov 4, 2018
7374726
Price.java: edited isValidPrice to ensure that values are less than F…
bluein-green Nov 4, 2018
4d6d6ad
loginInfoManager.json: EOF for checkstyle
bluein-green Nov 4, 2018
0fda6fc
Merge pull request #138 from bluein-green/testDrinkAttributes
bluein-green Nov 4, 2018
b3943b2
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 4, 2018
d0477b2
changed all IMPORT -> BUY or PURCHASE
bluein-green Nov 4, 2018
6ce8ac9
Fixed addDrink -> add in UG
bluein-green Nov 4, 2018
c45e909
fix command example Sell -> sell in UG, fixes #124
bluein-green Nov 4, 2018
ac6a62e
edited formatting of UG, loginInfoManager EOF
bluein-green Nov 4, 2018
74acfc9
updated tests to use PURCHASE instead of IMPORT
bluein-green Nov 4, 2018
b66a84e
UniqueBatchList.java: Made changes to resolve negative quantity issue
Lunastryke Nov 4, 2018
cfcc175
Merge pull request #141 from Lunastryke/master
Lunastryke Nov 4, 2018
1c6bbf8
Merge pull request #140 from bluein-green/fixAddBugs
bluein-green Nov 4, 2018
95c28ad
Added more variables to the browser panel.
Lunastryke Nov 4, 2018
796c95a
Checkstyle
Lunastryke Nov 4, 2018
250d031
Merge pull request #142 from Lunastryke/master
Lunastryke Nov 4, 2018
2a897a5
Fixed faulty html page
Lunastryke Nov 4, 2018
d6128dc
Merge pull request #143 from Lunastryke/master
Lunastryke Nov 4, 2018
1f8b361
DummySearchPage: Updated html formatting
Lunastryke Nov 4, 2018
3b08a97
BatchId.java: Autofills BatchId if not specified
Lunastryke Nov 4, 2018
856d8bf
Fixed BatchId bug
Lunastryke Nov 4, 2018
6c77f12
Added labels to the drink card
Lunastryke Nov 4, 2018
2d03f0f
Checkstyle
Lunastryke Nov 4, 2018
798b60d
Merge pull request #145 from Lunastryke/master
Lunastryke Nov 5, 2018
64c33de
Added additional tab at right side of UI to show batches
Lunastryke Nov 5, 2018
144f8e3
Added Exception handling for new tab display when there are no batche…
Lunastryke Nov 5, 2018
af7f0c4
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 5, 2018
4eff66a
Checkstyle
Lunastryke Nov 5, 2018
4931d73
Merge pull request #148 from Lunastryke/master
Lunastryke Nov 5, 2018
e318932
Drink attributes tests (#146) and refactor increase/decrease quantity
bluein-green Nov 6, 2018
2ed7dc8
UG fix #134 (#149)
bluein-green Nov 6, 2018
39babc3
Converting html drink display page to fxml
Lunastryke Nov 6, 2018
3c8123c
Added exception handling for when batch list has no items
Lunastryke Nov 6, 2018
adbdbc7
Checkstyle....
Lunastryke Nov 6, 2018
31879fb
More test added and make code follow some principles
LIU-TIANHANG Nov 6, 2018
c652279
Removed old code and edited css.
Lunastryke Nov 6, 2018
0ce4957
Prevents drink detail from showing up when there are no drinks
Lunastryke Nov 6, 2018
25ba57a
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 6, 2018
c48a3ec
Merge pull request #151 from Lunastryke/master
Lunastryke Nov 6, 2018
43baadb
CSS Changes
Lunastryke Nov 6, 2018
d1b1594
Changed order of displayed attributes
Lunastryke Nov 6, 2018
2f6511c
Acc command (#154)
LIU-TIANHANG Nov 6, 2018
d035715
Fixed bug which quantity was not updating instantly after buy & sell …
Lunastryke Nov 6, 2018
23c0a36
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 6, 2018
289af93
Checkstyle
Lunastryke Nov 6, 2018
96693d6
Merge pull request #155 from Lunastryke/master
Lunastryke Nov 6, 2018
adaa82b
Changed names of images to lowercase
Lunastryke Nov 8, 2018
536345e
Merge pull request #158 from Lunastryke/master
Lunastryke Nov 8, 2018
118b511
Updated guide with pictures of new UI
Lunastryke Nov 8, 2018
34d2224
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 8, 2018
8f1d242
change to ppp (#159)
LIU-TIANHANG Nov 9, 2018
7deccb8
fix a issue about us pic not showing (#161)
LIU-TIANHANG Nov 9, 2018
366c02c
Circumvented batch list not updating
Lunastryke Nov 9, 2018
720b7b6
Merge branch 'master' into master
Lunastryke Nov 9, 2018
527e939
Merge pull request #160 from Lunastryke/master
Lunastryke Nov 9, 2018
f5da13b
Enhancing the search function
Lunastryke Nov 10, 2018
aeb55e8
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 10, 2018
d5b86bd
Added functionality to find drinks with dates earlier than specified …
Lunastryke Nov 10, 2018
e4d8728
Added handling for when multiple prefixes are entered.
Lunastryke Nov 10, 2018
45f2dae
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 10, 2018
cbc17a5
Changed documentation for command
Lunastryke Nov 10, 2018
06fc1c9
Checkstyle
Lunastryke Nov 10, 2018
f71b439
Merge pull request #162 from Lunastryke/master
Lunastryke Nov 10, 2018
0b93549
Morphing of storage and cleaning up of addressBook storage code
Lunastryke Nov 10, 2018
f6913f7
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 10, 2018
65b3f2e
housekeeping for SRP (#163)
LIU-TIANHANG Nov 10, 2018
e5e5765
Fixing merge conflicts
Lunastryke Nov 10, 2018
33b5cf1
Merge branch 'master' into master
LIU-TIANHANG Nov 10, 2018
37730e5
Finance Analysis (Revenue, Profit, Cost) (#150)
bluein-green Nov 10, 2018
e6c4da0
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 10, 2018
582e1e8
Handling merge conflict
Lunastryke Nov 10, 2018
23809d2
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 10, 2018
6c4e252
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 10, 2018
e7d7d82
Checkstyle
Lunastryke Nov 10, 2018
ca033c6
[WIP] Edit prices command (#166)
bluein-green Nov 10, 2018
af01868
Added test (#167)
LIU-TIANHANG Nov 10, 2018
63fd1c2
Added Batch List storage. Removed lingering references to addressbook…
Lunastryke Nov 10, 2018
e580ede
Checkstyle
Lunastryke Nov 10, 2018
dcd099a
Checkstyle again
Lunastryke Nov 10, 2018
8bef724
Merge pull request #164 from Lunastryke/master
Lunastryke Nov 10, 2018
5e08ff8
Fix for Batch List not removing empty batches properly
Lunastryke Nov 10, 2018
cf15be5
Clarification on uniquenees of names
Lunastryke Nov 10, 2018
68afbc1
Bug fix for lists not updating after logout and login
Lunastryke Nov 11, 2018
1c62d69
Merge branch 'master' into master
Lunastryke Nov 11, 2018
72a935a
Checkstyle
Lunastryke Nov 11, 2018
a9259cb
Checkstyle
Lunastryke Nov 11, 2018
f101850
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 11, 2018
1141c45
Fix for travis
Lunastryke Nov 11, 2018
202ce1f
Fixed file names and documentation formatting
Lunastryke Nov 11, 2018
40bc3bc
Added project portfolio
Lunastryke Nov 11, 2018
7634f5a
Merge pull request #169 from Lunastryke/master
Lunastryke Nov 11, 2018
bafed18
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 11, 2018
a405205
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 11, 2018
86dc83b
For login error
Lunastryke Nov 11, 2018
0f2e17c
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 11, 2018
d1bdcf4
Changed documentation for find command.
Lunastryke Nov 11, 2018
855abdb
Checkstyle
Lunastryke Nov 11, 2018
a1fc00d
Merge pull request #170 from Lunastryke/master
Lunastryke Nov 11, 2018
a1c8fd0
added more test update on DG (#168)
LIU-TIANHANG Nov 11, 2018
2eacdc9
Transaction storage (#172)
bluein-green Nov 11, 2018
cda6ea7
Edits to UG and PPP
Lunastryke Nov 11, 2018
262c16c
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 11, 2018
8845736
[WIP] Tests for Analysis features (#165)
bluein-green Nov 11, 2018
114953d
Adding of Tests and updating of Utils
Lunastryke Nov 11, 2018
f00f435
Documentation updates (#174)
bluein-green Nov 11, 2018
fce5d1b
UGDG updates (#176)
bluein-green Nov 12, 2018
0eee61a
added interface for LoginInfomanager (#173)
LIU-TIANHANG Nov 12, 2018
ec33a7b
Edit analysis to pass predicate instead of AnalysisPeriodType (#177)
bluein-green Nov 12, 2018
a946f7a
Merge branch 'master' into master
Lunastryke Nov 12, 2018
fddccba
Bug fixes for find command not updating drink list and UI not resetti…
Lunastryke Nov 12, 2018
d9a5841
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 12, 2018
cdc9497
update on bugs(login logout from transaction list (#178)
LIU-TIANHANG Nov 12, 2018
2b2c508
Merge branch 'master' into master
Lunastryke Nov 12, 2018
f85ea1e
Checkstyle
Lunastryke Nov 12, 2018
d2618f1
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 12, 2018
9792fe1
Additional edits to personal portfolio
Lunastryke Nov 12, 2018
50fca3f
Checkstyle
Lunastryke Nov 12, 2018
8c827a8
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 12, 2018
35a14ed
Checkstyle
Lunastryke Nov 12, 2018
ee2c657
Merge pull request #175 from Lunastryke/master
Lunastryke Nov 12, 2018
51d2bb7
update of UG plus create 4 UG for roles (#179)
LIU-TIANHANG Nov 12, 2018
0790b08
update ReadMe (#180)
LIU-TIANHANG Nov 12, 2018
3332943
Bug fix for transaction list not updating upon relogin
Lunastryke Nov 12, 2018
6108241
Merge pull request #181 from Lunastryke/master
Lunastryke Nov 12, 2018
b2444c0
Add UI guide image
Lunastryke Nov 12, 2018
21062ab
Merge pull request #182 from Lunastryke/master
Lunastryke Nov 12, 2018
773937e
Updates to DG and PPP
Lunastryke Nov 12, 2018
9892213
update on DG (#184)
LIU-TIANHANG Nov 12, 2018
d10e0e1
DG updates on analyses (#183)
bluein-green Nov 12, 2018
5f869cf
update on UG (#186)
LIU-TIANHANG Nov 12, 2018
76f07c0
Added images for DG
Lunastryke Nov 12, 2018
82d0511
Merge branch 'master' into master
Lunastryke Nov 12, 2018
4dd9216
Dgchange (#187)
bluein-green Nov 12, 2018
ac67843
Merge pull request #185 from Lunastryke/master
Lunastryke Nov 12, 2018
a228607
update PPP
Nov 12, 2018
345a0f5
Merge pull request #189 from scottljw/master
scottljw Nov 12, 2018
8074613
update PPP
Nov 12, 2018
9321ade
Merge pull request #191 from scottljw/master
scottljw Nov 12, 2018
cc3ddce
Updates to PPP
Lunastryke Nov 12, 2018
caa3bd6
Merge branch 'master' of https://github.com/Lunastryke/main.git
Lunastryke Nov 12, 2018
7cbf957
add DG (#190)
bluein-green Nov 12, 2018
e8b01dd
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W12-4/mai…
Lunastryke Nov 12, 2018
f2f5226
Merge pull request #192 from Lunastryke/master
Lunastryke Nov 12, 2018
9cfebac
Changed image sizes for PPP
Lunastryke Nov 12, 2018
58ca586
Merge pull request #193 from Lunastryke/master
Lunastryke Nov 12, 2018
f931d97
Removed 1 sequence diagram to account for PPP Page limit
Lunastryke Nov 12, 2018
61c9bf8
Removed more diagrams
Lunastryke Nov 12, 2018
3d5f476
Merge pull request #195 from Lunastryke/master
Lunastryke Nov 12, 2018
f873216
edits to PPP, UG, DG (#194)
bluein-green Nov 12, 2018
e5551d3
UG change (#196)
bluein-green Nov 12, 2018
a54244e
Ug change (#197)
bluein-green Nov 12, 2018
41a9e4b
added more manual test cases
bluein-green Nov 12, 2018
8f3af6f
Merge pull request #198 from bluein-green/lastChangeToDG
Lunastryke Nov 12, 2018
4230653
Adding of author tags and updating reposense config
Lunastryke Nov 15, 2018
b526f6d
Newline @ EOF
Lunastryke Nov 15, 2018
6f7271b
Merge pull request #200 from Lunastryke/master
Lunastryke Nov 15, 2018
36bb302
Rename reposense config.json.txt to config.json
bluein-green Nov 15, 2018
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
  •  
  •  
  •  
39 changes: 22 additions & 17 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,41 +1,46 @@
= Address Book (Level 4)
= Drink I/O
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
https://https://travis-ci.org/CS2113-AY1819S1-W12-4[image:https://travis-ci.org/CS2113-AY1819S1-W12-4/main.svg?branch=master[Build Status]]
// https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
// https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
// https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
// https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
endif::[]

ifndef::env-github[]
image::images/drink_io_logo.png[width="600"]
endif::[]

== About App
*[blue]#_Drink I/O_#* is a comprehensive inventory management system targeted at small-scale drink distribution companies that typically use Microsoft Excel or paper to keep track of their stocks.
This system will enable employees and managers to keep track of the stocks of various drinks, as well as the profit / revenue earned over time periods.
This will enable them to stock up on goods in a timely manner and make it easier for them to track their finances.

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.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>
* https://cs2113-ay1819s1-w12-4.github.io/main/AccountantUserGuide.html[Accountant user guide]
* https://cs2113-ay1819s1-w12-4.github.io/main/ManagerUserGuide.html[Manager user guide]
* https://cs2113-ay1819s1-w12-4.github.io/main/StockTakerUserGuide.html[Stock taker user guide]
* https://cs2113-ay1819s1-w12-4.github.io/main/AdminUserGuide.html[Admin user guide]

== Acknowledgements

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
== Acknowledgements
* Original source of code: Addressbook-Level4 project created by SE-EDU initiative at [https://github.com/se-edu]
* Some parts of this application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]

25 changes: 25 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"authors":
[
{
"githubId": "bluein-green",
"displayName": "JIN...JIA",
"authorNames": ["bluein-green", "Jin Minjia"]
},
{
"githubId": "scottljw",
"displayName": "LI ...WEI",
"authorNames": ["scottljw", "Li Jiawei", "Scott Lee"]
},
{
"githubId": "Lunastryke",
"displayName": "LIM...HAO",
"authorNames": ["Lunastryke"]
},
{
"githubId": "liu-tianhang",
"displayName": "LIU...ANG",
"authorNames": ["liu-tianhang"]
}
]
}
16 changes: 11 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ plugins {
id 'org.asciidoctor.convert' version '1.5.6'
id 'application'
}

//jar {
// manifest {
// attributes(
// 'Main-Class': 'seedu.address.MainApp'
// )
// }
//}
if (JavaVersion.current() == JavaVersion.VERSION_1_10
&& System.getProperty('os.name').startsWith('Windows')) {
logger.warn('''\
Expand Down Expand Up @@ -82,7 +88,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -207,9 +213,9 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'Drink I/O',
'site-githuburl': 'https://cs2113-ay1819s1-w12-4.github.io/main/',
'site-seedu': false, // delete this line if your project is not a fork (not a SE-EDU project)
]

options['template_dirs'].each {
Expand Down
16 changes: 8 additions & 8 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!--
This configuration file enforces rules for a modified version of the module's code standard at
Expand Down Expand Up @@ -55,11 +55,11 @@
4. THIRD_PARTY_PACKAGE: defined as com imports
-->
<module name="CustomImportOrder">
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
</module>

<!-- Checks for redundant import statements.
Expand Down Expand Up @@ -220,7 +220,7 @@
some other variants which we don't publicized to promote consistency).
-->
<property name="reliefPattern"
value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
</module>

<module name="MissingSwitchDefault"/>
Expand Down
4 changes: 2 additions & 2 deletions config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">

<suppressions>
<suppress checks="JavadocType" files=".*Test\.java"/>
Expand Down
53 changes: 24 additions & 29 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,48 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 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.}_ +
*[blue]#_Drink I/O_#* was developed by Team CS2113-AY1819S1-W12-4. +
{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>>]
=== Jin Minjia
image::bluein-green.png[width="150", align="left"]
{empty}[http://github.com/bluein-green[github]] [<<bluein-green#, portfolio>>]

Role: Project Advisor
Role: Developer

'''

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

Role: Team Lead +
Responsibilities: UI
Responsibilities: Model

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Li Jiawei
image::scottljw.png[width="150", align="left"]
{empty}[http://github.com/scottljw[github]] [<<scottljw#, portfolio>>]

Role: Developer +
Responsibilities: Data
Role: Developer

Responsibilities: Storage

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Lim Xuan Hao
image::lunastryke.png[width="150", align="left"]
{empty}[http://github.com/Lunastryke[github]] [<<lunastryke#, portfolio>>]

Role: Developer

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Documentation, Git Expert

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Liu Tianhang
image::liu-tianhang.png[width="150", align="left"]
{empty}[http://github.com/LIU-TIANHANG[github]] [<<liu-tianhang#, portfolio>>]

Role: Developer

Role: Developer +
Responsibilities: UI
Responsibilities: Logic, Security

'''
Loading